Merge pull request #11613 from knweiss/gosimple

Code simplification (gosimple)
2018-04-17 22:40:40 +02:00
parent 6ba830c73b ed46efa081
commit 8367199a2d
45 changed files with 89 additions and 174 deletions
@@ -48,9 +48,9 @@ func (r *RoleType) UnmarshalJSON(data []byte) error {

 	*r = RoleType(str)

-	if (*r).IsValid() == false {
+	if !(*r).IsValid() {
 		if (*r) != "" {
-			return errors.New(fmt.Sprintf("JSON validation error: invalid role value: %s", *r))
+			return fmt.Errorf("JSON validation error: invalid role value: %s", *r)
 		}

 		*r = ROLE_VIEWER