fix: remove unnecessary err == EOF check

googleapis · Jul 3, 2024 · fefd679 · fefd679
1 parent 2de9f83
commit fefd679
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 38 deletions.
diff --git a/server/genrest/compliance.go b/server/genrest/compliance.go
@@ -56,7 +56,7 @@ func (backend *RESTBackend) HandleRepeatDataBody(w http.ResponseWriter, r *http.
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -131,7 +131,7 @@ func (backend *RESTBackend) HandleRepeatDataBodyInfo(w http.ResponseWriter, r *h
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -538,7 +538,7 @@ func (backend *RESTBackend) HandleRepeatDataBodyPut(w http.ResponseWriter, r *ht
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -612,7 +612,7 @@ func (backend *RESTBackend) HandleRepeatDataBodyPatch(w http.ResponseWriter, r *
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}

diff --git a/server/genrest/echo.go b/server/genrest/echo.go
@@ -56,7 +56,7 @@ func (backend *RESTBackend) HandleEcho(w http.ResponseWriter, r *http.Request) {
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -130,7 +130,7 @@ func (backend *RESTBackend) HandleEchoErrorDetails(w http.ResponseWriter, r *htt
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -204,7 +204,7 @@ func (backend *RESTBackend) HandleExpand(w http.ResponseWriter, r *http.Request)
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -281,7 +281,7 @@ func (backend *RESTBackend) HandlePagedExpand(w http.ResponseWriter, r *http.Req
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -355,7 +355,7 @@ func (backend *RESTBackend) HandlePagedExpandLegacy(w http.ResponseWriter, r *ht
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -429,7 +429,7 @@ func (backend *RESTBackend) HandlePagedExpandLegacyMapped(w http.ResponseWriter,
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -503,7 +503,7 @@ func (backend *RESTBackend) HandleWait(w http.ResponseWriter, r *http.Request) {
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -577,7 +577,7 @@ func (backend *RESTBackend) HandleBlock(w http.ResponseWriter, r *http.Request)
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}

diff --git a/server/genrest/iampolicy.go b/server/genrest/iampolicy.go
@@ -56,7 +56,7 @@ func (backend *RESTBackend) HandleSetIamPolicy(w http.ResponseWriter, r *http.Re
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -130,7 +130,7 @@ func (backend *RESTBackend) HandleSetIamPolicy_1(w http.ResponseWriter, r *http.
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -204,7 +204,7 @@ func (backend *RESTBackend) HandleSetIamPolicy_2(w http.ResponseWriter, r *http.
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -278,7 +278,7 @@ func (backend *RESTBackend) HandleSetIamPolicy_3(w http.ResponseWriter, r *http.
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -616,7 +616,7 @@ func (backend *RESTBackend) HandleTestIamPermissions(w http.ResponseWriter, r *h
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -690,7 +690,7 @@ func (backend *RESTBackend) HandleTestIamPermissions_1(w http.ResponseWriter, r
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -764,7 +764,7 @@ func (backend *RESTBackend) HandleTestIamPermissions_2(w http.ResponseWriter, r
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -838,7 +838,7 @@ func (backend *RESTBackend) HandleTestIamPermissions_3(w http.ResponseWriter, r
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}

diff --git a/server/genrest/identity.go b/server/genrest/identity.go
@@ -56,7 +56,7 @@ func (backend *RESTBackend) HandleCreateUser(w http.ResponseWriter, r *http.Requ
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -197,7 +197,7 @@ func (backend *RESTBackend) HandleUpdateUser(w http.ResponseWriter, r *http.Requ
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}

diff --git a/server/genrest/messaging.go b/server/genrest/messaging.go
@@ -56,7 +56,7 @@ func (backend *RESTBackend) HandleCreateRoom(w http.ResponseWriter, r *http.Requ
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -197,7 +197,7 @@ func (backend *RESTBackend) HandleUpdateRoom(w http.ResponseWriter, r *http.Requ
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -406,7 +406,7 @@ func (backend *RESTBackend) HandleCreateBlurb(w http.ResponseWriter, r *http.Req
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -480,7 +480,7 @@ func (backend *RESTBackend) HandleCreateBlurb_1(w http.ResponseWriter, r *http.R
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -687,7 +687,7 @@ func (backend *RESTBackend) HandleUpdateBlurb(w http.ResponseWriter, r *http.Req
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -770,7 +770,7 @@ func (backend *RESTBackend) HandleUpdateBlurb_1(w http.ResponseWriter, r *http.R
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -1116,7 +1116,7 @@ func (backend *RESTBackend) HandleSearchBlurbs(w http.ResponseWriter, r *http.Re
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -1256,7 +1256,7 @@ func (backend *RESTBackend) HandleStreamBlurbs(w http.ResponseWriter, r *http.Re
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -1326,7 +1326,7 @@ func (backend *RESTBackend) HandleStreamBlurbs_1(w http.ResponseWriter, r *http.
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}

diff --git a/server/genrest/sequenceservice.go b/server/genrest/sequenceservice.go
@@ -57,7 +57,7 @@ func (backend *RESTBackend) HandleCreateSequence(w http.ResponseWriter, r *http.
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -140,7 +140,7 @@ func (backend *RESTBackend) HandleCreateStreamingSequence(w http.ResponseWriter,
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -354,7 +354,7 @@ func (backend *RESTBackend) HandleAttemptSequence(w http.ResponseWriter, r *http
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}
@@ -428,7 +428,7 @@ func (backend *RESTBackend) HandleAttemptStreamingSequence(w http.ResponseWriter
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}

diff --git a/server/genrest/testing.go b/server/genrest/testing.go
@@ -57,7 +57,7 @@ func (backend *RESTBackend) HandleCreateSession(w http.ResponseWriter, r *http.R
 	var jsonReader bytes.Buffer
 	bodyReader := io.TeeReader(r.Body, &jsonReader)
 	rBytes, err := io.ReadAll(bodyReader)
-	if err != nil && err != io.EOF {
+	if err != nil {
 		backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err)
 		return
 	}

diff --git a/util/genrest/goviewcreator.go b/util/genrest/goviewcreator.go
@@ -123,7 +123,7 @@ func NewView(model *gomodel.Model) (*goview.View, error) {
 				source.P("  var jsonReader bytes.Buffer")
 				source.P("  bodyReader := io.TeeReader(r.Body, &jsonReader)")
 				source.P("  rBytes, err := io.ReadAll(bodyReader)")
-				source.P("  if err != nil && err != io.EOF {")
+				source.P("  if err != nil {")
 				source.P(`    backend.Error(w, http.StatusBadRequest, "error reading body content: %%s", err)`)
 				source.P("    return")
 				source.P("  }")
@@ -155,7 +155,7 @@ func NewView(model *gomodel.Model) (*goview.View, error) {
 				source.P("  var jsonReader bytes.Buffer")
 				source.P("  bodyReader := io.TeeReader(r.Body, &jsonReader)")
 				source.P("  rBytes, err := io.ReadAll(bodyReader)")
-				source.P("  if err != nil && err != io.EOF {")
+				source.P("  if err != nil {")
 				source.P(`    backend.Error(w, http.StatusBadRequest, "error reading body content: %%s", err)`)
 				source.P("    return")
 				source.P("  }")