Invert header & body conditions so Header override works on both functional options and direct call

Author: Anaethelion

internal/build/cmd/generate/commands/gensource/generator.go

@@ -30,15 +30,13 @@ import (
 )
 
 // Generator represents the "gensource" generator.
-//
 type Generator struct {
 	b bytes.Buffer
 
 	Endpoint *Endpoint
 }
 
 // Output returns the generator output.
-//
 func (g *Generator) Output() (io.Reader, error) {
 	g.genHeader()
 	g.genConstructor()
@@ -52,7 +50,6 @@ func (g *Generator) Output() (io.Reader, error) {
 }
 
 // OutputFormatted returns a formatted generator output.
-//
 func (g *Generator) OutputFormatted() (io.Reader, error) {
 	out, err := g.Output()
 	if err != nil {
@@ -794,12 +791,6 @@ func (r ` + g.Endpoint.MethodWithNamespace() + `Request) Do(ctx context.Context,
 		req.URL.RawQuery = q.Encode()
 	}` + "\n\n")
 
-	if g.Endpoint.Body != nil {
-		g.w(`if r.Body != nil && req.Header.Get(headerContentType) == "" {
-		req.Header[headerContentType] = headerContentTypeJSON
-	}` + "\n\n")
-	}
-
 	g.w(`if len(r.Header) > 0 {
 		if len(req.Header) == 0 {
 			req.Header = r.Header
@@ -812,6 +803,12 @@ func (r ` + g.Endpoint.MethodWithNamespace() + `Request) Do(ctx context.Context,
 		}
 	}` + "\n\n")
 
+	if g.Endpoint.Body != nil {
+		g.w(`if r.Body != nil && req.Header.Get(headerContentType) == "" {
+		req.Header[headerContentType] = headerContentTypeJSON
+	}` + "\n\n")
+	}
+
 	g.w(`if ctx != nil {
 		req = req.WithContext(ctx)
 	}` + "\n\n")