allow to set content type with charset

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

go.mod

@@ -2,4 +2,4 @@ module github.com/unistack-org/micro-client-http/v3
 
 go 1.16
 
-require github.com/unistack-org/micro/v3 v3.3.11
+require github.com/unistack-org/micro/v3 v3.3.13

go.sum

@@ -5,9 +5,9 @@ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/unistack-org/micro/v3 v3.3.11 h1:Jr0gAw5lLqgddiHKQeWUOUeP6ZqgRhz52EA9zJ5MJ3U=
-github.com/unistack-org/micro/v3 v3.3.11/go.mod h1:PPCt675o3HPcODFbJ4iRWPmQFAk1WQ+asQSOb/syq6U=
-golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+github.com/unistack-org/micro/v3 v3.3.13 h1:y4bDDkbwnjgOckrhFkC6D/o42tr75X33UbrB+Ko0M68=
+github.com/unistack-org/micro/v3 v3.3.13/go.mod h1:98hNcMXp/WyWJwLwCuwrhN1Jm7aCWaRNsMfRjK8Fq+Y=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

http.go

@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/unistack-org/micro/v3/broker"
@@ -133,6 +134,9 @@ func (h *httpClient) call(ctx context.Context, addr string, req client.Request,
 	}
 
 	ct := req.ContentType()
+	if len(opts.ContentType) > 0 {
+		ct = opts.ContentType
+	}
 
 	// set timeout in nanoseconds
 	header.Set("Timeout", fmt.Sprintf("%d", opts.RequestTimeout))
@@ -144,9 +148,9 @@ func (h *httpClient) call(ctx context.Context, addr string, req client.Request,
 	// get codec
 	switch ct {
 	case "application/x-www-form-urlencoded":
-		cf, err = h.newCodec(DefaultContentType)
+		cf, err = h.newCodec(strings.Split(DefaultContentType, ";")[0])
 	default:
-		cf, err = h.newCodec(ct)
+		cf, err = h.newCodec(strings.Split(ct, ";")[0])
 	}
 
 	if err != nil {
@@ -194,13 +198,17 @@ func (h *httpClient) stream(ctx context.Context, addr string, req client.Request
 	}
 
 	ct := req.ContentType()
+	if len(opts.ContentType) > 0 {
+		ct = opts.ContentType
+	}
+
 	// set timeout in nanoseconds
 	header.Set("Timeout", fmt.Sprintf("%d", opts.RequestTimeout))
 	// set the content type for the request
 	header.Set("Content-Type", ct)
 
 	// get codec
-	cf, err := h.newCodec(req.ContentType())
+	cf, err := h.newCodec(strings.Split(req.ContentType(), ";")[0])
 	if err != nil {
 		return nil, errors.InternalServerError("go.micro.client", err.Error())
 	}
@@ -552,7 +560,7 @@ func (h *httpClient) Publish(ctx context.Context, p client.Message, opts ...clie
 	md["Content-Type"] = p.ContentType()
 	md["Micro-Topic"] = p.Topic()
 
-	cf, err := h.newCodec(p.ContentType())
+	cf, err := h.newCodec(strings.Split(p.ContentType(), ";")[0])
 	if err != nil {
 		return errors.InternalServerError("go.micro.client", err.Error())
 	}

request.go

@@ -15,7 +15,6 @@ type httpRequest struct {
 
 func newHTTPRequest(service, method string, request interface{}, contentType string, opts ...client.RequestOption) client.Request {
 	options := client.NewRequestOptions(opts...)
-
 	if len(options.ContentType) == 0 {
 		options.ContentType = contentType
 	}

util.go

@@ -160,15 +160,23 @@ func newTemplate(path string) (util.Template, error) {
 }
 
 func parseRsp(ctx context.Context, hrsp *http.Response, cf codec.Codec, rsp interface{}, opts client.CallOptions) error {
+	// fast path return
+	if hrsp.StatusCode == http.StatusNoContent {
+		return nil
+	}
+
 	b, err := ioutil.ReadAll(hrsp.Body)
 	if err != nil {
 		return errors.InternalServerError("go.micro.client", err.Error())
 	}
 
 	if hrsp.StatusCode < 400 {
-		// unmarshal
-		if err := cf.Unmarshal(b, rsp); err != nil {
-			return errors.InternalServerError("go.micro.client", err.Error())
+		// unmarshal only if body not nil
+		if len(b) > 0 {
+			// unmarshal
+			if err := cf.Unmarshal(b, rsp); err != nil {
+				return errors.InternalServerError("go.micro.client", err.Error())
+			}
 		}
 		return nil
 	}
@@ -187,8 +195,12 @@ func parseRsp(ctx context.Context, hrsp *http.Response, cf codec.Codec, rsp inte
 		return errors.New("go.micro.client", string(b), int32(hrsp.StatusCode))
 	}
 
-	if cerr := cf.Unmarshal(b, err); cerr != nil {
-		return errors.InternalServerError("go.micro.client", cerr.Error())
+	if len(b) > 0 {
+		if cerr := cf.Unmarshal(b, err); cerr != nil {
+			err = errors.InternalServerError("go.micro.client", cerr.Error())
+		}
+	} else {
+		err = errors.New("go.micro.client", string(b), int32(hrsp.StatusCode))
 	}
 
 	return err