diff --git a/console/openapi-gen-angular/main.go b/console/openapi-gen-angular/main.go index 799cb900a5..eedb811df4 100644 --- a/console/openapi-gen-angular/main.go +++ b/console/openapi-gen-angular/main.go @@ -382,9 +382,7 @@ func convertType(prefixesToRemove []string, convertRefToClassName func(string) s switch prop.Type { case "string": return "string" - case "integer": - fallthrough - case "number": + case "integer", "number": return "number" case "boolean": return "boolean" @@ -392,9 +390,7 @@ func convertType(prefixesToRemove []string, convertRefToClassName func(string) s switch prop.Items.Type { case "string": return "Array" - case "integer": - fallthrough - case "number": + case "integer", "number": return "Array" case "boolean": return "Array" @@ -405,9 +401,7 @@ func convertType(prefixesToRemove []string, convertRefToClassName func(string) s switch prop.AdditionalProperties.Type { case "string": return "Map" - case "integer": - fallthrough - case "number": + case "integer", "number": return "Map" case "boolean": return "Map" diff --git a/iap/iap.go b/iap/iap.go index ac0e50490f..ad1960acc3 100644 --- a/iap/iap.go +++ b/iap/iap.go @@ -217,14 +217,7 @@ func ValidateReceiptAppleWithUrl(ctx context.Context, httpc *http.Client, url, r return sort.StringsAreSorted([]string{out.LatestReceiptInfo[j].ExpiresDateMs, out.LatestReceiptInfo[i].ExpiresDateMs}) }) - switch out.Status { - case AppleReceiptIsFromTestSandbox: - fallthrough - case AppleReceiptIsValid: - fallthrough - default: - return &out, buf, nil - } + return &out, buf, nil default: return nil, nil, &ValidationError{ Err: ErrNon200ServiceApple, diff --git a/migrate/migrate.go b/migrate/migrate.go index 961e76e61f..598138cbeb 100644 --- a/migrate/migrate.go +++ b/migrate/migrate.go @@ -215,9 +215,7 @@ func (ms *migrationService) parseParams(logger *zap.Logger, cmd, loggerFormat st ms.loggerFormat = server.JSONFormat switch strings.ToLower(loggerFormat) { - case "": - fallthrough - case "json": + case "", "json": ms.loggerFormat = server.JSONFormat case "stackdriver": ms.loggerFormat = server.StackdriverFormat diff --git a/server/logger.go b/server/logger.go index 2fa84c575c..6202a685ca 100644 --- a/server/logger.go +++ b/server/logger.go @@ -50,9 +50,7 @@ func SetupLogging(tmpLogger *zap.Logger, config Config) (*zap.Logger, *zap.Logge format := JSONFormat switch strings.ToLower(config.GetLogger().Format) { - case "": - fallthrough - case "json": + case "", "json": format = JSONFormat case "stackdriver": format = StackdriverFormat diff --git a/server/socket_ws.go b/server/socket_ws.go index da14de9998..0af807d2be 100644 --- a/server/socket_ws.go +++ b/server/socket_ws.go @@ -43,12 +43,10 @@ func NewSocketWsAcceptor(logger *zap.Logger, config Config, sessionRegistry Sess // Check format. var format SessionFormat switch r.URL.Query().Get("format") { + case "", "json": + format = SessionFormatJson case "protobuf": format = SessionFormatProtobuf - case "json": - fallthrough - case "": - format = SessionFormatJson default: // Invalid values are rejected. http.Error(w, "Invalid format parameter", 400) diff --git a/social/social.go b/social/social.go index 25f250944a..4b9c2f70ea 100644 --- a/social/social.go +++ b/social/social.go @@ -886,9 +886,7 @@ func (c *Client) CheckFacebookLimitedLoginToken(ctx context.Context, appId strin // Verify the issuer. switch iss, _ := claims["iss"].(string); iss { - case "https://www.facebook.com": - fallthrough - case "https://facebook.com": + case "https://www.facebook.com", "https://facebook.com": break default: return nil, fmt.Errorf("unexpected issuer: %v", claims["iss"])