From a8b94140e543f8a03dfbd844b0b9732895cf7a8f Mon Sep 17 00:00:00 2001 From: walnut-tom Date: Sun, 5 Jan 2020 00:15:29 +0800 Subject: [PATCH 1/8] =?UTF-8?q?@khmarbaise=E4=BF=AE=E6=94=B9=E9=83=A8?= =?UTF-8?q?=E5=88=86POST=E6=95=B0=E6=8D=AE=E4=BD=BF=E7=94=A8UTF-8=E7=BC=96?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jenkins/client/JenkinsHttpClient.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java b/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java index 4eadc5c9..3da3c7d7 100755 --- a/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java +++ b/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java @@ -12,6 +12,7 @@ import com.offbytwo.jenkins.model.BaseModel; import com.offbytwo.jenkins.model.Crumb; import com.offbytwo.jenkins.model.ExtractHeader; +import java.nio.charset.StandardCharsets; import net.sf.json.JSONObject; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; @@ -45,7 +46,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.URI; -import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -298,7 +298,8 @@ public void post_form(String path, Map data, boolean crumbFlag) queryParams.add("json=" + EncodingUtils.formParameter(JSONObject.fromObject(data).toString())); String value = mapper.writeValueAsString(data); - StringEntity stringEntity = new StringEntity(value, ContentType.APPLICATION_FORM_URLENCODED); + StringEntity stringEntity = new StringEntity(value, ContentType.create(ContentType.APPLICATION_FORM_URLENCODED.getMimeType(), + StandardCharsets.UTF_8)); request = new HttpPost(UrlUtils.toNoApiUri(uri, context, path) + StringUtils.join(queryParams, "&")); request.setEntity(stringEntity); } else { @@ -325,7 +326,7 @@ public void post_form(String path, Map data, boolean crumbFlag) public HttpResponse post_form_with_result(String path, List data, boolean crumbFlag) throws IOException { HttpPost request; if (data != null) { - UrlEncodedFormEntity urlEncodedFormEntity = new UrlEncodedFormEntity(data); + UrlEncodedFormEntity urlEncodedFormEntity = new UrlEncodedFormEntity(data,StandardCharsets.UTF_8); request = new HttpPost(UrlUtils.toNoApiUri(uri, context, path)); request.setEntity(urlEncodedFormEntity); } else { @@ -355,7 +356,7 @@ public String post_xml(String path, String xml_data, boolean crumbFlag) throws I handleCrumbFlag(crumbFlag, request); if (xml_data != null) { - request.setEntity(new StringEntity(xml_data, ContentType.create("text/xml", "utf-8"))); + request.setEntity(new StringEntity(xml_data, ContentType.create(ContentType.TEXT_PLAIN.getMimeType(), StandardCharsets.UTF_8))); } HttpResponse response = client.execute(request, localContext); jenkinsVersion = ResponseUtils.getJenkinsVersion(response); @@ -373,7 +374,7 @@ public String post_xml(String path, String xml_data, boolean crumbFlag) throws I */ @Override public String post_text(String path, String textData, boolean crumbFlag) throws IOException { - return post_text(path, textData, ContentType.DEFAULT_TEXT, crumbFlag); + return post_text(path, textData, ContentType.create(ContentType.TEXT_PLAIN.getMimeType(), StandardCharsets.UTF_8), crumbFlag); } /** @@ -445,7 +446,7 @@ public void close() { } } - + /** * Add authentication to supplied builder. * @param builder the builder to configure @@ -454,7 +455,7 @@ public void close() { * @param password the password * @return the passed in builder */ - protected static HttpClientBuilder addAuthentication(final HttpClientBuilder builder, + protected static HttpClientBuilder addAuthentication(final HttpClientBuilder builder, final URI uri, final String username, String password) { if (isNotBlank(username)) { @@ -469,7 +470,7 @@ protected static HttpClientBuilder addAuthentication(final HttpClientBuilder bui return builder; } - + /** * Get the local context. * @return context @@ -478,7 +479,7 @@ protected HttpContext getLocalContext() { return localContext; } - + /** * Set the local context. * @param localContext the context @@ -487,10 +488,10 @@ protected void setLocalContext(final HttpContext localContext) { this.localContext = localContext; } - - - - + + + + private T objectFromResponse(Class cls, HttpResponse response) throws IOException { InputStream content = response.getEntity().getContent(); byte[] bytes = IOUtils.toByteArray(content); From 05b0c1acc148823018c09627a9a2d716d4c3a296 Mon Sep 17 00:00:00 2001 From: walnut-tom Date: Sun, 5 Jan 2020 00:34:29 +0800 Subject: [PATCH 2/8] Fix 500 error --- .../java/com/offbytwo/jenkins/client/JenkinsHttpClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java b/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java index 3da3c7d7..52e1c7ea 100755 --- a/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java +++ b/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java @@ -356,7 +356,7 @@ public String post_xml(String path, String xml_data, boolean crumbFlag) throws I handleCrumbFlag(crumbFlag, request); if (xml_data != null) { - request.setEntity(new StringEntity(xml_data, ContentType.create(ContentType.TEXT_PLAIN.getMimeType(), StandardCharsets.UTF_8))); + request.setEntity(new StringEntity(xml_data, ContentType.create(ContentType.TEXT_XML.getMimeType(), StandardCharsets.UTF_8))); } HttpResponse response = client.execute(request, localContext); jenkinsVersion = ResponseUtils.getJenkinsVersion(response); From 1cebe657fbf9787de0ab22f09ef7538f3e4d03e6 Mon Sep 17 00:00:00 2001 From: walnut-tom Date: Mon, 20 Apr 2020 23:01:36 +0800 Subject: [PATCH 3/8] fix format --- .../java/com/offbytwo/jenkins/client/JenkinsHttpClient.java | 6 ++++++ pom.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java b/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java index 52e1c7ea..9782a490 100755 --- a/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java +++ b/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java @@ -5,7 +5,13 @@ */ package com.offbytwo.jenkins.client; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator; +import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder; import com.offbytwo.jenkins.client.util.EncodingUtils; import com.offbytwo.jenkins.client.util.RequestReleasingInputStream; import com.offbytwo.jenkins.client.validator.HttpResponseValidator; diff --git a/pom.xml b/pom.xml index 98ee517d..62007612 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 4.5.8 4.4.11 4.5.8 - 2.9.9 + 2.10.2 From ead9174fc029aa662889e2c227312af1ef5cffc1 Mon Sep 17 00:00:00 2001 From: walnut-tom Date: Mon, 20 Apr 2020 23:11:57 +0800 Subject: [PATCH 4/8] fix format --- .../java/com/offbytwo/jenkins/client/JenkinsHttpClient.java | 6 ------ pom.xml | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java b/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java index 9782a490..52e1c7ea 100755 --- a/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java +++ b/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java @@ -5,13 +5,7 @@ */ package com.offbytwo.jenkins.client; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator; -import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder; import com.offbytwo.jenkins.client.util.EncodingUtils; import com.offbytwo.jenkins.client.util.RequestReleasingInputStream; import com.offbytwo.jenkins.client.validator.HttpResponseValidator; diff --git a/pom.xml b/pom.xml index 62007612..821999a0 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 4.5.8 4.4.11 4.5.8 - 2.10.2 + 2.10.3 From e598e61ad1641e09401e038aa9d283b69251d579 Mon Sep 17 00:00:00 2001 From: walnut-tom Date: Mon, 20 Apr 2020 23:33:49 +0800 Subject: [PATCH 5/8] fix format --- .../offbytwo/jenkins/client/JenkinsHttpClient.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java b/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java index 52e1c7ea..08f9c37d 100755 --- a/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java +++ b/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java @@ -446,7 +446,7 @@ public void close() { } } - + /** * Add authentication to supplied builder. * @param builder the builder to configure @@ -470,7 +470,7 @@ protected static HttpClientBuilder addAuthentication(final HttpClientBuilder bui return builder; } - + /** * Get the local context. * @return context @@ -479,7 +479,7 @@ protected HttpContext getLocalContext() { return localContext; } - + /** * Set the local context. * @param localContext the context @@ -488,10 +488,10 @@ protected void setLocalContext(final HttpContext localContext) { this.localContext = localContext; } - - - - + + + + private T objectFromResponse(Class cls, HttpResponse response) throws IOException { InputStream content = response.getEntity().getContent(); byte[] bytes = IOUtils.toByteArray(content); From 6d6b9c04cd72603dce3ad1a48325870af59d8adc Mon Sep 17 00:00:00 2001 From: walnut-tom Date: Sun, 26 Apr 2020 14:16:18 +0800 Subject: [PATCH 6/8] fix jackson version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 821999a0..62007612 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 4.5.8 4.4.11 4.5.8 - 2.10.3 + 2.10.2 From 3132ddadce75d9c15b20ab9ad539ac3d5e22e55b Mon Sep 17 00:00:00 2001 From: walnut-tom Date: Sun, 26 Apr 2020 14:17:46 +0800 Subject: [PATCH 7/8] fix jackson version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62007612..98ee517d 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 4.5.8 4.4.11 4.5.8 - 2.10.2 + 2.9.9 From 2f323546c8b8918004838d9f3671f81c1e064368 Mon Sep 17 00:00:00 2001 From: walnut-tom Date: Wed, 29 Apr 2020 11:13:10 +0800 Subject: [PATCH 8/8] revert space --- .../java/com/offbytwo/jenkins/client/JenkinsHttpClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java b/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java index 08f9c37d..d70bdd90 100755 --- a/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java +++ b/jenkins-client/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java @@ -455,7 +455,7 @@ public void close() { * @param password the password * @return the passed in builder */ - protected static HttpClientBuilder addAuthentication(final HttpClientBuilder builder, + protected static HttpClientBuilder addAuthentication(final HttpClientBuilder builder, final URI uri, final String username, String password) { if (isNotBlank(username)) {