Add only one Content-Type header (raboof#12)

JakeFromTheDark · Kamil Jakubovic · web-flow · commit bd8b92c4c813 · 2021-02-19T13:48:16.000+01:00
* Add only one Content-Type header

Co-authored-by: Kamil Jakubovic &lt;kamil.jakubovic@sap.com&gt;
diff --git a/configuration_example.yml b/configuration_example.yml
@@ -10,6 +10,7 @@
 #    loadbalance: true
 #    compression_level: 9
 #    format: "json_lines"
+#    content_type: "text/plain"
 #    max_retries: 3
 #    timeout: 90 seconds
 #    tls:
diff --git a/http/client.go b/http/client.go
@@ -303,14 +303,13 @@ func (conn *Connection) execRequest(method, url string, body io.Reader, headers
 		return 0, nil, err
 	}
 	if body != nil {
-		conn.encoder.AddHeader(&req.Header)
+		conn.encoder.AddHeader(&req.Header, conn.ContentType)
 	}
 	return conn.execHTTPRequest(req, headers)
 }
 
 func (conn *Connection) execHTTPRequest(req *http.Request, headers map[string]string) (int, []byte, error) {
 	req.Header.Add("Accept", "application/json")
-	req.Header.Add("Content-Type", conn.ContentType)
 	for key, value := range headers {
 		req.Header.Add(key, value)
 	}
diff --git a/http/enc.go b/http/enc.go
@@ -18,7 +18,7 @@ type bodyEncoder interface {
 type bulkBodyEncoder interface {
 	bulkWriter
 
-	AddHeader(*http.Header)
+	AddHeader(*http.Header, string)
 	Reset()
 }
 
@@ -56,8 +56,12 @@ func (b *jsonEncoder) Reset() {
 	b.buf.Reset()
 }
 
-func (b *jsonEncoder) AddHeader(header *http.Header) {
-	header.Add("Content-Type", "application/json; charset=UTF-8")
+func (b *jsonEncoder) AddHeader(header *http.Header, contentType string) {
+	if (contentType == "") {
+		header.Add("Content-Type", "application/json; charset=UTF-8")
+	} else {
+		header.Add("Content-Type", contentType)
+	}
 }
 
 func (b *jsonEncoder) Reader() io.Reader {
@@ -101,8 +105,12 @@ func (b *jsonLinesEncoder) Reset() {
 	b.buf.Reset()
 }
 
-func (b *jsonLinesEncoder) AddHeader(header *http.Header) {
-	header.Add("Content-Type", "application/x-ndjson; charset=UTF-8")
+func (b *jsonLinesEncoder) AddHeader(header *http.Header, contentType string) {
+	if (contentType == "") {
+		header.Add("Content-Type", "application/x-ndjson; charset=UTF-8")
+	} else {
+		header.Add("Content-Type", contentType)
+	}
 }
 
 func (b *jsonLinesEncoder) Reader() io.Reader {
@@ -169,8 +177,12 @@ func (b *gzipEncoder) Reader() io.Reader {
 	return b.buf
 }
 
-func (b *gzipEncoder) AddHeader(header *http.Header) {
-	header.Add("Content-Type", "application/json; charset=UTF-8")
+func (b *gzipEncoder) AddHeader(header *http.Header, contentType string) {
+	if (contentType == "") {
+		header.Add("Content-Type", "application/json; charset=UTF-8")
+	} else {
+		header.Add("Content-Type", contentType)
+	}
 	header.Add("Content-Encoding", "gzip")
 }
 
@@ -225,8 +237,12 @@ func (b *gzipLinesEncoder) Reader() io.Reader {
 	return b.buf
 }
 
-func (b *gzipLinesEncoder) AddHeader(header *http.Header) {
-	header.Add("Content-Type", "application/x-ndjson; charset=UTF-8")
+func (b *gzipLinesEncoder) AddHeader(header *http.Header, contentType string) {
+	if (contentType == "") {
+		header.Add("Content-Type", "application/x-ndjson; charset=UTF-8")
+	} else {
+		header.Add("Content-Type", contentType)
+	}
 	header.Add("Content-Encoding", "gzip")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -303,14 +303,13 @@ func (conn *Connection) execRequest(method, url string, body io.Reader, headers`
`303`	`303`	`return 0, nil, err`
`304`	`304`	`}`
`305`	`305`	`if body != nil {`
`306`		`- conn.encoder.AddHeader(&req.Header)`
	`306`	`+ conn.encoder.AddHeader(&req.Header, conn.ContentType)`
`307`	`307`	`}`
`308`	`308`	`return conn.execHTTPRequest(req, headers)`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`func (conn Connection) execHTTPRequest(req http.Request, headers map[string]string) (int, []byte, error) {`
`312`	`312`	`req.Header.Add("Accept", "application/json")`
`313`		`- req.Header.Add("Content-Type", conn.ContentType)`
`314`	`313`	`for key, value := range headers {`
`315`	`314`	`req.Header.Add(key, value)`
`316`	`315`	`}`