This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit b8fb777a737e692cb44f2bc66420e6a78a92434d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 1 15:56:35 2016 +0200 Déplacement de certains objets --- .../services/ObserveServiceInitializer.java | 1 + services-model/pom.xml | 4 +++ .../dto}/ObserveSpeciesListConfiguration.java | 2 +- .../main/java/fr/ird/observe/util/ObserveUtil.java | 29 ++++++++++++++++++++++ .../services/rest/RestTestClassResource.java | 2 +- .../services/topia/entity/EntitiesSetFactory.java | 2 +- .../services/topia/TopiaTestClassResource.java | 2 +- 7 files changed, 38 insertions(+), 4 deletions(-) diff --git a/services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java b/services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java index 8583fff..9ef43c2 100644 --- a/services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java +++ b/services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java @@ -25,6 +25,7 @@ package fr.ird.observe.services; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; +import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; import fr.ird.observe.services.dto.constants.ReferentialLocale; import java.io.File; diff --git a/services-model/pom.xml b/services-model/pom.xml index 4c8de4b..aea7f25 100644 --- a/services-model/pom.xml +++ b/services-model/pom.xml @@ -58,6 +58,10 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> <dependency> <groupId>org.reflections</groupId> diff --git a/services-api/src/main/java/fr/ird/observe/services/ObserveSpeciesListConfiguration.java b/services-model/src/main/java/fr/ird/observe/services/dto/ObserveSpeciesListConfiguration.java similarity index 99% rename from services-api/src/main/java/fr/ird/observe/services/ObserveSpeciesListConfiguration.java rename to services-model/src/main/java/fr/ird/observe/services/dto/ObserveSpeciesListConfiguration.java index 612fece..2bb69d4 100644 --- a/services-api/src/main/java/fr/ird/observe/services/ObserveSpeciesListConfiguration.java +++ b/services-model/src/main/java/fr/ird/observe/services/dto/ObserveSpeciesListConfiguration.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.dto; /*- * #%L diff --git a/services-model/src/main/java/fr/ird/observe/util/ObserveUtil.java b/services-model/src/main/java/fr/ird/observe/util/ObserveUtil.java new file mode 100644 index 0000000..19791e2 --- /dev/null +++ b/services-model/src/main/java/fr/ird/observe/util/ObserveUtil.java @@ -0,0 +1,29 @@ +package fr.ird.observe.util; + +import org.nuiton.config.ApplicationConfig; + +import java.util.Map; +import java.util.Properties; + +/** + * Pour mettre du code util commun. + * + * Created on 01/09/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.0 + */ +public class ObserveUtil { + + public static Properties loadProperties(Properties sourceProperties, ApplicationConfig config) { + + Properties targetProperties = new Properties(); + for (Map.Entry<Object, Object> entry : sourceProperties.entrySet()) { + String key = (String) entry.getKey(); + String value = (String) entry.getValue(); + String newValue = config.replaceRecursiveOptions(value); + targetProperties.setProperty(key, newValue); + } + return targetProperties; + } +} diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestClassResource.java b/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestClassResource.java index 27d0a4d..eeadc0b 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestClassResource.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestClassResource.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.rest; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceInitializer; -import fr.ird.observe.services.ObserveSpeciesListConfiguration; +import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesSetFactory.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesSetFactory.java index c50cdde..2e4a110 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesSetFactory.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesSetFactory.java @@ -46,7 +46,7 @@ import fr.ird.observe.entities.seine.SchoolEstimate; import fr.ird.observe.entities.seine.TargetCatch; import fr.ird.observe.entities.seine.TargetCatchImpl; import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.ObserveSpeciesListConfiguration; +import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; import java.util.Objects; import java.util.function.Predicate; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java index 86d79f0..6d681d2 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceInitializer; -import fr.ird.observe.services.ObserveSpeciesListConfiguration; +import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.