Add deleted part

Author: tomas-sexenian

java/src/main/java/com/genexus/internet/HttpClientJavaLib.java

@@ -508,29 +508,39 @@ public void execute(String method, String url) {
 						}
 						response = httpClient.execute(httpget, httpClientContext);
 					}
-
 				} else if (method.equalsIgnoreCase("POST")) {
 					HttpPost httpPost = new HttpPost(url.trim());
 					httpPost.setConfig(reqConfig);
 					Set<String> keys = getheadersToSend().keySet();
-					boolean hasConentType = false;
+					boolean hasContentType = false;
 					for (String header : keys) {
 						httpPost.addHeader(header, getheadersToSend().get(header));
 						if (header.equalsIgnoreCase("Content-type"))
-							hasConentType = true;
+							hasContentType = true;
 					}
-					if (!hasConentType)        // Si no se setea Content-type, se pone uno default
-						httpPost.addHeader("Content-type", "application/x-www-form-urlencoded");
-
-					ByteArrayEntity dataToSend;
-					if (!getIsMultipart() && getVariablesToSend().size() > 0)
-						dataToSend = new ByteArrayEntity(CommonUtil.hashtable2query(getVariablesToSend()).getBytes());
-					else
-						dataToSend = new ByteArrayEntity(getData());
-					httpPost.setEntity(dataToSend);
-
+					HttpEntity entity;
+					if (getIsMultipart()) {
+						httpPost.removeHeaders("Content-type");
+						MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+						if (getVariablesToSend() != null && getVariablesToSend().size() > 0) {
+							for (Object obj : getVariablesToSend().entrySet()) {
+								Map.Entry entry = (Map.Entry) obj;
+								builder.addTextBody(entry.getKey().toString(), entry.getValue().toString(), ContentType.TEXT_PLAIN.withCharset(StandardCharsets.UTF_8));
+							}
+						} else if (getData() != null && getData().length > 0) {
+							builder.addBinaryBody("file", getData(), ContentType.DEFAULT_BINARY, "file");
+						}
+						entity = builder.build();
+					} else {
+						if (!hasContentType)
+							httpPost.addHeader("Content-type", "application/x-www-form-urlencoded");
+						if (getVariablesToSend() != null && getVariablesToSend().size() > 0)
+							entity = new ByteArrayEntity(CommonUtil.hashtable2query(getVariablesToSend()).getBytes());
+						else
+							entity = new ByteArrayEntity(getData());
+					}
+					httpPost.setEntity(entity);
 					response = httpClient.execute(httpPost, httpClientContext);
-
 				} else if (method.equalsIgnoreCase("PUT")) {
 					HttpPut httpPut = new HttpPut(url.trim());
 					httpPut.setConfig(reqConfig);