This is an automated email from the git hooks/post-receive script. New commit to branch feature/7677_action_export_donnees_server_distant in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 147815fb0f77251c9b8a199d0c49d62584aeae1c Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Aug 23 23:16:15 2016 +0200 Corrige les erreurs d'injection des objets de type Request/Result en implémentant le contrat ObserveDto refs #7677 --- .../web/ObserveWebApplicationListener.java | 2 - ...tionalReferntialSynchronizeRequestInjector.java | 75 ---------------------- .../export/ReplicateTripsExportRequest.java | 3 +- .../actions/export/ReplicateTripsExportResult.java | 3 +- .../actions/export/ReplicateTripsImportResult.java | 3 +- .../synchro/data/DataSynchronizeRequest.java | 3 +- ...nidirectionalReferentialSynchronizeRequest.java | 3 +- ...UnidirectionalReferentialSynchronizeResult.java | 3 +- 8 files changed, 12 insertions(+), 83 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java index b6b757c..f4bd444 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java @@ -31,7 +31,6 @@ import fr.ird.observe.application.web.injector.ObserveDataSourceConfigurationInj import fr.ird.observe.application.web.injector.ObserveDtoInjector; import fr.ird.observe.application.web.injector.ObserveReferenceSetRequestInjector; import fr.ird.observe.application.web.injector.SqlScriptProducerRequestInjector; -import fr.ird.observe.application.web.injector.UnidirectionalReferntialSynchronizeRequestInjector; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestConstants; import fr.ird.observe.services.dto.ObserveDbUserDto; import org.apache.commons.logging.Log; @@ -72,7 +71,6 @@ public class ObserveWebApplicationListener implements WebMotionServerListener { context.addInjector(new DateInjector(ObserveDataSourceConfigurationRestConstants.DATE_PATTERN)); context.addInjector(new SqlScriptProducerRequestInjector(gson)); context.addInjector(new ImmutableSetInjector()); - context.addInjector(new UnidirectionalReferntialSynchronizeRequestInjector(gson)); context.addConverter(new ObserveDtoConverter(gson), ObserveDbUserDto.class); context.getServletContext().setAttribute( diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/UnidirectionalReferntialSynchronizeRequestInjector.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/UnidirectionalReferntialSynchronizeRequestInjector.java deleted file mode 100644 index 59f0ad6..0000000 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/UnidirectionalReferntialSynchronizeRequestInjector.java +++ /dev/null @@ -1,75 +0,0 @@ -package fr.ird.observe.application.web.injector; - -/*- - * #%L - * ObServe :: Application Web - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.base.Preconditions; -import com.google.gson.Gson; -import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.debux.webmotion.server.call.Call; -import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; -import org.debux.webmotion.server.mapping.Mapping; - -import java.lang.reflect.Type; - -/** - * @author Samuel Maisonneuve - maisonneuve@codelutin.com - */ -public class UnidirectionalReferntialSynchronizeRequestInjector implements ExecutorParametersInjectorHandler.Injector { - - /** Logger. */ - private static final Log log = LogFactory.getLog(UnidirectionalReferntialSynchronizeRequestInjector.class); - - protected final Gson gson; - - public UnidirectionalReferntialSynchronizeRequestInjector(Gson gson) { - this.gson = gson; - } - - @Override - public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { - - UnidirectionalReferentialSynchronizeRequest result = null; - - if (type.equals(UnidirectionalReferentialSynchronizeRequest.class)) { - - Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); - - Preconditions.checkNotNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!"); - - String gsonContent = ((String[]) parameterTree.getValue())[0]; - - result = gson.fromJson(gsonContent, UnidirectionalReferentialSynchronizeRequest.class); - - if (log.isInfoEnabled()) { - log.info("Inject UnidirectionalReferntialSynchronizeRequestInjector: " + result); - } - - } - - return result; - - } - -} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportRequest.java index 2ec4413..c6f2768 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportRequest.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportRequest.java @@ -23,6 +23,7 @@ package fr.ird.observe.services.service.actions.export; */ import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.ObserveDto; import java.util.Iterator; import java.util.Objects; @@ -32,7 +33,7 @@ import java.util.Objects; * * @author Tony Chemit - chemit@codelutin.com */ -public class ReplicateTripsExportRequest implements Iterable<ReplicateTripsExportRequest.ReplicateTripExportRequest> { +public class ReplicateTripsExportRequest implements Iterable<ReplicateTripsExportRequest.ReplicateTripExportRequest>, ObserveDto { public static ExportTripsRequestBuilder builder() { return new ExportTripsRequestBuilder(); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportResult.java index 1502c16..e068eb3 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportResult.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportResult.java @@ -23,6 +23,7 @@ package fr.ird.observe.services.service.actions.export; */ import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.ObserveDto; import java.util.Iterator; import java.util.Objects; @@ -32,7 +33,7 @@ import java.util.Objects; * * @author Tony Chemit - chemit@codelutin.com */ -public class ReplicateTripsExportResult implements Iterable<ReplicateTripsExportResult.ReplicateTripExportResult> { +public class ReplicateTripsExportResult implements Iterable<ReplicateTripsExportResult.ReplicateTripExportResult>, ObserveDto { public static ExportTripsRequestBuilder builder() { return new ExportTripsRequestBuilder(); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsImportResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsImportResult.java index 7ff8af6..2d4ef0a 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsImportResult.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsImportResult.java @@ -23,6 +23,7 @@ package fr.ird.observe.services.service.actions.export; */ import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.ObserveDto; import java.util.Iterator; @@ -34,7 +35,7 @@ import java.util.Iterator; * @author Tony Chemit - chemit@codelutin.com * @since 5.0 */ -public class ReplicateTripsImportResult implements Iterable<ReplicateTripsImportResult.ReplicateTripImportResult> { +public class ReplicateTripsImportResult implements Iterable<ReplicateTripsImportResult.ReplicateTripImportResult>, ObserveDto { public static ExportTripsResultBuilder builder() { return new ExportTripsResultBuilder(); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeRequest.java index 6218431..b994f67 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeRequest.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeRequest.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.service.actions.synchro.data; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.service.actions.synchro.data.task.DataSynchronizeCopyTask; import fr.ird.observe.services.service.actions.synchro.data.task.DataSynchronizeDeleteTask; import org.apache.commons.logging.Log; @@ -12,7 +13,7 @@ import org.apache.commons.logging.LogFactory; * @author Tony Chemit - chemit@codelutin.com * @since 5.0 */ -public class DataSynchronizeRequest { +public class DataSynchronizeRequest implements ObserveDto { /** Logger. */ private static final Log log = LogFactory.getLog(DataSynchronizeRequest.class); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java index 4ec070a..6de789a 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java @@ -26,6 +26,7 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multiset; +import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialMultimap; @@ -41,7 +42,7 @@ import java.util.Objects; * @author Tony Chemit - chemit@codelutin.com * @since 5.0 */ -public class UnidirectionalReferentialSynchronizeRequest<R extends ReferentialDto> { +public class UnidirectionalReferentialSynchronizeRequest<R extends ReferentialDto> implements ObserveDto { public static <R extends ReferentialDto> Builder<R> builder(Class<R> referentialName) { Objects.nonNull(referentialName); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java index 52c46a0..2829d22 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeResult.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; +import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import org.apache.commons.lang3.tuple.Pair; @@ -40,7 +41,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 5.0 */ -public class UnidirectionalReferentialSynchronizeResult { +public class UnidirectionalReferentialSynchronizeResult implements ObserveDto { private final Set<Class<? extends ReferentialDto>> referentialNames; private final Multimap<Class<? extends ReferentialDto>, String> referentialAdded; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.