This is an automated email from the git hooks/post-receive script. New commit to branch feature/4 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c3942c7c9ef6916fa2ad139f37a82e21d4dcb8e2 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sun Jan 1 12:55:21 2017 +0100 Move an gson adapater + reduce timeout of connection to 30 seconds instead of 1 minute (Closes #4) --- .../java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java | 2 -- .../java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java | 4 ++-- .../fr/ird/observe/services/rest/http/ObserveResponseBuilder.java | 2 +- .../java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java | 2 ++ .../java/fr/ird/observe/services/gson}/ObserveHttpErrorAdapter.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java index 74ae552..dcf45af 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java @@ -37,7 +37,6 @@ import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfiguration import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRestConstants; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConnectionRest; import fr.ird.observe.services.gson.ObserveDtoGsonSupplier; -import fr.ird.observe.services.http.ObserveHttpError; import fr.ird.observe.services.rest.http.ObserveRequest; import fr.ird.observe.services.rest.http.ObserveRequestBuilder; import fr.ird.observe.services.rest.http.ObserveRequestMethod; @@ -81,7 +80,6 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl // Les ObserveDataSourceConnection sont obligatoirement de type ObserveDataSourceConnectionRest builder.registerTypeAdapter(ObserveDataSourceConnection.class, new ObserveDataSourceConnectionAdapter()); - builder.registerTypeAdapter(ObserveHttpError.class, new ObserveHttpErrorAdapter()); return builder; } diff --git a/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java index 737704d..6a1e72d 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.rest.http; * #L% */ -import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -34,6 +33,7 @@ import org.apache.http.message.BasicNameValuePair; import java.io.File; import java.util.Collection; import java.util.Objects; +import java.util.Optional; import java.util.function.Supplier; /** @@ -126,7 +126,7 @@ public class ObserveRequestBuilder { this.headers = new ImmutableMap.Builder<>(); this.files = new ImmutableMap.Builder<>(); this.parameters = new ImmutableList.Builder<>(); - this.gson = MoreObjects.firstNonNull(gsonSupplier, ObserveDtoGsonSupplier.DEFAULT_GSON_SUPPLIER).get(); + this.gson = Optional.ofNullable(gsonSupplier).orElse(ObserveDtoGsonSupplier.DEFAULT_GSON_SUPPLIER).get(); } protected void checkParameterNotNull(String parparameterNamemName, Object value) { diff --git a/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveResponseBuilder.java b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveResponseBuilder.java index 7b95673..fe5cbd1 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveResponseBuilder.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveResponseBuilder.java @@ -78,7 +78,7 @@ public class ObserveResponseBuilder { public static ObserveResponseBuilder create(Supplier<Gson> gsonSupplier) { CloseableHttpClient build = HttpClientBuilder.create() - .setConnectionTimeToLive(1, TimeUnit.MINUTES) + .setConnectionTimeToLive(30, TimeUnit.SECONDS) .build(); return new ObserveResponseBuilder(build, gsonSupplier); } diff --git a/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java b/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java index b9f4eef..afeb190 100644 --- a/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java @@ -47,6 +47,7 @@ import fr.ird.observe.services.gson.reference.DataReferenceSetAdapter; import fr.ird.observe.services.gson.reference.ReferentialReferenceAdapter; import fr.ird.observe.services.gson.reference.ReferentialReferenceSetAdapter; import fr.ird.observe.services.gson.reference.UnknownReferenceAdapter; +import fr.ird.observe.services.http.ObserveHttpError; import fr.ird.observe.services.service.actions.report.ReportVariable; import org.nuiton.version.Version; @@ -144,6 +145,7 @@ public class ObserveDtoGsonSupplier implements Supplier<Gson> { gsonBuilder.registerTypeAdapter(Form.class, new FormAdapter()); gsonBuilder.registerTypeAdapter(ReportVariable.class, new ReportVariableAdapter()); gsonBuilder.registerTypeAdapter(Version.class, new VersionAdapter()); + gsonBuilder.registerTypeAdapter(ObserveHttpError.class, new ObserveHttpErrorAdapter()); gsonBuilder.enableComplexMapKeySerialization(); } diff --git a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveHttpErrorAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/ObserveHttpErrorAdapter.java similarity index 98% rename from services-rest/src/main/java/fr/ird/observe/services/rest/ObserveHttpErrorAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/ObserveHttpErrorAdapter.java index 2f2468f..7703554 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveHttpErrorAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ObserveHttpErrorAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.rest; +package fr.ird.observe.services.gson; /*- * #%L -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.