Shaun Johnson signs new two-year contract with The Warriors.