This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git commit 7fcd43926d4593cc6710ee24b6b98212d1693594 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 4 07:22:36 2015 +0200 Revue un peu du paquetage http (See #7463) --- .../ird/observe/services/http/RequestBuilder.java | 8 ++-- .../ird/observe/services/http/RequestResult.java | 52 ++++++---------------- 2 files changed, 17 insertions(+), 43 deletions(-) diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestBuilder.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestBuilder.java index 8eb1e0b..1a67ae0 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestBuilder.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestBuilder.java @@ -2,12 +2,12 @@ package fr.ird.observe.services.http; import com.google.common.base.Charsets; import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.base.Supplier; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.Gson; +import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -58,7 +58,7 @@ public class RequestBuilder { @Override public Gson get() { - return new Gson(); + return new ObserveDtoGsonSupplier().get(); } }; @@ -364,7 +364,7 @@ public class RequestBuilder { public <T> T postAndGetJsonAndCloseConnection(Type type) throws IOException { RequestResult postResult = postAndCloseConnection(); if (postResult.getStatusCode() != 200 && log.isWarnEnabled()) { - log.warn(String.format("Unexpected status code: %d%nResponse is: %s", postResult.getStatusCode(), postResult)); + log.warn(String.format("Unexpected status code: %d\nResponse is: %s", postResult.getStatusCode(), postResult)); } T result = convertJson(postResult.getResponse(), type, getGson()); return result; @@ -489,7 +489,7 @@ public class RequestBuilder { @Override public String toString() { - Objects.ToStringHelper helper = Objects.toStringHelper(this).add("url", baseUrl); + MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(this).add("url", baseUrl); if (header != null) { for (Map.Entry<String, String> entry : header.entrySet()) { String key = String.format("Header [%s]", entry.getKey()); diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestResult.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestResult.java index b83da5b..47d7ed2 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestResult.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestResult.java @@ -13,24 +13,26 @@ import java.io.StringWriter; */ public class RequestResult { - protected int statusCode; - protected Header[] headers; - protected String responseAsString; + protected final int statusCode; + + protected final Header[] headers; + + protected final String responseAsString; public RequestResult(HttpResponse response) throws IOException { this.statusCode = response.getStatusLine().getStatusCode(); this.headers = response.getAllHeaders(); response.getEntity(); - StringWriter writer = new StringWriter(); - InputStream inputStream = response.getEntity().getContent(); - try { - IOUtils.copy(inputStream, writer, "UTF-8"); - inputStream.close(); - } finally { - IOUtils.closeQuietly(inputStream); + try (InputStream inputStream = response.getEntity().getContent()) { + + try (StringWriter writer = new StringWriter()) { + + IOUtils.copy(inputStream, writer, "UTF-8"); + + responseAsString = writer.toString(); + } } - responseAsString = writer.toString(); } public int getStatusCode() { @@ -64,34 +66,6 @@ public class RequestResult { throw new IllegalArgumentException(key + " key is not found in header"); } -// public String getResponseAsString(String fieldName) throws IOException { -// if (responseAsString == null) { -// return null; -// } -// JsonNode jsonNodes = new Gson().(responseAsString).get(fieldName); -// if (jsonNodes == null) { -// return null; -// } -// return jsonNodes.asText(); -// } -// -// public Boolean getResponseAsBoolean(String fieldName) throws IOException { -// JsonNode jsonNodes = getResponseAsJsonNode(fieldName); -// if (jsonNodes == null) return null; -// return jsonNodes.asBoolean(); -// } -// -// public JsonNode getResponseAsJsonNode(String fieldName) throws IOException { -// if (responseAsString == null) { -// return null; -// } -// JsonNode jsonNodes = new ObjectMapper().readTree(responseAsString).get(fieldName); -// if (jsonNodes == null) { -// return null; -// } -// return jsonNodes; -// } - public String getResponse() throws IOException { return responseAsString; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.