2727import org .apache .http .client .utils .URIBuilder ;
2828import org .apache .http .client .utils .URLEncodedUtils ;
2929import org .apache .http .entity .ByteArrayEntity ;
30+ import org .apache .http .entity .ContentType ;
3031import org .apache .http .entity .StringEntity ;
3132import org .apache .http .impl .client .HttpClientBuilder ;
3233import org .apache .http .util .EntityUtils ;
@@ -101,30 +102,22 @@ HttpUriRequest toHttpUriRequest(Request request, Request.Options options) throws
101102
102103 URI uri = new URIBuilder (request .url ()).build ();
103104
104- //request url
105- requestBuilder .setUri (uri .getScheme () + "://" + uri .getAuthority () + uri .getPath ());
105+ requestBuilder .setUri (uri .getScheme () + "://" + uri .getAuthority () + uri .getRawPath ());
106106
107107 //request query params
108108 List <NameValuePair > queryParams = URLEncodedUtils .parse (uri , requestBuilder .getCharset ().name ());
109109 for (NameValuePair queryParam : queryParams ) {
110110 requestBuilder .addParameter (queryParam );
111111 }
112112
113- //request body
114- if (request .body () != null ) {
115- HttpEntity entity = request .charset () != null ?
116- new StringEntity (new String (request .body (), request .charset ())) :
117- new ByteArrayEntity (request .body ());
118- requestBuilder .setEntity (entity );
119- }
120-
121113 //request headers
122114 boolean hasAcceptHeader = false ;
123115 for (Map .Entry <String , Collection <String >> headerEntry : request .headers ().entrySet ()) {
124116 String headerName = headerEntry .getKey ();
125117 if (headerName .equalsIgnoreCase (ACCEPT_HEADER_NAME )) {
126118 hasAcceptHeader = true ;
127119 }
120+
128121 if (headerName .equalsIgnoreCase (Util .CONTENT_LENGTH ) &&
129122 requestBuilder .getHeaders (headerName ) != null ) {
130123 //if the 'Content-Length' header is already present, it's been set from HttpEntity, so we
@@ -141,9 +134,36 @@ HttpUriRequest toHttpUriRequest(Request request, Request.Options options) throws
141134 requestBuilder .addHeader (ACCEPT_HEADER_NAME , "*/*" );
142135 }
143136
137+ //request body
138+ if (request .body () != null ) {
139+ HttpEntity entity = null ;
140+ if (request .charset () != null ) {
141+ ContentType contentType = getContentType (request );
142+ String content = new String (request .body (), request .charset ());
143+ entity = new StringEntity (content , contentType );
144+ } else {
145+ entity = new ByteArrayEntity (request .body ());
146+ }
147+
148+ requestBuilder .setEntity (entity );
149+ }
150+
144151 return requestBuilder .build ();
145152 }
146153
154+ private ContentType getContentType (Request request ) {
155+ ContentType contentType = ContentType .DEFAULT_TEXT ;
156+ for (Map .Entry <String , Collection <String >> entry : request .headers ().entrySet ())
157+ if (entry .getKey ().equalsIgnoreCase ("Content-Type" )) {
158+ Collection values = entry .getValue ();
159+ if (values != null && !values .isEmpty ()) {
160+ contentType = ContentType .create (entry .getValue ().iterator ().next (), request .charset ());
161+ break ;
162+ }
163+ }
164+ return contentType ;
165+ }
166+
147167 Response toFeignResponse (HttpResponse httpResponse ) throws IOException {
148168 StatusLine statusLine = httpResponse .getStatusLine ();
149169 int statusCode = statusLine .getStatusCode ();
0 commit comments