[Observe-commits] 02/08: Review package of services-topia and services-rest

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 20666762883014f15f7fcbe8ad2b159a5faa4cb1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 30 12:57:52 2016 +0200 Review package of services-topia and services-rest --- services-rest/pom.xml | 38 +- .../ObserveDataSourceConnectionAdapter.java | 2 +- .../{ => rest}/ObserveHttpErrorAdapter.java | 2 +- .../{ => rest}/ObserveServiceFactoryRest.java | 53 +-- .../ObserveServiceRestErrorException.java | 2 +- .../ObserveServiceRestNotAvailableException.java | 2 +- .../services/{ => rest}/http/ObserveRequest.java | 2 +- .../{ => rest}/http/ObserveRequestBuilder.java | 14 +- .../{ => rest}/http/ObserveRequestMethod.java | 2 +- .../services/{ => rest}/http/ObserveResponse.java | 5 +- .../{ => rest}/http/ObserveResponseBuilder.java | 25 +- .../fr.ird.observe.services.ObserveServiceFactory | 1 - .../fr/ird/observe/services/TestClassResource.java | 197 ----------- .../ird/observe/services/TestMethodResource.java | 161 --------- .../services/rest/RestTestClassResource.java | 106 ++++++ .../services/rest/RestTestMethodResource.java | 109 ++++++ .../service/AbstractServiceRestTest.java | 31 +- .../service/DataSourceServiceRestTest.java | 32 +- .../{ => rest}/service/PingServiceRestTest.java | 25 +- .../service/ReferenceValuesSetServiceRestTest.java | 24 +- .../service/ReferentialServiceRestTest.java | 25 +- .../ConsolidateDataServiceRestTest.java | 10 +- .../report/AbstractReportServiceRestTest.java | 11 +- .../report/ReportAccessoryCatchRestTest.java | 2 +- .../actions/validate/ValidateServiceRestTest.java | 16 +- .../seine/TripSeineGearUseServiceRestTest.java | 21 +- .../service/seine/TripSeineServiceRestTest.java | 34 +- services-topia/pom.xml | 35 +- .../services/{ => topia}/ObserveJdbcHelper.java | 9 +- .../{ => topia}/ObserveSecurityHelper.java | 33 +- .../{ => topia}/ObserveServiceContextTopia.java | 15 +- .../{ => topia}/ObserveServiceFactoryTopia.java | 47 ++- .../services/{ => topia}/ObserveServiceTopia.java | 66 ++-- .../ObserveTopiaApplicationContextFactory.java | 16 +- .../services/{ => topia}/binder/BinderEngine.java | 32 +- .../binder/BinderEngineInitializer.java | 230 ++++++------ .../services/{ => topia}/binder/BinderSupport.java | 10 +- .../binder/ReferenceBinderEngineSupplierTopia.java | 4 +- .../binder/data/ActivityLonglineBinder.java | 2 +- .../data/ActivityLonglineEncouterDtoBinder.java | 2 +- .../data/ActivityLonglineSensorUsedDtoBinder.java | 2 +- .../binder/data/ActivityLonglineStubDtoBinder.java | 2 +- .../binder/data/ActivitySeineBinder.java | 2 +- .../data/ActivitySeineObservedSystemDtoBinder.java | 2 +- .../binder/data/ActivitySeineStubDtoBinder.java | 4 +- .../binder/data/BaitsCompositionBinder.java | 2 +- .../{ => topia}/binder/data/BasketBinder.java | 2 +- .../{ => topia}/binder/data/BranchlineBinder.java | 2 +- .../binder/data/BranchlinesCompositionBinder.java | 2 +- .../binder/data/CatchLonglineBinder.java | 2 +- .../{ => topia}/binder/data/DataBinderSupport.java | 6 +- .../{ => topia}/binder/data/EncounterBinder.java | 2 +- .../binder/data/FloatingObjectBinder.java | 2 +- .../FloatingObjectObservedSpeciesDtoBinder.java | 2 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 2 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 2 +- .../binder/data/FloatlinesCompositionBinder.java | 2 +- .../binder/data/GearUseFeaturesLonglineBinder.java | 2 +- .../GearUseFeaturesMeasurementLonglineBinder.java | 2 +- .../GearUseFeaturesMeasurementSeineBinder.java | 2 +- .../binder/data/GearUseFeaturesSeineBinder.java | 2 +- .../binder/data/HooksCompositionBinder.java | 2 +- .../binder/data/NonTargetCatchBinder.java | 2 +- .../binder/data/NonTargetLengthBinder.java | 2 +- .../binder/data/NonTargetSampleBinder.java | 2 +- .../binder/data/ObjectObservedSpeciesBinder.java | 2 +- .../binder/data/ObjectSchoolEstimateBinder.java | 2 +- .../{ => topia}/binder/data/RouteBinder.java | 2 +- .../binder/data/RouteStubDtoBinder.java | 2 +- .../binder/data/SchoolEstimateBinder.java | 2 +- .../{ => topia}/binder/data/SectionBinder.java | 2 +- .../{ => topia}/binder/data/SensorUsedBinder.java | 2 +- .../{ => topia}/binder/data/SetLonglineBinder.java | 2 +- .../binder/data/SetLonglineCatchDtoBinder.java | 2 +- .../SetLonglineDetailCompositionDtoBinder.java | 2 +- .../SetLonglineGlobalCompositionDtoBinder.java | 2 +- .../binder/data/SetLonglineStubDtoBinder.java | 4 +- .../binder/data/SetLonglineTdrDtoBinder.java | 2 +- .../{ => topia}/binder/data/SetSeineBinder.java | 4 +- .../data/SetSeineNonTargetCatchDtoBinder.java | 2 +- .../data/SetSeineSchoolEstimateDtoBinder.java | 2 +- .../binder/data/SetSeineTargetCatchDtoBinder.java | 2 +- .../{ => topia}/binder/data/SizeMeasureBinder.java | 2 +- .../{ => topia}/binder/data/TargetCatchBinder.java | 2 +- .../binder/data/TargetLengthBinder.java | 2 +- .../binder/data/TargetSampleBinder.java | 2 +- .../{ => topia}/binder/data/TdrBinder.java | 2 +- .../binder/data/TransmittingBuoyBinder.java | 10 +- .../binder/data/TripLonglineActivityDtoBinder.java | 2 +- .../binder/data/TripLonglineBinder.java | 2 +- .../binder/data/TripLonglineGearUseDtoBinder.java | 2 +- .../{ => topia}/binder/data/TripSeineBinder.java | 2 +- .../binder/data/TripSeineGearUseDtoBinder.java | 2 +- .../binder/data/WeightMeasureBinder.java | 2 +- .../referential/BaitHaulingStatusBinder.java | 2 +- .../referential/BaitSettingStatusBinder.java | 2 +- .../binder/referential/BaitTypeBinder.java | 2 +- .../referential/CatchFateLonglineBinder.java | 2 +- .../binder/referential/CountryBinder.java | 2 +- .../binder/referential/DetectionModeBinder.java | 2 +- .../binder/referential/EncounterTypeBinder.java | 2 +- .../binder/referential/FpaZoneBinder.java | 2 +- .../{ => topia}/binder/referential/GearBinder.java | 2 +- .../referential/GearCaracteristicBinder.java | 2 +- .../referential/GearCaracteristicTypeBinder.java | 2 +- .../binder/referential/HarbourBinder.java | 2 +- .../binder/referential/HealthnessBinder.java | 2 +- .../binder/referential/HookPositionBinder.java | 2 +- .../binder/referential/HookSizeBinder.java | 4 +- .../binder/referential/HookTypeBinder.java | 2 +- .../referential/ItemHorizontalPositionBinder.java | 4 +- .../referential/ItemVerticalPositionBinder.java | 4 +- .../referential/LengthWeightParameterBinder.java | 2 +- .../binder/referential/LightsticksColorBinder.java | 2 +- .../binder/referential/LightsticksTypeBinder.java | 2 +- .../binder/referential/LineTypeBinder.java | 2 +- .../binder/referential/MaturityStatusBinder.java | 2 +- .../binder/referential/MitigationTypeBinder.java | 2 +- .../binder/referential/ObjectFateBinder.java | 2 +- .../binder/referential/ObjectOperationBinder.java | 2 +- .../binder/referential/ObjectTypeBinder.java | 2 +- .../binder/referential/ObservedSystemBinder.java | 4 +- .../binder/referential/OceanBinder.java | 2 +- .../binder/referential/OrganismBinder.java | 4 +- .../binder/referential/PersonBinder.java | 2 +- .../binder/referential/ProgramBinder.java | 2 +- .../binder/referential/ReasonForDiscardBinder.java | 4 +- .../referential/ReasonForNoFishingBinder.java | 4 +- .../binder/referential/ReasonForNullSetBinder.java | 4 +- .../referential/ReferentialBinderSupport.java | 4 +- .../binder/referential/SensorBrandBinder.java | 4 +- .../binder/referential/SensorDataFormatBinder.java | 4 +- .../binder/referential/SensorTypeBinder.java | 4 +- .../binder/referential/SettingShapeBinder.java | 4 +- .../{ => topia}/binder/referential/SexBinder.java | 4 +- .../binder/referential/SizeMeasureTypeBinder.java | 4 +- .../binder/referential/SpeciesBinder.java | 2 +- .../binder/referential/SpeciesFateBinder.java | 4 +- .../binder/referential/SpeciesGroupBinder.java | 4 +- .../binder/referential/SpeciesListBinder.java | 2 +- .../binder/referential/SpeciesStatusBinder.java | 4 +- .../binder/referential/StomacFullnessBinder.java | 4 +- .../referential/SurroundingActivityBinder.java | 4 +- .../TransmittingBuoyOperationBinder.java | 4 +- .../referential/TransmittingBuoyTypeBinder.java | 4 +- .../binder/referential/TripTypeBinder.java | 4 +- .../referential/VesselActivityLonglineBinder.java | 4 +- .../referential/VesselActivitySeineBinder.java | 4 +- .../binder/referential/VesselBinder.java | 4 +- .../referential/VesselSizeCategoryBinder.java | 4 +- .../binder/referential/VesselTypeBinder.java | 4 +- .../binder/referential/WeightCategoryBinder.java | 4 +- .../referential/WeightMeasureTypeBinder.java | 4 +- .../{ => topia}/binder/referential/WindBinder.java | 2 +- .../entity/BasketEntitiesExtractor.java | 2 +- .../entity/BranchlineEntitiesExtractor.java | 2 +- .../{ => topia}/entity/EntitiesExtractor.java | 12 +- .../{ => topia}/entity/EntitiesSetFactory.java | 12 +- .../entity/SectionEntitiesExtractor.java | 2 +- .../entity/SpeciesListEntitiesExtractor.java | 2 +- .../entity/SpeciesListOceanEntitiesExtractor.java | 2 +- .../{ => topia}/entity/TripMapDtoFactory.java | 18 +- .../service/DataSourceServiceTopia.java | 53 +-- .../service}/ImportTripScriptTopiaSqlWork.java | 2 +- .../service/ReferentialServiceTopia.java | 24 +- .../service/SqlScriptProducerServiceTopia.java | 9 +- .../service}/TripManagementServiceTopia.java | 13 +- .../ConsolidateActivitySeineDataResultBuilder.java | 106 +++--- .../consolidate/ConsolidateDataServiceTopia.java | 193 ++++++----- .../service/actions/report/ReportServiceTopia.java | 19 +- .../ReferentialSynchronizeDiffServiceTopia.java | 14 +- ...nalReferentialSynchronizeLocalServiceTopia.java | 20 +- .../ng/ReferentialSynchronizeServiceTopia.java | 9 +- .../ReferentialSynchronizeSqlsRequestBuilder.java | 25 +- .../referential/sql/ApplySqlRequestWork.java | 2 +- .../sql/DeleteSqlStatementGenerator.java | 2 +- .../sql/DesactivateSqlStatementGenerator.java | 2 +- .../sql/InsertSqlStatementGenerator.java | 63 ++-- .../InsertSqlWithCascadeStatementGenerator.java | 6 +- .../sql/ReplaceSqlStatementGenerator.java | 30 +- .../sql/UpdateSqlStatementGenerator.java | 54 +-- .../UpdateSqlWithCascadeStatementGenerator.java | 6 +- .../GenerateValidatorDescriptorsFileTool.java | 5 +- .../service/actions/validate/ObserveValidator.java | 74 ++-- .../actions/validate/ValidateServiceTopia.java | 21 +- .../actions/validate/ValidationDataContext.java | 70 ++-- .../validate/ValidationMessageDetector.java | 5 +- .../service/actions/validate/ValidatorsMap.java | 5 +- .../ActivityLongLineEncounterServiceTopia.java | 9 +- .../ActivityLongLineSensorUsedServiceTopia.java | 13 +- .../longline/ActivityLonglineServiceTopia.java | 22 +- .../service/longline/BranchlineServiceTopia.java | 5 +- .../longline/LonglinePositionSetDtoHelper.java | 38 +- .../longline/SetLonglineCatchServiceTopia.java | 9 +- .../SetLonglineDetailCompositionServiceTopia.java | 21 +- .../SetLonglineGlobalCompositionServiceTopia.java | 13 +- .../service/longline/SetLonglineServiceTopia.java | 10 +- .../service/longline/TdrServiceTopia.java | 9 +- .../longline/TripLonglineGearUseServiceTopia.java | 11 +- .../service/longline/TripLonglineServiceTopia.java | 33 +- .../ActivitySeineObservedSystemServiceTopia.java | 13 +- .../service/seine/ActivitySeineServiceTopia.java | 15 +- .../service/seine/FloatingObjectServiceTopia.java | 21 +- .../service/seine/NonTargetCatchServiceTopia.java | 5 +- .../service/seine/NonTargetSampleServiceTopia.java | 29 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 16 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 20 +- .../service/seine/RouteServiceTopia.java | 22 +- .../service/seine/SchoolEstimateServiceTopia.java | 11 +- .../service/seine/SetSeineServiceTopia.java | 27 +- .../service/seine/TargetCatchServiceTopia.java | 5 +- .../service/seine/TargetSampleServiceTopia.java | 13 +- .../TransmittingBuoyOperationServiceTopia.java | 16 +- .../seine/TripSeineGearUseServiceTopia.java | 11 +- .../service/seine/TripSeineServiceTopia.java | 37 +- .../fr.ird.observe.services.ObserveServiceFactory | 1 - ...ces.dto.reference.ReferenceBinderEngineSupplier | 2 +- .../services/ApplicationContextResource.java | 385 --------------------- .../ird/observe/services/DataSourceResource.java | 347 ------------------- .../services/topia/DataSourcesForTestManager.java | 82 +++++ .../ObserveDataSourceConnectionTopiaTaiste.java | 2 +- .../ObserveServiceContextTopiaTaiste.java | 5 +- .../services/topia/TopiaTestClassResource.java | 179 ++++++++++ .../services/topia/TopiaTestMethodResource.java | 177 ++++++++++ .../binder/BinderEngineMetadataTest.java | 6 +- .../{ => topia}/binder/BinderEngineTest.java | 8 +- .../binder/ReferenceBinderEngineTest.java | 2 +- .../topia/entity}/LengthWeightParemetersTest.java | 15 +- .../topia/entity}/ReplicateReferentialsTest.java | 4 +- .../topia/entity}/ReplicateTestSupport.java | 28 +- .../topia/entity}/ReplicateTripLonglineTest.java | 4 +- .../topia/entity}/ReplicateTripSeineTest.java | 10 +- .../service/AbstractServiceTopiaTest.java | 33 +- .../AddSqlScriptProducerServiceTopiaTest.java | 8 +- .../service/DataSourceServiceTopiaTest.java | 127 +++++-- .../{ => topia}/service/MigrateTestsDatabases.java | 20 +- .../service/ReferentialServiceTopiaTest.java | 12 +- .../services/{ => topia}/service/RigthTest.java | 152 +++----- .../ConsolidateDataServiceTopiaTest.java | 11 +- .../report/AbstractReportServiceTopiaTest.java | 8 +- .../actions/report/ReportAccessoryCatch2Test.java | 2 +- .../report/ReportAccessoryCatchByGroup2Test.java | 2 +- .../report/ReportAccessoryCatchByGroupTest.java | 2 +- .../actions/report/ReportAccessoryCatchTest.java | 2 +- .../report/ReportActivityWithCommentTest.java | 2 +- .../actions/report/ReportAllActivitysTest.java | 2 +- .../actions/report/ReportDailySetAndCatchTest.java | 2 +- .../service/actions/report/ReportDcpUsageTest.java | 2 +- .../actions/report/ReportSetByAssociationTest.java | 2 +- .../report/ReportTargetCatchByAssociationTest.java | 2 +- .../ReportTargetDiscardedByAssociationTest.java | 2 +- .../UnidirectionalSynchronizeReferentialTest.java | 28 +- .../actions/validate/ValidateServiceTopiaTest.java | 15 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 9 +- .../service/seine/RouteServiceTopiaTest.java | 7 +- .../seine/TargetSampleServiceTopiaTest.java | 7 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 13 +- .../service/seine/TripSeineServiceTopiaTest.java | 25 +- 258 files changed, 2193 insertions(+), 2658 deletions(-) diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 1052164..e25410b 100644 --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -40,7 +40,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>test-data</artifactId> + <artifactId>test</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> @@ -120,4 +120,40 @@ </dependencies> + <build> + + <plugins> + + <plugin> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> + <executions> + <execution> + <phase>process-classes</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <scripts> + <script><![CDATA[ + new org.reflections.Reflections("fr.ird.observe.services.rest") + .save("${project.build.outputDirectory}/META-INF/reflections/${project.artifactId}-reflections.xml") + ]]></script> + </scripts> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + + </build> + </project> \ No newline at end of file diff --git a/services-rest/src/main/java/fr/ird/observe/services/ObserveDataSourceConnectionAdapter.java b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveDataSourceConnectionAdapter.java similarity index 97% rename from services-rest/src/main/java/fr/ird/observe/services/ObserveDataSourceConnectionAdapter.java rename to services-rest/src/main/java/fr/ird/observe/services/rest/ObserveDataSourceConnectionAdapter.java index bf567ff..bdb209f 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/ObserveDataSourceConnectionAdapter.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveDataSourceConnectionAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.rest; /* * #%L diff --git a/services-rest/src/main/java/fr/ird/observe/services/ObserveHttpErrorAdapter.java b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveHttpErrorAdapter.java similarity index 98% rename from services-rest/src/main/java/fr/ird/observe/services/ObserveHttpErrorAdapter.java rename to services-rest/src/main/java/fr/ird/observe/services/rest/ObserveHttpErrorAdapter.java index 4671fbd..2416c32 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/ObserveHttpErrorAdapter.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveHttpErrorAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.rest; /*- * #%L diff --git a/services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java similarity index 87% rename from services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java rename to services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java index 9131f46..b7ea481 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.rest; /* * #%L @@ -24,11 +24,13 @@ package fr.ird.observe.services; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import com.google.common.base.Supplier; import com.google.common.collect.ImmutableSet; import com.google.common.reflect.Reflection; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.ObserveServiceFactorySupport; +import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestConstants; @@ -36,11 +38,11 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.ObserveDataSourceConnectionRest; import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; import fr.ird.observe.services.http.ObserveHttpError; -import fr.ird.observe.services.http.ObserveRequest; -import fr.ird.observe.services.http.ObserveRequestBuilder; -import fr.ird.observe.services.http.ObserveRequestMethod; -import fr.ird.observe.services.http.ObserveResponse; -import fr.ird.observe.services.http.ObserveResponseBuilder; +import fr.ird.observe.services.rest.http.ObserveRequest; +import fr.ird.observe.services.rest.http.ObserveRequestBuilder; +import fr.ird.observe.services.rest.http.ObserveRequestMethod; +import fr.ird.observe.services.rest.http.ObserveResponse; +import fr.ird.observe.services.rest.http.ObserveResponseBuilder; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; @@ -55,6 +57,8 @@ import java.lang.reflect.TypeVariable; import java.text.SimpleDateFormat; import java.util.Collection; import java.util.Date; +import java.util.Objects; +import java.util.function.Supplier; /** * Created on 16/08/15. @@ -66,7 +70,7 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl /** Logger. */ private static final Log log = LogFactory.getLog(ObserveServiceFactoryRest.class); - protected final Supplier<Gson> gsonSupplier = new ObserveDtoGsonSupplier() { + protected final java.util.function.Supplier<Gson> gsonSupplier = new ObserveDtoGsonSupplier() { @Override protected GsonBuilder getGsonBuilder(boolean prettyPrint) { @@ -86,8 +90,8 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl @Override public <S extends ObserveService> boolean accept(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { - Preconditions.checkNotNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); - Preconditions.checkNotNull(serviceType, "serviceType can't be null."); + Objects.requireNonNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); + Objects.requireNonNull(serviceType, "serviceType can't be null."); return dataSourceConfiguration instanceof ObserveDataSourceConfigurationRest; } @@ -95,8 +99,8 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl @Override public <S extends ObserveService> boolean accept(ObserveDataSourceConnection dataSourceConnection, Class<S> serviceType) { - Preconditions.checkNotNull(dataSourceConnection, "dataSourceConfiguration can't be null."); - Preconditions.checkNotNull(serviceType, "serviceType can't be null."); + Objects.requireNonNull(dataSourceConnection, "dataSourceConfiguration can't be null."); + Objects.requireNonNull(serviceType, "serviceType can't be null."); return dataSourceConnection instanceof ObserveDataSourceConnectionRest; } @@ -104,11 +108,11 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl @Override public <S extends ObserveService> S newService(ObserveServiceInitializer observeServiceInitializer, Class<S> serviceType) { - Preconditions.checkNotNull(observeServiceInitializer, "observeServiceInitializerContext can't be null."); - Preconditions.checkNotNull(serviceType, "serviceType can't be null."); - Preconditions.checkNotNull(observeServiceInitializer.getApplicationLocale(), "applicationLocale can't be null."); - Preconditions.checkNotNull(observeServiceInitializer.getReferentialLocale(), "referentialLocale can't be null."); - Preconditions.checkNotNull(observeServiceInitializer.getTemporaryDirectoryRoot(), "temporaryDirectoryRoot can't be null."); + Objects.requireNonNull(observeServiceInitializer, "observeServiceInitializerContext can't be null."); + Objects.requireNonNull(serviceType, "serviceType can't be null."); + Objects.requireNonNull(observeServiceInitializer.getApplicationLocale(), "applicationLocale can't be null."); + Objects.requireNonNull(observeServiceInitializer.getReferentialLocale(), "referentialLocale can't be null."); + Objects.requireNonNull(observeServiceInitializer.getTemporaryDirectoryRoot(), "temporaryDirectoryRoot can't be null."); if (observeServiceInitializer.withDataSourceConnection()) { @@ -120,13 +124,12 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl // Pas encore connecté on utilise la configuration de la source de données ObserveDataSourceConfiguration dataSourceConfiguration = observeServiceInitializer.getDataSourceConfiguration(); - Preconditions.checkNotNull(dataSourceConfiguration, "dataSourceConnection and dataSourceConfiguration can't be null."); + Objects.requireNonNull(dataSourceConfiguration, "dataSourceConnection and dataSourceConfiguration can't be null."); Preconditions.checkArgument(dataSourceConfiguration instanceof ObserveDataSourceConfigurationRest, "dataSourceConfiguration must be of type " + ObserveDataSourceConfigurationRest.class.getName()); } - S service = newRemoteProxyServiceInstance(serviceType, observeServiceInitializer); - return service; + return newRemoteProxyServiceInstance(serviceType, observeServiceInitializer); } @@ -135,11 +138,10 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl responseBuilder.close(); } - protected <S extends ObserveService> S newRemoteProxyServiceInstance(Class<S> serviceType, ObserveServiceInitializer observeServiceInitializer) { + private <S extends ObserveService> S newRemoteProxyServiceInstance(Class<S> serviceType, ObserveServiceInitializer observeServiceInitializer) { RemoteInvocationHandler handler = new RemoteInvocationHandler<>(serviceType, observeServiceInitializer, gsonSupplier, responseBuilder); - S result = Reflection.newProxy(serviceType, handler); - return result; + return Reflection.newProxy(serviceType, handler); } @@ -287,8 +289,7 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl log.debug(String.format("Invoke remote service on endpoint: %s", url)); } - ObserveRequest request = requestBuilder.build(url); - return request; + return requestBuilder.build(url); } @@ -333,7 +334,7 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl requestBuilder.addParameter(PARAMETERIZED_TYPE_PREFIX + typeVariable.getName(), value.getClass().getCanonicalName()); if (log.isInfoEnabled()) { - log.info("add parameterized type " + typeVariable.getName() + " as " + value.getClass() + " into request" ); + log.info("add parameterized type " + typeVariable.getName() + " as " + value.getClass() + " into request"); } } diff --git a/services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestErrorException.java b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestErrorException.java similarity index 96% rename from services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestErrorException.java rename to services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestErrorException.java index 639d6e4..07b1eb6 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestErrorException.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestErrorException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.rest; /*- * #%L diff --git a/services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestNotAvailableException.java b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestNotAvailableException.java similarity index 97% rename from services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestNotAvailableException.java rename to services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestNotAvailableException.java index 35d7f93..3a6064a 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestNotAvailableException.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestNotAvailableException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.rest; /* * #%L diff --git a/services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequest.java b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequest.java similarity index 98% rename from services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequest.java rename to services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequest.java index 47cd729..c6edc02 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequest.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.http; +package fr.ird.observe.services.rest.http; /* * #%L diff --git a/services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java similarity index 93% rename from services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java rename to services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java index 67ea47a..f6a34af 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.http; +package fr.ird.observe.services.rest.http; /* * #%L @@ -24,7 +24,6 @@ package fr.ird.observe.services.http; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; -import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gson.Gson; @@ -35,6 +34,8 @@ import org.apache.http.message.BasicNameValuePair; import java.io.File; import java.io.IOException; import java.util.Collection; +import java.util.Objects; +import java.util.function.Supplier; /** * @author Arnaud Thimel - thimel@codelutin.com @@ -61,10 +62,10 @@ public class ObserveRequestBuilder { public ObserveRequest build(String baseUrl) { - Preconditions.checkNotNull(baseUrl, "'baseUrl' can't be null"); + Objects.requireNonNull(baseUrl, "'baseUrl' can't be null"); Preconditions.checkState(requestMethod != null, "'requestMethod' was not setted"); - ObserveRequest request = new ObserveRequest( + return new ObserveRequest( requestMethod, baseUrl, contentType, @@ -73,7 +74,6 @@ public class ObserveRequestBuilder { parameters.build(), files.build() ); - return request; } public ObserveRequestBuilder setRequestMethod(ObserveRequestMethod requestMethod) { @@ -139,8 +139,8 @@ public class ObserveRequestBuilder { } protected void checkKeyValueNotNull(String key, Object value, String keyErrorMessage, String valueErrorMessage) { - Preconditions.checkNotNull(key, keyErrorMessage); - Preconditions.checkNotNull(value, valueErrorMessage); + Objects.requireNonNull(key, keyErrorMessage); + Objects.requireNonNull(value, valueErrorMessage); } } diff --git a/services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestMethod.java b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestMethod.java similarity index 95% rename from services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestMethod.java rename to services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestMethod.java index f684124..5585930 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestMethod.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestMethod.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.http; +package fr.ird.observe.services.rest.http; /* * #%L diff --git a/services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponse.java b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveResponse.java similarity index 96% rename from services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponse.java rename to services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveResponse.java index db23f12..23f6751 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponse.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveResponse.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.http; +package fr.ird.observe.services.rest.http; /* * #%L @@ -98,7 +98,6 @@ public class ObserveResponse<T> { } } buffer.append('\n').append(responseAsString); - String result = buffer.toString(); - return result; + return buffer.toString(); } } diff --git a/services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveResponseBuilder.java similarity index 95% rename from services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java rename to services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveResponseBuilder.java index 3e28af8..362fa47 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveResponseBuilder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.http; +package fr.ird.observe.services.rest.http; /* * #%L @@ -24,10 +24,10 @@ package fr.ird.observe.services.http; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; -import com.google.common.base.Supplier; import com.google.gson.Gson; -import fr.ird.observe.services.ObserveServiceRestErrorException; -import fr.ird.observe.services.ObserveServiceRestNotAvailableException; +import fr.ird.observe.services.http.ObserveHttpError; +import fr.ird.observe.services.rest.ObserveServiceRestErrorException; +import fr.ird.observe.services.rest.ObserveServiceRestNotAvailableException; import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; import org.apache.commons.io.Charsets; import org.apache.commons.io.IOUtils; @@ -72,7 +72,9 @@ import java.net.UnknownHostException; import java.nio.charset.Charset; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; /** * @author Tony Chemit - chemit@codelutin.com @@ -112,7 +114,7 @@ public class ObserveResponseBuilder { public <T> ObserveResponse<T> build(ObserveRequest request, Type resultType) throws Throwable { String baseUrl = request.getBaseUrl(); - Preconditions.checkNotNull(baseUrl, "'baseUrl' can't be null"); + Objects.requireNonNull(baseUrl, "'baseUrl' can't be null"); ObserveRequestMethod requestMethod = request.getRequestMethod(); Preconditions.checkState(requestMethod != null, "'requestMethod' was not setted"); @@ -159,9 +161,8 @@ public class ObserveResponseBuilder { } T resultObject = convertJson(responseContext.responseAsString, resultType); - ObserveResponse<T> result = new ObserveResponse<>(responseContext.statusCode, responseContext.responseHeaders, responseContext.responseAsString, resultObject); - return result; + return new ObserveResponse<>(responseContext.statusCode, responseContext.responseHeaders, responseContext.responseAsString, resultObject); } @@ -191,8 +192,7 @@ public class ObserveResponseBuilder { HttpResponse response = responsePair.getRight(); - ResponseContext responseContext = consumeResponse(request, response); - return responseContext; + return consumeResponse(request, response); } finally { if (responsePair != null) { @@ -338,8 +338,7 @@ public class ObserveResponseBuilder { protected HttpResponse executeRequest(HttpRequestBase request) throws IOException, ObserveServiceRestNotAvailableException { try { - HttpResponse response = client.execute(request); - return response; + return client.execute(request); } catch (UnknownHostException | ConnectException e) { // Le service n'est pas accessible throw new ObserveServiceRestNotAvailableException(request.getURI().toURL()); @@ -381,8 +380,8 @@ public class ObserveResponseBuilder { public <T> T convertJson(String json, Type type) { - Preconditions.checkNotNull(json); - Preconditions.checkNotNull(gson); + Objects.requireNonNull(json); + Objects.requireNonNull(gson); // we must try to convert json to a T instance T result = null; diff --git a/services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory b/services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory deleted file mode 100644 index 2f268d7..0000000 --- a/services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory +++ /dev/null @@ -1 +0,0 @@ -fr.ird.observe.services.ObserveServiceFactoryRest \ No newline at end of file diff --git a/services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java b/services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java deleted file mode 100644 index 311c1c4..0000000 --- a/services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java +++ /dev/null @@ -1,197 +0,0 @@ -package fr.ird.observe.services; - -/* - * #%L - * ObServe :: Services REST Implementation - * %% - * 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 fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; -import fr.ird.observe.services.configuration.ObserveDataSourceConnection; -import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.test.TestHelper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; -import org.nuiton.version.Version; - -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.nio.file.Path; -import java.util.Locale; - -/** - * Created on 03/09/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class TestClassResource implements TestRule { - - /** Logger. */ - private static final Log log = LogFactory.getLog(TestClassResource.class); - - protected final ObserveServiceFactoryRest serviceFactory; - - private File testDirectory; - - private Path temporaryDirectoryRoot; - - protected final URL serverUrl; - - public TestClassResource() { - this("http://localhost:8080/observeweb/api/v1"); - // pour les test sur Demo - //this("http://demo.codelutin.com/observeweb-latest/api/v1"); - } - - public TestClassResource(String serverUrl) { - try { - this.serverUrl = new URL(serverUrl); - } catch (MalformedURLException e) { - throw new IllegalStateException("Could not convert serverUrl: " + serverUrl, e); - } - this.serviceFactory = new ObserveServiceFactoryRest() { - -// @Override -// protected ObserveServiceContextTopia createServiceContext(ObserveServiceInitializer observeServiceInitializer) { -// ObserveServiceContextTopiaTaiste serviceContext = new ObserveServiceContextTopiaTaiste(observeServiceInitializer, mainServiceFactory, this); -// return serviceContext; -// } - }; - serviceFactory.setMainServiceFactory(serviceFactory); - } - - public <S extends ObserveService> S newService(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { - ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( - Locale.FRANCE, - ReferentialLocale.FR, - temporaryDirectoryRoot.toFile(), - ObserveSpeciesListConfiguration.newDefaultConfiguration(), - dataSourceConfiguration - ); - return serviceFactory.newService(observeServiceInitializer, serviceType); - } - - public <S extends ObserveService> S newService(ObserveDataSourceConnection dataSourceConnection, Class<S> serviceType) { - ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( - Locale.FRANCE, - ReferentialLocale.FR, - temporaryDirectoryRoot.toFile(), - ObserveSpeciesListConfiguration.newDefaultConfiguration(), - dataSourceConnection - ); - return serviceFactory.newService(observeServiceInitializer, serviceType); - } - - public void closeServiceFactory() { - serviceFactory.close(); - } - - public void setTemporaryDirectoryRoot(Path temporaryDirectoryRoot) { - this.temporaryDirectoryRoot = temporaryDirectoryRoot; - } - - @Override - public Statement apply(final Statement base, final Description description) { - return new Statement() { - - @Override - public void evaluate() throws Throwable { - before(description); - try { - base.evaluate(); - } finally { - after(description); - } - } - }; - } - - protected void before(Description description) throws IOException { - - Class<?> testClass = description.getTestClass(); - if (log.isDebugEnabled()) { - log.debug("Starts " + testClass.getName()); - } - - TestHelper.initTest(testClass); - - } - - protected void after(Description description) { - - Class<?> testClass = description.getTestClass(); - if (log.isDebugEnabled()) { - log.debug("Ends " + testClass.getName()); - } - - closeServiceFactory(); - setTemporaryDirectoryRoot(null); - - } - - public File getTestDirectory() { - return testDirectory; - } - - public void setTestDirectory(File testDirectory) { - this.testDirectory = testDirectory; - } - - public ObserveDataSourceConfigurationRest createDataSourceConfigurationRest(Class<?> testClass, - String databaseName, - String login, - Version dbVersion, - char... password) { - - ObserveDataSourceConfigurationRest configurationRest = new ObserveDataSourceConfigurationRest(); - configurationRest.setLabel(testClass.getSimpleName() + "#" + serverUrl); - configurationRest.setServerUrl(serverUrl); - configurationRest.setLogin(login); - configurationRest.setPassword(password); - configurationRest.setOptionalDatabaseName(databaseName); - configurationRest.setModelVersion(dbVersion); - - return configurationRest; - - } - - public ObserveDataSourceConfigurationRest createDataSourceConfigurationRest(Class<?> testClass, - String login, - Version dbVersion, - char... password) { - - ObserveDataSourceConfigurationRest configurationRest = new ObserveDataSourceConfigurationRest(); - configurationRest.setLabel(testClass.getSimpleName() + "#" + serverUrl); - configurationRest.setServerUrl(serverUrl); - configurationRest.setLogin(login); - configurationRest.setPassword(password); - configurationRest.setOptionalDatabaseName(null); - configurationRest.setModelVersion(dbVersion); - - return configurationRest; - - } - -} diff --git a/services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java b/services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java deleted file mode 100644 index 2f79488..0000000 --- a/services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java +++ /dev/null @@ -1,161 +0,0 @@ -package fr.ird.observe.services; - -/* - * #%L - * ObServe :: Services REST Implementation - * %% - * 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 fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; -import fr.ird.observe.services.service.PingService; -import fr.ird.observe.test.TestHelper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Assume; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; -import org.nuiton.version.Version; - -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Path; - -/** - * Created on 03/09/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class TestMethodResource implements TestRule { - - /** Logger. */ - private static final Log log = LogFactory.getLog(TestMethodResource.class); - - protected final TestClassResource testClassResource; - - protected final String login; - - protected final char[] password; - - protected final String databaseName; - - protected ObserveDataSourceConfigurationRest dataSourceConfiguration; - - public TestMethodResource(TestClassResource testClassResource) { - this(testClassResource, null); - } - - public TestMethodResource(TestClassResource testClassResource, String databaseName) { - this(testClassResource, databaseName, "admin", 'a'); - // pour les tests sur demo - //this(testClassResource, databaseName, "admin", ";;dm8-admin..".toCharArray()); - } - - public TestMethodResource(TestClassResource testClassResource, String databaseName, String login, char... password) { - this.testClassResource = testClassResource; - this.databaseName = databaseName; - this.login = login; - this.password = password; - } - - @Override - public Statement apply(final Statement base, final Description description) { - return new Statement() { - - @Override - public void evaluate() throws Throwable { - before(description); - try { - base.evaluate(); - } finally { - after(description); - } - } - }; - } - - public ObserveDataSourceConfigurationRest getDataSourceConfiguration() { - return dataSourceConfiguration; - } - - protected void before(Description description) throws Throwable { - - Class<?> testClass = description.getTestClass(); - String methodName = description.getMethodName(); - if (log.isDebugEnabled()) { - log.debug("Starts " + testClass.getName() + "::" + methodName); - } - - File testDirectory = TestHelper.newFile(methodName); - - testClassResource.setTestDirectory(testDirectory); - - Path temporaryDirectoryRoot = new File(testDirectory, "tmp").toPath(); - - Files.createDirectories(temporaryDirectoryRoot); - - testClassResource.setTemporaryDirectoryRoot(temporaryDirectoryRoot); - - Version modelVersion = TestHelper.getModelVersion(); - - dataSourceConfiguration = testClassResource.createDataSourceConfigurationRest(testClass, databaseName, login, modelVersion, password); - - checkServerIsAvailable(testClass, methodName); - - } - - protected void after(Description description) { - - Class<?> testClass = description.getTestClass(); - String methodName = description.getMethodName(); - if (log.isDebugEnabled()) { - log.debug("Ends " + testClass.getName() + "::" + methodName); - } - - testClassResource.setTemporaryDirectoryRoot(null); - - } - - public void checkServerIsAvailable(Class<?> testClass, String methodName) { - - boolean serverExist = true; - - PingService service = testClassResource.newService(dataSourceConfiguration, PingService.class); - - try { - Version serverVersion = service.ping(); - Version modelVersion = TestHelper.getModelVersion(); - if (!serverVersion.equals(modelVersion)) { - serverExist = false; - } - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("error on check server ", e); - } - serverExist = false; - } - - if (!serverExist) { - if (log.isWarnEnabled()) { - log.warn("Skip test [" + testClass.getName() + "#" + methodName + "], server " + dataSourceConfiguration.getServerUrl() + " is not available."); - } - } - Assume.assumeTrue("Server " + dataSourceConfiguration.getServerUrl() + " not found", serverExist); - } -} 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 new file mode 100644 index 0000000..27d0a4d --- /dev/null +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestClassResource.java @@ -0,0 +1,106 @@ +package fr.ird.observe.services.rest; + +/* + * #%L + * ObServe :: Services REST Implementation + * %% + * 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 fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.ObserveServiceInitializer; +import fr.ird.observe.services.ObserveSpeciesListConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.ObserveDataSourceConnection; +import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.test.TestClassResourceSupport; +import fr.ird.observe.test.spi.DatabaseClassifier; +import org.junit.runner.Description; +import org.nuiton.version.Version; + +import java.net.URL; +import java.util.Locale; + +/** + * Created on 03/09/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class RestTestClassResource extends TestClassResourceSupport { + + private final ObserveServiceFactoryRest serviceFactory; + + public RestTestClassResource() { + + super(DatabaseClassifier.DEFAULT); + this.serviceFactory = new ObserveServiceFactoryRest(); + this.serviceFactory.setMainServiceFactory(serviceFactory); + } + + public <S extends ObserveService> S newService(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { + ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( + Locale.FRANCE, + ReferentialLocale.FR, + temporaryDirectoryRoot.toFile(), + ObserveSpeciesListConfiguration.newDefaultConfiguration(), + dataSourceConfiguration + ); + return serviceFactory.newService(observeServiceInitializer, serviceType); + } + + public <S extends ObserveService> S newService(ObserveDataSourceConnection dataSourceConnection, Class<S> serviceType) { + ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( + Locale.FRANCE, + ReferentialLocale.FR, + temporaryDirectoryRoot.toFile(), + ObserveSpeciesListConfiguration.newDefaultConfiguration(), + dataSourceConnection + ); + return serviceFactory.newService(observeServiceInitializer, serviceType); + } + + @Override + protected void after(Description description) { + + super.after(description); + + serviceFactory.close(); + + } + + ObserveDataSourceConfigurationRest createDataSourceConfigurationRest(Class<?> testClass, + String databaseName, + Version dbVersion, + URL serverUrl, + String login, + char... password) { + + ObserveDataSourceConfigurationRest configurationRest = new ObserveDataSourceConfigurationRest(); + configurationRest.setLabel(testClass.getSimpleName() + "#" + serverUrl); + configurationRest.setServerUrl(serverUrl); + configurationRest.setLogin(login); + configurationRest.setPassword(password); + configurationRest.setOptionalDatabaseName(databaseName); + configurationRest.setModelVersion(dbVersion); + + return configurationRest; + + } + +} diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java b/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java new file mode 100644 index 0000000..8dc2a75 --- /dev/null +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java @@ -0,0 +1,109 @@ +package fr.ird.observe.services.rest; + +/* + * #%L + * ObServe :: Services REST Implementation + * %% + * 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 fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.service.PingService; +import fr.ird.observe.test.ObserveTestConfiguration; +import fr.ird.observe.test.TestMethodResourceSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assume; +import org.junit.runner.Description; +import org.nuiton.version.Version; + +import java.util.Objects; + +/** + * Created on 03/09/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class RestTestMethodResource extends TestMethodResourceSupport<RestTestClassResource> { + + /** Logger. */ + private static final Log log = LogFactory.getLog(RestTestMethodResource.class); + + private ObserveDataSourceConfigurationRest dataSourceConfiguration; + + public RestTestMethodResource(RestTestClassResource restTestClassResource) { + super(restTestClassResource); + } + +// public RestTestMethodResource(RestTestClassResource restTestClassResource, String databaseName) { +// super(restTestClassResource); +// // pour les tests sur demo +// //this(REST_TEST_CLASS_RESOURCE, databaseName, "admin", ";;dm8-admin..".toCharArray()); +// } + + public ObserveDataSourceConfigurationRest getDataSourceConfiguration() { + return dataSourceConfiguration; + } + + @Override + protected void before(Description description) throws Throwable { + + super.before(description); + + Objects.requireNonNull(getUrl(), "Pas d'url spécifié"); + Objects.requireNonNull(getLogin(), "Pas de login spécifié"); + Objects.requireNonNull(getPassword(), "Pas de password spécifié"); + + Class<?> testClass = description.getTestClass(); + String methodName = description.getMethodName(); + + Version modelVersion = ObserveTestConfiguration.getModelVersion(); + + dataSourceConfiguration = testClassResource.createDataSourceConfigurationRest(testClass, null, modelVersion, getUrl(), getLogin(), getPassword()); + + checkServerIsAvailable(testClass, methodName); + + } + + private void checkServerIsAvailable(Class<?> testClass, String methodName) { + + boolean serverExist = true; + + PingService service = testClassResource.newService(dataSourceConfiguration, PingService.class); + + try { + Version serverVersion = service.ping(); + Version modelVersion = ObserveTestConfiguration.getModelVersion(); + if (!serverVersion.equals(modelVersion)) { + serverExist = false; + } + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("error on check server ", e); + } + serverExist = false; + } + + if (!serverExist) { + if (log.isWarnEnabled()) { + log.warn("Skip test [" + testClass.getName() + "#" + methodName + "], server " + dataSourceConfiguration.getServerUrl() + " is not available."); + } + } + Assume.assumeTrue("Server " + dataSourceConfiguration.getServerUrl() + " not found", serverExist); + } +} diff --git a/services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/AbstractServiceRestTest.java similarity index 74% rename from services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/rest/service/AbstractServiceRestTest.java index 504d315..2c30502 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/AbstractServiceRestTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.rest.service; /* * #%L @@ -23,12 +23,17 @@ package fr.ird.observe.services.service; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.TestClassResource; -import fr.ird.observe.services.TestMethodResource; +import fr.ird.observe.services.rest.RestTestClassResource; +import fr.ird.observe.services.rest.RestTestMethodResource; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.service.DataSourceService; +import fr.ird.observe.test.ObserveTestConfiguration; +import fr.ird.observe.test.spi.DatabaseLoginConfiguration; +import fr.ird.observe.test.spi.DatabasePasswordConfiguration; +import fr.ird.observe.test.spi.DatabaseUrlConfiguration; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -37,20 +42,16 @@ import org.junit.Rule; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ +@DatabaseLoginConfiguration(ObserveTestConfiguration.WEB_LOGIN) +@DatabasePasswordConfiguration(ObserveTestConfiguration.WEB_PASSWORD) +@DatabaseUrlConfiguration(ObserveTestConfiguration.WEB_URL) public abstract class AbstractServiceRestTest { - public static final String TRIP_SEINE_ID_1 = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; - public static final String TRIP_SEINE_ID_2 = "fr.ird.observe.entities.seine.TripSeine#1359280279156#0.41771067982188215"; - public static final String TRIP_SEINE_ID_3 = "fr.ird.observe.entities.seine.TripSeine#1360156698296#0.6097793743126777"; - - public static final String PROGRAM_ID = "fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234"; - - @ClassRule - public static final TestClassResource testClassResource = new TestClassResource(); + public static final RestTestClassResource REST_TEST_CLASS_RESOURCE = new RestTestClassResource(); @Rule - public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource); + public final RestTestMethodResource restTestMethodResource = new RestTestMethodResource(REST_TEST_CLASS_RESOURCE); private ObserveDataSourceConnection dataSourceConnection; @@ -59,9 +60,9 @@ public abstract class AbstractServiceRestTest { @Before public void setUp() throws Exception { - ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration(); + ObserveDataSourceConfigurationRest dataSourceConfiguration = restTestMethodResource.getDataSourceConfiguration(); - dataSourceService = testClassResource.newService(dataSourceConfiguration, DataSourceService.class); + dataSourceService = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, DataSourceService.class); dataSourceConnection = dataSourceService.open(dataSourceConfiguration); } @@ -75,7 +76,7 @@ public abstract class AbstractServiceRestTest { } public <S extends ObserveService> S newService(Class<S> serviceType) { - return testClassResource.newService(dataSourceConnection, serviceType); + return REST_TEST_CLASS_RESOURCE.newService(dataSourceConnection, serviceType); } protected <T extends IdDto> void assertEditLabels(Form<T> form, int expectedLabels, Class<?>... expectedTypes) { diff --git a/services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/DataSourceServiceRestTest.java similarity index 75% rename from services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/rest/service/DataSourceServiceRestTest.java index 4a94359..c2f1c59 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/DataSourceServiceRestTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.rest.service; /* * #%L @@ -22,17 +22,17 @@ package fr.ird.observe.services.service; * #L% */ -import fr.ird.observe.services.TestClassResource; -import fr.ird.observe.services.TestMethodResource; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DataSourceService; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; import org.junit.Assert; -import org.junit.ClassRule; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; import java.io.IOException; @@ -42,22 +42,16 @@ import java.io.IOException; * * @author Tony Chemit - chemit@codelutin.com */ -public class DataSourceServiceRestTest { - - @ClassRule - public static final TestClassResource testClassResource = new TestClassResource(); - - @Rule - public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource); +public class DataSourceServiceRestTest extends AbstractServiceRestTest { //FIXME @Ignore @Test public void testOpenNotExistingDatabase() throws IOException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, CloneNotSupportedException, BabModelVersionException { - ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration().clone(); + ObserveDataSourceConfigurationRest dataSourceConfiguration = restTestMethodResource.getDataSourceConfiguration().clone(); dataSourceConfiguration.setLogin(dataSourceConfiguration.getLogin() + System.nanoTime()); - DataSourceService service = testClassResource.newService(dataSourceConfiguration, DataSourceService.class); + DataSourceService service = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, DataSourceService.class); service.open(dataSourceConfiguration); } @@ -65,14 +59,14 @@ public class DataSourceServiceRestTest { @Test public void testOpen() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration(); + ObserveDataSourceConfigurationRest dataSourceConfiguration = restTestMethodResource.getDataSourceConfiguration(); - DataSourceService service1 = testClassResource.newService(dataSourceConfiguration, DataSourceService.class); + DataSourceService service1 = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, DataSourceService.class); ObserveDataSourceConnection dataSourceConnection = service1.open(dataSourceConfiguration); Assert.assertNotNull(dataSourceConnection); Assert.assertNotNull(dataSourceConnection.getAuthenticationToken()); - DataSourceService service2 = testClassResource.newService(dataSourceConfiguration, DataSourceService.class); + DataSourceService service2 = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, DataSourceService.class); ObserveDataSourceConnection dataSourceConnection2 = service2.open(dataSourceConfiguration); Assert.assertNotNull(dataSourceConnection2); Assert.assertNotNull(dataSourceConnection2.getAuthenticationToken()); @@ -88,11 +82,11 @@ public class DataSourceServiceRestTest { public void testCreateEmptyDataSource() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { //FIXME Should get an not implemented exception for this service - ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration(); + ObserveDataSourceConfigurationRest dataSourceConfiguration = restTestMethodResource.getDataSourceConfiguration(); DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto(); dataSourceCreateConfiguration.setCanCreateEmptyDatabase(true); - DataSourceService service = testClassResource.newService(dataSourceConfiguration, DataSourceService.class); + DataSourceService service = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, DataSourceService.class); service.create(dataSourceConfiguration, dataSourceCreateConfiguration); } diff --git a/services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java similarity index 66% rename from services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java index 99e2a39..7916356 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.rest.service; /* * #%L @@ -22,12 +22,9 @@ package fr.ird.observe.services.service; * #L% */ -import fr.ird.observe.services.ObserveServiceRestNotAvailableException; -import fr.ird.observe.services.TestClassResource; -import fr.ird.observe.services.TestMethodResource; +import fr.ird.observe.services.rest.ObserveServiceRestNotAvailableException; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; -import org.junit.ClassRule; -import org.junit.Rule; +import fr.ird.observe.services.service.PingService; import org.junit.Test; import java.net.MalformedURLException; @@ -38,21 +35,15 @@ import java.net.URL; * * @author Tony Chemit - chemit@codelutin.com */ -public class PingServiceRestTest { - - @ClassRule - public static final TestClassResource testClassResource = new TestClassResource(); - - @Rule - public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource); +public class PingServiceRestTest extends AbstractServiceRestTest { @Test(expected = ObserveServiceRestNotAvailableException.class) public void testPingWithBadServerUrl() throws MalformedURLException, CloneNotSupportedException { - ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration().clone(); + ObserveDataSourceConfigurationRest dataSourceConfiguration = restTestMethodResource.getDataSourceConfiguration().clone(); dataSourceConfiguration.setServerUrl(new URL("http://fake_" + System.nanoTime())); - PingService service = testClassResource.newService(dataSourceConfiguration, PingService.class); + PingService service = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, PingService.class); service.ping(); @@ -61,10 +52,10 @@ public class PingServiceRestTest { @Test public void testPingWithBadUserName() throws CloneNotSupportedException { - ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration().clone(); + ObserveDataSourceConfigurationRest dataSourceConfiguration = restTestMethodResource.getDataSourceConfiguration().clone(); dataSourceConfiguration.setLogin("fake_" + System.nanoTime()); - PingService service = testClassResource.newService(dataSourceConfiguration, PingService.class); + PingService service = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, PingService.class); service.ping(); diff --git a/services-rest/src/test/java/fr/ird/observe/services/service/ReferenceValuesSetServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java similarity index 82% rename from services-rest/src/test/java/fr/ird/observe/services/service/ReferenceValuesSetServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java index f140cc5..627c05f 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/service/ReferenceValuesSetServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.rest.service; /*- * #%L @@ -24,16 +24,15 @@ package fr.ird.observe.services.service; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.TestClassResource; -import fr.ird.observe.services.TestMethodResource; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.service.DataSourceService; +import fr.ird.observe.services.service.ReferenceSetsRequest; +import fr.ird.observe.services.service.ReferentialService; import org.junit.Assert; import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; import org.junit.Test; /** @@ -41,25 +40,18 @@ import org.junit.Test; * * @author Tony Chemit - chemit@codelutin.com */ -public class ReferenceValuesSetServiceRestTest { - - @ClassRule - public static final TestClassResource testClassResource = new TestClassResource(); - - @Rule - public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource); - +public class ReferenceValuesSetServiceRestTest extends AbstractServiceRestTest { protected ReferentialService service; @Before public void setUp() throws Exception { - ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration().clone(); - DataSourceService dataSourceService = testClassResource.newService(dataSourceConfiguration, DataSourceService.class); + ObserveDataSourceConfigurationRest dataSourceConfiguration = restTestMethodResource.getDataSourceConfiguration().clone(); + DataSourceService dataSourceService = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, DataSourceService.class); ObserveDataSourceConnection connection = dataSourceService.open(dataSourceConfiguration); - service = testClassResource.newService(connection, ReferentialService.class); + service = REST_TEST_CLASS_RESOURCE.newService(connection, ReferentialService.class); } diff --git a/services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java similarity index 78% rename from services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java index fce3cc9..91d093f 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.rest.service; /*- * #%L @@ -23,16 +23,17 @@ package fr.ird.observe.services.service; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.TestClassResource; -import fr.ird.observe.services.TestMethodResource; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DataSourceService; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.services.service.ReferentialService; import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Rule; import org.junit.Test; import java.io.IOException; @@ -44,22 +45,16 @@ import java.util.List; * * @author Tony Chemit - chemit@codelutin.com */ -public class ReferentialServiceRestTest { - - @ClassRule - public static final TestClassResource testClassResource = new TestClassResource(); - - @Rule - public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource); +public class ReferentialServiceRestTest extends AbstractServiceRestTest { @Test public void testGetPrograms() throws IOException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, CloneNotSupportedException, BabModelVersionException { - ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration().clone(); - DataSourceService dataSourceService = testClassResource.newService(dataSourceConfiguration, DataSourceService.class); + ObserveDataSourceConfigurationRest dataSourceConfiguration = restTestMethodResource.getDataSourceConfiguration().clone(); + DataSourceService dataSourceService = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, DataSourceService.class); ObserveDataSourceConnection connection = dataSourceService.open(dataSourceConfiguration); - ReferentialService referentialService = testClassResource.newService(connection, ReferentialService.class); + ReferentialService referentialService = REST_TEST_CLASS_RESOURCE.newService(connection, ReferentialService.class); ReferentialReferenceSet<ProgramDto> referentialReferenceSet = referentialService.getReferenceSet(ProgramDto.class, new Date()); diff --git a/services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/consolidate/ConsolidateDataServiceRestTest.java similarity index 75% rename from services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/consolidate/ConsolidateDataServiceRestTest.java index 358fe01..0d37e46 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/consolidate/ConsolidateDataServiceRestTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.consolidate; +package fr.ird.observe.services.rest.service.actions.consolidate; /* * #%L @@ -24,7 +24,11 @@ package fr.ird.observe.services.service.actions.consolidate; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import fr.ird.observe.services.service.AbstractServiceRestTest; +import fr.ird.observe.services.rest.service.AbstractServiceRestTest; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataResult; +import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; import org.junit.Test; @@ -48,7 +52,7 @@ public class ConsolidateDataServiceRestTest extends AbstractServiceRestTest { @Test public void testConsolidateTripSeines() throws Exception { - List<String> tripSeineIds = Lists.newArrayList(TRIP_SEINE_ID_1, TRIP_SEINE_ID_2, TRIP_SEINE_ID_3); + List<String> tripSeineIds = Lists.newArrayList(ObserveFixtures.TRIP_SEINE_ID_1, ObserveFixtures.TRIP_SEINE_ID_2, ObserveFixtures.TRIP_SEINE_ID_3); ConsolidateTripSeineDataRequest request = new ConsolidateTripSeineDataRequest(); request.setTripSeineIds(ImmutableSet.copyOf(tripSeineIds)); diff --git a/services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/AbstractReportServiceRestTest.java similarity index 93% rename from services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/AbstractReportServiceRestTest.java index f74eeaa..dd973c3 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/AbstractReportServiceRestTest.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.rest.service.actions.report; import fr.ird.observe.services.dto.AbstractReference; @@ -27,7 +27,10 @@ import fr.ird.observe.services.dto.actions.report.DataMatrix; import fr.ird.observe.services.dto.actions.report.Report; import fr.ird.observe.services.dto.actions.report.ReportRequest; import fr.ird.observe.services.dto.actions.report.ReportVariable; -import fr.ird.observe.services.service.AbstractServiceRestTest; +import fr.ird.observe.services.rest.service.AbstractServiceRestTest; +import fr.ird.observe.services.service.actions.report.ReportBuilder; +import fr.ird.observe.services.service.actions.report.ReportService; +import fr.ird.observe.test.ObserveFixtures; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -97,14 +100,14 @@ public abstract class AbstractReportServiceRestTest extends AbstractServiceRestT testReportSyntax(report); // creation de l'executeur de report - report = service.populateVariables(report, TRIP_SEINE_ID_1); + report = service.populateVariables(report, ObserveFixtures.TRIP_SEINE_ID_1); // preparation des variables prepareVariables(); // on execute le report - DataMatrix result = service.executeReport(report, TRIP_SEINE_ID_1); + DataMatrix result = service.executeReport(report,ObserveFixtures. TRIP_SEINE_ID_1); if (log.isInfoEnabled()) { log.info("Result :\n" + result.getClipbordContent(true, true)); diff --git a/services-rest/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/ReportAccessoryCatchRestTest.java similarity index 99% rename from services-rest/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/ReportAccessoryCatchRestTest.java index d2b2a0d..6e5bbd6 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/ReportAccessoryCatchRestTest.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.rest.service.actions.report; import fr.ird.observe.services.dto.actions.report.DataMatrix; diff --git a/services-rest/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/validate/ValidateServiceRestTest.java similarity index 94% rename from services-rest/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/validate/ValidateServiceRestTest.java index a43c629..1b600dd 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/validate/ValidateServiceRestTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.validate; +package fr.ird.observe.services.rest.service.actions.validate; /* * #%L @@ -93,7 +93,15 @@ import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.AbstractServiceRestTest; +import fr.ird.observe.services.rest.service.AbstractServiceRestTest; +import fr.ird.observe.services.service.actions.validate.ValidateDataRequest; +import fr.ird.observe.services.service.actions.validate.ValidateDataResult; +import fr.ird.observe.services.service.actions.validate.ValidateReferentialsRequest; +import fr.ird.observe.services.service.actions.validate.ValidateReferentialsResult; +import fr.ird.observe.services.service.actions.validate.ValidateResultForDto; +import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoType; +import fr.ird.observe.services.service.actions.validate.ValidateService; +import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; import org.junit.Test; import org.nuiton.validator.NuitonValidatorScope; @@ -220,7 +228,7 @@ public class ValidateServiceRestTest extends AbstractServiceRestTest { request.setValidationContext(ValidateService.SERVICE_VALIDATION_CONTEXT); request.setScopes(ImmutableSet.copyOf(NuitonValidatorScope.values())); - request.setDataIds(ImmutableSet.of(TRIP_SEINE_ID_1, TRIP_SEINE_ID_2)); + request.setDataIds(ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1, ObserveFixtures.TRIP_SEINE_ID_2)); ValidateDataResult result = service.validateData(request); Assert.assertNotNull(result); @@ -243,7 +251,7 @@ public class ValidateServiceRestTest extends AbstractServiceRestTest { request.setValidationContext(ValidateService.SERVICE_VALIDATION_CONTEXT); request.setScopes(ImmutableSet.copyOf(NuitonValidatorScope.values())); - request.setDataIds(ImmutableSet.of(TRIP_SEINE_ID_1, TRIP_SEINE_ID_2)); + request.setDataIds(ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1, ObserveFixtures.TRIP_SEINE_ID_2)); ValidateDataResult result = service.validateData(request); Assert.assertNotNull(result); diff --git a/services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java similarity index 92% rename from services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java index 7599e58..2aee42f 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.rest.service.seine; /* * #%L @@ -30,7 +30,10 @@ import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; -import fr.ird.observe.services.service.AbstractServiceRestTest; +import fr.ird.observe.services.rest.service.AbstractServiceRestTest; +import fr.ird.observe.services.service.seine.TripSeineGearUseService; +import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; import org.junit.Assume; import org.junit.Ignore; @@ -63,14 +66,14 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { Map<String, DataReference<TripSeineDto>> tripIds = DataReference.splitById(allTripSeine.getReferences()); - Assume.assumeTrue("Marée " + TRIP_SEINE_ID_1 + " non trouvée dans cette base. Test annulé", tripIds.containsKey(TRIP_SEINE_ID_1)); - Form<TripSeineGearUseDto> form = service.loadForm(TRIP_SEINE_ID_1); + Assume.assumeTrue("Marée " + ObserveFixtures.TRIP_SEINE_ID_1 + " non trouvée dans cette base. Test annulé", tripIds.containsKey(ObserveFixtures.TRIP_SEINE_ID_1)); + Form<TripSeineGearUseDto> form = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); Assert.assertNotNull(form); TripSeineGearUseDto tripSeineGearUseDto = form.getObject(); - Assert.assertEquals(TRIP_SEINE_ID_1, tripSeineGearUseDto.getId()); + Assert.assertEquals(ObserveFixtures.TRIP_SEINE_ID_1, tripSeineGearUseDto.getId()); //FIXME // Assert.assertEquals(2, tripSeineGearUseDto.sizeGearUseFeaturesSeine()); // @@ -125,8 +128,8 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { Map<String, DataReference<TripSeineDto>> tripIds = DataReference.splitById(allTripSeine.getReferences()); - Assume.assumeTrue("Marée " + TRIP_SEINE_ID_1 + " non trouvée dans cette base. Test annulé", tripIds.containsKey(TRIP_SEINE_ID_1)); - Form<TripSeineGearUseDto> form = service.loadForm(TRIP_SEINE_ID_1); + Assume.assumeTrue("Marée " + ObserveFixtures.TRIP_SEINE_ID_1 + " non trouvée dans cette base. Test annulé", tripIds.containsKey(ObserveFixtures.TRIP_SEINE_ID_1)); + Form<TripSeineGearUseDto> form = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); Assert.assertNotNull(form); //FIXME @@ -188,7 +191,7 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { @Ignore @Test public void saveUpdateTest() { - Form<TripSeineGearUseDto> form = service.loadForm(TRIP_SEINE_ID_1); + Form<TripSeineGearUseDto> form = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); TripSeineGearUseDto tripSeineGearUseDto = form.getObject(); @@ -212,7 +215,7 @@ public class TripSeineGearUseServiceRestTest extends AbstractServiceRestTest { service.save(tripSeineGearUseDto); - Form<TripSeineGearUseDto> formAfterSave = service.loadForm(TRIP_SEINE_ID_1); + Form<TripSeineGearUseDto> formAfterSave = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); tripSeineGearUseDto = formAfterSave.getObject(); diff --git a/services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java similarity index 88% rename from services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java rename to services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java index 6332c57..870ff43 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.rest.service.seine; /* * #%L @@ -32,7 +32,9 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.AbstractServiceRestTest; +import fr.ird.observe.services.rest.service.AbstractServiceRestTest; +import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -56,31 +58,31 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest { @Test public void getTripSeineByProgramTest() { - DataReferenceSet<TripSeineDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); + DataReferenceSet<TripSeineDto> stubDtos = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); Assert.assertNotNull(stubDtos); Assert.assertEquals(134, stubDtos.sizeReference()); - DataReference<TripSeineDto> tripSeineStub1Dto = DataReference.find(stubDtos.getReferences(), TRIP_SEINE_ID_1); + DataReference<TripSeineDto> tripSeineStub1Dto = DataReference.find(stubDtos.getReferences(), ObserveFixtures.TRIP_SEINE_ID_1); - Assert.assertEquals(TRIP_SEINE_ID_1, tripSeineStub1Dto.getId()); + Assert.assertEquals(ObserveFixtures.TRIP_SEINE_ID_1, tripSeineStub1Dto.getId()); Assert.assertEquals(DateUtil.createDate(25, 1, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); Assert.assertEquals(DateUtil.createDate(27, 2, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); Assert.assertEquals("BERNICA", tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); Assert.assertEquals("Varenne Fanchon", tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); - DataReference<TripSeineDto> tripSeineStub2Dto = DataReference.find(stubDtos.getReferences(), TRIP_SEINE_ID_2); + DataReference<TripSeineDto> tripSeineStub2Dto = DataReference.find(stubDtos.getReferences(), ObserveFixtures.TRIP_SEINE_ID_2); - Assert.assertEquals(TRIP_SEINE_ID_2, tripSeineStub2Dto.getId()); + Assert.assertEquals(ObserveFixtures.TRIP_SEINE_ID_2, tripSeineStub2Dto.getId()); Assert.assertEquals(DateUtil.createDate(26, 1, 2013), tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); Assert.assertEquals(DateUtil.createDate(12, 3, 2013), tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); Assert.assertEquals("VIA EUROS", tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); Assert.assertEquals("Protat Martin", tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); - DataReference<TripSeineDto> tripSeineStub3Dto = DataReference.find(stubDtos.getReferences(), TRIP_SEINE_ID_3); + DataReference<TripSeineDto> tripSeineStub3Dto = DataReference.find(stubDtos.getReferences(), ObserveFixtures.TRIP_SEINE_ID_3); - Assert.assertEquals(TRIP_SEINE_ID_3, tripSeineStub3Dto.getId()); + Assert.assertEquals(ObserveFixtures.TRIP_SEINE_ID_3, tripSeineStub3Dto.getId()); Assert.assertEquals(DateUtil.createDate(1, 2, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); Assert.assertEquals(DateUtil.createDate(17, 3, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); Assert.assertEquals("GUERIDEN", tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); @@ -91,7 +93,7 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest { @Test public void loadFormTest() throws Exception { - Form<TripSeineDto> form = service.loadForm(TRIP_SEINE_ID_1); + Form<TripSeineDto> form = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); Assert.assertNotNull(form); TripSeineDto tripSeineDto = form.getObject(); @@ -128,7 +130,7 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest { @Test public void preCreateTest() { - Form<TripSeineDto> form = service.preCreate(PROGRAM_ID); + Form<TripSeineDto> form = service.preCreate(ObserveFixtures.PROGRAM_ID); Assert.assertNotNull(form); TripSeineDto tripSeineDto = form.getObject(); @@ -161,7 +163,7 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest { @Test public void saveUpdateTest() { - Form<TripSeineDto> form = service.loadForm(TRIP_SEINE_ID_1); + Form<TripSeineDto> form = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); TripSeineDto tripSeineDto = form.getObject(); @@ -189,7 +191,7 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest { service.save(form.getObject()); - Form<TripSeineDto> formReload = service.loadForm(TRIP_SEINE_ID_1); + Form<TripSeineDto> formReload = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); TripSeineDto tripSeineDtoReload = formReload.getObject(); Assert.assertEquals(tripSeineDto.getCaptain().getId(), tripSeineDtoReload.getCaptain().getId()); @@ -212,13 +214,13 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest { @Test public void deleteTest() { - service.delete(TRIP_SEINE_ID_1); + service.delete(ObserveFixtures.TRIP_SEINE_ID_1); - DataReferenceSet<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); + DataReferenceSet<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); Assert.assertEquals(2, tripSeineByProgram.sizeReference()); - Assert.assertTrue(Iterables.isEmpty(DataReference.filterById(tripSeineByProgram.getReferences(), TRIP_SEINE_ID_1))); + Assert.assertTrue(Iterables.isEmpty(DataReference.filterById(tripSeineByProgram.getReferences(), ObserveFixtures.TRIP_SEINE_ID_1))); } diff --git a/services-topia/pom.xml b/services-topia/pom.xml index d5d2231..1325205 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -57,7 +57,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>test-data</artifactId> + <artifactId>test</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> @@ -111,10 +111,10 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-migration</artifactId> - </dependency> + </dependency--> <dependency> <groupId>${project.groupId}</groupId> <artifactId>topia-extension</artifactId> @@ -164,6 +164,28 @@ <build> <plugins> + + <plugin> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> + <executions> + <execution> + <phase>process-classes</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <scripts> + <script><![CDATA[ + new org.reflections.Reflections("fr.ird.observe.services.topia") + .save("${project.build.outputDirectory}/META-INF/reflections/${project.artifactId}-reflections.xml") + ]]></script> + </scripts> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> @@ -184,12 +206,12 @@ <!--FIXME Comprendre pourquoi on doit avoir cette dependence en scope compile (sinon ça ne compile pas) --> <plugin> <artifactId>maven-dependency-plugin</artifactId> - <configuration> + <!--configuration> <ignoredUnusedDeclaredDependencies> <ignoredUnusedDeclaredDependency>org.nuiton.topia:topia-service-migration </ignoredUnusedDeclaredDependency> </ignoredUnusedDeclaredDependencies> - </configuration> + </configuration--> </plugin> </plugins> </pluginManagement> @@ -215,7 +237,8 @@ </execution> </executions> <configuration> - <mainClass>fr.ird.observe.services.service.actions.validate.GenerateValidatorDescriptorsFileTool</mainClass> + <mainClass>fr.ird.observe.services.topia.service.actions.validate.GenerateValidatorDescriptorsFileTool + </mainClass> <arguments> <argument> ${project.basedir}/src/main/resources/fr/ird/observe/services/service/actions/validate/validators.json diff --git a/services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveJdbcHelper.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/ObserveJdbcHelper.java index 449f032..e4d2347 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveJdbcHelper.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.topia; /*- * #%L @@ -52,9 +52,8 @@ import java.util.Set; */ public class ObserveJdbcHelper extends JdbcHelper { - private static final Log log = LogFactory.getLog(ObserveJdbcHelper.class); - protected static final Set<String> POSTGIS_TABLES = Sets.newHashSet("geometry_columns", "spatial_ref_sys"); + private static final Log log = LogFactory.getLog(ObserveJdbcHelper.class); public ObserveJdbcHelper(JdbcConfiguration jdbcConfiguration) { @@ -232,8 +231,8 @@ public class ObserveJdbcHelper extends JdbcHelper { PreparedStatement preparedStatement = null; String sql = String.format("SELECT ns.nspname::text || '.' || p.proname::text || '(' || oidvectortypes(p.proargtypes)::text || ')'" + - " FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)" + - " WHERE ns.nspname = 'public' AND p.proname ILIKE '%s%%';", functionPattern); + " FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)" + + " WHERE ns.nspname = 'public' AND p.proname ILIKE '%s%%';", functionPattern); try { connection = openConnection(); preparedStatement = connection.prepareStatement(sql); diff --git a/services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java similarity index 99% rename from services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java index 1215dbf..9e1a65d 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.topia; /*- * #%L @@ -54,56 +54,35 @@ import java.util.stream.Collectors; */ public class ObserveSecurityHelper { - private static final Log log = LogFactory.getLog(ObserveSecurityHelper.class); - + public static final String OBSERVE_COMMON_SCHEMA_NAME = "observe_common"; + public static final String OBSERVE_SEINE_SCHEMA_NAME = "observe_seine"; + public static final String OBSERVE_LONGLINE_SCHEMA_NAME = "observe_longline"; + public static final Function<String, String> ESCAPE_STRING = input -> "\"" + input + "\""; protected static final String DROP_TABLE_PATTERN = "DROP TABLE IF EXISTS %s.%s CASCADE;\n"; - protected static final String DROP_SCHEMA_PATTERN = "DROP SCHEMA IF EXISTS %s CASCADE;\n"; - protected static final String REVOKE_ON_TABLE_ALL_PATTERN = "REVOKE ALL ON %s.%s FROM %s CASCADE;\n"; - protected static final String SET_ON_TABLE_OWNER_PATTERN = "ALTER TABLE %s.%s OWNER TO %s;\n"; - protected static final String GRANT_ON_TABLE_READ_PATTERN = "GRANT SELECT ON %s.%s TO %s;\n"; - protected static final String GRANT_ON_TABLE_ALL_PATTERN = "GRANT ALL ON %s.%s TO %s;\n"; - protected static final String GRANT_ON_FUNCTION_PATTERN = "GRANT EXECUTE ON FUNCTION %s TO %s;\n"; - protected static final String REVOKE_ON_SCHEMA_ALL_PATTERN = "REVOKE ALL ON SCHEMA %s FROM %s CASCADE;\n"; - protected static final String REVOKE_ON_FUNCTIONS_PATTERN = "REVOKE EXECUTE ON FUNCTION %s FROM %s CASCADE;\n"; - protected static final String GRANT_ON_SCHEMA_ALL_PATTERN = "GRANT USAGE ON SCHEMA %s TO %s;\n"; - protected static final Set<String> EXTRA_TABLES = Sets.newHashSet( TMSVersionHibernateDao.TABLE_NAME, TMSVersionHibernateDao.LEGACY_TABLE_NAME); - protected static final Set<String> FUNCTION_NAMES_PREFIXS = Sets.newHashSet("ST_MakePoint", "ST_SetSRID", "sync_", "tr_sync", "ot_enhanced_school_type", "observe_"); - - protected static final String SCHEMA_PUBLIC = "public"; - - public static final String OBSERVE_COMMON_SCHEMA_NAME = "observe_common"; - - public static final String OBSERVE_SEINE_SCHEMA_NAME = "observe_seine"; - - public static final String OBSERVE_LONGLINE_SCHEMA_NAME = "observe_longline"; - protected static final Set<String> SCHEMAS = Sets.newHashSet(SCHEMA_PUBLIC, OBSERVE_COMMON_SCHEMA_NAME, OBSERVE_SEINE_SCHEMA_NAME, OBSERVE_LONGLINE_SCHEMA_NAME); - - public static final Function<String, String> ESCAPE_STRING = input -> "\"" + input + "\""; - - + private static final Log log = LogFactory.getLog(ObserveSecurityHelper.class); protected final ObserveJdbcHelper jdbcHelper; protected final JdbcConfiguration jdbcConfiguration; diff --git a/services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java similarity index 96% rename from services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java index cdc1f9d..3ec6303 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.topia; /* * #%L @@ -24,12 +24,15 @@ package fr.ird.observe.services; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.ObserveServiceFactory; +import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaSupport; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.ObserveDataSourceConnectionTopia; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.entity.EntitiesSetFactory; +import fr.ird.observe.services.topia.entity.EntitiesSetFactory; import java.io.File; import java.io.IOException; @@ -74,6 +77,10 @@ public class ObserveServiceContextTopia { return topiaApplicationContext; } + public void setTopiaApplicationContext(ObserveTopiaApplicationContext topiaApplicationContext) { + this.topiaApplicationContext = topiaApplicationContext; + } + public Locale getApplicationLocale() { return observeServiceInitializer.getApplicationLocale(); } @@ -135,10 +142,6 @@ public class ObserveServiceContextTopia { this.topiaPersistenceContext = topiaPersistenceContext; } - public void setTopiaApplicationContext(ObserveTopiaApplicationContext topiaApplicationContext) { - this.topiaApplicationContext = topiaApplicationContext; - } - public void closeTopiaPersistenceContext() { topiaPersistenceContext.close(); topiaPersistenceContext = null; diff --git a/services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java similarity index 85% rename from services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java index 3193154..6113c9d 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.topia; /* * #%L @@ -28,6 +28,9 @@ import com.google.common.collect.ImmutableSet; import com.google.common.reflect.Reflection; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.ObserveServiceFactorySupport; +import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaSupport; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; @@ -45,6 +48,7 @@ import org.apache.commons.logging.LogFactory; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.Objects; import java.util.Set; /** @@ -54,16 +58,15 @@ import java.util.Set; */ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { + protected static final LoadingCache<Class<?>, Class<?>> serviceTypeCache = newServiceImplementationTypesCache("Topia"); /** Logger. */ private static final Log log = LogFactory.getLog(ObserveServiceFactoryTopia.class); - protected static final LoadingCache<Class<?>, Class<?>> serviceTypeCache = newServiceImplementationTypesCache("Topia"); - @Override public <S extends ObserveService> boolean accept(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { - Preconditions.checkNotNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); - Preconditions.checkNotNull(serviceType, "serviceType can't be null."); + Objects.requireNonNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); + Objects.requireNonNull(serviceType, "serviceType can't be null."); return dataSourceConfiguration instanceof ObserveDataSourceConfigurationTopiaSupport; } @@ -71,8 +74,8 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { @Override public <S extends ObserveService> boolean accept(ObserveDataSourceConnection dataSourceConnection, Class<S> serviceType) { - Preconditions.checkNotNull(dataSourceConnection, "dataSourceConfiguration can't be null."); - Preconditions.checkNotNull(serviceType, "serviceType can't be null."); + Objects.requireNonNull(dataSourceConnection, "dataSourceConfiguration can't be null."); + Objects.requireNonNull(serviceType, "serviceType can't be null."); return dataSourceConnection instanceof ObserveDataSourceConnectionTopia; } @@ -80,8 +83,8 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { @Override public <S extends ObserveService> S newService(ObserveServiceInitializer observeServiceInitializer, Class<S> serviceType) { - Preconditions.checkNotNull(observeServiceInitializer, "observeServiceInitializerContext can't be null."); - Preconditions.checkNotNull(serviceType, "serviceType can't be null."); + Objects.requireNonNull(observeServiceInitializer, "observeServiceInitializerContext can't be null."); + Objects.requireNonNull(serviceType, "serviceType can't be null."); if (observeServiceInitializer.withDataSourceConnection()) { @@ -91,13 +94,13 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { } else { ObserveDataSourceConfiguration dataSourceConfiguration = observeServiceInitializer.getDataSourceConfiguration(); - Preconditions.checkNotNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); + Objects.requireNonNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); Preconditions.checkArgument(dataSourceConfiguration instanceof ObserveDataSourceConfigurationTopiaSupport, "dataSourceConfiguration must be of type " + ObserveDataSourceConfigurationTopiaSupport.class.getName()); } Class<S> serviceTypeImpl = getServiceClassType(serviceTypeCache, serviceType); - Preconditions.checkNotNull(serviceTypeImpl, "serviceTypeImpl not found for : " + serviceType.getName()); + Objects.requireNonNull(serviceTypeImpl, "serviceTypeImpl not found for : " + serviceType.getName()); ObserveServiceContextTopia serviceContext = createServiceContext(observeServiceInitializer); @@ -109,9 +112,7 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { protected ObserveServiceContextTopia createServiceContext(ObserveServiceInitializer observeServiceInitializer) { - ObserveServiceContextTopia serviceContext = new ObserveServiceContextTopia(observeServiceInitializer, mainServiceFactory, this); - - return serviceContext; + return new ObserveServiceContextTopia(observeServiceInitializer, mainServiceFactory, this); } @@ -128,8 +129,7 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { protected <S extends ObserveService> S newServiceTransactionalProxy(Class<S> serviceType, S service, ObserveServiceContextTopia serviceContext) { ObserveServiceInvocationHandler invocationHandler = new ObserveServiceInvocationHandler(serviceContext, service); - S proxyService = Reflection.newProxy(serviceType, invocationHandler); - return proxyService; + return Reflection.newProxy(serviceType, invocationHandler); } @@ -200,18 +200,18 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { boolean readReferentialPermissionPresent = method.isAnnotationPresent(ReadReferentialPermission.class); boolean writeReferentialPermissionPresent = method.isAnnotationPresent(WriteReferentialPermission.class); if (readDataPermissionPresent - || writeDataPermissionPresent - || readReferentialPermissionPresent - || writeReferentialPermissionPresent) { + || writeDataPermissionPresent + || readReferentialPermissionPresent + || writeReferentialPermissionPresent) { if (serviceContext.withDataSourceConnection()) { ObserveDataSourceConnectionTopia dataSourceConnection = serviceContext.getDataSourceConnection(); if (readDataPermissionPresent && !dataSourceConnection.canReadData() - || writeDataPermissionPresent && !dataSourceConnection.canWriteData() - || readReferentialPermissionPresent && !dataSourceConnection.canReadReferential() - || writeReferentialPermissionPresent && !dataSourceConnection.canWriteReferential()) { + || writeDataPermissionPresent && !dataSourceConnection.canWriteData() + || readReferentialPermissionPresent && !dataSourceConnection.canReadReferential() + || writeReferentialPermissionPresent && !dataSourceConnection.canWriteReferential()) { throw new UnauthorizedException(method.getClass().getCanonicalName(), method.getName()); @@ -235,8 +235,7 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { protected Object invokeMethod(Method method, Object... args) throws Throwable { try { - Object result = method.invoke(target, args); - return result; + return method.invoke(target, args); } catch (InvocationTargetException e) { if (log.isErrorEnabled()) { log.error("Error in method " + method.getName(), e); diff --git a/services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java similarity index 89% rename from services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java index d762ec7..33ddd8c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.topia; /* * #%L @@ -22,15 +22,15 @@ package fr.ird.observe.services; * #L% */ -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.services.binder.BinderEngine; -import fr.ird.observe.services.binder.data.DataBinderSupport; -import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.topia.binder.BinderEngine; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataFileDto; import fr.ird.observe.services.dto.DataReference; @@ -57,6 +57,7 @@ import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Locale; +import java.util.Objects; import java.util.Optional; /** @@ -68,23 +69,19 @@ import java.util.Optional; */ public abstract class ObserveServiceTopia implements ObserveService { + protected static final BinderEngine BINDER_ENGINE = BinderEngine.get(); /** * Logger. */ private static final Log log = LogFactory.getLog(ObserveServiceTopia.class); - - protected static final BinderEngine BINDER_ENGINE = BinderEngine.get(); - protected ObserveServiceContextTopia serviceContext; public static <D extends DataDto, E extends ObserveDataEntity> Class<E> getDataEntityType(Class<D> dtoType) { - Class<E> dataEntityType = BINDER_ENGINE.getDataEntityType(dtoType); - return dataEntityType; + return BINDER_ENGINE.getDataEntityType(dtoType); } public static <D extends ReferentialDto, E extends ObserveReferentialEntity> Class<E> getReferentialEntityType(Class<D> dtoType) { - Class<E> referentialEntityType = BINDER_ENGINE.getReferentialEntityType(dtoType); - return referentialEntityType; + return BINDER_ENGINE.getReferentialEntityType(dtoType); } public static ImmutableSet<Class<? extends ReferentialDto>> getReferentialDtoTypes() { @@ -92,13 +89,12 @@ public abstract class ObserveServiceTopia implements ObserveService { } public void setServiceContext(ObserveServiceContextTopia serviceContext) { - Preconditions.checkNotNull(serviceContext, "serviceContext can't be null."); + Objects.requireNonNull(serviceContext, "serviceContext can't be null."); this.serviceContext = serviceContext; } public ReferentialLocale getReferentialLocale() { - ReferentialLocale referentialLocale = serviceContext.getReferentialLocale(); - return referentialLocale; + return serviceContext.getReferentialLocale(); } public Locale getApplicationLocale() { @@ -110,8 +106,7 @@ public abstract class ObserveServiceTopia implements ObserveService { log.info("Load entity: " + id); } try { - E entity = getTopiaPersistenceContext().findByTopiaId(id); - return entity; + return getTopiaPersistenceContext().findByTopiaId(id); } catch (TopiaNoResultException e) { throw new DataNotFoundException(dtoType, id); } @@ -120,8 +115,7 @@ public abstract class ObserveServiceTopia implements ObserveService { public <E extends ObserveEntity> E newEntity(Class<E> entityType) { ObserveTopiaPersistenceContext persistenceContext = getTopiaPersistenceContext(); TopiaDao<E> dao = persistenceContext.getDao(entityType); - E entity = dao.newInstance(); - return entity; + return dao.newInstance(); } public ObserveTopiaPersistenceContext getTopiaPersistenceContext() { @@ -131,23 +125,21 @@ public abstract class ObserveServiceTopia implements ObserveService { protected <E extends ObserveEntity> List<E> loadEntities(Class<E> entityType) { ObserveTopiaPersistenceContext persistenceContext = getTopiaPersistenceContext(); TopiaDao<E> dao = persistenceContext.getDao(entityType); - List<E> entities = dao.findAll(); - return entities; + return dao.findAll(); } + public <E extends ObserveEntity> List<E> loadEntities(Class<E> entityType, Collection<String> ids) { ObserveTopiaPersistenceContext persistenceContext = getTopiaPersistenceContext(); TopiaDao<E> dao = persistenceContext.getDao(entityType); - List<E> entities = dao.forTopiaIdIn(ids).findAll(); - return entities; + return dao.forTopiaIdIn(ids).findAll(); } protected <E extends ObserveEntity> Optional<Date> getLastUpdate(Class<E> entityType) { ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); Date lastUpdateDate = persistenceContext.getLastUpdateDate(entityType); - Optional<Date> result = Optional.ofNullable(lastUpdateDate); - return result; + return Optional.ofNullable(lastUpdateDate); } protected <D extends IdDto, E extends ObserveEntity> void deleteEntity(Class<D> dtoType, Class<E> entityType, Iterable<String> ids) { @@ -194,9 +186,8 @@ public abstract class ObserveServiceTopia implements ObserveService { D dto = BINDER_ENGINE.transformEntityToDataDto(serviceContext.getReferentialLocale(), dtoType, entity); - Form<D> form = Form.newFormDto(dtoType, dto, referentialRequestDefinition == null ? null : + return Form.newFormDto(dtoType, dto, referentialRequestDefinition == null ? null : referentialRequestDefinition.name(), null); - return form; } @@ -206,9 +197,8 @@ public abstract class ObserveServiceTopia implements ObserveService { D dto = BINDER_ENGINE.transformEntityToReferentialDto(serviceContext.getReferentialLocale(), entity); - Form<D> form = Form.newFormDto(dtoType, dto, referentialRequestDefinition == null ? null : + return Form.newFormDto(dtoType, dto, referentialRequestDefinition == null ? null : referentialRequestDefinition.name(), null); - return form; } @@ -376,8 +366,7 @@ public abstract class ObserveServiceTopia implements ObserveService { E entity = loadEntity(dtoType, id); DataBinderSupport<E, D> binder = getDataBinder(dtoType); - D dto = binder.toData(getReferentialLocale(), entity); - return dto; + return binder.toData(getReferentialLocale(), entity); } @@ -385,8 +374,7 @@ public abstract class ObserveServiceTopia implements ObserveService { E entity = loadEntity(dtoType, id); ReferentialBinderSupport<E, D> binder = getReferentialBinder(dtoType); - D dto = binder.toDto(getReferentialLocale(), entity); - return dto; + return binder.toDto(getReferentialLocale(), entity); } @@ -398,15 +386,13 @@ public abstract class ObserveServiceTopia implements ObserveService { protected <D extends ReferentialDto> ReferentialReference<D> toReference(ObserveReferentialEntity entity) { - ReferentialReference<D> reference = BinderEngine.get().transformEntityToReferentialReferenceDto(getReferentialLocale(), entity); - return reference; + return BinderEngine.get().transformEntityToReferentialReferenceDto(getReferentialLocale(), entity); } protected <D extends DataDto> DataReference<D> toReference(ObserveDataEntity entity) { - DataReference<D> reference = BinderEngine.get().transformEntityToDataReferenceDto(getReferentialLocale(), entity); - return reference; + return BinderEngine.get().transformEntityToDataReferenceDto(getReferentialLocale(), entity); } @@ -449,15 +435,13 @@ public abstract class ObserveServiceTopia implements ObserveService { protected <D extends DataDto, E extends ObserveDataEntity> DataBinderSupport<E, D> getDataBinder(Class<D> dtoType) { - DataBinderSupport<E, D> reference = BINDER_ENGINE.getDataBinder(dtoType); - return reference; + return BINDER_ENGINE.getDataBinder(dtoType); } protected <D extends ReferentialDto, E extends ObserveReferentialEntity> ReferentialBinderSupport<E, D> getReferentialBinder(Class<D> dtoType) { - ReferentialBinderSupport<E, D> reference = BINDER_ENGINE.getReferentialBinder(dtoType); - return reference; + return BINDER_ENGINE.getReferentialBinder(dtoType); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/ObserveTopiaApplicationContextFactory.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java similarity index 92% rename from services-topia/src/main/java/fr/ird/observe/services/ObserveTopiaApplicationContextFactory.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java index 427bdce..9e9f647 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/ObserveTopiaApplicationContextFactory.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.topia; /* * #%L @@ -36,6 +36,7 @@ import org.nuiton.topia.persistence.TopiaApplicationContext; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; +import java.util.Objects; import java.util.Optional; /** @@ -47,11 +48,10 @@ import java.util.Optional; */ public class ObserveTopiaApplicationContextFactory { + protected static final Map<ObserveDataSourceConfigurationTopiaSupport, ObserveTopiaApplicationContext> TOPIA_APPLICATION_CONTEXT_CACHE = new HashMap<>(); /** Logger. */ private static final Log log = LogFactory.getLog(ObserveTopiaApplicationContextFactory.class); - protected static final Map<ObserveDataSourceConfigurationTopiaSupport, ObserveTopiaApplicationContext> TOPIA_APPLICATION_CONTEXT_CACHE = new HashMap<>(); - public static ObserveTopiaApplicationContext getOrCreateTopiaApplicationContext(ObserveDataSourceConfigurationTopiaSupport dataSourceConfiguration) { Optional<ObserveTopiaApplicationContext> optionalTopiaApplicationContext = getTopiaApplicationContextIfPresent(dataSourceConfiguration); @@ -78,7 +78,7 @@ public class ObserveTopiaApplicationContextFactory { } else if (configuration instanceof ObserveDataSourceConfigurationTopiaPG) { topiaApplicationContext = createTopiaApplicationContext((ObserveDataSourceConfigurationTopiaPG) configuration, initSchema); } - Preconditions.checkNotNull(topiaApplicationContext, "Did not find how to create ObserveTopiaApplicationContext from: " + configuration); + Objects.requireNonNull(topiaApplicationContext, "Did not find how to create ObserveTopiaApplicationContext from: " + configuration); return topiaApplicationContext; } @@ -99,7 +99,7 @@ public class ObserveTopiaApplicationContextFactory { break; } } - Preconditions.checkNotNull(result, "Did not find how to create ObserveTopiaApplicationContext from: " + authenticationToken); + Objects.requireNonNull(result, "Did not find how to create ObserveTopiaApplicationContext from: " + authenticationToken); return result; } @@ -145,8 +145,7 @@ public class ObserveTopiaApplicationContextFactory { ObserveTopiaConfiguration topiaConfiguration = createTopiaConfiguration(configuration, initSchema); - ObserveTopiaApplicationContext topiaApplicationContext = new MyObserveTopiaApplicationContext(topiaConfiguration, configuration); - return topiaApplicationContext; + return new MyObserveTopiaApplicationContext(topiaConfiguration, configuration); } @@ -165,8 +164,7 @@ public class ObserveTopiaApplicationContextFactory { if (log.isInfoEnabled()) { log.info("H2 Topia configuration: " + topiaConfiguration); } - ObserveTopiaApplicationContext topiaApplicationContext = new MyObserveTopiaApplicationContext(topiaConfiguration, configuration); - return topiaApplicationContext; + return new MyObserveTopiaApplicationContext(topiaConfiguration, configuration); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java similarity index 91% rename from services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java index 4a4117c..7349816 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder; +package fr.ird.observe.services.topia.binder; /*- * #%L @@ -27,8 +27,8 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.services.binder.data.DataBinderSupport; -import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.ObserveModelInitializerRunner; @@ -60,10 +60,6 @@ public class BinderEngine implements ReferenceBinderEngine { protected final ImmutableMap<Class<? extends ObserveDataEntity>, Class<? extends DataDto>> dataEntityToDtoTypes; - public static BinderEngine get() { - return INSTANCE; - } - protected BinderEngine() { BinderEngineInitializer initializer = new BinderEngineInitializer(); @@ -80,6 +76,10 @@ public class BinderEngine implements ReferenceBinderEngine { } + public static BinderEngine get() { + return INSTANCE; + } + public <D extends ReferentialDto, E extends ObserveReferentialEntity> ReferentialBinderSupport<E, D> getReferentialBinder(Class<D> dtoType) { return (ReferentialBinderSupport) referentialBinders.get(dtoType); } @@ -115,9 +115,9 @@ public class BinderEngine implements ReferenceBinderEngine { } public <D extends ReferentialDto> Class<D> getReferentialDtoType(ObserveEntityEnum entityEnum) { - Class<D> dtoType = BinderEngine.get().getReferentialDtoType((Class) entityEnum.getContract()); - return dtoType ; + return BinderEngine.get().getReferentialDtoType((Class) entityEnum.getContract()); } + public <D extends ReferentialDto, E extends ObserveReferentialEntity> Class<D> getReferentialDtoType(Class<E> entityType) { Class<D> result = (Class<D>) referentialEntityToDtoTypes.get(entityType); if (result == null) { @@ -168,8 +168,7 @@ public class BinderEngine implements ReferenceBinderEngine { Class<D> dtoType = (Class<D>) dto.getClass(); ReferentialBinderSupport<?, D> binder = getReferentialBinder(dtoType); - ReferentialReference<D> reference = binder.toReferentialReference(referentialLocale, dto); - return reference; + return binder.toReferentialReference(referentialLocale, dto); } @@ -177,10 +176,9 @@ public class BinderEngine implements ReferenceBinderEngine { public <D extends DataDto> DataReference<D> transformDataDtoToReference(ReferentialLocale referentialLocale, D dto) { Class<D> dtoType = (Class<D>) dto.getClass(); - DataBinderSupport<?, D> binder = getDataBinder((Class)dtoType); + DataBinderSupport<?, D> binder = getDataBinder((Class) dtoType); - DataReference<D> reference = binder.toDataReference(referentialLocale, dto); - return reference; + return binder.toDataReference(referentialLocale, dto); } @@ -200,8 +198,7 @@ public class BinderEngine implements ReferenceBinderEngine { Class<D> dtoType = getDataDtoType(entity.getClass()); DataBinderSupport<E, D> binder = getDataBinder(dtoType); - DataReference<D> dto = binder.toDataReference(referentialLocale, entity); - return dto; + return binder.toDataReference(referentialLocale, entity); } @@ -210,8 +207,7 @@ public class BinderEngine implements ReferenceBinderEngine { Class<D> dtoType = getReferentialDtoType(entity.getClass()); ReferentialBinderSupport<E, D> binder = getReferentialBinder(dtoType); - ReferentialReference<D> dto = binder.toReferentialReference(referentialLocale, entity, dtoType); - return dto; + return binder.toReferentialReference(referentialLocale, entity, dtoType); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java similarity index 84% rename from services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java index 33eab24..098b00b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder; +package fr.ird.observe.services.topia.binder; /*- * #%L @@ -120,120 +120,120 @@ import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; import fr.ird.observe.entities.seine.TransmittingBuoy; import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.binder.data.ActivityLonglineBinder; -import fr.ird.observe.services.binder.data.ActivityLonglineEncouterDtoBinder; -import fr.ird.observe.services.binder.data.ActivityLonglineSensorUsedDtoBinder; -import fr.ird.observe.services.binder.data.ActivityLonglineStubDtoBinder; -import fr.ird.observe.services.binder.data.ActivitySeineBinder; -import fr.ird.observe.services.binder.data.ActivitySeineObservedSystemDtoBinder; -import fr.ird.observe.services.binder.data.ActivitySeineStubDtoBinder; -import fr.ird.observe.services.binder.data.BaitsCompositionBinder; -import fr.ird.observe.services.binder.data.BasketBinder; -import fr.ird.observe.services.binder.data.BranchlineBinder; -import fr.ird.observe.services.binder.data.BranchlinesCompositionBinder; -import fr.ird.observe.services.binder.data.CatchLonglineBinder; -import fr.ird.observe.services.binder.data.EncounterBinder; -import fr.ird.observe.services.binder.data.FloatingObjectBinder; -import fr.ird.observe.services.binder.data.FloatingObjectObservedSpeciesDtoBinder; -import fr.ird.observe.services.binder.data.FloatingObjectSchoolEstimateDtoBinder; -import fr.ird.observe.services.binder.data.FloatingObjectTransmittingBuoyDtoBinder; -import fr.ird.observe.services.binder.data.FloatlinesCompositionBinder; -import fr.ird.observe.services.binder.data.GearUseFeaturesLonglineBinder; -import fr.ird.observe.services.binder.data.GearUseFeaturesMeasurementLonglineBinder; -import fr.ird.observe.services.binder.data.GearUseFeaturesMeasurementSeineBinder; -import fr.ird.observe.services.binder.data.GearUseFeaturesSeineBinder; -import fr.ird.observe.services.binder.data.HooksCompositionBinder; -import fr.ird.observe.services.binder.data.NonTargetCatchBinder; -import fr.ird.observe.services.binder.data.NonTargetLengthBinder; -import fr.ird.observe.services.binder.data.NonTargetSampleBinder; -import fr.ird.observe.services.binder.data.ObjectObservedSpeciesBinder; -import fr.ird.observe.services.binder.data.ObjectSchoolEstimateBinder; -import fr.ird.observe.services.binder.data.RouteBinder; -import fr.ird.observe.services.binder.data.RouteStubDtoBinder; -import fr.ird.observe.services.binder.data.SchoolEstimateBinder; -import fr.ird.observe.services.binder.data.SectionBinder; -import fr.ird.observe.services.binder.data.SensorUsedBinder; -import fr.ird.observe.services.binder.data.SetLonglineBinder; -import fr.ird.observe.services.binder.data.SetLonglineCatchDtoBinder; -import fr.ird.observe.services.binder.data.SetLonglineDetailCompositionDtoBinder; -import fr.ird.observe.services.binder.data.SetLonglineGlobalCompositionDtoBinder; -import fr.ird.observe.services.binder.data.SetLonglineStubDtoBinder; -import fr.ird.observe.services.binder.data.SetLonglineTdrDtoBinder; -import fr.ird.observe.services.binder.data.SetSeineBinder; -import fr.ird.observe.services.binder.data.SetSeineNonTargetCatchDtoBinder; -import fr.ird.observe.services.binder.data.SetSeineSchoolEstimateDtoBinder; -import fr.ird.observe.services.binder.data.SetSeineTargetCatchDtoBinder; -import fr.ird.observe.services.binder.data.SizeMeasureBinder; -import fr.ird.observe.services.binder.data.TargetCatchBinder; -import fr.ird.observe.services.binder.data.TargetLengthBinder; -import fr.ird.observe.services.binder.data.TargetSampleBinder; -import fr.ird.observe.services.binder.data.TdrBinder; -import fr.ird.observe.services.binder.data.TransmittingBuoyBinder; -import fr.ird.observe.services.binder.data.TripLonglineActivityDtoBinder; -import fr.ird.observe.services.binder.data.TripLonglineBinder; -import fr.ird.observe.services.binder.data.TripLonglineGearUseDtoBinder; -import fr.ird.observe.services.binder.data.TripSeineBinder; -import fr.ird.observe.services.binder.data.TripSeineGearUseDtoBinder; -import fr.ird.observe.services.binder.data.WeightMeasureBinder; -import fr.ird.observe.services.binder.referential.BaitHaulingStatusBinder; -import fr.ird.observe.services.binder.referential.BaitSettingStatusBinder; -import fr.ird.observe.services.binder.referential.BaitTypeBinder; -import fr.ird.observe.services.binder.referential.CatchFateLonglineBinder; -import fr.ird.observe.services.binder.referential.CountryBinder; -import fr.ird.observe.services.binder.referential.DetectionModeBinder; -import fr.ird.observe.services.binder.referential.EncounterTypeBinder; -import fr.ird.observe.services.binder.referential.FpaZoneBinder; -import fr.ird.observe.services.binder.referential.GearBinder; -import fr.ird.observe.services.binder.referential.GearCaracteristicBinder; -import fr.ird.observe.services.binder.referential.GearCaracteristicTypeBinder; -import fr.ird.observe.services.binder.referential.HarbourBinder; -import fr.ird.observe.services.binder.referential.HealthnessBinder; -import fr.ird.observe.services.binder.referential.HookPositionBinder; -import fr.ird.observe.services.binder.referential.HookSizeBinder; -import fr.ird.observe.services.binder.referential.HookTypeBinder; -import fr.ird.observe.services.binder.referential.ItemHorizontalPositionBinder; -import fr.ird.observe.services.binder.referential.ItemVerticalPositionBinder; -import fr.ird.observe.services.binder.referential.LengthWeightParameterBinder; -import fr.ird.observe.services.binder.referential.LightsticksColorBinder; -import fr.ird.observe.services.binder.referential.LightsticksTypeBinder; -import fr.ird.observe.services.binder.referential.LineTypeBinder; -import fr.ird.observe.services.binder.referential.MaturityStatusBinder; -import fr.ird.observe.services.binder.referential.MitigationTypeBinder; -import fr.ird.observe.services.binder.referential.ObjectFateBinder; -import fr.ird.observe.services.binder.referential.ObjectOperationBinder; -import fr.ird.observe.services.binder.referential.ObjectTypeBinder; -import fr.ird.observe.services.binder.referential.ObservedSystemBinder; -import fr.ird.observe.services.binder.referential.OceanBinder; -import fr.ird.observe.services.binder.referential.OrganismBinder; -import fr.ird.observe.services.binder.referential.PersonBinder; -import fr.ird.observe.services.binder.referential.ProgramBinder; -import fr.ird.observe.services.binder.referential.ReasonForDiscardBinder; -import fr.ird.observe.services.binder.referential.ReasonForNoFishingBinder; -import fr.ird.observe.services.binder.referential.ReasonForNullSetBinder; -import fr.ird.observe.services.binder.referential.SensorBrandBinder; -import fr.ird.observe.services.binder.referential.SensorDataFormatBinder; -import fr.ird.observe.services.binder.referential.SensorTypeBinder; -import fr.ird.observe.services.binder.referential.SettingShapeBinder; -import fr.ird.observe.services.binder.referential.SexBinder; -import fr.ird.observe.services.binder.referential.SizeMeasureTypeBinder; -import fr.ird.observe.services.binder.referential.SpeciesBinder; -import fr.ird.observe.services.binder.referential.SpeciesFateBinder; -import fr.ird.observe.services.binder.referential.SpeciesGroupBinder; -import fr.ird.observe.services.binder.referential.SpeciesListBinder; -import fr.ird.observe.services.binder.referential.SpeciesStatusBinder; -import fr.ird.observe.services.binder.referential.StomacFullnessBinder; -import fr.ird.observe.services.binder.referential.SurroundingActivityBinder; -import fr.ird.observe.services.binder.referential.TransmittingBuoyOperationBinder; -import fr.ird.observe.services.binder.referential.TransmittingBuoyTypeBinder; -import fr.ird.observe.services.binder.referential.TripTypeBinder; -import fr.ird.observe.services.binder.referential.VesselActivityLonglineBinder; -import fr.ird.observe.services.binder.referential.VesselActivitySeineBinder; -import fr.ird.observe.services.binder.referential.VesselBinder; -import fr.ird.observe.services.binder.referential.VesselSizeCategoryBinder; -import fr.ird.observe.services.binder.referential.VesselTypeBinder; -import fr.ird.observe.services.binder.referential.WeightCategoryBinder; -import fr.ird.observe.services.binder.referential.WeightMeasureTypeBinder; -import fr.ird.observe.services.binder.referential.WindBinder; +import fr.ird.observe.services.topia.binder.data.ActivityLonglineBinder; +import fr.ird.observe.services.topia.binder.data.ActivityLonglineEncouterDtoBinder; +import fr.ird.observe.services.topia.binder.data.ActivityLonglineSensorUsedDtoBinder; +import fr.ird.observe.services.topia.binder.data.ActivityLonglineStubDtoBinder; +import fr.ird.observe.services.topia.binder.data.ActivitySeineBinder; +import fr.ird.observe.services.topia.binder.data.ActivitySeineObservedSystemDtoBinder; +import fr.ird.observe.services.topia.binder.data.ActivitySeineStubDtoBinder; +import fr.ird.observe.services.topia.binder.data.BaitsCompositionBinder; +import fr.ird.observe.services.topia.binder.data.BasketBinder; +import fr.ird.observe.services.topia.binder.data.BranchlineBinder; +import fr.ird.observe.services.topia.binder.data.BranchlinesCompositionBinder; +import fr.ird.observe.services.topia.binder.data.CatchLonglineBinder; +import fr.ird.observe.services.topia.binder.data.EncounterBinder; +import fr.ird.observe.services.topia.binder.data.FloatingObjectBinder; +import fr.ird.observe.services.topia.binder.data.FloatingObjectObservedSpeciesDtoBinder; +import fr.ird.observe.services.topia.binder.data.FloatingObjectSchoolEstimateDtoBinder; +import fr.ird.observe.services.topia.binder.data.FloatingObjectTransmittingBuoyDtoBinder; +import fr.ird.observe.services.topia.binder.data.FloatlinesCompositionBinder; +import fr.ird.observe.services.topia.binder.data.GearUseFeaturesLonglineBinder; +import fr.ird.observe.services.topia.binder.data.GearUseFeaturesMeasurementLonglineBinder; +import fr.ird.observe.services.topia.binder.data.GearUseFeaturesMeasurementSeineBinder; +import fr.ird.observe.services.topia.binder.data.GearUseFeaturesSeineBinder; +import fr.ird.observe.services.topia.binder.data.HooksCompositionBinder; +import fr.ird.observe.services.topia.binder.data.NonTargetCatchBinder; +import fr.ird.observe.services.topia.binder.data.NonTargetLengthBinder; +import fr.ird.observe.services.topia.binder.data.NonTargetSampleBinder; +import fr.ird.observe.services.topia.binder.data.ObjectObservedSpeciesBinder; +import fr.ird.observe.services.topia.binder.data.ObjectSchoolEstimateBinder; +import fr.ird.observe.services.topia.binder.data.RouteBinder; +import fr.ird.observe.services.topia.binder.data.RouteStubDtoBinder; +import fr.ird.observe.services.topia.binder.data.SchoolEstimateBinder; +import fr.ird.observe.services.topia.binder.data.SectionBinder; +import fr.ird.observe.services.topia.binder.data.SensorUsedBinder; +import fr.ird.observe.services.topia.binder.data.SetLonglineBinder; +import fr.ird.observe.services.topia.binder.data.SetLonglineCatchDtoBinder; +import fr.ird.observe.services.topia.binder.data.SetLonglineDetailCompositionDtoBinder; +import fr.ird.observe.services.topia.binder.data.SetLonglineGlobalCompositionDtoBinder; +import fr.ird.observe.services.topia.binder.data.SetLonglineStubDtoBinder; +import fr.ird.observe.services.topia.binder.data.SetLonglineTdrDtoBinder; +import fr.ird.observe.services.topia.binder.data.SetSeineBinder; +import fr.ird.observe.services.topia.binder.data.SetSeineNonTargetCatchDtoBinder; +import fr.ird.observe.services.topia.binder.data.SetSeineSchoolEstimateDtoBinder; +import fr.ird.observe.services.topia.binder.data.SetSeineTargetCatchDtoBinder; +import fr.ird.observe.services.topia.binder.data.SizeMeasureBinder; +import fr.ird.observe.services.topia.binder.data.TargetCatchBinder; +import fr.ird.observe.services.topia.binder.data.TargetLengthBinder; +import fr.ird.observe.services.topia.binder.data.TargetSampleBinder; +import fr.ird.observe.services.topia.binder.data.TdrBinder; +import fr.ird.observe.services.topia.binder.data.TransmittingBuoyBinder; +import fr.ird.observe.services.topia.binder.data.TripLonglineActivityDtoBinder; +import fr.ird.observe.services.topia.binder.data.TripLonglineBinder; +import fr.ird.observe.services.topia.binder.data.TripLonglineGearUseDtoBinder; +import fr.ird.observe.services.topia.binder.data.TripSeineBinder; +import fr.ird.observe.services.topia.binder.data.TripSeineGearUseDtoBinder; +import fr.ird.observe.services.topia.binder.data.WeightMeasureBinder; +import fr.ird.observe.services.topia.binder.referential.BaitHaulingStatusBinder; +import fr.ird.observe.services.topia.binder.referential.BaitSettingStatusBinder; +import fr.ird.observe.services.topia.binder.referential.BaitTypeBinder; +import fr.ird.observe.services.topia.binder.referential.CatchFateLonglineBinder; +import fr.ird.observe.services.topia.binder.referential.CountryBinder; +import fr.ird.observe.services.topia.binder.referential.DetectionModeBinder; +import fr.ird.observe.services.topia.binder.referential.EncounterTypeBinder; +import fr.ird.observe.services.topia.binder.referential.FpaZoneBinder; +import fr.ird.observe.services.topia.binder.referential.GearBinder; +import fr.ird.observe.services.topia.binder.referential.GearCaracteristicBinder; +import fr.ird.observe.services.topia.binder.referential.GearCaracteristicTypeBinder; +import fr.ird.observe.services.topia.binder.referential.HarbourBinder; +import fr.ird.observe.services.topia.binder.referential.HealthnessBinder; +import fr.ird.observe.services.topia.binder.referential.HookPositionBinder; +import fr.ird.observe.services.topia.binder.referential.HookSizeBinder; +import fr.ird.observe.services.topia.binder.referential.HookTypeBinder; +import fr.ird.observe.services.topia.binder.referential.ItemHorizontalPositionBinder; +import fr.ird.observe.services.topia.binder.referential.ItemVerticalPositionBinder; +import fr.ird.observe.services.topia.binder.referential.LengthWeightParameterBinder; +import fr.ird.observe.services.topia.binder.referential.LightsticksColorBinder; +import fr.ird.observe.services.topia.binder.referential.LightsticksTypeBinder; +import fr.ird.observe.services.topia.binder.referential.LineTypeBinder; +import fr.ird.observe.services.topia.binder.referential.MaturityStatusBinder; +import fr.ird.observe.services.topia.binder.referential.MitigationTypeBinder; +import fr.ird.observe.services.topia.binder.referential.ObjectFateBinder; +import fr.ird.observe.services.topia.binder.referential.ObjectOperationBinder; +import fr.ird.observe.services.topia.binder.referential.ObjectTypeBinder; +import fr.ird.observe.services.topia.binder.referential.ObservedSystemBinder; +import fr.ird.observe.services.topia.binder.referential.OceanBinder; +import fr.ird.observe.services.topia.binder.referential.OrganismBinder; +import fr.ird.observe.services.topia.binder.referential.PersonBinder; +import fr.ird.observe.services.topia.binder.referential.ProgramBinder; +import fr.ird.observe.services.topia.binder.referential.ReasonForDiscardBinder; +import fr.ird.observe.services.topia.binder.referential.ReasonForNoFishingBinder; +import fr.ird.observe.services.topia.binder.referential.ReasonForNullSetBinder; +import fr.ird.observe.services.topia.binder.referential.SensorBrandBinder; +import fr.ird.observe.services.topia.binder.referential.SensorDataFormatBinder; +import fr.ird.observe.services.topia.binder.referential.SensorTypeBinder; +import fr.ird.observe.services.topia.binder.referential.SettingShapeBinder; +import fr.ird.observe.services.topia.binder.referential.SexBinder; +import fr.ird.observe.services.topia.binder.referential.SizeMeasureTypeBinder; +import fr.ird.observe.services.topia.binder.referential.SpeciesBinder; +import fr.ird.observe.services.topia.binder.referential.SpeciesFateBinder; +import fr.ird.observe.services.topia.binder.referential.SpeciesGroupBinder; +import fr.ird.observe.services.topia.binder.referential.SpeciesListBinder; +import fr.ird.observe.services.topia.binder.referential.SpeciesStatusBinder; +import fr.ird.observe.services.topia.binder.referential.StomacFullnessBinder; +import fr.ird.observe.services.topia.binder.referential.SurroundingActivityBinder; +import fr.ird.observe.services.topia.binder.referential.TransmittingBuoyOperationBinder; +import fr.ird.observe.services.topia.binder.referential.TransmittingBuoyTypeBinder; +import fr.ird.observe.services.topia.binder.referential.TripTypeBinder; +import fr.ird.observe.services.topia.binder.referential.VesselActivityLonglineBinder; +import fr.ird.observe.services.topia.binder.referential.VesselActivitySeineBinder; +import fr.ird.observe.services.topia.binder.referential.VesselBinder; +import fr.ird.observe.services.topia.binder.referential.VesselSizeCategoryBinder; +import fr.ird.observe.services.topia.binder.referential.VesselTypeBinder; +import fr.ird.observe.services.topia.binder.referential.WeightCategoryBinder; +import fr.ird.observe.services.topia.binder.referential.WeightMeasureTypeBinder; +import fr.ird.observe.services.topia.binder.referential.WindBinder; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.ObserveModelInitializer; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java index a07faae..da930e1 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder; +package fr.ird.observe.services.topia.binder; /*- * #%L @@ -34,7 +34,7 @@ import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperationPers import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.I18nReferentialEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.constants.ReferenceStatus; @@ -218,8 +218,7 @@ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { protected E newEntity() { try { - E entity = (E) ObserveEntityEnum.valueOf(entityType).getImplementation().newInstance(); - return entity; + return (E) ObserveEntityEnum.valueOf(entityType).getImplementation().newInstance(); } catch (InstantiationException | IllegalAccessException e) { throw new RuntimeException("What ever"); } @@ -227,8 +226,7 @@ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { protected D newDto() { try { - D dto = dtoType.newInstance(); - return dto; + return dtoType.newInstance(); } catch (InstantiationException | IllegalAccessException e) { throw new RuntimeException("What ever"); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngineSupplierTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineSupplierTopia.java similarity index 96% rename from services-topia/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngineSupplierTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineSupplierTopia.java index efb25f9..9291986 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngineSupplierTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineSupplierTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder; +package fr.ird.observe.services.topia.binder; /*- * #%L @@ -36,5 +36,5 @@ public class ReferenceBinderEngineSupplierTopia extends ReferenceBinderEngineSup public ReferenceBinderEngine get() { return BinderEngine.get(); } - + } diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java index 56df311..a3f46da 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java index 63bbb4b..e37be2c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java index a575752..7cc9a07 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineStubDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineStubDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java index 5ffcc6e..add3b66 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineStubDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java similarity index 99% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java index 3c2ccc1..2e2fabb 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineObservedSystemDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineObservedSystemDtoBinder.java index bf7ab96..b64ef03 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineObservedSystemDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java similarity index 92% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java index 4167703..99addd1 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L @@ -53,7 +53,7 @@ public class ActivitySeineStubDtoBinder extends DataBinderSupport<ActivitySeine, dto.setLongitude(entity.getLongitude()); boolean isFindeVeille = entity.getVesselActivitySeine() != null - && ActivitySeineImpl.ACTIVITY_FIN_DE_VEILLE.equals(entity.getVesselActivitySeine().getCode()); + && ActivitySeineImpl.ACTIVITY_FIN_DE_VEILLE.equals(entity.getVesselActivitySeine().getCode()); dto.setActivityFinDeVeille(isFindeVeille); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/BaitsCompositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/BaitsCompositionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java index 9a9ebac..041a035 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/BaitsCompositionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/BasketBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/BasketBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java index 4aace2c..def56e1 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/BasketBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java similarity index 99% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java index 37094cb..6bd5066 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlinesCompositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlinesCompositionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java index 901b64a..3dd9dfb 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlinesCompositionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/CatchLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java similarity index 99% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/CatchLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java index e480b87..599db78 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/CatchLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java index 4c12427..b38df55 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L @@ -28,8 +28,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ird.observe.entities.CommentableEntity; import fr.ird.observe.entities.ObserveDataEntity; -import fr.ird.observe.services.binder.BinderEngine; -import fr.ird.observe.services.binder.BinderSupport; +import fr.ird.observe.services.topia.binder.BinderEngine; +import fr.ird.observe.services.topia.binder.BinderSupport; import fr.ird.observe.services.dto.CommentableDto; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/EncounterBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/EncounterBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/EncounterBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/EncounterBinder.java index 9b891e9..6b6b475 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/EncounterBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/EncounterBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java index 2b6b2f8..3c234bf 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectObservedSpeciesDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectObservedSpeciesDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java index 4918508..be0da4b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectObservedSpeciesDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectSchoolEstimateDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectSchoolEstimateDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java index 1a0ec50..3245920 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectSchoolEstimateDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java index 55580ba..db3d00d 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatlinesCompositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatlinesCompositionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java index 7617ab2..b952408 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatlinesCompositionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java index 82aa334..b93c7cf 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java index eabfcc6..d115df4 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementSeineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java index b68c097..68dfd3c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementSeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesSeineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java index 3a3bf64..18d5fd8 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesSeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/HooksCompositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/HooksCompositionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java index 2a1528e..bea9a20 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/HooksCompositionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetCatchBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetCatchBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetCatchBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetCatchBinder.java index 56669bc..b2d2ba2 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetCatchBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetCatchBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetLengthBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetLengthBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java index e57d1ec..44ea733 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetLengthBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetSampleBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetSampleBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java index ac28556..82d352e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetSampleBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectObservedSpeciesBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectObservedSpeciesBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java index 7a8820a..640f38d 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectObservedSpeciesBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectSchoolEstimateBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectSchoolEstimateBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java index 2dab9be..c59f854 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectSchoolEstimateBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/RouteBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/RouteBinder.java index b181cd6..99f7157 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/RouteBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteStubDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteStubDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java index da06123..9f499d7 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteStubDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SchoolEstimateBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SchoolEstimateBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/SchoolEstimateBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SchoolEstimateBinder.java index a78d9ff..0175b2f 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SchoolEstimateBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SchoolEstimateBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SectionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/SectionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java index 9ccb9ce..da4d9c6 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SectionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SensorUsedBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/SensorUsedBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java index 4e52dcf..4e1dcc3 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SensorUsedBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineBinder.java similarity index 99% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineBinder.java index e3679d0..bd82476 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java index cbf03cd..96f68c4 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java index eb6dec2..c74e0e9 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java index 614aebb..e12de90 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineStubDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java similarity index 95% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineStubDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java index 99ca644..ed7f239 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineStubDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L @@ -50,7 +50,7 @@ public class SetLonglineStubDtoBinder extends DataBinderSupport<SetLongline, Set dto.setHomeId(entity.getHomeId()); dto.setNumber(entity.getNumber()); - dto.setActivityLongline(toDataReference(referentialLocale, null,ActivityLonglineDto.class)); + dto.setActivityLongline(toDataReference(referentialLocale, null, ActivityLonglineDto.class)); } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java index 23e35d9..d4f689a 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java index b05b210..efb6d8e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L @@ -98,7 +98,7 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { } @Override - public DataReference<SetSeineDto> toDataReference(ReferentialLocale referentialLocale, SetSeineDto dto) { + public DataReference<SetSeineDto> toDataReference(ReferentialLocale referentialLocale, SetSeineDto dto) { return toDataReference(dto, dto.getComment()); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineNonTargetCatchDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineNonTargetCatchDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java index d9db812..8a91d23 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineNonTargetCatchDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java index 07dfb95..1d87fd0 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java index fe751f4..1547ee9 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SizeMeasureBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/SizeMeasureBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java index 5fb91a1..6b184af 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/SizeMeasureBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetCatchBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetCatchBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java index 377ee05..c66ee85 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetCatchBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetLengthBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetLengthBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java index da330be..bfdc931 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetLengthBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetSampleBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetSampleBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java index 69c658e..3010cca 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetSampleBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java similarity index 99% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java index fd34392..28f829f 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TransmittingBuoyBinder.java similarity index 89% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TransmittingBuoyBinder.java index 678c1d5..697308d 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TransmittingBuoyBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L @@ -75,10 +75,10 @@ public class TransmittingBuoyBinder extends DataBinderSupport<TransmittingBuoy, @Override public DataReference<TransmittingBuoyDto> toDataReference(ReferentialLocale referentialLocale, TransmittingBuoy entity) { return toDataReference(entity, - entity.getCode(), - entity.getBrand(), - toReferentialReference(referentialLocale, entity.getTransmittingBuoyType(), TransmittingBuoyTypeDto.class), - toReferentialReference(referentialLocale, entity.getTransmittingBuoyOperation(), TransmittingBuoyOperationDto.class)); + entity.getCode(), + entity.getBrand(), + toReferentialReference(referentialLocale, entity.getTransmittingBuoyType(), TransmittingBuoyTypeDto.class), + toReferentialReference(referentialLocale, entity.getTransmittingBuoyOperation(), TransmittingBuoyOperationDto.class)); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineActivityDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineActivityDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java index 6057285..70c2071 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineActivityDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java similarity index 99% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java index ece7c75..f033104 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java index 43b3e4e..e4312cf 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java similarity index 99% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java index e8577a1..3708403 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java index eaa6e3d..3f44f0e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/data/WeightMeasureBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/data/WeightMeasureBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java index 4e512ad..27d1c0c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/WeightMeasureBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.data; +package fr.ird.observe.services.topia.binder.data; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitHaulingStatusBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitHaulingStatusBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitHaulingStatusBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitHaulingStatusBinder.java index df8f35b..b676596 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitHaulingStatusBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitHaulingStatusBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitSettingStatusBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitSettingStatusBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitSettingStatusBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitSettingStatusBinder.java index 1a43e5a..356c14b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitSettingStatusBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitSettingStatusBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitTypeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitTypeBinder.java index 0892792..770dadb 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/CatchFateLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/CatchFateLonglineBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/CatchFateLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/CatchFateLonglineBinder.java index d1701f5..6c6bdfa 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/CatchFateLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/CatchFateLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/CountryBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/CountryBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/CountryBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/CountryBinder.java index 6107838..0e37cc6 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/CountryBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/CountryBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/DetectionModeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/DetectionModeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/DetectionModeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/DetectionModeBinder.java index 8f24d34..c35381d 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/DetectionModeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/DetectionModeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/EncounterTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/EncounterTypeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/EncounterTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/EncounterTypeBinder.java index 23459e6..1d496f6 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/EncounterTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/EncounterTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/FpaZoneBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/FpaZoneBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/FpaZoneBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/FpaZoneBinder.java index 221f2f8..901ad56 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/FpaZoneBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/FpaZoneBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearBinder.java index d2af2af..2ceba61 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicBinder.java index a084f1c..2f4b8b6 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicTypeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicTypeBinder.java index be22bc4..7480a27 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HarbourBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HarbourBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/HarbourBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HarbourBinder.java index 5f37439..fd681a4 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HarbourBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HarbourBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HealthnessBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HealthnessBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/HealthnessBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HealthnessBinder.java index aac0f43..7792683 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HealthnessBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HealthnessBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookPositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookPositionBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookPositionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookPositionBinder.java index 9d9fbc9..163a943 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookPositionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookPositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookSizeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookSizeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookSizeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookSizeBinder.java index f1982ad..b415193 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookSizeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookSizeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class HookSizeBinder extends ReferentialBinderSupport<HookSize, HookSizeD public void copyToEntity(ReferentialLocale referentialLocale, HookSizeDto dto, HookSize entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class HookSizeBinder extends ReferentialBinderSupport<HookSize, HookSizeD public void copyToDto(ReferentialLocale referentialLocale, HookSize entity, HookSizeDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookTypeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookTypeBinder.java index c35cb51..b519ca6 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemHorizontalPositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemHorizontalPositionBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemHorizontalPositionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemHorizontalPositionBinder.java index e1d8c9d..d93c371 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemHorizontalPositionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemHorizontalPositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class ItemHorizontalPositionBinder extends ReferentialBinderSupport<ItemH public void copyToEntity(ReferentialLocale referentialLocale, ItemHorizontalPositionDto dto, ItemHorizontalPosition entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class ItemHorizontalPositionBinder extends ReferentialBinderSupport<ItemH public void copyToDto(ReferentialLocale referentialLocale, ItemHorizontalPosition entity, ItemHorizontalPositionDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemVerticalPositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemVerticalPositionBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemVerticalPositionBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemVerticalPositionBinder.java index 76465d5..989af75 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemVerticalPositionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemVerticalPositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class ItemVerticalPositionBinder extends ReferentialBinderSupport<ItemVer public void copyToEntity(ReferentialLocale referentialLocale, ItemVerticalPositionDto dto, ItemVerticalPosition entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class ItemVerticalPositionBinder extends ReferentialBinderSupport<ItemVer public void copyToDto(ReferentialLocale referentialLocale, ItemVerticalPosition entity, ItemVerticalPositionDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/LengthWeightParameterBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/LengthWeightParameterBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java index a3a3d3c..f5d9752 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/LengthWeightParameterBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksColorBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksColorBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksColorBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksColorBinder.java index e32699f..216b155 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksColorBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksColorBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksTypeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksTypeBinder.java index a56462b..5e65f98 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/LineTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LineTypeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/LineTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LineTypeBinder.java index 15fa612..f1b4aa8 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/LineTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LineTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/MaturityStatusBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/MaturityStatusBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/MaturityStatusBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/MaturityStatusBinder.java index 6a385f4..7b5e06f 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/MaturityStatusBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/MaturityStatusBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/MitigationTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/MitigationTypeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/MitigationTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/MitigationTypeBinder.java index 2d1b0a9..2941dfb 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/MitigationTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/MitigationTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectFateBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectFateBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectFateBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectFateBinder.java index 802a4a1..18051c5 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectFateBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectFateBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectOperationBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectOperationBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectOperationBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectOperationBinder.java index 86fe162..6b393f2 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectOperationBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectOperationBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectTypeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectTypeBinder.java index 2cf7e3e..16ad6be 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObservedSystemBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObservedSystemBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObservedSystemBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObservedSystemBinder.java index 2d09ad1..91a95b6 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObservedSystemBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObservedSystemBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class ObservedSystemBinder extends ReferentialBinderSupport<ObservedSyste public void copyToEntity(ReferentialLocale referentialLocale, ObservedSystemDto dto, ObservedSystem entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); entity.setSchoolType(SCHOOL_TYPE_TO_ENTITY.apply(dto.getSchoolType())); @@ -53,7 +52,6 @@ public class ObservedSystemBinder extends ReferentialBinderSupport<ObservedSyste public void copyToDto(ReferentialLocale referentialLocale, ObservedSystem entity, ObservedSystemDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); dto.setSchoolType(SCHOOL_TYPE_TO_DTO.apply(entity.getSchoolType())); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/OceanBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/OceanBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/OceanBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/OceanBinder.java index a10c6b1..b705e5c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/OceanBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/OceanBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/OrganismBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/OrganismBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/OrganismBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/OrganismBinder.java index 1ad1791..f14f4c1 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/OrganismBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/OrganismBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -44,7 +44,6 @@ public class OrganismBinder extends ReferentialBinderSupport<Organism, OrganismD public void copyToEntity(ReferentialLocale referentialLocale, OrganismDto dto, Organism entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); entity.setCountry(toEntity(dto.getCountry(), Country.class)); @@ -56,7 +55,6 @@ public class OrganismBinder extends ReferentialBinderSupport<Organism, OrganismD public void copyToDto(ReferentialLocale referentialLocale, Organism entity, OrganismDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); dto.setCountry(toReferentialReference(referentialLocale, entity.getCountry(), CountryDto.class)); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/PersonBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/PersonBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/PersonBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/PersonBinder.java index bb181e9..afc7f90 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/PersonBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/PersonBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ProgramBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/ProgramBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java index e456d52..3857bcf 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ProgramBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForDiscardBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForDiscardBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForDiscardBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForDiscardBinder.java index 02786a2..93b85fa 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForDiscardBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForDiscardBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class ReasonForDiscardBinder extends ReferentialBinderSupport<ReasonForDi public void copyToEntity(ReferentialLocale referentialLocale, ReasonForDiscardDto dto, ReasonForDiscard entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class ReasonForDiscardBinder extends ReferentialBinderSupport<ReasonForDi public void copyToDto(ReferentialLocale referentialLocale, ReasonForDiscard entity, ReasonForDiscardDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNoFishingBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNoFishingBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNoFishingBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNoFishingBinder.java index 2bf272f..53a7220 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNoFishingBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNoFishingBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class ReasonForNoFishingBinder extends ReferentialBinderSupport<ReasonFor public void copyToEntity(ReferentialLocale referentialLocale, ReasonForNoFishingDto dto, ReasonForNoFishing entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class ReasonForNoFishingBinder extends ReferentialBinderSupport<ReasonFor public void copyToDto(ReferentialLocale referentialLocale, ReasonForNoFishing entity, ReasonForNoFishingDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNullSetBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNullSetBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNullSetBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNullSetBinder.java index c7abe6a..fc93791 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNullSetBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNullSetBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class ReasonForNullSetBinder extends ReferentialBinderSupport<ReasonForNu public void copyToEntity(ReferentialLocale referentialLocale, ReasonForNullSetDto dto, ReasonForNullSet entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class ReasonForNullSetBinder extends ReferentialBinderSupport<ReasonForNu public void copyToDto(ReferentialLocale referentialLocale, ReasonForNullSet entity, ReasonForNullSetDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java index fccbb3c..2fa4d5a 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -24,7 +24,7 @@ package fr.ird.observe.services.binder.referential; import fr.ird.observe.entities.referentiel.I18nReferentialEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.services.binder.BinderSupport; +import fr.ird.observe.services.topia.binder.BinderSupport; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions; diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorBrandBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorBrandBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorBrandBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorBrandBinder.java index e7d050c..eff9c91 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorBrandBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorBrandBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class SensorBrandBinder extends ReferentialBinderSupport<SensorBrand, Sen public void copyToEntity(ReferentialLocale referentialLocale, SensorBrandDto dto, SensorBrand entity) { - copyDtoReferentialFieldsToEntity(dto, entity); entity.setBrandName(dto.getBrandName()); @@ -52,7 +51,6 @@ public class SensorBrandBinder extends ReferentialBinderSupport<SensorBrand, Sen public void copyToDto(ReferentialLocale referentialLocale, SensorBrand entity, SensorBrandDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); dto.setBrandName(entity.getBrandName()); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorDataFormatBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorDataFormatBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorDataFormatBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorDataFormatBinder.java index 3305c00..c69e775 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorDataFormatBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorDataFormatBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class SensorDataFormatBinder extends ReferentialBinderSupport<SensorDataF public void copyToEntity(ReferentialLocale referentialLocale, SensorDataFormatDto dto, SensorDataFormat entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class SensorDataFormatBinder extends ReferentialBinderSupport<SensorDataF public void copyToDto(ReferentialLocale referentialLocale, SensorDataFormat entity, SensorDataFormatDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorTypeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorTypeBinder.java index db72ac1..021edf9 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class SensorTypeBinder extends ReferentialBinderSupport<SensorType, Senso public void copyToEntity(ReferentialLocale referentialLocale, SensorTypeDto dto, SensorType entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class SensorTypeBinder extends ReferentialBinderSupport<SensorType, Senso public void copyToDto(ReferentialLocale referentialLocale, SensorType entity, SensorTypeDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SettingShapeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SettingShapeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/SettingShapeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SettingShapeBinder.java index 2f83330..73d0606 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SettingShapeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SettingShapeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class SettingShapeBinder extends ReferentialBinderSupport<SettingShape, S public void copyToEntity(ReferentialLocale referentialLocale, SettingShapeDto dto, SettingShape entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class SettingShapeBinder extends ReferentialBinderSupport<SettingShape, S public void copyToDto(ReferentialLocale referentialLocale, SettingShape entity, SettingShapeDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SexBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SexBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/SexBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SexBinder.java index fdabea7..22fd95c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SexBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SexBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class SexBinder extends ReferentialBinderSupport<Sex, SexDto> { public void copyToEntity(ReferentialLocale referentialLocale, SexDto dto, Sex entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class SexBinder extends ReferentialBinderSupport<Sex, SexDto> { public void copyToDto(ReferentialLocale referentialLocale, Sex entity, SexDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SizeMeasureTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/SizeMeasureTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java index 938b8b7..bc6edb7 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SizeMeasureTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class SizeMeasureTypeBinder extends ReferentialBinderSupport<SizeMeasureT public void copyToEntity(ReferentialLocale referentialLocale, SizeMeasureTypeDto dto, SizeMeasureType entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class SizeMeasureTypeBinder extends ReferentialBinderSupport<SizeMeasureT public void copyToDto(ReferentialLocale referentialLocale, SizeMeasureType entity, SizeMeasureTypeDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java index cc65966..5bd8f8b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesFateBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesFateBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java index 6f5af0f..0e38001 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesFateBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class SpeciesFateBinder extends ReferentialBinderSupport<SpeciesFate, Spe public void copyToEntity(ReferentialLocale referentialLocale, SpeciesFateDto dto, SpeciesFate entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class SpeciesFateBinder extends ReferentialBinderSupport<SpeciesFate, Spe public void copyToDto(ReferentialLocale referentialLocale, SpeciesFate entity, SpeciesFateDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesGroupBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesGroupBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesGroupBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesGroupBinder.java index 932c094..aac74b0 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesGroupBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesGroupBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class SpeciesGroupBinder extends ReferentialBinderSupport<SpeciesGroup, S public void copyToEntity(ReferentialLocale referentialLocale, SpeciesGroupDto dto, SpeciesGroup entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class SpeciesGroupBinder extends ReferentialBinderSupport<SpeciesGroup, S public void copyToDto(ReferentialLocale referentialLocale, SpeciesGroup entity, SpeciesGroupDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesListBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesListBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesListBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesListBinder.java index 493df36..54c13a1 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesListBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesListBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesStatusBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesStatusBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesStatusBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesStatusBinder.java index 29574bd..31e6081 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesStatusBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesStatusBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class SpeciesStatusBinder extends ReferentialBinderSupport<SpeciesStatus, public void copyToEntity(ReferentialLocale referentialLocale, SpeciesStatusDto dto, SpeciesStatus entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class SpeciesStatusBinder extends ReferentialBinderSupport<SpeciesStatus, public void copyToDto(ReferentialLocale referentialLocale, SpeciesStatus entity, SpeciesStatusDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/StomacFullnessBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/StomacFullnessBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/StomacFullnessBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/StomacFullnessBinder.java index 3dea963..334a663 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/StomacFullnessBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/StomacFullnessBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class StomacFullnessBinder extends ReferentialBinderSupport<StomacFullnes public void copyToEntity(ReferentialLocale referentialLocale, StomacFullnessDto dto, StomacFullness entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class StomacFullnessBinder extends ReferentialBinderSupport<StomacFullnes public void copyToDto(ReferentialLocale referentialLocale, StomacFullness entity, StomacFullnessDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SurroundingActivityBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SurroundingActivityBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/SurroundingActivityBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SurroundingActivityBinder.java index fb8c892..e73e932 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/SurroundingActivityBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SurroundingActivityBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class SurroundingActivityBinder extends ReferentialBinderSupport<Surround public void copyToEntity(ReferentialLocale referentialLocale, SurroundingActivityDto dto, SurroundingActivity entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class SurroundingActivityBinder extends ReferentialBinderSupport<Surround public void copyToDto(ReferentialLocale referentialLocale, SurroundingActivity entity, SurroundingActivityDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyOperationBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyOperationBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyOperationBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyOperationBinder.java index 7757630..dd0ee64 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyOperationBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyOperationBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class TransmittingBuoyOperationBinder extends ReferentialBinderSupport<Tr public void copyToEntity(ReferentialLocale referentialLocale, TransmittingBuoyOperationDto dto, TransmittingBuoyOperation entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class TransmittingBuoyOperationBinder extends ReferentialBinderSupport<Tr public void copyToDto(ReferentialLocale referentialLocale, TransmittingBuoyOperation entity, TransmittingBuoyOperationDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyTypeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyTypeBinder.java index 67d3e9b..d7b403f 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class TransmittingBuoyTypeBinder extends ReferentialBinderSupport<Transmi public void copyToEntity(ReferentialLocale referentialLocale, TransmittingBuoyTypeDto dto, TransmittingBuoyType entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class TransmittingBuoyTypeBinder extends ReferentialBinderSupport<Transmi public void copyToDto(ReferentialLocale referentialLocale, TransmittingBuoyType entity, TransmittingBuoyTypeDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/TripTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TripTypeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/TripTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TripTypeBinder.java index 0837ac4..a2405ef 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/TripTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TripTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class TripTypeBinder extends ReferentialBinderSupport<TripType, TripTypeD public void copyToEntity(ReferentialLocale referentialLocale, TripTypeDto dto, TripType entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class TripTypeBinder extends ReferentialBinderSupport<TripType, TripTypeD public void copyToDto(ReferentialLocale referentialLocale, TripType entity, TripTypeDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivityLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivityLonglineBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivityLonglineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivityLonglineBinder.java index 47262d9..a13f4ba 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivityLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivityLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class VesselActivityLonglineBinder extends ReferentialBinderSupport<Vesse public void copyToEntity(ReferentialLocale referentialLocale, VesselActivityLonglineDto dto, VesselActivityLongline entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class VesselActivityLonglineBinder extends ReferentialBinderSupport<Vesse public void copyToDto(ReferentialLocale referentialLocale, VesselActivityLongline entity, VesselActivityLonglineDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivitySeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivitySeineBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java index ad0581f..4abcdc6 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivitySeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class VesselActivitySeineBinder extends ReferentialBinderSupport<VesselAc public void copyToEntity(ReferentialLocale referentialLocale, VesselActivitySeineDto dto, VesselActivitySeine entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class VesselActivitySeineBinder extends ReferentialBinderSupport<VesselAc public void copyToDto(ReferentialLocale referentialLocale, VesselActivitySeine entity, VesselActivitySeineDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java index 7936b4f..d313ef6 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -48,7 +48,6 @@ public class VesselBinder extends ReferentialBinderSupport<Vessel, VesselDto> { public void copyToEntity(ReferentialLocale referentialLocale, VesselDto dto, Vessel entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); entity.setVesselSizeCategory(toEntity(dto.getVesselSizeCategory(), VesselSizeCategory.class)); @@ -70,7 +69,6 @@ public class VesselBinder extends ReferentialBinderSupport<Vessel, VesselDto> { public void copyToDto(ReferentialLocale referentialLocale, Vessel entity, VesselDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); dto.setVesselSizeCategory(toReferentialReference(referentialLocale, entity.getVesselSizeCategory(), VesselSizeCategoryDto.class)); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselSizeCategoryBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselSizeCategoryBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselSizeCategoryBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselSizeCategoryBinder.java index d991db1..8548f3e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselSizeCategoryBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselSizeCategoryBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class VesselSizeCategoryBinder extends ReferentialBinderSupport<VesselSiz public void copyToEntity(ReferentialLocale referentialLocale, VesselSizeCategoryDto dto, VesselSizeCategory entity) { - copyDtoReferentialFieldsToEntity(dto, entity); entity.setGaugeLabel(dto.getGaugeLabel()); entity.setCapacityLabel(dto.getCapacityLabel()); @@ -53,7 +52,6 @@ public class VesselSizeCategoryBinder extends ReferentialBinderSupport<VesselSiz public void copyToDto(ReferentialLocale referentialLocale, VesselSizeCategory entity, VesselSizeCategoryDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); dto.setGaugeLabel(entity.getGaugeLabel()); dto.setCapacityLabel(entity.getCapacityLabel()); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselTypeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselTypeBinder.java index f0903b5..e375bc1 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class VesselTypeBinder extends ReferentialBinderSupport<VesselType, Vesse public void copyToEntity(ReferentialLocale referentialLocale, VesselTypeDto dto, VesselType entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class VesselTypeBinder extends ReferentialBinderSupport<VesselType, Vesse public void copyToDto(ReferentialLocale referentialLocale, VesselType entity, VesselTypeDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightCategoryBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightCategoryBinder.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightCategoryBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightCategoryBinder.java index 52d2c76..c9fef62 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightCategoryBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightCategoryBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -44,7 +44,6 @@ public class WeightCategoryBinder extends ReferentialBinderSupport<WeightCategor public void copyToEntity(ReferentialLocale referentialLocale, WeightCategoryDto dto, WeightCategory entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); entity.setSpecies(toEntity(dto.getSpecies(), Species.class)); @@ -55,7 +54,6 @@ public class WeightCategoryBinder extends ReferentialBinderSupport<WeightCategor public void copyToDto(ReferentialLocale referentialLocale, WeightCategory entity, WeightCategoryDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class)); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightMeasureTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightMeasureTypeBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java index 3c99635..50cbe95 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightMeasureTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L @@ -42,7 +42,6 @@ public class WeightMeasureTypeBinder extends ReferentialBinderSupport<WeightMeas public void copyToEntity(ReferentialLocale referentialLocale, WeightMeasureTypeDto dto, WeightMeasureType entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); @@ -52,7 +51,6 @@ public class WeightMeasureTypeBinder extends ReferentialBinderSupport<WeightMeas public void copyToDto(ReferentialLocale referentialLocale, WeightMeasureType entity, WeightMeasureTypeDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/WindBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WindBinder.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/binder/referential/WindBinder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WindBinder.java index d394bbb..47e4cb5 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/WindBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WindBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder.referential; +package fr.ird.observe.services.topia.binder.referential; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/entity/BasketEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/BasketEntitiesExtractor.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/entity/BasketEntitiesExtractor.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/entity/BasketEntitiesExtractor.java index 1d16449..df71971 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/entity/BasketEntitiesExtractor.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/BasketEntitiesExtractor.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.entity; +package fr.ird.observe.services.topia.entity; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/entity/BranchlineEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/BranchlineEntitiesExtractor.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/entity/BranchlineEntitiesExtractor.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/entity/BranchlineEntitiesExtractor.java index 19772fb..9e8c37b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/entity/BranchlineEntitiesExtractor.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/BranchlineEntitiesExtractor.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.entity; +package fr.ird.observe.services.topia.entity; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesExtractor.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesExtractor.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesExtractor.java index de85bb9..7ceec54 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesExtractor.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesExtractor.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.entity; +package fr.ird.observe.services.topia.entity; /*- * #%L @@ -50,6 +50,11 @@ public class EntitiesExtractor<E extends ObserveEntity> { */ protected final Predicate<E> optionalFilter; + protected EntitiesExtractor(Class<E> entityType, Predicate<E> optionalFilter) { + this.entityType = entityType; + this.optionalFilter = optionalFilter; + } + public Iterable<E> getEntities(ObserveTopiaPersistenceContext persistenceContext, Map<String, Object> requestContext) { Collection<E> result = getEntitiesSetBase(persistenceContext, requestContext); Predicate<E> filter = getFilter(requestContext); @@ -59,11 +64,6 @@ public class EntitiesExtractor<E extends ObserveEntity> { return result; } - protected EntitiesExtractor(Class<E> entityType, Predicate<E> optionalFilter) { - this.entityType = entityType; - this.optionalFilter = optionalFilter; - } - protected Collection<E> getEntitiesSetBase(ObserveTopiaPersistenceContext persistenceContext, Map<String, Object> requestContext) { TopiaDao<E> dao = persistenceContext.getDao(entityType); return dao.findAll(); diff --git a/services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesSetFactory.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesSetFactory.java index 034a4a8..c50cdde 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesSetFactory.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.entity; +package fr.ird.observe.services.topia.entity; /*- * #%L @@ -22,7 +22,6 @@ package fr.ird.observe.services.entity; * #L% */ -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.ObserveEntity; @@ -49,6 +48,7 @@ import fr.ird.observe.entities.seine.TargetCatchImpl; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveSpeciesListConfiguration; +import java.util.Objects; import java.util.function.Predicate; /** @@ -196,9 +196,9 @@ public class EntitiesSetFactory { Class<C> propertyType, String propertyName) { - Preconditions.checkNotNull(parentType, "Parent type is required"); - Preconditions.checkNotNull(propertyName, "Property name is required"); - Preconditions.checkNotNull(propertyType, "Property type is required"); + Objects.requireNonNull(parentType, "Parent type is required"); + Objects.requireNonNull(propertyName, "Property name is required"); + Objects.requireNonNull(propertyType, "Property type is required"); String key = buildKey(parentType, propertyName); EntitiesExtractor<C> entitiesExtractor = cache.get(key); @@ -210,7 +210,7 @@ public class EntitiesSetFactory { if (Entities.isReferentielClass(propertyType)) { // On veut tous les référentiels sauf ceux qui sont désactivés - entitiesExtractor = new EntitiesExtractor<>(propertyType, (Predicate)ObserveReferentialEntities.IS_ACTIF_PREDICATE); + entitiesExtractor = new EntitiesExtractor<>(propertyType, (Predicate) ObserveReferentialEntities.IS_ACTIF_PREDICATE); } else { diff --git a/services-topia/src/main/java/fr/ird/observe/services/entity/SectionEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SectionEntitiesExtractor.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/entity/SectionEntitiesExtractor.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/entity/SectionEntitiesExtractor.java index 7368060..62d6868 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/entity/SectionEntitiesExtractor.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SectionEntitiesExtractor.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.entity; +package fr.ird.observe.services.topia.entity; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SpeciesListEntitiesExtractor.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesExtractor.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/entity/SpeciesListEntitiesExtractor.java index ef6ee49..d5dec31 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesExtractor.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SpeciesListEntitiesExtractor.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.entity; +package fr.ird.observe.services.topia.entity; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SpeciesListOceanEntitiesExtractor.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesExtractor.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/entity/SpeciesListOceanEntitiesExtractor.java index 94d2cfe..f3c317a 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesExtractor.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SpeciesListOceanEntitiesExtractor.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.entity; +package fr.ird.observe.services.topia.entity; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/entity/TripMapDtoFactory.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/TripMapDtoFactory.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/entity/TripMapDtoFactory.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/entity/TripMapDtoFactory.java index 8755efc..554c7fa 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/entity/TripMapDtoFactory.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/TripMapDtoFactory.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.entity; +package fr.ird.observe.services.topia.entity; /*- * #%L @@ -40,14 +40,6 @@ import java.util.function.Function; */ public class TripMapDtoFactory { - public static TripMapDto newTripMapDto(String tripId, Set<TripMapPoint> points) { - TripMapDto tripMapDto = new TripMapDto(); - tripMapDto.setId(tripId); - LinkedHashSet<TripMapPointDto> pointDtos = Sets.newLinkedHashSet(Iterables.transform(points, TRIP_MAP_POINT_TRIP_MAP_POINT_DTO_FUNCTION::apply)); - tripMapDto.setPoints(pointDtos); - return tripMapDto; - } - protected static final Function<TripMapPoint, TripMapPointDto> TRIP_MAP_POINT_TRIP_MAP_POINT_DTO_FUNCTION = tripMapPoint -> { TripMapPointDto result = new TripMapPointDto(); result.setLatitude(tripMapPoint.getLatitude()); @@ -56,4 +48,12 @@ public class TripMapDtoFactory { result.setType(TripMapPointType.valueOf(tripMapPoint.getType().name())); return result; }; + + public static TripMapDto newTripMapDto(String tripId, Set<TripMapPoint> points) { + TripMapDto tripMapDto = new TripMapDto(); + tripMapDto.setId(tripId); + LinkedHashSet<TripMapPointDto> pointDtos = Sets.newLinkedHashSet(Iterables.transform(points, TRIP_MAP_POINT_TRIP_MAP_POINT_DTO_FUNCTION::apply)); + tripMapDto.setPoints(pointDtos); + return tripMapDto; + } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java similarity index 96% rename from services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java index 3999017..d37c6ee 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.topia.service; /* * #%L @@ -33,11 +33,18 @@ import fr.ird.observe.ObserveTopiaConfiguration; import fr.ird.observe.ObserveTopiaConfigurationFactory; import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.services.ObserveJdbcHelper; -import fr.ird.observe.services.ObserveSecurityHelper; -import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.ObserveTopiaApplicationContextFactory; -import fr.ird.observe.services.binder.BinderEngine; +import fr.ird.observe.services.service.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DataSourceService; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseDestroyNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.services.topia.ObserveJdbcHelper; +import fr.ird.observe.services.topia.ObserveSecurityHelper; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.ObserveTopiaApplicationContextFactory; +import fr.ird.observe.services.topia.binder.BinderEngine; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; @@ -80,6 +87,18 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS */ private static final Log log = LogFactory.getLog(DataSourceServiceTopia.class); + protected static boolean canWrite(Set<?> privileges) { + return privileges != null && + privileges.contains("DELETE") && + privileges.contains("UPDATE") && + privileges.contains("INSERT"); + } + + protected static boolean canRead(Set<?> privileges) { + // seul les utilisateurs avec au moins un droit sur les donnes observer peut les lire + return privileges != null && !privileges.isEmpty(); + } + @Override public ObserveDataSourceInformation checkCanConnect(ObserveDataSourceConfiguration dataSourceConfiguration) throws DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException { if (log.isTraceEnabled()) { @@ -522,15 +541,13 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS protected ObserveDataSourceConnectionTopia createDataSourceConnection(ObserveDataSourceInformation dataSourceInformation, String authenticationToken) { - ObserveDataSourceConnectionTopia dataSourceConnection = new ObserveDataSourceConnectionTopia( + return new ObserveDataSourceConnectionTopia( authenticationToken, dataSourceInformation.canReadReferential(), dataSourceInformation.canWriteReferential(), dataSourceInformation.canReadData(), dataSourceInformation.canWriteData(), dataSourceInformation.getVersion()); - - return dataSourceConnection; } protected ObserveDataSourceInformation getDataSourceInformation(ObserveDataSourceConfigurationTopiaSupport dataSourceConfiguration, ObserveTopiaConfiguration topiaConfiguration) { @@ -599,7 +616,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS } ObserveMigrationConfigurationProvider observeMigrationConfigurationProvider = ObserveMigrationConfigurationProvider.get(); - ObserveDataSourceInformation information = new ObserveDataSourceInformation( + return new ObserveDataSourceInformation( readReferential, writeReferential, readData, @@ -607,22 +624,6 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS observeMigrationConfigurationProvider.getMinimumVersion(), version, observeMigrationConfigurationProvider.getVersionsAfter(version)); - return information; - } - - - protected static boolean canWrite(Set<?> privileges) { - boolean result = privileges != null && - privileges.contains("DELETE") && - privileges.contains("UPDATE") && - privileges.contains("INSERT"); - return result; - } - - protected static boolean canRead(Set<?> privileges) { - // seul les utilisateurs avec au moins un droit sur les donnes observer peut les lire - boolean result = privileges != null && !privileges.isEmpty(); - return result; } private static class DetectReferentialTypesInShellBuilder implements TopiaMetadataModelVisitor { diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/trip/ImportTripScriptTopiaSqlWork.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/ImportTripScriptTopiaSqlWork.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/service/trip/ImportTripScriptTopiaSqlWork.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/ImportTripScriptTopiaSqlWork.java index a965c03..185dda2 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/trip/ImportTripScriptTopiaSqlWork.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/ImportTripScriptTopiaSqlWork.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.trip; +package fr.ird.observe.services.topia.service; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialServiceTopia.java similarity index 93% rename from services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialServiceTopia.java index b19622a..e8264f1 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.topia.service; /* * #%L @@ -23,16 +23,18 @@ package fr.ird.observe.services.service; */ import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.EntityMap; import fr.ird.observe.entities.constants.ReferenceStatusPersist; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.binder.BinderEngine; -import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.service.DataNotFoundException; +import fr.ird.observe.services.service.ReferenceSetsRequest; +import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.BinderEngine; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; @@ -55,6 +57,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.Objects; import java.util.Optional; /** @@ -104,7 +107,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe ImmutableSet.Builder<ReferentialReferenceSet<?>> resultBuilder = ImmutableSet.builder(); ImmutableMap<Class<?>, Date> lastUpdateDates = request.getLastUpdateDates(); - Preconditions.checkNotNull(lastUpdateDates); + Objects.requireNonNull(lastUpdateDates); for (ReferenceSetDefinition<? extends ReferentialDto> definition : requestDefinition.getReferentialReferenceSetDefinitions()) { @@ -129,8 +132,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe Species speciesEntity = loadEntity(SpeciesDto.class, id); ReferentialBinderSupport<Species, SpeciesDto> binder = getReferentialBinder(SpeciesDto.class); - SpeciesDto speciesDto = binder.toDto(getReferentialLocale(), speciesEntity); - return speciesDto; + return binder.toDto(getReferentialLocale(), speciesEntity); } @@ -162,8 +164,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe ObserveReferentialEntity entity = loadEntity(type, id); ReferentialBinderSupport<ObserveReferentialEntity, D> referentialBinder = getReferentialBinder(type); - ReferentialReference<D> reference = referentialBinder.toReferentialReference(getReferentialLocale(), entity); - return reference; + return referentialBinder.toReferentialReference(getReferentialLocale(), entity); } @@ -178,8 +179,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe entity.setStatus(ReferenceStatusPersist.enabled); //TODO Voir selon le type d'entité si il y a des valeurs par défaut à utiliser //FIXME Definir une definition pour chaque formulaire de référentiel - Form<D> form = referentialEntityToForm(type, entity, null); - return form; + return referentialEntityToForm(type, entity, null); } public <D extends ReferentialDto> SaveResultDto save(D bean) { diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java similarity index 95% rename from services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java index 8b9701e..4fa7802 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.topia.service; /*- * #%L @@ -25,7 +25,12 @@ package fr.ird.observe.services.service; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.entities.Entities; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.AddSqlScriptProducerResult; +import fr.ird.observe.services.service.DeleteSqlScriptProducerRequest; +import fr.ird.observe.services.service.ObserveBlobsContainer; +import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.service.sql.batch.SqlRequests; diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/TripManagementServiceTopia.java similarity index 91% rename from services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/TripManagementServiceTopia.java index e04c6de..da44911 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/TripManagementServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.trip; +package fr.ird.observe.services.topia.service; /*- * #%L @@ -24,8 +24,15 @@ package fr.ird.observe.services.service.trip; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.services.ObserveServiceContextTopia; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.trip.DeleteTripRequest; +import fr.ird.observe.services.service.trip.DeleteTripResult; +import fr.ird.observe.services.service.trip.ExportTripRequest; +import fr.ird.observe.services.service.trip.ExportTripResult; +import fr.ird.observe.services.service.trip.ImportTripRequest; +import fr.ird.observe.services.service.trip.ImportTripResult; +import fr.ird.observe.services.service.trip.TripManagementService; +import fr.ird.observe.services.topia.ObserveServiceContextTopia; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.service.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.AddSqlScriptProducerResult; diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java similarity index 79% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java index cc2722f..0871d4c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.consolidate; +package fr.ird.observe.services.topia.service.actions.consolidate; /* * #%L @@ -36,6 +36,7 @@ import fr.ird.observe.entities.seine.NonTargetLength; import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.constants.seine.SchoolType; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateActivitySeineDataResult; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -59,28 +60,25 @@ public class ConsolidateActivitySeineDataResultBuilder { /** Logger. */ private static final Log log = LogFactory.getLog(ConsolidateActivitySeineDataResultBuilder.class); - - public static ConsolidateActivitySeineDataResultBuilder create(Locale locale, ReferentialLocale referenceLocale, ActivitySeine activitySeine) { - return new ConsolidateActivitySeineDataResultBuilder(locale, referenceLocale, activitySeine); - } - protected final ReferentialLocale referenceLocale; - protected final Locale locale; - protected final ActivitySeine activitySeine; - - protected SchoolType oldSchoolType; - - protected SchoolType newSchoolType; - protected final ImmutableSet.Builder<String> lengthWeightParameterNotFoundBuilder = new ImmutableSet.Builder<>(); - protected final ImmutableSet.Builder<TargetLengthModification> targetLengthModificationBuilder = new ImmutableSet.Builder<>(); - protected final ImmutableSet.Builder<NonTargetLengthModification> nonTargetLengthModificationBuilder = new ImmutableSet.Builder<>(); - protected final ImmutableSet.Builder<NonTargetCatchModification> nonTargetCatchModificationBuilder = new ImmutableSet.Builder<>(); + protected SchoolType oldSchoolType; + protected SchoolType newSchoolType; + + protected ConsolidateActivitySeineDataResultBuilder(Locale locale, ReferentialLocale referenceLocale, ActivitySeine activitySeine) { + this.locale = locale; + this.referenceLocale = referenceLocale; + this.activitySeine = activitySeine; + } + + public static ConsolidateActivitySeineDataResultBuilder create(Locale locale, ReferentialLocale referenceLocale, ActivitySeine activitySeine) { + return new ConsolidateActivitySeineDataResultBuilder(locale, referenceLocale, activitySeine); + } public void flushTargetLengthModification(TargetLength targetLength, String... propertyNamesModified) { @@ -90,19 +88,19 @@ public class ConsolidateActivitySeineDataResultBuilder { if (modifiedProperty.equals(TargetLength.PROPERTY_LENGTH)) { TargetLengthModification element = new TargetLengthModification(); - element.targetLengthId = targetLength.getTopiaId(); - element.speciesLabel = speciesLabel; - element.propertyName = TargetLength.PROPERTY_LENGTH; - element.newValue = targetLength.getLength(); + element.setTargetLengthId(targetLength.getTopiaId()); + element.setSpeciesLabel(speciesLabel); + element.setPropertyName(TargetLength.PROPERTY_LENGTH); + element.setNewValue(targetLength.getLength()); targetLengthModificationBuilder.add(element); } else if (modifiedProperty.equals(TargetLength.PROPERTY_WEIGHT)) { TargetLengthModification element = new TargetLengthModification(); - element.targetLengthId = targetLength.getTopiaId(); - element.speciesLabel = speciesLabel; - element.propertyName = TargetLength.PROPERTY_LENGTH; - element.newValue = targetLength.getLength(); + element.setTargetLengthId(targetLength.getTopiaId()); + element.setSpeciesLabel(speciesLabel); + element.setPropertyName(TargetLength.PROPERTY_LENGTH); + element.setNewValue(targetLength.getLength()); targetLengthModificationBuilder.add(element); } @@ -118,19 +116,19 @@ public class ConsolidateActivitySeineDataResultBuilder { if (modifiedProperty.equals(NonTargetLength.PROPERTY_LENGTH)) { NonTargetLengthModification element = new NonTargetLengthModification(); - element.nonTargetLengthId = nonTargetLength.getTopiaId(); - element.speciesLabel = speciesLabel; - element.propertyName = NonTargetLength.PROPERTY_LENGTH; - element.newValue = nonTargetLength.getLength(); + element.setNonTargetLengthId(nonTargetLength.getTopiaId()); + element.setSpeciesLabel(speciesLabel); + element.setPropertyName(NonTargetLength.PROPERTY_LENGTH); + element.setNewValue(nonTargetLength.getLength()); nonTargetLengthModificationBuilder.add(element); } else if (modifiedProperty.equals(NonTargetLength.PROPERTY_WEIGHT)) { NonTargetLengthModification element = new NonTargetLengthModification(); - element.nonTargetLengthId = nonTargetLength.getTopiaId(); - element.speciesLabel = speciesLabel; - element.propertyName = NonTargetLength.PROPERTY_LENGTH; - element.newValue = nonTargetLength.getLength(); + element.setNonTargetLengthId(nonTargetLength.getTopiaId()); + element.setSpeciesLabel(speciesLabel); + element.setPropertyName(NonTargetLength.PROPERTY_LENGTH); + element.setNewValue(nonTargetLength.getLength()); nonTargetLengthModificationBuilder.add(element); } @@ -147,10 +145,10 @@ public class ConsolidateActivitySeineDataResultBuilder { case NonTargetCatch.PROPERTY_MEAN_LENGTH: { NonTargetCatchModification element = new NonTargetCatchModification(); - element.nonTargetCatchId = nonTargetCatch.getTopiaId(); - element.speciesLabel = speciesLabel; - element.propertyName = NonTargetCatch.PROPERTY_MEAN_LENGTH; - element.newValue = nonTargetCatch.getMeanLength(); + element.setNonTargetCatchId(nonTargetCatch.getTopiaId()); + element.setSpeciesLabel(speciesLabel); + element.setPropertyName(NonTargetCatch.PROPERTY_MEAN_LENGTH); + element.setNewValue(nonTargetCatch.getMeanLength()); // element.computeValueSource = I18nEnumUtil.getLabel(locale, nonTargetCatch.getMeanLengthComputedSource()); nonTargetCatchModificationBuilder.add(element); @@ -159,10 +157,10 @@ public class ConsolidateActivitySeineDataResultBuilder { case NonTargetCatch.PROPERTY_MEAN_WEIGHT: { NonTargetCatchModification element = new NonTargetCatchModification(); - element.nonTargetCatchId = nonTargetCatch.getTopiaId(); - element.speciesLabel = speciesLabel; - element.propertyName = NonTargetCatch.PROPERTY_MEAN_WEIGHT; - element.newValue = nonTargetCatch.getMeanWeight(); + element.setNonTargetCatchId(nonTargetCatch.getTopiaId()); + element.setSpeciesLabel(speciesLabel); + element.setPropertyName(NonTargetCatch.PROPERTY_MEAN_WEIGHT); + element.setNewValue(nonTargetCatch.getMeanWeight()); // element.computeValueSource = I18nEnumUtil.getLabel(locale, nonTargetCatch.getMeanWeightComputedSource()); nonTargetCatchModificationBuilder.add(element); @@ -171,10 +169,10 @@ public class ConsolidateActivitySeineDataResultBuilder { case NonTargetCatch.PROPERTY_CATCH_WEIGHT: { NonTargetCatchModification element = new NonTargetCatchModification(); - element.nonTargetCatchId = nonTargetCatch.getTopiaId(); - element.speciesLabel = speciesLabel; - element.propertyName = NonTargetCatch.PROPERTY_CATCH_WEIGHT; - element.newValue = nonTargetCatch.getCatchWeight(); + element.setNonTargetCatchId(nonTargetCatch.getTopiaId()); + element.setSpeciesLabel(speciesLabel); + element.setPropertyName(NonTargetCatch.PROPERTY_CATCH_WEIGHT); + element.setNewValue(nonTargetCatch.getCatchWeight()); // element.computeValueSource = I18nEnumUtil.getLabel(locale, nonTargetCatch.getCatchWeightComputedSource()); nonTargetCatchModificationBuilder.add(element); @@ -183,10 +181,10 @@ public class ConsolidateActivitySeineDataResultBuilder { case NonTargetCatch.PROPERTY_TOTAL_COUNT: { NonTargetCatchModification element = new NonTargetCatchModification(); - element.nonTargetCatchId = nonTargetCatch.getTopiaId(); - element.speciesLabel = speciesLabel; - element.propertyName = NonTargetCatch.PROPERTY_TOTAL_COUNT; - element.newValue = nonTargetCatch.getTotalCount(); + element.setNonTargetCatchId(nonTargetCatch.getTopiaId()); + element.setSpeciesLabel(speciesLabel); + element.setPropertyName(NonTargetCatch.PROPERTY_TOTAL_COUNT); + element.setNewValue(nonTargetCatch.getTotalCount()); // element.computeValueSource = I18nEnumUtil.getLabel(locale, nonTargetCatch.getTotalCountComputedSource()); nonTargetCatchModificationBuilder.add(element); @@ -222,9 +220,9 @@ public class ConsolidateActivitySeineDataResultBuilder { ImmutableSet<NonTargetCatchModification> nonTargetCatchModifications = nonTargetCatchModificationBuilder.build(); boolean noModification = (targetLengthModifications.isEmpty() - && nonTargetLengthModifications.isEmpty() - && nonTargetCatchModifications.isEmpty() - && newSchoolType == null); + && nonTargetLengthModifications.isEmpty() + && nonTargetCatchModifications.isEmpty() + && newSchoolType == null); ConsolidateActivitySeineDataResult consolidateActivitySeineDataResult; if (noModification) { @@ -249,10 +247,4 @@ public class ConsolidateActivitySeineDataResultBuilder { return Optional.ofNullable(consolidateActivitySeineDataResult); } - - protected ConsolidateActivitySeineDataResultBuilder(Locale locale, ReferentialLocale referenceLocale, ActivitySeine activitySeine) { - this.locale = locale; - this.referenceLocale = referenceLocale; - this.activitySeine = activitySeine; - } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java index 9a9b7a9..b63f69e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.consolidate; +package fr.ird.observe.services.topia.service.actions.consolidate; /* * #%L @@ -46,7 +46,11 @@ import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeines; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateActivitySeineDataResult; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataResult; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.TripSeineDto; import org.apache.commons.collections4.CollectionUtils; @@ -69,98 +73,6 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements /** Logger. */ private static final Log log = LogFactory.getLog(ConsolidateDataServiceTopia.class); - protected static class ConsolidationActivitySeineDataContext { - - protected ObserveTopiaDaoSupplier daoSupplier; - - protected Locale locale; - - protected boolean failIfLenghtWeightParameterNotFound; - - protected TripSeine tripSeine; - - protected Route route; - - protected ActivitySeine activity; - - protected BeanMonitor targetLengthMonitor; - - protected BeanMonitor nonTargetLengthMonitor; - - protected BeanMonitor nonTargetCatchMonitor; - - protected ConsolidateActivitySeineDataResultBuilder resultBuilder; - - public Ocean getOcean() { - return tripSeine.getOcean(); - } - - public Date getRouteDate() { - return route.getDate(); - } - - public SetSeine getSetSeine() { - return activity.getSetSeine(); - } - - public LengthWeightParameter findLengthWeightParameter(Species species, Sex sex) { - Ocean ocean = getOcean(); - Date routeDate = getRouteDate(); - LengthWeightParameter lengthWeightParameter = LengthWeightParameters.findLengthWeightParameter(daoSupplier, species, ocean, sex, routeDate); - if (lengthWeightParameter == null) { - - if (failIfLenghtWeightParameterNotFound) { - throw new LengthWeightParameterNotFoundException(species, ocean, sex, routeDate); - } - - resultBuilder.registerLengthWeightParameterNotFound(species, ocean, sex, routeDate); - - } - return lengthWeightParameter; - } - - public void setSchoolTypeChanged(SchoolTypePersist oldSchoolType, SchoolTypePersist newSchoolType) { - resultBuilder.setSchoolTypeChanged(oldSchoolType, newSchoolType); - } - - public void watchTargetLength(TargetLength targetLength) { - targetLengthMonitor.setBean(targetLength); - } - - public void watchNonTargetLenght(NonTargetLength nonTargetLength) { - nonTargetLengthMonitor.setBean(nonTargetLength); - } - - public void flushTargetLength() { - if (targetLengthMonitor.wasModified()) { - TargetLength targetLength = (TargetLength) targetLengthMonitor.getBean(); - resultBuilder.flushTargetLengthModification(targetLength, targetLengthMonitor.getModifiedProperties()); - } - targetLengthMonitor.setBean(null); - } - - public void flushNonTargetLength() { - if (nonTargetLengthMonitor.wasModified()) { - NonTargetLength nonTargetLength = (NonTargetLength) nonTargetLengthMonitor.getBean(); - resultBuilder.flushNonTargetLengthModification(nonTargetLength, nonTargetLengthMonitor.getModifiedProperties()); - } - nonTargetLengthMonitor.setBean(null); - } - - public void watchNonTargetCatch(NonTargetCatch nonTargetCatch) { - nonTargetCatchMonitor.setBean(nonTargetCatch); - } - - public void flushNonTargetCatch() { - if (nonTargetCatchMonitor.wasModified()) { - NonTargetCatch nonTargetCatch = (NonTargetCatch) nonTargetCatchMonitor.getBean(); - resultBuilder.flushNonTargetCatchModification(nonTargetCatch, nonTargetCatchMonitor.getModifiedProperties()); - } - nonTargetCatchMonitor.setBean(null); - } - - } - @Override public ImmutableSet<ConsolidateTripSeineDataResult> consolidateTripSeines(ConsolidateTripSeineDataRequest consolidateTripSeineDataRequest) { @@ -274,7 +186,6 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements } - protected void consolidateActivitySeine(ConsolidationActivitySeineDataContext activityContext) { ActivitySeine activity = activityContext.activity; @@ -741,4 +652,96 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements } } + protected static class ConsolidationActivitySeineDataContext { + + protected ObserveTopiaDaoSupplier daoSupplier; + + protected Locale locale; + + protected boolean failIfLenghtWeightParameterNotFound; + + protected TripSeine tripSeine; + + protected Route route; + + protected ActivitySeine activity; + + protected BeanMonitor targetLengthMonitor; + + protected BeanMonitor nonTargetLengthMonitor; + + protected BeanMonitor nonTargetCatchMonitor; + + protected ConsolidateActivitySeineDataResultBuilder resultBuilder; + + public Ocean getOcean() { + return tripSeine.getOcean(); + } + + public Date getRouteDate() { + return route.getDate(); + } + + public SetSeine getSetSeine() { + return activity.getSetSeine(); + } + + public LengthWeightParameter findLengthWeightParameter(Species species, Sex sex) { + Ocean ocean = getOcean(); + Date routeDate = getRouteDate(); + LengthWeightParameter lengthWeightParameter = LengthWeightParameters.findLengthWeightParameter(daoSupplier, species, ocean, sex, routeDate); + if (lengthWeightParameter == null) { + + if (failIfLenghtWeightParameterNotFound) { + throw new LengthWeightParameterNotFoundException(species, ocean, sex, routeDate); + } + + resultBuilder.registerLengthWeightParameterNotFound(species, ocean, sex, routeDate); + + } + return lengthWeightParameter; + } + + public void setSchoolTypeChanged(SchoolTypePersist oldSchoolType, SchoolTypePersist newSchoolType) { + resultBuilder.setSchoolTypeChanged(oldSchoolType, newSchoolType); + } + + public void watchTargetLength(TargetLength targetLength) { + targetLengthMonitor.setBean(targetLength); + } + + public void watchNonTargetLenght(NonTargetLength nonTargetLength) { + nonTargetLengthMonitor.setBean(nonTargetLength); + } + + public void flushTargetLength() { + if (targetLengthMonitor.wasModified()) { + TargetLength targetLength = (TargetLength) targetLengthMonitor.getBean(); + resultBuilder.flushTargetLengthModification(targetLength, targetLengthMonitor.getModifiedProperties()); + } + targetLengthMonitor.setBean(null); + } + + public void flushNonTargetLength() { + if (nonTargetLengthMonitor.wasModified()) { + NonTargetLength nonTargetLength = (NonTargetLength) nonTargetLengthMonitor.getBean(); + resultBuilder.flushNonTargetLengthModification(nonTargetLength, nonTargetLengthMonitor.getModifiedProperties()); + } + nonTargetLengthMonitor.setBean(null); + } + + public void watchNonTargetCatch(NonTargetCatch nonTargetCatch) { + nonTargetCatchMonitor.setBean(nonTargetCatch); + } + + public void flushNonTargetCatch() { + if (nonTargetCatchMonitor.wasModified()) { + NonTargetCatch nonTargetCatch = (NonTargetCatch) nonTargetCatchMonitor.getBean(); + resultBuilder.flushNonTargetCatchModification(nonTargetCatch, nonTargetCatchMonitor.getModifiedProperties()); + } + nonTargetCatchMonitor.setBean(null); + } + + } + } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java index 127636e..9e3d7a1 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.topia.service.actions.report; /* * #%L @@ -28,9 +28,10 @@ import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.binder.data.DataBinderSupport; -import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.service.actions.report.ReportService; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; @@ -142,7 +143,7 @@ public class ReportServiceTopia extends ObserveServiceTopia implements ReportSer if (log.isDebugEnabled()) { log.debug("Build result for report [" + report.getName() + - "] on " + tripId); + "] on " + tripId); } int rows = report.getRows(); @@ -425,9 +426,7 @@ public class ReportServiceTopia extends ObserveServiceTopia implements ReportSer public DataMatrix executeReportRequest(ReportRequest request, Report report, String tripId) { Map<String, Object> params = ReportRequest.extractParams(report, tripId); - DataMatrix dataMatrix = executeReportRequest(request, params); - - return dataMatrix; + return executeReportRequest(request, params); } @@ -617,9 +616,7 @@ public class ReportServiceTopia extends ObserveServiceTopia implements ReportSer AbstractObserveTopiaDao dao = (AbstractObserveTopiaDao) getTopiaPersistenceContext().getDao(TripSeine.class); - List<R> result = dao.findAllFromHql(request, paramsFixes); - - return result; + return dao.findAllFromHql(request, paramsFixes); } protected void doPopulateRepeatVariables(Report report, String tripId) { diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java similarity index 91% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java index e71b4f4..d8751c2 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro.referential.diff; +package fr.ird.observe.services.topia.service.actions.synchro.referential.diff; /*- * #%L @@ -28,9 +28,12 @@ import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.constants.ReferenceStatusPersist; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.binder.BinderEngine; -import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialDataSourceState; +import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialDataSourceStates; +import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.BinderEngine; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialMultimap; @@ -64,8 +67,7 @@ public class ReferentialSynchronizeDiffServiceTopia extends ObserveServiceTopia Class<? extends ObserveReferentialEntity> entityType = BinderEngine.get().getReferentialEntityType(referentialName); ObserveEntityEnum entityEnum = ObserveEntityEnum.valueOf(entityType); - ReferentialReferenceSet<R> result = getEnabledReferenceSet0(entityType, referentialName); - return result; + return getEnabledReferenceSet0(entityType, referentialName); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java similarity index 88% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java index 2c88a67..4c877bf 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro.referential.legacy; +package fr.ird.observe.services.topia.service.actions.synchro.referential.legacy; /*- * #%L @@ -24,16 +24,18 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.binder.BinderEngine; -import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; +import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeRequest; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.BinderEngine; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.service.actions.synchro.referential.sql.ApplySqlRequestWork; -import fr.ird.observe.services.service.actions.synchro.referential.sql.DeleteSqlStatementGenerator; -import fr.ird.observe.services.service.actions.synchro.referential.sql.InsertSqlStatementGenerator; -import fr.ird.observe.services.service.actions.synchro.referential.sql.ReplaceSqlStatementGenerator; -import fr.ird.observe.services.service.actions.synchro.referential.sql.UpdateSqlStatementGenerator; +import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.ApplySqlRequestWork; +import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.DeleteSqlStatementGenerator; +import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.InsertSqlStatementGenerator; +import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.ReplaceSqlStatementGenerator; +import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.UpdateSqlStatementGenerator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaDao; diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java similarity index 84% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java index cb92a9a..13f4d97 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro.referential.ng; +package fr.ird.observe.services.topia.service.actions.synchro.referential.ng; /*- * #%L @@ -22,8 +22,11 @@ package fr.ird.observe.services.service.actions.synchro.referential.ng; * #L% */ -import fr.ird.observe.services.ObserveServiceContextTopia; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeRequest; +import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeService; +import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeSqlsRequest; +import fr.ird.observe.services.topia.ObserveServiceContextTopia; +import fr.ird.observe.services.topia.ObserveServiceTopia; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.TimeLog; diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java similarity index 92% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java index 840894b..9f59c73 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro.referential.ng; +package fr.ird.observe.services.topia.service.actions.synchro.referential.ng; /*- * #%L @@ -24,18 +24,20 @@ package fr.ird.observe.services.service.actions.synchro.referential.ng; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.services.binder.BinderEngine; -import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeRequest; +import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeSqlsRequest; +import fr.ird.observe.services.topia.binder.BinderEngine; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.synchro.referential.ng.task.ReferentialSynchronizeTask; -import fr.ird.observe.services.service.actions.synchro.referential.sql.DeleteSqlStatementGenerator; -import fr.ird.observe.services.service.actions.synchro.referential.sql.DesactivateSqlStatementGenerator; -import fr.ird.observe.services.service.actions.synchro.referential.sql.InsertSqlStatementGenerator; -import fr.ird.observe.services.service.actions.synchro.referential.sql.InsertSqlWithCascadeStatementGenerator; -import fr.ird.observe.services.service.actions.synchro.referential.sql.ReplaceSqlStatementGenerator; -import fr.ird.observe.services.service.actions.synchro.referential.sql.UpdateSqlStatementGenerator; -import fr.ird.observe.services.service.actions.synchro.referential.sql.UpdateSqlWithCascadeStatementGenerator; +import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.DeleteSqlStatementGenerator; +import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.DesactivateSqlStatementGenerator; +import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.InsertSqlStatementGenerator; +import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.InsertSqlWithCascadeStatementGenerator; +import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.ReplaceSqlStatementGenerator; +import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.UpdateSqlStatementGenerator; +import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.UpdateSqlWithCascadeStatementGenerator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; @@ -302,8 +304,7 @@ public class ReferentialSynchronizeSqlsRequestBuilder { InsertSqlStatementGenerator<R> insertGenerator = new InsertSqlStatementGenerator<>(metadata, referentialType); R referential = service.loadEntityToReferentialDto(referentialType, id); - String sql = insertGenerator.generateSql(referential); - return sql; + return insertGenerator.generateSql(referential); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ApplySqlRequestWork.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/ApplySqlRequestWork.java similarity index 95% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ApplySqlRequestWork.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/ApplySqlRequestWork.java index d95db49..dfaa976 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ApplySqlRequestWork.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/ApplySqlRequestWork.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro.referential.sql; +package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java similarity index 96% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java index a61a3fc..baa774a 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro.referential.sql; +package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/DesactivateSqlStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DesactivateSqlStatementGenerator.java similarity index 96% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/DesactivateSqlStatementGenerator.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DesactivateSqlStatementGenerator.java index 13d264e..e446f04 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/DesactivateSqlStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DesactivateSqlStatementGenerator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro.referential.sql; +package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; /*- * #%L diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java similarity index 99% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java index a31250e..8d73bf9 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro.referential.sql; +package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; /*- * #%L @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.actions.synchro.referential.sql; */ import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.services.binder.BinderEngine; +import fr.ird.observe.services.topia.binder.BinderEngine; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import org.apache.commons.collections4.CollectionUtils; @@ -70,35 +70,6 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { private final Set<String> primitiveLongPropertyNames; private final Set<String> primitiveFloatPropertyNames; - /** - * Pour décrire une association nm. - */ - private static class ManyToManyAssociationStruct { - - /** - * Le nom de la propriété dans l'objet. - */ - private final String propertyName; - /** - * Le nom de la colonne de l'association dans la table d'association. - */ - private final String dbColumnName; - /** - * Le nom de la table d'association. - */ - private final String tableName; - - private final Class<? extends ReferentialDto> type; - - private ManyToManyAssociationStruct(String propertyName, String dbColumnName, String tableName, Class<? extends ReferentialDto> type) { - this.propertyName = propertyName; - this.dbColumnName = dbColumnName; - this.tableName = tableName; - this.type = type; - } - - } - public InsertSqlStatementGenerator(TopiaMetadataEntity metadataEntity, Class<R> dtoType) { this.schemaName = metadataEntity.getDbSchemaName(); this.tableName = metadataEntity.getDbTableName(); @@ -303,7 +274,6 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { parameters.add("'" + new Timestamp(parameter.getTime()) + "'::timestamp"); } - private void addEnumParameter(Enum parameter, List<String> parameters) { parameters.add("" + parameter.ordinal()); } @@ -319,4 +289,33 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { protected void addReferentialDtoParameter(ReferentialDto parameter, List<String> parameters) { addStringParameter(parameter.getId(), parameters); } + + /** + * Pour décrire une association nm. + */ + private static class ManyToManyAssociationStruct { + + /** + * Le nom de la propriété dans l'objet. + */ + private final String propertyName; + /** + * Le nom de la colonne de l'association dans la table d'association. + */ + private final String dbColumnName; + /** + * Le nom de la table d'association. + */ + private final String tableName; + + private final Class<? extends ReferentialDto> type; + + private ManyToManyAssociationStruct(String propertyName, String dbColumnName, String tableName, Class<? extends ReferentialDto> type) { + this.propertyName = propertyName; + this.dbColumnName = dbColumnName; + this.tableName = tableName; + this.type = type; + } + + } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java index e4a8afc..46ea7e2 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro.referential.sql; +package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; /*- * #%L @@ -49,8 +49,6 @@ public abstract class InsertSqlWithCascadeStatementGenerator<R extends Referenti private final StringBuilder sqlBuilder = new StringBuilder(); - protected abstract <D extends ReferentialDto> String insertMissingReferential(Class<D> referentialType, String id); - public InsertSqlWithCascadeStatementGenerator(TopiaMetadataEntity metadataEntity, Class<R> dtoType, Multimap<Class<? extends ReferentialDto>, String> idsOnlyExistingOnThisSide) { @@ -77,6 +75,8 @@ public abstract class InsertSqlWithCascadeStatementGenerator<R extends Referenti }; } + protected abstract <D extends ReferentialDto> String insertMissingReferential(Class<D> referentialType, String id); + public String generateSql(R referentialDto) { String sql = delegateGenerator.generateSql(referentialDto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java index 3ac9bf9..2b03d28 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro.referential.sql; +package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; /*- * #%L @@ -56,20 +56,6 @@ public class ReplaceSqlStatementGenerator<R extends ReferentialDto> { */ private final Set<ReplacementStruct> manyToManyAssociationReplacements; - private static class ReplacementStruct { - - private final String schemaName; - private final String tableName; - private final String columnName; - - private ReplacementStruct(String schemaName, String tableName, String columnName) { - this.schemaName = schemaName; - this.tableName = tableName; - this.columnName = columnName; - } - - } - public ReplaceSqlStatementGenerator(TopiaMetadataModel topiaMetadataModel, String referentialName) { this.manyToOneAssociationReplacements = computeManyToOneAssociationReplacements(referentialName, topiaMetadataModel); this.manyToManyAssociationReplacements = computeManyToManyAssociationReplacements(referentialName, topiaMetadataModel); @@ -150,4 +136,18 @@ public class ReplaceSqlStatementGenerator<R extends ReferentialDto> { } + private static class ReplacementStruct { + + private final String schemaName; + private final String tableName; + private final String columnName; + + private ReplacementStruct(String schemaName, String tableName, String columnName) { + this.schemaName = schemaName; + this.tableName = tableName; + this.columnName = columnName; + } + + } + } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java similarity index 99% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java index 12346ec..a2803c2 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro.referential.sql; +package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; /*- * #%L @@ -68,32 +68,6 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { private final Set<String> primitiveLongPropertyNames; private final Set<String> primitiveFloatPropertyNames; - /** - * Pour décrire une association nm. - */ - private static class ManyToManyAssociationStruct { - - /** - * Le nom de la propriété dans l'objet. - */ - private final String propertyName; - /** - * Le nom de la colonne de l'association dans la table d'association. - */ - private final String dbColumnName; - /** - * Le nom de la table d'association. - */ - private final String tableName; - - private ManyToManyAssociationStruct(String propertyName, String dbColumnName, String tableName) { - this.propertyName = propertyName; - this.dbColumnName = dbColumnName; - this.tableName = tableName; - } - - } - public UpdateSqlStatementGenerator(TopiaMetadataEntity metadataEntity, Class<R> dtoType) { this.schemaName = metadataEntity.getDbSchemaName(); this.tableName = metadataEntity.getDbTableName(); @@ -351,4 +325,30 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { private void addPrimitiveFloatParameter(String columnName, Float parameter, StringBuilder parameters) { addParameter0(columnName, "" + (parameter == null ? 0f : parameter), parameters); } + + /** + * Pour décrire une association nm. + */ + private static class ManyToManyAssociationStruct { + + /** + * Le nom de la propriété dans l'objet. + */ + private final String propertyName; + /** + * Le nom de la colonne de l'association dans la table d'association. + */ + private final String dbColumnName; + /** + * Le nom de la table d'association. + */ + private final String tableName; + + private ManyToManyAssociationStruct(String propertyName, String dbColumnName, String tableName) { + this.propertyName = propertyName; + this.dbColumnName = dbColumnName; + this.tableName = tableName; + } + + } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java index fbd8fb4..8b7b5bd 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro.referential.sql; +package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; /*- * #%L @@ -47,8 +47,6 @@ public abstract class UpdateSqlWithCascadeStatementGenerator<R extends Referenti private final StringBuilder sqlBuilder = new StringBuilder(); - protected abstract <D extends ReferentialDto> String insertMissingReferential(Class<D> referentialType, String id); - public UpdateSqlWithCascadeStatementGenerator(TopiaMetadataEntity metadataEntity, Class<R> dtoType, Multimap<Class<? extends ReferentialDto>, String> idsOnlyExistingOnThisSide) { @@ -75,6 +73,8 @@ public abstract class UpdateSqlWithCascadeStatementGenerator<R extends Referenti }; } + protected abstract <D extends ReferentialDto> String insertMissingReferential(Class<D> referentialType, String id); + public String generateSql(R referentialDto) { String sql = delegateGenerator.generateSql(referentialDto); diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/GenerateValidatorDescriptorsFileTool.java similarity index 96% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/GenerateValidatorDescriptorsFileTool.java index adfc118..2867ab4 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/GenerateValidatorDescriptorsFileTool.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/GenerateValidatorDescriptorsFileTool.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.validate; +package fr.ird.observe.services.topia.service.actions.validate; /*- * #%L @@ -30,7 +30,8 @@ import com.google.gson.Gson; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.services.binder.BinderEngine; +import fr.ird.observe.services.service.actions.validate.ValidatorDto; +import fr.ird.observe.services.topia.binder.BinderEngine; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ObserveValidator.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ObserveValidator.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ObserveValidator.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ObserveValidator.java index ff76af1..38ccc14 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ObserveValidator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ObserveValidator.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.validate; +package fr.ird.observe.services.topia.service.actions.validate; import com.google.common.base.Preconditions; import com.opensymphony.xwork2.ActionContext; @@ -51,14 +51,11 @@ public class ObserveValidator<B> extends SimpleBeanValidator<B> { private static ValidationDataContext validationDataContext; - public static <B> ObserveValidator<B> newObserveValidator(Class<B> type, - String context, - NuitonValidatorScope... scopes) { - return new ObserveValidator<>( - type, - context, - scopes - ); + public ObserveValidator( + Class<B> type, + String context, + NuitonValidatorScope... scopes) { + super(NuitonValidatorFactory.getDefaultProvider(), type, context, scopes); } // public static <B> ObserveValidator<B> newValidator(NuitonValidatorProvider provider, @@ -73,11 +70,14 @@ public class ObserveValidator<B> extends SimpleBeanValidator<B> { // ); // } - public ObserveValidator( - Class<B> type, - String context, - NuitonValidatorScope... scopes) { - super(NuitonValidatorFactory.getDefaultProvider(), type, context, scopes); + public static <B> ObserveValidator<B> newObserveValidator(Class<B> type, + String context, + NuitonValidatorScope... scopes) { + return new ObserveValidator<>( + type, + context, + scopes + ); } // public ObserveValidator(NuitonValidatorProvider provider, @@ -87,28 +87,6 @@ public class ObserveValidator<B> extends SimpleBeanValidator<B> { // super(provider, type, context, scopes); // } - @Override - protected void rebuildDelegateValidator(Class<B> beanType, - String context, - NuitonValidatorScope... scopes) { - super.rebuildDelegateValidator(beanType, context, scopes); - - if (!isInit()) { - - // on positionne dans la stack de dataContext pour pouvoir faire de la - // validation sur des objets dans le scope. - - ValidationDataContext dataContext = getValidationDataContext(); - - reloadDataContext(dataContext, true); - - // on marque pour ne jamais revenir ici - setInit(true); - - } - - } - public static void reloadDataContext(ValidationDataContext validationDataContext, boolean strict) { if (validationDataContext != ObserveValidator.validationDataContext) { @@ -136,7 +114,7 @@ public class ObserveValidator<B> extends SimpleBeanValidator<B> { if (valueStack != null) { if (log.isDebugEnabled()) { log.debug("Enregistrement du context de validation [" + validationDataContext + "] dans la valueStack de " + - "validation (" + valueStack + ')'); + "validation (" + valueStack + ')'); } valueStack.push(validationDataContext); @@ -162,5 +140,27 @@ public class ObserveValidator<B> extends SimpleBeanValidator<B> { ObserveValidator.init = init; } + @Override + protected void rebuildDelegateValidator(Class<B> beanType, + String context, + NuitonValidatorScope... scopes) { + super.rebuildDelegateValidator(beanType, context, scopes); + + if (!isInit()) { + + // on positionne dans la stack de dataContext pour pouvoir faire de la + // validation sur des objets dans le scope. + + ValidationDataContext dataContext = getValidationDataContext(); + + reloadDataContext(dataContext, true); + + // on marque pour ne jamais revenir ici + setInit(true); + + } + + } + } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java similarity index 92% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java index 2824d3c..c912203 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.validate; +package fr.ird.observe.services.topia.service.actions.validate; /* * #%L @@ -30,7 +30,15 @@ import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.Trip; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.actions.validate.ValidateDataRequest; +import fr.ird.observe.services.service.actions.validate.ValidateDataResult; +import fr.ird.observe.services.service.actions.validate.ValidateReferentialsRequest; +import fr.ird.observe.services.service.actions.validate.ValidateReferentialsResult; +import fr.ird.observe.services.service.actions.validate.ValidateResultForDto; +import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoType; +import fr.ird.observe.services.service.actions.validate.ValidateService; +import fr.ird.observe.services.service.actions.validate.ValidationMessage; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.IdDto; @@ -80,8 +88,7 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat } ImmutableMap validateResultForDtoTypeMap = buildResultForDtoTypes(detector); - ValidateReferentialsResult result = new ValidateReferentialsResult(request, validateResultForDtoTypeMap); - return result; + return new ValidateReferentialsResult(request, validateResultForDtoTypeMap); } @@ -110,8 +117,7 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat } ImmutableMap<Class<? extends IdDto>, ValidateResultForDtoType> validateResultForDtoTypeMap = buildResultForDtoTypes(detector); - ValidateDataResult result = new ValidateDataResult(request, validateResultForDtoTypeMap); - return result; + return new ValidateDataResult(request, validateResultForDtoTypeMap); } @@ -129,8 +135,7 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat } - ImmutableMap<Class<? extends IdDto>, ValidateResultForDtoType> resultForDtoTypes = forDtoTypeBuilder.build(); - return resultForDtoTypes; + return forDtoTypeBuilder.build(); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationDataContext.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationDataContext.java index def055d..3958b4b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationDataContext.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.validate; +package fr.ird.observe.services.topia.service.actions.validate; import fr.ird.observe.entities.Activity; import fr.ird.observe.entities.ObserveSet; @@ -92,14 +92,28 @@ public class ValidationDataContext { return tripSeineEntity; } + void setTripSeineEntity(TripSeine tripSeineEntity) { + this.tripSeineEntity = tripSeineEntity; + this.programEntity = tripSeineEntity == null ? null : tripSeineEntity.getProgram(); + } + public TripLongline getTripLonglineEntity() { return tripLonglineEntity; } + void setTripLonglineEntity(TripLongline tripLonglineEntity) { + this.tripLonglineEntity = tripLonglineEntity; + this.programEntity = tripLonglineEntity == null ? null : tripLonglineEntity.getProgram(); + } + public Route getRouteEntity() { return routeEntity; } + void setRouteEntity(Route routeEntity) { + this.routeEntity = routeEntity; + } + public Activity getActivityEntity() { Activity result = getActivitySeineEntity(); if (result == null) { @@ -112,10 +126,18 @@ public class ValidationDataContext { return activitySeineEntity; } + void setActivitySeineEntity(ActivitySeine activitySeineEntity) { + this.activitySeineEntity = activitySeineEntity; + } + public ActivityLongline getActivityLonglineEntity() { return activityLonglineEntity; } + void setActivityLonglineEntity(ActivityLongline activityLonglineEntity) { + this.activityLonglineEntity = activityLonglineEntity; + } + public ObserveSet getSetEntity() { ObserveSet result = getSetSeineEntity(); if (result == null) { @@ -128,52 +150,30 @@ public class ValidationDataContext { return setSeineEntity; } - public SetLongline getSetLonglineEntity() { - return setLonglineEntity; - } - - public FloatingObject getFloatingObjectEntity() { - return floatingObjectEntity; - } - - public List<?> getEditingReferentielListEntity() { - return editingReferentielListEntity; - } - - void setTripSeineEntity(TripSeine tripSeineEntity) { - this.tripSeineEntity = tripSeineEntity; - this.programEntity = tripSeineEntity == null ? null : tripSeineEntity.getProgram(); - } - - void setTripLonglineEntity(TripLongline tripLonglineEntity) { - this.tripLonglineEntity = tripLonglineEntity; - this.programEntity = tripLonglineEntity == null ? null : tripLonglineEntity.getProgram(); - } - - void setRouteEntity(Route routeEntity) { - this.routeEntity = routeEntity; - } - - void setActivitySeineEntity(ActivitySeine activitySeineEntity) { - this.activitySeineEntity = activitySeineEntity; - } - - void setActivityLonglineEntity(ActivityLongline activityLonglineEntity) { - this.activityLonglineEntity = activityLonglineEntity; - } - void setSetSeineEntity(SetSeine setSeineEntity) { this.setSeineEntity = setSeineEntity; } + public SetLongline getSetLonglineEntity() { + return setLonglineEntity; + } + void setSetLonglineEntity(SetLongline setLonglineEntity) { this.setLonglineEntity = setLonglineEntity; } + public FloatingObject getFloatingObjectEntity() { + return floatingObjectEntity; + } + void setFloatingObjectEntity(FloatingObject floatingObjectEntity) { this.floatingObjectEntity = floatingObjectEntity; } + public List<?> getEditingReferentielListEntity() { + return editingReferentielListEntity; + } + void setEditingReferentielListEntity(List<?> editingReferentielListEntity) { this.editingReferentielListEntity = editingReferentielListEntity; } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationMessageDetector.java similarity index 98% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationMessageDetector.java index 15efdc5..8767f04 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationMessageDetector.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.validate; +package fr.ird.observe.services.topia.service.actions.validate; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -34,6 +34,7 @@ import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.service.actions.validate.ValidationMessage; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; @@ -228,7 +229,7 @@ public class ValidationMessageDetector { public void visit(TopiaEntity e, String name, Class<?> collectionType, Class<?> type, Object value) { Collection<?> cValue = (Collection<?>) value; if (TopiaEntity.class.isAssignableFrom(type) && - cValue != null && !cValue.isEmpty()) { + cValue != null && !cValue.isEmpty()) { int i = 0; for (Object currentValue : cValue) { visit(e, name, collectionType, type, i++, currentValue); diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorsMap.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidatorsMap.java similarity index 94% rename from services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorsMap.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidatorsMap.java index a351b62..cd767a4 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorsMap.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidatorsMap.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.validate; +package fr.ird.observe.services.topia.service.actions.validate; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidator; @@ -54,8 +54,7 @@ public class ValidatorsMap implements Map<Class<?>, ObserveValidator<?>> { } public <X> ObserveValidator<X> getValidator(Class<X> klass) { - ObserveValidator<X> beanValidator = (ObserveValidator<X>) get(klass); - return beanValidator; + return (ObserveValidator<X>) get(klass); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLongLineEncounterServiceTopia.java similarity index 91% rename from services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLongLineEncounterServiceTopia.java index 0fb3e97..e2bb448 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLongLineEncounterServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.topia.service.longline; /* * #%L @@ -23,7 +23,8 @@ package fr.ird.observe.services.service.longline; */ import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.longline.ActivityLongLineEncounterService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; @@ -46,13 +47,11 @@ public class ActivityLongLineEncounterServiceTopia extends ObserveServiceTopia i ActivityLongline activityLongline = loadEntity(ActivityLonglineEncounterDto.class, activityLonglineId); - Form<ActivityLonglineEncounterDto> form = dataEntityToForm( + return dataEntityToForm( ActivityLonglineEncounterDto.class, activityLongline, ReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_ENCOUTER_FORM); - return form; - } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLongLineSensorUsedServiceTopia.java similarity index 86% rename from services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLongLineSensorUsedServiceTopia.java index 7e9a521..c3d003e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLongLineSensorUsedServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.topia.service.longline; /* * #%L @@ -24,7 +24,8 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.SensorUsed; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.longline.ActivityLongLineSensorUsedService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.DataFileDto; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; @@ -50,11 +51,9 @@ public class ActivityLongLineSensorUsedServiceTopia extends ObserveServiceTopia ActivityLongline activityLongline = loadEntity(ActivityLonglineSensorUsedDto.class, activityLonglineId); - Form<ActivityLonglineSensorUsedDto> form = dataEntityToForm(ActivityLonglineSensorUsedDto.class, - activityLongline, - ReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_SENSOR_USED_FORM); - - return form; + return dataEntityToForm(ActivityLonglineSensorUsedDto.class, + activityLongline, + ReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_SENSOR_USED_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLonglineServiceTopia.java similarity index 93% rename from services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLonglineServiceTopia.java index cdcb970..70337c2 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLonglineServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.topia.service.longline; /* * #%L @@ -30,7 +30,8 @@ import fr.ird.observe.entities.longline.ActivityLonglineTopiaDao; import fr.ird.observe.entities.longline.ActivityLonglines; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; @@ -78,8 +79,7 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements TripLongline tripLongline = loadEntity(TripLonglineDto.class, tripLonglineId); ActivityLongline activityLongline = tripLongline.getActivityLonglineByTopiaId(activityLonglineId); - int position = getActivityLonglinePositionInTripLongline(tripLongline, activityLongline); - return position; + return getActivityLonglinePositionInTripLongline(tripLongline, activityLongline); } @@ -91,8 +91,7 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, activityLonglineId); - DataReference<ActivityLonglineDto> reference = toReference(activityLongline); - return reference; + return toReference(activityLongline); } @@ -176,11 +175,9 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements preCreated.setTimeStamp(timestamp); - Form<ActivityLonglineDto> form = dataEntityToForm(ActivityLonglineDto.class, - preCreated, - ReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_FORM); - - return form; + return dataEntityToForm(ActivityLonglineDto.class, + preCreated, + ReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_FORM); } @@ -234,9 +231,8 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements tripLongline.removeActivityLongline(activityLongline); TripLonglineTopiaDao tripLonglineTopiaDao = getTopiaPersistenceContext().getTripLonglineDao(); - boolean wasEndDateUpdated = tripLonglineTopiaDao.updateEndDate(tripLongline); - return wasEndDateUpdated; + return tripLonglineTopiaDao.updateEndDate(tripLongline); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/BranchlineServiceTopia.java similarity index 92% rename from services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/BranchlineServiceTopia.java index b3d9d89..4009fcb 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/BranchlineServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.topia.service.longline; /*- * #%L @@ -24,7 +24,8 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.longline.BranchlineService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/longline/LonglinePositionSetDtoHelper.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/LonglinePositionSetDtoHelper.java similarity index 78% rename from services-topia/src/main/java/fr/ird/observe/services/service/longline/LonglinePositionSetDtoHelper.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/LonglinePositionSetDtoHelper.java index e50ec99..8b17374 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/longline/LonglinePositionSetDtoHelper.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/LonglinePositionSetDtoHelper.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.topia.service.longline; /*- * #%L @@ -43,7 +43,7 @@ public class LonglinePositionSetDtoHelper { // constitution des références des position sur la ligne public static void loadPositionSet(SetLongline setLongline, LonglinePositionSetDto target) { - for(Section section : setLongline.getSection()) { + for (Section section : setLongline.getSection()) { DataReference<SectionDto> sectionRef = toSectionReference(section); @@ -76,9 +76,9 @@ public class LonglinePositionSetDtoHelper { if (basketRef != null) { DataReference<BasketDto> basketRefWithSection = positionSetDto.getBaskets().stream() - .filter(b -> basketRef.getId().equals(b.getId())) - .findFirst() - .get(); + .filter(b -> basketRef.getId().equals(b.getId())) + .findFirst() + .get(); positionDto.setBasket(basketRefWithSection); @@ -89,9 +89,9 @@ public class LonglinePositionSetDtoHelper { if (branchlineRef != null) { DataReference<BranchlineDto> branchlineRefWithSection = positionSetDto.getBranchlines().stream() - .filter(b -> branchlineRef.getId().equals(b.getId())) - .findFirst() - .get(); + .filter(b -> branchlineRef.getId().equals(b.getId())) + .findFirst() + .get(); positionDto.setBranchline(branchlineRefWithSection); @@ -108,9 +108,9 @@ public class LonglinePositionSetDtoHelper { ReferenceSetDefinition<SectionDto> definition = DataReferenceSetDefinitions.SECTION.getDefinition(); reference.init(definition.getType(), - definition.getPropertyNames(), - section.getSettingIdentifier(), - section.getHaulingIdentifier()); + definition.getPropertyNames(), + section.getSettingIdentifier(), + section.getHaulingIdentifier()); return reference; } @@ -125,10 +125,10 @@ public class LonglinePositionSetDtoHelper { ReferenceSetDefinition<BasketDto> definition = DataReferenceSetDefinitions.BASKET_WITH_SECTION.getDefinition(); reference.init(definition.getType(), - definition.getPropertyNames(), - basket.getSettingIdentifier(), - basket.getHaulingIdentifier(), - section.getTopiaId()); + definition.getPropertyNames(), + basket.getSettingIdentifier(), + basket.getHaulingIdentifier(), + section.getTopiaId()); return reference; } @@ -143,10 +143,10 @@ public class LonglinePositionSetDtoHelper { ReferenceSetDefinition<BranchlineDto> definition = DataReferenceSetDefinitions.BRANCHLINE_WITH_BASKET.getDefinition(); reference.init(definition.getType(), - definition.getPropertyNames(), - branchline.getSettingIdentifier(), - branchline.getHaulingIdentifier(), - basket.getTopiaId()); + definition.getPropertyNames(), + branchline.getSettingIdentifier(), + branchline.getHaulingIdentifier(), + basket.getTopiaId()); return reference; } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineCatchServiceTopia.java similarity index 93% rename from services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineCatchServiceTopia.java index 540d664..6e7cd4e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineCatchServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.topia.service.longline; /* * #%L @@ -23,7 +23,8 @@ package fr.ird.observe.services.service.longline; */ import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.longline.SetLonglineCatchService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; @@ -76,6 +77,6 @@ public class SetLonglineCatchServiceTopia extends ObserveServiceTopia implements return saveEntity(entity); } - - + + } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopia.java similarity index 88% rename from services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopia.java index 00592a4..bc7309d 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.topia.service.longline; /* * #%L @@ -26,7 +26,8 @@ import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.longline.SetLonglineDetailCompositionService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; @@ -52,13 +53,11 @@ public class SetLonglineDetailCompositionServiceTopia extends ObserveServiceTopi SetLongline setLongline = loadEntity(SetLonglineDetailCompositionDto.class, setLonglineId); - Form<SetLonglineDetailCompositionDto> form = dataEntityToForm( + return dataEntityToForm( SetLonglineDetailCompositionDto.class, setLongline, ReferenceSetRequestDefinitions.SET_LONGLINE_DETAIL_COMPOSITION_FORM); - return form; - } @Override @@ -69,12 +68,12 @@ public class SetLonglineDetailCompositionServiceTopia extends ObserveServiceTopi Section section = loadEntity(SectionDto.class, sectionId); - boolean sectionUsed = getTopiaPersistenceContext().getSectionDao().isUsed(section); + boolean sectionUsed = getTopiaPersistenceContext().getSectionDao().isUsed(section); // il ne doit pas être nécessaire de parcourir les paniers de las section // car si un des paniers de la section est utilisé alors la section est aussi utilisé. - return ! sectionUsed; + return !sectionUsed; } @@ -86,12 +85,12 @@ public class SetLonglineDetailCompositionServiceTopia extends ObserveServiceTopi Basket basket = loadEntity(BasketDto.class, basketId); - boolean basketUsed = getTopiaPersistenceContext().getBasketDao().isUsed(basket); + boolean basketUsed = getTopiaPersistenceContext().getBasketDao().isUsed(basket); // il ne doit pas être nécessaire de parcourir les avançons du panier // car si un des avançons du panier est utilisé alors le panier est aussi utilisé. - return ! basketUsed; + return !basketUsed; } @@ -105,7 +104,7 @@ public class SetLonglineDetailCompositionServiceTopia extends ObserveServiceTopi boolean branchlineUsed = getTopiaPersistenceContext().getBranchlineDao().isUsed(branchline); - return ! branchlineUsed; + return !branchlineUsed; } @@ -128,5 +127,5 @@ public class SetLonglineDetailCompositionServiceTopia extends ObserveServiceTopi return result; } - + } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineGlobalCompositionServiceTopia.java similarity index 82% rename from services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineGlobalCompositionServiceTopia.java index b1f2423..1f0d770 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineGlobalCompositionServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.topia.service.longline; /* * #%L @@ -23,7 +23,8 @@ package fr.ird.observe.services.service.longline; */ import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.longline.SetLonglineGlobalCompositionService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; @@ -46,11 +47,9 @@ public class SetLonglineGlobalCompositionServiceTopia extends ObserveServiceTopi SetLongline setLongline = loadEntity(SetLonglineGlobalCompositionDto.class, setLonglineId); - Form<SetLonglineGlobalCompositionDto> form = dataEntityToForm(SetLonglineGlobalCompositionDto.class, - setLongline, - ReferenceSetRequestDefinitions.SET_LONGLINE_GLOBAL_COMPOSITION_FORM); - - return form; + return dataEntityToForm(SetLonglineGlobalCompositionDto.class, + setLongline, + ReferenceSetRequestDefinitions.SET_LONGLINE_GLOBAL_COMPOSITION_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineServiceTopia.java similarity index 96% rename from services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineServiceTopia.java index 8d9b327..1daba96 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.topia.service.longline; /* * #%L @@ -28,8 +28,9 @@ import fr.ird.observe.entities.longline.ActivityLonglineTopiaDao; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; -import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.binder.data.DataBinderSupport; +import fr.ird.observe.services.service.longline.SetLonglineService; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -82,8 +83,7 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL SetLongline setLongline = loadEntity(SetLonglineDto.class, setLonglineId); - DataReference<SetLonglineDto> reference = toReference(setLongline); - return reference; + return toReference(setLongline); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TdrServiceTopia.java similarity index 94% rename from services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TdrServiceTopia.java index c61148b..5c64ac3 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TdrServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.topia.service.longline; /* * #%L @@ -24,7 +24,8 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.longline.Tdr; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.longline.TdrService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.DataFileDto; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; @@ -94,6 +95,6 @@ public class TdrServiceTopia extends ObserveServiceTopia implements TdrService { return saveEntity(entity); } - - + + } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TripLonglineGearUseServiceTopia.java similarity index 91% rename from services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TripLonglineGearUseServiceTopia.java index d6cb34c..3044767 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TripLonglineGearUseServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.topia.service.longline; /* * #%L @@ -25,7 +25,8 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.entities.longline.GearUseFeaturesLongline; import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline; import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.longline.TripLonglineGearUseService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; @@ -51,13 +52,11 @@ public class TripLonglineGearUseServiceTopia extends ObserveServiceTopia impleme TripLongline tripLongline = loadEntity(TripLonglineGearUseDto.class, tripLonglineId); - Form<TripLonglineGearUseDto> form = dataEntityToForm( + return dataEntityToForm( TripLonglineGearUseDto.class, tripLongline, ReferenceSetRequestDefinitions.TRIP_LONGLINE_GEAR_USE_FORM); - return form; - } @Override @@ -74,7 +73,7 @@ public class TripLonglineGearUseServiceTopia extends ObserveServiceTopia impleme } - protected SaveResultDto saveEntity(TripLongline entity) { + protected SaveResultDto saveEntity(TripLongline entity) { SaveResultDto saveResultDto = super.saveEntity(entity); Date lastUpdateDate = saveResultDto.getLastUpdateDate(); diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TripLonglineServiceTopia.java similarity index 90% rename from services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TripLonglineServiceTopia.java index 42bbe6d..eb534fb 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/TripLonglineServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.topia.service.longline; /* * #%L @@ -33,8 +33,9 @@ import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.Species2; import fr.ird.observe.entities.referentiel.SpeciesList; -import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.service.longline.TripLonglineService; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; @@ -47,7 +48,7 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.entity.TripMapDtoFactory; +import fr.ird.observe.services.topia.entity.TripMapDtoFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -95,8 +96,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri if (log.isTraceEnabled()) { log.trace("loadDto(" + tripLonglineId + ")"); } - TripLonglineDto dto = loadEntityToDataDto(TripLonglineDto.class, tripLonglineId); - return dto; + return loadEntityToDataDto(TripLonglineDto.class, tripLonglineId); } @@ -106,8 +106,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri log.trace("getTripLonglinePositionInProgram(" + programId + ", " + tripLonglineId + ")"); } - int position = getDao().findPositionByProgramId(programId, tripLonglineId); - return position; + return getDao().findPositionByProgramId(programId, tripLonglineId); } @@ -119,8 +118,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri LinkedHashSet<TripMapPoint> points = getDao().extractTripMapActivityPoints(tripLonglineId); - TripMapDto dto = TripMapDtoFactory.newTripMapDto(tripLonglineId, points); - return dto; + return TripMapDtoFactory.newTripMapDto(tripLonglineId, points); } @@ -132,8 +130,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri TripLongline tripLongline = loadEntity(TripLonglineDto.class, tripLonglineId); - DataReference<TripLonglineDto> reference = toReference(tripLongline); - return reference; + return toReference(tripLongline); } @@ -188,11 +185,9 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri tripLongline.setProgram(program); - Form<TripLonglineDto> form = dataEntityToForm(TripLonglineDto.class, - tripLongline, - ReferenceSetRequestDefinitions.TRIP_LONGLINE_FORM); - - return form; + return dataEntityToForm(TripLonglineDto.class, + tripLongline, + ReferenceSetRequestDefinitions.TRIP_LONGLINE_FORM); } @@ -266,7 +261,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } return result; - + } @Override @@ -280,7 +275,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri Ocean ocean = tripLongline.getOcean(); - SpeciesList speciesList = loadEntity(SpeciesListDto.class, speciesListId); + SpeciesList speciesList = loadEntity(SpeciesListDto.class, speciesListId); List<Species> species2 = Species2.filterByOcean(speciesList.getSpecies(), ocean); diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineObservedSystemServiceTopia.java similarity index 82% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineObservedSystemServiceTopia.java index ebb87e3..bdfed08 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineObservedSystemServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -23,7 +23,8 @@ package fr.ird.observe.services.service.seine; */ import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -46,11 +47,9 @@ public class ActivitySeineObservedSystemServiceTopia extends ObserveServiceTopia ActivitySeine activitySeine = loadEntity(ActivitySeineObservedSystemDto.class, activitySeineId); - Form<ActivitySeineObservedSystemDto> form = dataEntityToForm(ActivitySeineObservedSystemDto.class, - activitySeine, - ReferenceSetRequestDefinitions.ACTIVITY_SEINE_OBSERVED_SYSTEM_FORM); - - return form; + return dataEntityToForm(ActivitySeineObservedSystemDto.class, + activitySeine, + ReferenceSetRequestDefinitions.ACTIVITY_SEINE_OBSERVED_SYSTEM_FORM); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java similarity index 95% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java index a8f0458..d564b4c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -30,7 +30,8 @@ import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.ActivitySeineTopiaDao; import fr.ird.observe.entities.seine.ActivitySeines; import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; @@ -66,8 +67,7 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac ActivitySeineTopiaDao dao = getTopiaPersistenceContext().getActivitySeineDao(); List<ActivitySeine> allStubByTripId = dao.findAllStubByRouteId(routeId, referenceLocale.ordinal()); - DataReferenceSet<ActivitySeineDto> dataReferenceSet = toDataReferenceSet(ActivitySeineDto.class, allStubByTripId); - return dataReferenceSet; + return toDataReferenceSet(ActivitySeineDto.class, allStubByTripId); } @@ -82,9 +82,7 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac ActivitySeine activitySeine = route.getActivitySeineByTopiaId(activitySeineId); - int position = getActivitySeinePositionInRoute(route, activitySeine); - - return position; + return getActivitySeinePositionInRoute(route, activitySeine); } @Override @@ -95,8 +93,7 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, activitySeineId); - DataReference<ActivitySeineDto> reference = toReference(activitySeine); - return reference; + return toReference(activitySeine); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/FloatingObjectServiceTopia.java similarity index 88% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/FloatingObjectServiceTopia.java index ce05492..1ef2824 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/FloatingObjectServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -25,7 +25,8 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.FloatingObjectTopiaDao; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.seine.FloatingObjectService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; @@ -99,11 +100,9 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, floatingObjectId); - Form<FloatingObjectDto> form = dataEntityToForm(FloatingObjectDto.class, - floatingObject, - ReferenceSetRequestDefinitions.FLOATING_OBJECT_FORM); - - return form; + return dataEntityToForm(FloatingObjectDto.class, + floatingObject, + ReferenceSetRequestDefinitions.FLOATING_OBJECT_FORM); } @Override @@ -114,11 +113,9 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F FloatingObject floatingObject = newEntity(FloatingObject.class); - Form<FloatingObjectDto> form = dataEntityToForm(FloatingObjectDto.class, - floatingObject, - ReferenceSetRequestDefinitions.FLOATING_OBJECT_FORM); - - return form; + return dataEntityToForm(FloatingObjectDto.class, + floatingObject, + ReferenceSetRequestDefinitions.FLOATING_OBJECT_FORM); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/NonTargetCatchServiceTopia.java similarity index 96% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/NonTargetCatchServiceTopia.java index af89411..bc551ae 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/NonTargetCatchServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -27,7 +27,8 @@ import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.seine.NonTargetLength; import fr.ird.observe.entities.seine.NonTargetSample; import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.seine.NonTargetCatchService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ReferentialReference; diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/NonTargetSampleServiceTopia.java similarity index 84% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/NonTargetSampleServiceTopia.java index 6d3a1cd..674f676 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/NonTargetSampleServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -27,8 +27,9 @@ import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.seine.NonTargetCatch; import fr.ird.observe.entities.seine.NonTargetSample; import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.service.seine.NonTargetSampleService; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; @@ -41,7 +42,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.util.Collection; -import java.util.List; import java.util.stream.Collectors; /** @@ -83,25 +83,23 @@ public class NonTargetSampleServiceTopia extends ObserveServiceTopia implements @Override public Form<NonTargetSampleDto> loadForm(String setSeineId) { if (log.isTraceEnabled()) { - log.trace("loadForm(" + setSeineId + ")"); + log.trace("loadForm(" + setSeineId + ")"); } SetSeine setSeine = loadEntity(SetSeineDto.class, setSeineId); NonTargetSample nonTargetSample = getNonTargetSample(setSeine); - Form<NonTargetSampleDto> form = dataEntityToForm( + return dataEntityToForm( NonTargetSampleDto.class, nonTargetSample, ReferenceSetRequestDefinitions.NON_TARGET_SAMPLE_FORM); - - return form; } @Override public Collection<ReferentialReference<SpeciesDto>> getSampleSpecies(String setSeineId) { if (log.isTraceEnabled()) { - log.trace("getSampleSpecies(" + setSeineId + ")"); + log.trace("getSampleSpecies(" + setSeineId + ")"); } SetSeine setSeine = loadEntity(SetSeineDto.class, setSeineId); @@ -111,13 +109,12 @@ public class NonTargetSampleServiceTopia extends ObserveServiceTopia implements ReferentialLocale referentialLocale = getReferentialLocale(); // on recupere la liste des espèces thon cible - List<ReferentialReference<SpeciesDto>> species = setSeine.getNonTargetCatch().stream() - .map(NonTargetCatch::getSpecies) - .distinct() - .map(s -> speciesBinder.toReferentialReference(referentialLocale, s)) - .collect(Collectors.toList()); - return species; + return setSeine.getNonTargetCatch().stream() + .map(NonTargetCatch::getSpecies) + .distinct() + .map(s -> speciesBinder.toReferentialReference(referentialLocale, s)) + .collect(Collectors.toList()); } @Override @@ -137,7 +134,7 @@ public class NonTargetSampleServiceTopia extends ObserveServiceTopia implements if (dto.isNotPersisted()) { setSeine.addNonTargetSample(entity); - + } return saveEntity(setSeine, entity); diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ObjectObservedSpeciesServiceTopia.java similarity index 84% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ObjectObservedSpeciesServiceTopia.java index 88890b6..94853e0 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ObjectObservedSpeciesServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -23,7 +23,8 @@ package fr.ird.observe.services.service.seine; */ import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.seine.ObjectObservedSpeciesService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -47,13 +48,10 @@ public class ObjectObservedSpeciesServiceTopia extends ObserveServiceTopia imple FloatingObject floatingObject = loadEntity(FloatingObjectObservedSpeciesDto.class, floatingObjectId); - Form<FloatingObjectObservedSpeciesDto> form = - dataEntityToForm( - FloatingObjectObservedSpeciesDto.class, - floatingObject, - ReferenceSetRequestDefinitions.FLOATING_OBJECT_OBSERVED_SPECIES_FORM); - - return form; + return dataEntityToForm( + FloatingObjectObservedSpeciesDto.class, + floatingObject, + ReferenceSetRequestDefinitions.FLOATING_OBJECT_OBSERVED_SPECIES_FORM); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ObjectSchoolEstimateServiceTopia.java similarity index 83% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ObjectSchoolEstimateServiceTopia.java index dba264a..1495c33 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ObjectSchoolEstimateServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -23,7 +23,8 @@ package fr.ird.observe.services.service.seine; */ import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.seine.ObjectSchoolEstimateService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -47,14 +48,11 @@ public class ObjectSchoolEstimateServiceTopia extends ObserveServiceTopia implem FloatingObject floatingObject = loadEntity(FloatingObjectSchoolEstimateDto.class, floatingObjectId); - Form<FloatingObjectSchoolEstimateDto> form = - dataEntityToForm( - FloatingObjectSchoolEstimateDto.class, - floatingObject, - ReferenceSetRequestDefinitions.FLOATING_OBJECT_SCHOOL_ESTIMATE_FORM - ); - - return form; + return dataEntityToForm( + FloatingObjectSchoolEstimateDto.class, + floatingObject, + ReferenceSetRequestDefinitions.FLOATING_OBJECT_SCHOOL_ESTIMATE_FORM + ); } @Override @@ -66,6 +64,6 @@ public class ObjectSchoolEstimateServiceTopia extends ObserveServiceTopia implem FloatingObject entity = loadOrCreateEntityAndCheckLastUpdate(dto); copyDataDtoToEntity(dto, entity); return saveEntity(entity); - + } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopia.java similarity index 94% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopia.java index cec810f..b501bcd 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -33,8 +33,9 @@ import fr.ird.observe.entities.seine.RouteTopiaDao; import fr.ird.observe.entities.seine.Routes; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; -import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.binder.data.DataBinderSupport; +import fr.ird.observe.services.service.seine.RouteService; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; @@ -100,9 +101,7 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi Route route = tripSeine.getRouteByTopiaId(routeId); - int position = getRoutePositionInTripSeine(tripSeine, route); - - return position; + return getRoutePositionInTripSeine(tripSeine, route); } @@ -131,11 +130,9 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi Route route = loadEntity(RouteDto.class, routeId); - DataReference<RouteDto> reference = toReference(route); - //FIXME // bindFindeVeilleProperties(route.getActivitySeine(), referenceDto.getForm().getActivitySeine()); - return reference; + return toReference(route); } @@ -203,9 +200,7 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi preCreated.setDate(DateUtil.getDay(date)); - Form<RouteDto> form = dataEntityToForm(RouteDto.class, preCreated, null); - - return form; + return dataEntityToForm(RouteDto.class, preCreated, null); } @Override @@ -277,9 +272,8 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi tripSeine.removeRoute(route); TripSeineTopiaDao tripSeineTopiaDao = getTopiaPersistenceContext().getTripSeineDao(); - boolean wasEndDateUpdated = tripSeineTopiaDao.updateEndDate(tripSeine); - return wasEndDateUpdated; + return tripSeineTopiaDao.updateEndDate(tripSeine); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SchoolEstimateServiceTopia.java similarity index 91% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SchoolEstimateServiceTopia.java index 27fe39e..c6c7a60 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SchoolEstimateServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -24,7 +24,8 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.entities.seine.SchoolEstimate; import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.seine.SchoolEstimateService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -47,13 +48,11 @@ public class SchoolEstimateServiceTopia extends ObserveServiceTopia implements S SetSeine setSeine = loadEntity(SetSeineSchoolEstimateDto.class, setSeineId); - Form<SetSeineSchoolEstimateDto> form = dataEntityToForm( + return dataEntityToForm( SetSeineSchoolEstimateDto.class, setSeine, ReferenceSetRequestDefinitions.SET_SEINE_SCHOOL_ESTIMATE_FORM ); - - return form; } @Override @@ -71,6 +70,6 @@ public class SchoolEstimateServiceTopia extends ObserveServiceTopia implements S } return saveEntity(entity); - + } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SetSeineServiceTopia.java similarity index 87% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SetSeineServiceTopia.java index 494f4d2..cafc0a9 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SetSeineServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -26,8 +26,9 @@ import fr.ird.observe.entities.constants.seine.SchoolTypePersist; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.binder.data.DataBinderSupport; +import fr.ird.observe.services.service.seine.SetSeineService; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.constants.ReferentialLocale; @@ -62,9 +63,7 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein DataBinderSupport<SetSeine, SetSeineDto> binder = getDataBinder(SetSeineDto.class); - DataReference<SetSeineDto> reference = binder.toDataReference(referenceLocale, setSeine); - - return reference; + return binder.toDataReference(referenceLocale, setSeine); } @Override @@ -93,11 +92,9 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein SetSeine setSeine = loadEntity(SetSeineDto.class, setSeineId); - Form<SetSeineDto> form = dataEntityToForm(SetSeineDto.class, - setSeine, - ReferenceSetRequestDefinitions.SET_SEINE_FORM); - - return form; + return dataEntityToForm(SetSeineDto.class, + setSeine, + ReferenceSetRequestDefinitions.SET_SEINE_FORM); } @Override @@ -135,11 +132,9 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein SchoolTypePersist schoolType = activitySeine.getSchoolType(); preCreated.setSchoolType(schoolType); - Form<SetSeineDto> form = dataEntityToForm(SetSeineDto.class, - preCreated, - ReferenceSetRequestDefinitions.SET_SEINE_FORM); - - return form; + return dataEntityToForm(SetSeineDto.class, + preCreated, + ReferenceSetRequestDefinitions.SET_SEINE_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetCatchServiceTopia.java similarity index 97% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetCatchServiceTopia.java index e19e821..2fdbfad 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetCatchServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /*- * #%L @@ -28,7 +28,8 @@ import fr.ird.observe.entities.seine.TargetCatch; import fr.ird.observe.entities.seine.TargetCatchs; import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.seine.TargetCatchService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ReferentialReferences; diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopia.java similarity index 94% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopia.java index 7f1423d..941cd1e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -30,8 +30,9 @@ import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.entities.seine.TargetCatch; import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; -import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.service.seine.TargetSampleService; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; @@ -89,12 +90,10 @@ public class TargetSampleServiceTopia extends ObserveServiceTopia implements Tar TargetSample targetSample = getTargetSample(setSeine, discarded); - Form<TargetSampleDto> form = dataEntityToForm( + return dataEntityToForm( TargetSampleDto.class, targetSample, ReferenceSetRequestDefinitions.TARGET_SAMPLE_FORM); - - return form; } @Override @@ -134,7 +133,7 @@ public class TargetSampleServiceTopia extends ObserveServiceTopia implements Tar ReferentialBinderSupport<ObserveReferentialEntity, SpeciesDto> binder = getReferentialBinder(SpeciesDto.class); - for (Species species : speciesSet ) { + for (Species species : speciesSet) { ReferentialReference<SpeciesDto> speciesRef = binder.toReferentialReference(referentialLocale, species); speciesBuilder.add(speciesRef); diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TransmittingBuoyOperationServiceTopia.java similarity index 84% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TransmittingBuoyOperationServiceTopia.java index d28394a..c887960 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TransmittingBuoyOperationServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -23,7 +23,8 @@ package fr.ird.observe.services.service.seine; */ import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.seine.TransmittingBuoyOperationService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -47,13 +48,10 @@ public class TransmittingBuoyOperationServiceTopia extends ObserveServiceTopia i FloatingObject floatingObject = loadEntity(FloatingObjectTransmittingBuoyDto.class, floatingObjectId); - Form<FloatingObjectTransmittingBuoyDto> form = - dataEntityToForm( - FloatingObjectTransmittingBuoyDto.class, - floatingObject, - ReferenceSetRequestDefinitions.FLOATING_OBJECT_TRANSMITTING_BUOY_FORM); - - return form; + return dataEntityToForm( + FloatingObjectTransmittingBuoyDto.class, + floatingObject, + ReferenceSetRequestDefinitions.FLOATING_OBJECT_TRANSMITTING_BUOY_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopia.java similarity index 91% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopia.java index fd20dbb..517715e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -25,7 +25,8 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.seine.TripSeineGearUseService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -51,13 +52,11 @@ public class TripSeineGearUseServiceTopia extends ObserveServiceTopia implements TripSeine tripSeine = loadEntity(TripSeineGearUseDto.class, tripSeineId); - Form<TripSeineGearUseDto> form = dataEntityToForm( + return dataEntityToForm( TripSeineGearUseDto.class, tripSeine, ReferenceSetRequestDefinitions.TRIP_SEINE_GEAR_USE_FORM); - return form; - } @Override @@ -72,7 +71,7 @@ public class TripSeineGearUseServiceTopia extends ObserveServiceTopia implements } - protected SaveResultDto saveEntity(TripSeine entity) { + protected SaveResultDto saveEntity(TripSeine entity) { SaveResultDto saveResultDto = super.saveEntity(entity); Date lastUpdateDate = saveResultDto.getLastUpdateDate(); diff --git a/services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopia.java similarity index 87% rename from services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopia.java index b0a0340..60bc6e2 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopia.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -32,8 +32,9 @@ import fr.ird.observe.entities.referentiel.Species2; import fr.ird.observe.entities.referentiel.SpeciesList; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; -import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; @@ -46,7 +47,7 @@ import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.entity.TripMapDtoFactory; +import fr.ird.observe.services.topia.entity.TripMapDtoFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -76,8 +77,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe List<TripSeine> tripSeines = loadEntities(TripSeine.class); - DataReferenceSet<TripSeineDto> dataReferenceSet = toDataReferenceSet(TripSeineDto.class, tripSeines); - return dataReferenceSet; + return toDataReferenceSet(TripSeineDto.class, tripSeines); } @@ -94,8 +94,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe List<TripSeine> tripSeines = getDao().findAllStubByProgramId(programId, referenceLocale.ordinal()); - DataReferenceSet<TripSeineDto> dataReferenceSet = toDataReferenceSet(TripSeineDto.class, tripSeines); - return dataReferenceSet; + return toDataReferenceSet(TripSeineDto.class, tripSeines); } @@ -105,8 +104,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe log.trace("getTripSeinePositionInProgram(" + programId + ", " + tripSeineId + ")"); } - int position = getDao().findPositionByProgramId(programId, tripSeineId); - return position; + return getDao().findPositionByProgramId(programId, tripSeineId); } @Override @@ -137,8 +135,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe log.trace("loadDto(" + tripSeineId + ")"); } - TripSeineDto dto = loadEntityToDataDto(TripSeineDto.class, tripSeineId); - return dto; + return loadEntityToDataDto(TripSeineDto.class, tripSeineId); } @Override @@ -149,8 +146,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe LinkedHashSet<TripMapPoint> points = getDao().extractTripMapActivityPoints(tripSeineId); - TripMapDto tripMapDto = TripMapDtoFactory.newTripMapDto(tripSeineId, points); - return tripMapDto; + return TripMapDtoFactory.newTripMapDto(tripSeineId, points); } @@ -162,8 +158,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); - DataReference<TripSeineDto> reference = toReference(tripSeine); - return reference; + return toReference(tripSeine); } @@ -195,11 +190,9 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe tripSeine.setProgram(program); - Form<TripSeineDto> form = dataEntityToForm(TripSeineDto.class, - tripSeine, - ReferenceSetRequestDefinitions.TRIP_SEINE_FORM); - - return form; + return dataEntityToForm(TripSeineDto.class, + tripSeine, + ReferenceSetRequestDefinitions.TRIP_SEINE_FORM); } @@ -285,7 +278,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe Ocean ocean = tripSeine.getOcean(); - SpeciesList speciesList = loadEntity(SpeciesListDto.class, speciesListId); + SpeciesList speciesList = loadEntity(SpeciesListDto.class, speciesListId); List<Species> species2 = Species2.filterByOcean(speciesList.getSpecies(), ocean); diff --git a/services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory b/services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory deleted file mode 100644 index ee2101e..0000000 --- a/services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory +++ /dev/null @@ -1 +0,0 @@ -fr.ird.observe.services.ObserveServiceFactoryTopia \ No newline at end of file diff --git a/services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier b/services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier index 05eb7af..308332f 100644 --- a/services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier +++ b/services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier @@ -1 +1 @@ -fr.ird.observe.services.binder.ReferenceBinderEngineSupplierTopia \ No newline at end of file +fr.ird.observe.services.topia.binder.ReferenceBinderEngineSupplierTopia \ No newline at end of file diff --git a/services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java b/services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java deleted file mode 100644 index bb4d81c..0000000 --- a/services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java +++ /dev/null @@ -1,385 +0,0 @@ -package fr.ird.observe.services; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * 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 fr.ird.observe.ObserveTopiaApplicationContext; -import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.configuration.ObserveDataSourceConnection; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; -import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.service.BabModelVersionException; -import fr.ird.observe.services.service.DataSourceService; -import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; -import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.test.ObserveFixtures; -import fr.ird.observe.test.TestHelper; -import fr.ird.observe.test.spi.CopyDatabaseConfiguration; -import fr.ird.observe.test.spi.DatabaseClassifier; -import fr.ird.observe.test.spi.DatabaseNameConfiguration; -import fr.ird.observe.test.spi.DatabaseVersionConfiguration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Assert; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; -import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.version.Version; -import org.nuiton.version.Versions; - -import java.io.File; -import java.io.IOException; -import java.lang.annotation.Annotation; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Locale; - -/** - * Created on 18/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ApplicationContextResource implements TestRule { - - /** Logger. */ - private static final Log log = LogFactory.getLog(ApplicationContextResource.class); - - protected final ObserveServiceFactoryTopia serviceFactory; - - private Path temporaryDirectoryRoot; - - private final ObserveSpeciesListConfiguration speciesListConfiguration; - - private final DataSourcesForTestManager dataSourcesForTestManager; - - protected String dbName; - - protected String dbVersion; - - protected final DatabaseClassifier classifier; - - public ApplicationContextResource(DatabaseClassifier classifier) { - this.classifier = classifier; - this.speciesListConfiguration = ObserveSpeciesListConfiguration.newDefaultConfiguration(); - this.serviceFactory = new ObserveServiceFactoryTopia() { - - @Override - protected ObserveServiceContextTopia createServiceContext(ObserveServiceInitializer observeServiceInitializer) { - ObserveServiceContextTopiaTaiste serviceContext = new ObserveServiceContextTopiaTaiste(observeServiceInitializer, mainServiceFactory, this); - return serviceContext; - } - }; - serviceFactory.setMainServiceFactory(serviceFactory); - - dataSourcesForTestManager = new DataSourcesForTestManager(); - } - - public ApplicationContextResource() { - this(DatabaseClassifier.DEFAULT); - } - - public ObserveDataSourceConfigurationTopiaH2 createDataSource(Version dbVersion, String dbName, File targetPath) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { - - ObserveDataSourceConfigurationTopiaH2 sharedDatabaseConfiguration = dataSourcesForTestManager.createSharedDataSourceConfigurationH2(dbVersion, dbName); - - File sharedDatabaseFile = sharedDatabaseConfiguration.getDatabaseFile(); - - ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration; - - boolean sharedDatabaseExist = sharedDatabaseFile.exists(); - if (!sharedDatabaseExist) { - - if (log.isInfoEnabled()) { - log.info("Create shared database: " + dbVersion.toString() + "/" + dbName + " to " + sharedDatabaseFile); - } - - try (DataSourceService dataSourceService = newService(sharedDatabaseConfiguration, DataSourceService.class)) { - DataSourceCreateConfigurationDto createConfiguration = new DataSourceCreateConfigurationDto(); - - byte[] databaseToImportContent = dataSourcesForTestManager.getDatabaseScriptContent(dbVersion, dbName); - createConfiguration.setImportDatabase(databaseToImportContent); - - dataSourceService.create(sharedDatabaseConfiguration, createConfiguration); - } - - } - - if (targetPath == null) { - - dataSourceConfiguration = sharedDatabaseConfiguration; - } else { - - // Use a copy - - dataSourceConfiguration = dataSourcesForTestManager.createDataSourceConfigurationH2(targetPath, dbVersion, dbName); - File databaseFileTarget = dataSourceConfiguration.getDatabaseFile(); - - if (log.isInfoEnabled()) { - log.info("Copy database: " + dbVersion.toString() + "/" + dbName + " to " + databaseFileTarget); - } - Files.createDirectories(databaseFileTarget.toPath().getParent()); - Files.copy(sharedDatabaseFile.toPath(), databaseFileTarget.toPath()); - - } - - dataSourceConfiguration.setModelVersion(Versions.valueOf(ObserveFixtures.DEFAULT_VERSION)); - - return dataSourceConfiguration; - - } - - public String getScriptPath(String classifier, Version databaseVersion) { - return TestHelper.getBackupScript(databaseVersion, classifier); - } - - public <S extends ObserveService> S newService(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { - ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( - Locale.FRANCE, - ReferentialLocale.FR, - temporaryDirectoryRoot.toFile(), - speciesListConfiguration, - dataSourceConfiguration - ); - return serviceFactory.newService(observeServiceInitializer, serviceType); - } - - public <S extends ObserveService> S newService(ObserveDataSourceConnection dataSourceConnection, Class<S> serviceType) { - ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( - Locale.FRANCE, - ReferentialLocale.FR, - temporaryDirectoryRoot.toFile(), - speciesListConfiguration, - dataSourceConnection - ); - return serviceFactory.newService(observeServiceInitializer, serviceType); - } - - public void closeServiceFactory() { - serviceFactory.close(); - } - - public void setTemporaryDirectoryRoot(Path temporaryDirectoryRoot) { - this.temporaryDirectoryRoot = temporaryDirectoryRoot; - } - - @Override - public Statement apply(final Statement base, final Description description) { - return new Statement() { - - @Override - public void evaluate() throws Throwable { - before(description); - try { - base.evaluate(); - } finally { - after(description); - } - } - }; - } - - protected void before(Description description) throws IOException { - - Class<?> testClass = description.getTestClass(); - if (log.isDebugEnabled()) { - log.debug("Starts " + testClass.getName()); - } - - TestHelper.initTest(testClass); - - DatabaseNameConfiguration databaseNameConfiguration = getDatabaseNameConfigurationAnnotation(testClass, classifier); - if (databaseNameConfiguration != null) { - dbName = databaseNameConfiguration.value().name(); - } - - DatabaseVersionConfiguration databaseVersionConfiguration = getDatabaseVersionConfigurationAnnotation(testClass, classifier); - if (databaseVersionConfiguration != null) { - dbVersion = databaseVersionConfiguration.value(); - } - - } - - protected void after(Description description) { - - Class<?> testClass = description.getTestClass(); - if (log.isDebugEnabled()) { - log.debug("Ends " + testClass.getName()); - } - - closeServiceFactory(); - setTemporaryDirectoryRoot(null); - - } - - public void assertSchemaCreated(ObserveTopiaApplicationContext topiaApplicationContext) { - - try (ObserveTopiaPersistenceContext topiaPersistenceContext = topiaApplicationContext.newPersistenceContext()) { - TestHelper.assertSchemaCreated(topiaApplicationContext, topiaPersistenceContext, false); - } - - } - - public void assertEntitiesExist(ObserveTopiaApplicationContext topiaApplicationContext, String... ids) { - - try (ObserveTopiaPersistenceContext persistenceContext = topiaApplicationContext.newPersistenceContext()) { - - for (String id : ids) { - try { - persistenceContext.findByTopiaId(id); - if (log.isInfoEnabled()) { - log.info("Entity " + id + " found."); - } - } catch (TopiaException e) { - Assert.fail("Could not find entity with id: " + id); - } - } - } - } - - public String getDbName() { - return dbName; - } - - public String getDbVersion() { - return dbVersion; - } - - public File createTemporaryFile(String suffix) { - return temporaryDirectoryRoot.resolve(System.nanoTime() + suffix).toFile(); - } - - public DatabaseClassifier getClassifier() { - return classifier; - } - - /** - * Created on 26/12/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ - public static class DataSourcesForTestManager { - - /** - * Root path of shared databases. - */ - private static Path sharedDatabasesRootPath; - - public Path getSharedDatabasesRootPath() { - if (sharedDatabasesRootPath == null) { - sharedDatabasesRootPath = TestHelper.getCommonsDir().toPath(); - } - return sharedDatabasesRootPath; - } - - public Path getSharedDatabasePath(Version dbVersion, String dbName) { - return getDatabasePath(getSharedDatabasesRootPath(), dbVersion, dbName); - } - - public Path getDatabasePath(Path rootPath, Version dbVersion, String dbName) { - return rootPath.resolve(dbVersion.getValidName()).resolve(dbName); - } - - public ObserveDataSourceConfigurationTopiaH2 createSharedDataSourceConfigurationH2(Version dbVersion, String dbName) { - Path databasePath = getDatabasePath(getSharedDatabasesRootPath(), dbVersion, dbName); - return createDataSourceConfigurationH2(databasePath.toFile(), dbVersion, dbName); - } - - public ObserveDataSourceConfigurationTopiaH2 createDataSourceConfigurationH2(File localDbFile, Version dbVersion, String dbName) { - - ObserveDataSourceConfigurationTopiaH2 configurationTopiaH2 = new ObserveDataSourceConfigurationTopiaH2(); - - if (log.isDebugEnabled()) { - log.debug("db directory: " + localDbFile); - } - configurationTopiaH2.setLabel("Commons database#" + dbName); - configurationTopiaH2.setUsername(TestHelper.TEST_H2_LOGIN); - configurationTopiaH2.setPassword(TestHelper.TEST_H2_PASSWORD); - configurationTopiaH2.setDirectory(localDbFile); - configurationTopiaH2.setDbName("obstuna"); - configurationTopiaH2.setAutoMigrate(true); - configurationTopiaH2.setModelVersion(dbVersion); - return configurationTopiaH2; - - } - - public byte[] getDatabaseScriptContent(Version dbVersion, String dbName) throws IOException { - String scriptPath = "/db/" + dbVersion.toString() + "/" + dbName + ".sql.gz"; - - byte[] databaseToImportContent = TestHelper.getResourceContent(scriptPath); - return databaseToImportContent; - } - - } - - private DatabaseNameConfiguration getDatabaseNameConfigurationAnnotation(Class<?> testClass, DatabaseClassifier classifier) { - - DatabaseNameConfiguration[] annotations = getAnnotations(testClass, DatabaseNameConfiguration.class); - - for (DatabaseNameConfiguration annotation : annotations) { - if (classifier.equals(annotation.classifier())) { - return annotation; - } - } - return null; - } - - private DatabaseVersionConfiguration getDatabaseVersionConfigurationAnnotation(Class<?> testClass, DatabaseClassifier classifier) { - - DatabaseVersionConfiguration[] annotations = getAnnotations(testClass, DatabaseVersionConfiguration.class); - - for (DatabaseVersionConfiguration annotation : annotations) { - if (classifier.equals(annotation.classifier())) { - return annotation; - } - } - return null; - } - - private CopyDatabaseConfiguration getCopyDatabaseConfigurationAnnotation(Class<?> testClass, DatabaseClassifier classifier) { - - CopyDatabaseConfiguration[] annotations = getAnnotations(testClass, CopyDatabaseConfiguration.class); - - for (CopyDatabaseConfiguration annotation : annotations) { - if (classifier.equals(annotation.classifier())) { - return annotation; - } - } - return null; - } - - private <E extends Annotation> E[] getAnnotations(Class<?> clazz, Class<E> annotationType) { - - E[] annotations = clazz.getAnnotationsByType(annotationType); - - if (annotations.length == 0 && clazz.getSuperclass() != null) { - annotations = getAnnotations(clazz.getSuperclass(), annotationType); - } - return annotations; - } - - -} diff --git a/services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java b/services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java deleted file mode 100644 index e2e432e..0000000 --- a/services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java +++ /dev/null @@ -1,347 +0,0 @@ -package fr.ird.observe.services; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * 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.common.base.Strings; -import fr.ird.observe.ObserveTopiaApplicationContext; -import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.configuration.ObserveDataSourceConnection; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; -import fr.ird.observe.services.service.BabModelVersionException; -import fr.ird.observe.services.service.DataSourceService; -import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; -import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.ObserveReferentialCache; -import fr.ird.observe.test.TestHelper; -import fr.ird.observe.test.spi.CopyDatabaseConfiguration; -import fr.ird.observe.test.spi.DatabaseClassifier; -import fr.ird.observe.test.spi.DatabaseNameConfiguration; -import fr.ird.observe.test.spi.DatabaseVersionConfiguration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; -import org.nuiton.topia.persistence.TopiaDao; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaPersistenceContext; -import org.nuiton.version.Version; -import org.nuiton.version.Versions; - -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Method; -import java.nio.file.Files; -import java.nio.file.Path; - -/** - * Created on 18/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class DataSourceResource implements TestRule { - - /** Logger. */ - private static final Log log = LogFactory.getLog(DataSourceResource.class); - - protected final ApplicationContextResource applicationContextResource; - - protected ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration; - - protected ObserveDataSourceConnection dataSourceConnection; - - protected ObserveReferentialCache referentialCache; - - protected File testDirectory; - - public DataSourceResource(ApplicationContextResource applicationContextResource) { - this.applicationContextResource = applicationContextResource; - } - - public <S extends ObserveService> S newService(Class<S> serviceType) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - - ObserveDataSourceConnection dataSourceConnection = getDataSourceConnection(); - - if (dataSourceConnection == null) { - - ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = getDataSourceConfiguration(); - - DataSourceService dataSourceService = applicationContextResource.newService(dataSourceConfiguration, DataSourceService.class); - - dataSourceConnection = dataSourceService.open(dataSourceConfiguration); - - dataSourceConnection = new ObserveDataSourceConnectionTopiaTaiste(dataSourceConnection.getAuthenticationToken()); - - setDataSourceConnection(dataSourceConnection); - } - - S service = applicationContextResource.newService(dataSourceConnection, serviceType); - - return service; - } - - - public ObserveDataSourceConfigurationTopiaH2 getDataSourceConfiguration() { - return dataSourceConfiguration; - } - - public ObserveDataSourceConnection getDataSourceConnection() { - return dataSourceConnection; - } - - public void setDataSourceConnection(ObserveDataSourceConnection dataSourceConnection) { - this.dataSourceConnection = dataSourceConnection; - } - - public ObserveReferentialCache getReferentialCache() { - if (referentialCache == null) { - referentialCache = new ObserveReferentialCache(); - } - return referentialCache; - } - - public ObserveTopiaPersistenceContext newPersistenceContext() { - ObserveTopiaPersistenceContext persistenceContext = getTopiaApplicationContext().newPersistenceContext(); - return persistenceContext; - } - - public ObserveTopiaApplicationContext getTopiaApplicationContext() { - return ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext(dataSourceConfiguration); - } - - public <E extends TopiaEntity> E findById(Class<E> entityType, String id) { - - TopiaPersistenceContext persistenceContext = newPersistenceContext(); - - TopiaDao<E> dao = persistenceContext.getDao(entityType); - E entity = dao.forTopiaIdEquals(id).findUnique(); - - return entity; - - } - - public <E extends TopiaEntity> boolean exists(Class<E> entityType, String id) { - - TopiaPersistenceContext persistenceContext = newPersistenceContext(); - - TopiaDao<E> dao = persistenceContext.getDao(entityType); - - boolean exist = dao.forTopiaIdEquals(id).exists(); - - return exist; - - } - - public void createDataSourceFromScript(String scriptPath) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { - - byte[] databaseToImportContent = TestHelper.getResourceContent(scriptPath); - - DataSourceService dataSourceService = applicationContextResource.newService(dataSourceConfiguration, DataSourceService.class); - DataSourceCreateConfigurationDto createConfiguration = new DataSourceCreateConfigurationDto(); - createConfiguration.setImportDatabase(databaseToImportContent); - dataSourceService.create(dataSourceConfiguration, createConfiguration); - - } - - @Override - public Statement apply(final Statement base, final Description description) { - return new Statement() { - - @Override - public void evaluate() throws Throwable { - before(description); - try { - base.evaluate(); - } finally { - after(description); - } - } - }; - } - - private Class<?> testClass; - - private String methodName; - - private boolean useSharedDatabase; - - private String dbName; - - private Version dbVersion; - - public String getDbName() { - return dbName; - } - - public Version getDbVersion() { - return dbVersion; - } - - public String getMethodName() { - return methodName; - } - - public Class<?> getTestClass() { - return testClass; - } - - public boolean isUseSharedDatabase() { - return useSharedDatabase; - } - - public File getTestDirectory() { - return testDirectory; - } - - public ObserveDataSourceConfigurationTopiaH2 createDataSourceConfigurationH2(Class<?> testClass, String dbName) { - - ObserveDataSourceConfigurationTopiaH2 configurationTopiaH2 = new ObserveDataSourceConfigurationTopiaH2(); - - File localDbFile = new File(testDirectory, dbName); - - if (log.isInfoEnabled()) { - log.info("db directory: " + localDbFile); - } - configurationTopiaH2.setLabel(testClass.getSimpleName() + "#" + dbName); - configurationTopiaH2.setUsername(TestHelper.TEST_H2_LOGIN); - configurationTopiaH2.setPassword(TestHelper.TEST_H2_PASSWORD); - configurationTopiaH2.setDirectory(localDbFile); - configurationTopiaH2.setDbName("obstuna"); - configurationTopiaH2.setAutoMigrate(true); - configurationTopiaH2.setModelVersion(ObserveMigrationConfigurationProvider.get().getLastVersion()); - return configurationTopiaH2; - - } - - protected void before(Description description) throws Throwable { - - testClass = description.getTestClass(); - methodName = description.getMethodName(); - if (log.isDebugEnabled()) { - log.debug("Starts " + testClass.getName() + "::" + methodName); - } - - Method testClassMethod = testClass.getMethod(methodName); - - String dbVersionStr; - - DatabaseNameConfiguration databaseNameConfiguration = getDatabaseNameConfigurationAnnotation(testClassMethod, applicationContextResource.getClassifier()); - if (databaseNameConfiguration != null) { - dbName = databaseNameConfiguration.value().name(); - } else { - dbName = applicationContextResource.getDbName(); - } - Preconditions.checkState(!Strings.isNullOrEmpty(dbName), "Pas de nom de base spécifié"); - - DatabaseVersionConfiguration databaseVersionConfiguration = getDatabaseVersionConfigurationAnnotation(testClassMethod, applicationContextResource.getClassifier()); - if (databaseVersionConfiguration != null) { - dbVersionStr = databaseVersionConfiguration.value(); - } else { - dbVersionStr = applicationContextResource.getDbVersion(); - } - Preconditions.checkState(!Strings.isNullOrEmpty(dbVersionStr), "Pas de version de base spécifié"); - dbVersion = Versions.valueOf(dbVersionStr); - - CopyDatabaseConfiguration copyDatabaseConfiguration = getCopyDatabaseConfigurationAnnotation(testClassMethod, applicationContextResource.getClassifier()); - useSharedDatabase = copyDatabaseConfiguration == null; - - if (log.isDebugEnabled()) { - log.debug("Starts " + testClass.getName() + "::" + methodName); - } - - testDirectory = TestHelper.newFile(methodName + "-" + applicationContextResource.getClassifier()); - - Path temporaryDirectoryRoot = new File(testDirectory, "tmp").toPath(); - - Files.createDirectories(temporaryDirectoryRoot); - - applicationContextResource.setTemporaryDirectoryRoot(temporaryDirectoryRoot); - - File databasePath = useSharedDatabase - ? null - : getTestDirectory().toPath().resolve("localDb").toFile(); - - dataSourceConfiguration = applicationContextResource.createDataSource(dbVersion, this.dbName, databasePath); - - } - - - protected void after(Description description) { - - Class<?> testClass = description.getTestClass(); - String methodName = description.getMethodName(); - if (log.isDebugEnabled()) { - log.debug("Ends " + testClass.getName() + "::" + methodName); - } - - if (referentialCache != null) { - referentialCache.close(); - } - - applicationContextResource.closeServiceFactory(); - applicationContextResource.setTemporaryDirectoryRoot(null); - - } - - private DatabaseNameConfiguration getDatabaseNameConfigurationAnnotation(Method testClassMethod, DatabaseClassifier classifier) { - - DatabaseNameConfiguration[] annotations = testClassMethod.getAnnotationsByType(DatabaseNameConfiguration.class); - - for (DatabaseNameConfiguration annotation : annotations) { - if (classifier.equals(annotation.classifier())) { - return annotation; - } - } - return null; - } - - private DatabaseVersionConfiguration getDatabaseVersionConfigurationAnnotation(Method testClassMethod, DatabaseClassifier classifier) { - - DatabaseVersionConfiguration[] annotations = testClassMethod.getAnnotationsByType(DatabaseVersionConfiguration.class); - - for (DatabaseVersionConfiguration annotation : annotations) { - if (classifier.equals(annotation.classifier())) { - return annotation; - } - } - return null; - } - - private CopyDatabaseConfiguration getCopyDatabaseConfigurationAnnotation(Method testClassMethod, DatabaseClassifier classifier) { - - CopyDatabaseConfiguration[] annotations = testClassMethod.getAnnotationsByType(CopyDatabaseConfiguration.class); - - for (CopyDatabaseConfiguration annotation : annotations) { - if (classifier.equals(annotation.classifier())) { - return annotation; - } - } - return null; - } - -} diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java b/services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java new file mode 100644 index 0000000..df805ac --- /dev/null +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java @@ -0,0 +1,82 @@ +package fr.ird.observe.services.topia; + +import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.test.TestHelper; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.version.Version; + +import java.io.File; +import java.nio.file.Path; + +/** + * Created on 26/12/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class DataSourcesForTestManager { + + /** Logger. */ + private static final Log log = LogFactory.getLog(DataSourcesForTestManager.class); + + /** + * Root path of shared databases. + */ + private static Path sharedDatabasesRootPath; + + private Path getSharedDatabasesRootPath() { + if (sharedDatabasesRootPath == null) { + sharedDatabasesRootPath = TestHelper.getCommonsDir().toPath(); + } + return sharedDatabasesRootPath; + } + + private Path getDatabasePath(Path rootPath, Version dbVersion, String dbName) { + return rootPath.resolve(dbVersion.getValidName()).resolve(dbName); + } + + public ObserveDataSourceConfigurationTopiaH2 createSharedDataSourceConfigurationH2(Version dbVersion, String dbName, String login, char[] password) { + Path databasePath = getDatabasePath(getSharedDatabasesRootPath(), dbVersion, dbName); + return createDataSourceConfigurationH2(databasePath.toFile(), dbVersion, dbName, login, password); + } + + public ObserveDataSourceConfigurationTopiaH2 createDataSourceConfigurationH2(File localDbFile, Version dbVersion, String dbName, String login, char[] password) { + + ObserveDataSourceConfigurationTopiaH2 configurationTopiaH2 = new ObserveDataSourceConfigurationTopiaH2(); + + if (log.isDebugEnabled()) { + log.debug("db directory: " + localDbFile); + } + configurationTopiaH2.setLabel("Commons database#" + dbName); + configurationTopiaH2.setUsername(login); + configurationTopiaH2.setPassword(password); + configurationTopiaH2.setDirectory(localDbFile); + configurationTopiaH2.setDbName("obstuna"); + configurationTopiaH2.setAutoMigrate(true); + configurationTopiaH2.setModelVersion(dbVersion); + return configurationTopiaH2; + + } + + public ObserveDataSourceConfigurationTopiaH2 createDataSourceConfigurationH2(File testDirectory, Class<?> testClass, String dbName, String login, char[] password) { + + ObserveDataSourceConfigurationTopiaH2 configurationTopiaH2 = new ObserveDataSourceConfigurationTopiaH2(); + + File localDbFile = new File(testDirectory, dbName); + + if (log.isInfoEnabled()) { + log.info("db directory: " + localDbFile); + } + configurationTopiaH2.setLabel(testClass.getSimpleName() + "#" + dbName); + configurationTopiaH2.setUsername(login); + configurationTopiaH2.setPassword(password); + configurationTopiaH2.setDirectory(localDbFile); + configurationTopiaH2.setDbName("obstuna"); + configurationTopiaH2.setAutoMigrate(true); + configurationTopiaH2.setModelVersion(ObserveMigrationConfigurationProvider.get().getLastVersion()); + return configurationTopiaH2; + + } + +} diff --git a/services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java b/services-topia/src/test/java/fr/ird/observe/services/topia/ObserveDataSourceConnectionTopiaTaiste.java similarity index 97% rename from services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/ObserveDataSourceConnectionTopiaTaiste.java index 0aa0e55..9f20224 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/ObserveDataSourceConnectionTopiaTaiste.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.topia; /*- * #%L diff --git a/services-topia/src/test/java/fr/ird/observe/services/ObserveServiceContextTopiaTaiste.java b/services-topia/src/test/java/fr/ird/observe/services/topia/ObserveServiceContextTopiaTaiste.java similarity index 86% rename from services-topia/src/test/java/fr/ird/observe/services/ObserveServiceContextTopiaTaiste.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/ObserveServiceContextTopiaTaiste.java index 2e145df..abcf4cc 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/ObserveServiceContextTopiaTaiste.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/ObserveServiceContextTopiaTaiste.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.topia; /* * #%L @@ -22,6 +22,9 @@ package fr.ird.observe.services; * #L% */ +import fr.ird.observe.services.ObserveServiceFactory; +import fr.ird.observe.services.ObserveServiceInitializer; +import fr.ird.observe.services.topia.ObserveServiceContextTopia; import org.nuiton.util.DateUtil; import java.util.Date; 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 new file mode 100644 index 0000000..86d79f0 --- /dev/null +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java @@ -0,0 +1,179 @@ +package fr.ird.observe.services.topia; + +/* + * #%L + * ObServe :: Services ToPIA Implementation + * %% + * 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 fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.ObserveServiceInitializer; +import fr.ird.observe.services.ObserveSpeciesListConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.ObserveDataSourceConnection; +import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DataSourceService; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.test.ObserveTestConfiguration; +import fr.ird.observe.test.ObserveTestResources; +import fr.ird.observe.test.TestClassResourceSupport; +import fr.ird.observe.test.spi.DatabaseClassifier; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.runner.Description; +import org.nuiton.version.Version; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.util.Locale; + +/** + * Created on 18/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class TopiaTestClassResource extends TestClassResourceSupport { + + /** Logger. */ + private static final Log log = LogFactory.getLog(TopiaTestClassResource.class); + + private final ObserveServiceFactoryTopia serviceFactory; + + private final ObserveSpeciesListConfiguration speciesListConfiguration; + + private final DataSourcesForTestManager dataSourcesForTestManager; + + public TopiaTestClassResource() { + this(DatabaseClassifier.DEFAULT); + } + + public TopiaTestClassResource(DatabaseClassifier classifier) { + super(classifier); + this.speciesListConfiguration = ObserveSpeciesListConfiguration.newDefaultConfiguration(); + this.serviceFactory = new ObserveServiceFactoryTopia() { + + @Override + protected ObserveServiceContextTopia createServiceContext(ObserveServiceInitializer observeServiceInitializer) { + return new ObserveServiceContextTopiaTaiste(observeServiceInitializer, mainServiceFactory, this); + } + }; + serviceFactory.setMainServiceFactory(serviceFactory); + + dataSourcesForTestManager = new DataSourcesForTestManager(); + } + + public DataSourcesForTestManager getDataSourcesForTestManager() { + return dataSourcesForTestManager; + } + + public ObserveDataSourceConfigurationTopiaH2 createDataSource(Version dbVersion, String dbName, File targetPath, String login, char[] password) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { + + ObserveDataSourceConfigurationTopiaH2 sharedDatabaseConfiguration = dataSourcesForTestManager.createSharedDataSourceConfigurationH2(dbVersion, dbName, login, password); + + File sharedDatabaseFile = sharedDatabaseConfiguration.getDatabaseFile(); + + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration; + + boolean sharedDatabaseExist = sharedDatabaseFile.exists(); + if (!sharedDatabaseExist) { + + if (log.isInfoEnabled()) { + log.info("Create shared database: " + dbVersion.toString() + "/" + dbName + " to " + sharedDatabaseFile); + } + + try (DataSourceService dataSourceService = newService(sharedDatabaseConfiguration, DataSourceService.class)) { + DataSourceCreateConfigurationDto createConfiguration = new DataSourceCreateConfigurationDto(); + + String scriptPath = "/db/" + dbVersion.toString() + "/" + dbName + ".sql.gz"; + + byte[] databaseToImportContent = ObserveTestResources.getResourceContent(scriptPath); + + createConfiguration.setImportDatabase(databaseToImportContent); + + dataSourceService.create(sharedDatabaseConfiguration, createConfiguration); + } + + } + + if (targetPath == null) { + + dataSourceConfiguration = sharedDatabaseConfiguration; + } else { + + // Use a copy + + dataSourceConfiguration = dataSourcesForTestManager.createDataSourceConfigurationH2(targetPath, dbVersion, dbName, login, password); + File databaseFileTarget = dataSourceConfiguration.getDatabaseFile(); + + if (log.isInfoEnabled()) { + log.info("Copy database: " + dbVersion.toString() + "/" + dbName + " to " + databaseFileTarget); + } + Files.createDirectories(databaseFileTarget.toPath().getParent()); + Files.copy(sharedDatabaseFile.toPath(), databaseFileTarget.toPath()); + + } + + dataSourceConfiguration.setModelVersion(ObserveTestConfiguration.getModelVersion()); + + return dataSourceConfiguration; + + } + + public <S extends ObserveService> S newService(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { + ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( + Locale.FRANCE, + ReferentialLocale.FR, + temporaryDirectoryRoot.toFile(), + speciesListConfiguration, + dataSourceConfiguration + ); + return serviceFactory.newService(observeServiceInitializer, serviceType); + } + + public <S extends ObserveService> S newService(ObserveDataSourceConnection dataSourceConnection, Class<S> serviceType) { + ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( + Locale.FRANCE, + ReferentialLocale.FR, + temporaryDirectoryRoot.toFile(), + speciesListConfiguration, + dataSourceConnection + ); + return serviceFactory.newService(observeServiceInitializer, serviceType); + } + + void closeServiceFactory() { + serviceFactory.close(); + } + + protected void after(Description description) { + + super.after(description); + + closeServiceFactory(); + + } + +} diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java new file mode 100644 index 0000000..de1f2f9 --- /dev/null +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java @@ -0,0 +1,177 @@ +package fr.ird.observe.services.topia; + +/* + * #%L + * ObServe :: Services ToPIA Implementation + * %% + * 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 fr.ird.observe.ObserveTopiaApplicationContext; +import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.ObserveDataSourceConnection; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DataSourceService; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.services.service.ObserveReferentialCache; +import fr.ird.observe.test.ObserveTestConfiguration; +import fr.ird.observe.test.TestMethodResourceSupport; +import fr.ird.observe.test.spi.CopyDatabaseConfiguration; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.runner.Description; +import org.nuiton.topia.persistence.TopiaDao; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaPersistenceContext; + +import java.io.File; +import java.util.Objects; + + +/** + * Created on 18/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class TopiaTestMethodResource extends TestMethodResourceSupport<TopiaTestClassResource> { + + /** Logger. */ + private static final Log log = LogFactory.getLog(TopiaTestMethodResource.class); + + private ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration; + + private ObserveDataSourceConnection dataSourceConnection; + + private ObserveReferentialCache referentialCache; + + public TopiaTestMethodResource(TopiaTestClassResource topiaTestClassResource) { + super(topiaTestClassResource); + } + + public <S extends ObserveService> S newService(Class<S> serviceType) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { + + ObserveDataSourceConnection dataSourceConnection = getDataSourceConnection(); + + if (dataSourceConnection == null) { + + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = getDataSourceConfiguration(); + + DataSourceService dataSourceService = testClassResource.newService(dataSourceConfiguration, DataSourceService.class); + + dataSourceConnection = dataSourceService.open(dataSourceConfiguration); + + dataSourceConnection = new ObserveDataSourceConnectionTopiaTaiste(dataSourceConnection.getAuthenticationToken()); + + setDataSourceConnection(dataSourceConnection); + } + + return testClassResource.newService(dataSourceConnection, serviceType); + } + + + public ObserveDataSourceConfigurationTopiaH2 getDataSourceConfiguration() { + return dataSourceConfiguration; + } + + public ObserveDataSourceConnection getDataSourceConnection() { + return dataSourceConnection; + } + + public void setDataSourceConnection(ObserveDataSourceConnection dataSourceConnection) { + this.dataSourceConnection = dataSourceConnection; + } + + public ObserveReferentialCache getReferentialCache() { + if (referentialCache == null) { + referentialCache = new ObserveReferentialCache(); + } + return referentialCache; + } + + public ObserveTopiaPersistenceContext newPersistenceContext() { + return getTopiaApplicationContext().newPersistenceContext(); + } + + public ObserveTopiaApplicationContext getTopiaApplicationContext() { + return ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext(dataSourceConfiguration); + } + + public <E extends TopiaEntity> E findById(Class<E> entityType, String id) { + + TopiaPersistenceContext persistenceContext = newPersistenceContext(); + + TopiaDao<E> dao = persistenceContext.getDao(entityType); + + return dao.forTopiaIdEquals(id).findUnique(); + + } + + public <E extends TopiaEntity> boolean exists(Class<E> entityType, String id) { + + TopiaPersistenceContext persistenceContext = newPersistenceContext(); + + TopiaDao<E> dao = persistenceContext.getDao(entityType); + + return dao.forTopiaIdEquals(id).exists(); + + } + + public ObserveDataSourceConfigurationTopiaH2 createDataSourceConfigurationH2(Class<?> testClass, String dbName) { + + return testClassResource.getDataSourcesForTestManager().createDataSourceConfigurationH2( + getTestDirectory(), testClass, dbName, getLogin(), getPassword()); + + } + + @Override + protected void before(Description description) throws Throwable { + + super.before(description); + + Objects.requireNonNull(getDbName(), "Pas de nom de base spécifié"); + Objects.requireNonNull(getDbVersion(), "Pas de version de base spécifié"); + Objects.requireNonNull(getLogin(), "Pas de login spécifié"); + Objects.requireNonNull(getPassword(), "Pas de password spécifié"); + + CopyDatabaseConfiguration copyDatabaseConfiguration = ObserveTestConfiguration.getCopyDatabaseConfigurationAnnotation(testClassMethod, testClassResource.getClassifier()); + boolean useSharedDatabase = copyDatabaseConfiguration == null; + + File databasePath = useSharedDatabase + ? null + : getTestDirectory().toPath().resolve("localDb").toFile(); + + dataSourceConfiguration = testClassResource.createDataSource(getDbVersion(), getDbName(), databasePath, getLogin(), getPassword()); + + } + + @Override + protected void after(Description description) { + + super.after(description); + + if (referentialCache != null) { + referentialCache.close(); + } + testClassResource.closeServiceFactory(); + + } + +} diff --git a/services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java similarity index 97% rename from services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java index 8974afb..30a72ec 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder; +package fr.ird.observe.services.topia.binder; /*- * #%L @@ -28,8 +28,8 @@ import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.longline.TdrRecord; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.services.binder.data.DataBinderSupport; -import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import org.junit.Assert; diff --git a/services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java similarity index 98% rename from services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java index 8eff6f0..002c8d3 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder; +package fr.ird.observe.services.topia.binder; /*- * #%L @@ -142,7 +142,7 @@ import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; -import fr.ird.observe.services.service.AbstractServiceTopiaTest; +import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.apache.commons.logging.Log; @@ -305,7 +305,7 @@ public class BinderEngineTest extends AbstractServiceTopiaTest { Class<E> entityType = binderEngine.getDataEntityType(dtoType); - try (ObserveTopiaPersistenceContext persistenceContext = dataSourceResource.getTopiaApplicationContext().newPersistenceContext()) { + try (ObserveTopiaPersistenceContext persistenceContext = topiaTestMethodResource.getTopiaApplicationContext().newPersistenceContext()) { TopiaDao<E> dao = persistenceContext.getDao(entityType); List<E> entities = dao.findAll(); @@ -341,7 +341,7 @@ public class BinderEngineTest extends AbstractServiceTopiaTest { Class<E> entityType = binderEngine.getReferentialEntityType(dtoType); - try (ObserveTopiaPersistenceContext persistenceContext = dataSourceResource.getTopiaApplicationContext().newPersistenceContext()) { + try (ObserveTopiaPersistenceContext persistenceContext = topiaTestMethodResource.getTopiaApplicationContext().newPersistenceContext()) { TopiaDao<E> dao = persistenceContext.getDao(entityType); List<E> entities = dao.findAll(); diff --git a/services-topia/src/test/java/fr/ird/observe/services/binder/ReferenceBinderEngineTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineTest.java similarity index 96% rename from services-topia/src/test/java/fr/ird/observe/services/binder/ReferenceBinderEngineTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineTest.java index 57c3ec7..07adc77 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/binder/ReferenceBinderEngineTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.binder; +package fr.ird.observe.services.topia.binder; /*- * #%L diff --git a/services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java similarity index 94% rename from services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java index bf15fbc..7bbb816 100644 --- a/services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java @@ -19,13 +19,22 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.entities.referentiel; +package fr.ird.observe.services.topia.entity; import com.opensymphony.xwork2.interceptor.annotations.After; import fr.ird.observe.ObserveTopiaDaoSupplier; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.constants.ReferenceStatusPersist; -import fr.ird.observe.services.service.AbstractServiceTopiaTest; +import fr.ird.observe.entities.referentiel.LengthWeightParameter; +import fr.ird.observe.entities.referentiel.LengthWeightParameterTopiaDao; +import fr.ird.observe.entities.referentiel.LengthWeightParameters; +import fr.ird.observe.entities.referentiel.Ocean; +import fr.ird.observe.entities.referentiel.OceanTopiaDao; +import fr.ird.observe.entities.referentiel.Sex; +import fr.ird.observe.entities.referentiel.SexTopiaDao; +import fr.ird.observe.entities.referentiel.Species; +import fr.ird.observe.entities.referentiel.SpeciesTopiaDao; +import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -53,7 +62,7 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { @Before public void setUp() { - persistenceContext = dataSourceResource.newPersistenceContext(); + persistenceContext = topiaTestMethodResource.newPersistenceContext(); SpeciesTopiaDao speciesDAO = persistenceContext.getSpeciesDao(); OceanTopiaDao oceanDAO = persistenceContext.getOceanDao(); diff --git a/services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateReferentialsTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateReferentialsTest.java similarity index 91% rename from services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateReferentialsTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateReferentialsTest.java index dcee4b0..8e8e4fb 100644 --- a/services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateReferentialsTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateReferentialsTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.replication; +package fr.ird.observe.services.topia.entity; /*- * #%L @@ -40,7 +40,7 @@ public class ReplicateReferentialsTest extends ReplicateTestSupport { @Test public void testReplicate() throws Exception { - TopiaSqlTables tables = dataSourceResource.getTopiaApplicationContext().getReferentialTables(); + TopiaSqlTables tables = topiaTestMethodResource.getTopiaApplicationContext().getReferentialTables(); ReplicateTablesRequest request = createReplicateTablesRequest(DatabaseName.empty_h2) diff --git a/services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTestSupport.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java similarity index 81% rename from services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTestSupport.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java index d8d2975..05f82fc 100644 --- a/services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTestSupport.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.replication; +package fr.ird.observe.services.topia.entity; /*- * #%L @@ -26,11 +26,11 @@ import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.services.ObserveTopiaApplicationContextFactory; +import fr.ird.observe.services.topia.ObserveTopiaApplicationContextFactory; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; -import fr.ird.observe.services.service.AbstractServiceTopiaTest; +import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; @@ -65,19 +65,19 @@ public class ReplicateTestSupport extends AbstractServiceTopiaTest { protected ReplicateTablesRequest.Builder createReplicateTablesRequest(DatabaseName databaseName) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - File targetDatabaseDirectory = new File(dataSourceResource.getTestDirectory(), "targetReplication"); - ObserveDataSourceConfigurationTopiaH2 targetTopiaConfiguration = applicationContextResource.createDataSource(dataSourceResource.getDbVersion(), databaseName.name(), targetDatabaseDirectory); + File targetDatabaseDirectory = new File(topiaTestMethodResource.getTestDirectory(), "targetReplication"); + ObserveDataSourceConfigurationTopiaH2 targetTopiaConfiguration = TOPIA_TEST_CLASS_RESOURCE.createDataSource(topiaTestMethodResource.getDbVersion(), databaseName.name(), targetDatabaseDirectory, topiaTestMethodResource.getLogin(), topiaTestMethodResource.getPassword()); ObserveTopiaApplicationContext targetTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext(targetTopiaConfiguration); - scriptFile = new File(dataSourceResource.getTestDirectory(), "script.sql"); + scriptFile = new File(topiaTestMethodResource.getTestDirectory(), "script.sql"); Writer writer = Files.newWriter(scriptFile, StandardCharsets.UTF_8); - return dataSourceResource.getTopiaApplicationContext() - .getSqlBatchService() - .replicateTablesRequestBuilder() - .to(targetTopiaApplicationContext) - .to(writer); + return topiaTestMethodResource.getTopiaApplicationContext() + .getSqlBatchService() + .replicateTablesRequestBuilder() + .to(targetTopiaApplicationContext) + .to(writer); } protected static void assertReplicateTripResults(ReplicateTablesRequest replicationRequest, ImmutableMap<String, Long> expectedResults) { @@ -117,9 +117,9 @@ public class ReplicateTestSupport extends AbstractServiceTopiaTest { TopiaSqlTables tables = request.getTables(); log.info(tables); - dataSourceResource.getTopiaApplicationContext() - .getSqlBatchService() - .execute(request); + topiaTestMethodResource.getTopiaApplicationContext() + .getSqlBatchService() + .execute(request); assertReplicateTripResults(request, expectedTablesCount); diff --git a/services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripLonglineTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTripLonglineTest.java similarity index 95% rename from services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripLonglineTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTripLonglineTest.java index 11a4fe7..94a8487 100644 --- a/services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripLonglineTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTripLonglineTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.replication; +package fr.ird.observe.services.topia.entity; /*- * #%L @@ -79,7 +79,7 @@ public class ReplicateTripLonglineTest extends ReplicateTestSupport { protected void testReplicate(ImmutableMap<String, Long> expectedTablesCount, String... tripIds) throws DataSourceCreateWithNoReferentialImportException, IOException, IncompatibleDataSourceCreateConfigurationException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { - TopiaSqlTables tables = dataSourceResource.getTopiaApplicationContext().getTripLonglineTables(); + TopiaSqlTables tables = topiaTestMethodResource.getTopiaApplicationContext().getTripLonglineTables(); ReplicateTablesRequest request = createReplicateTablesRequest(DatabaseName.referentiel) .setSelectArgument(TopiaSqlTableSelectArgument.of(tripIds)) diff --git a/services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripSeineTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTripSeineTest.java similarity index 89% rename from services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripSeineTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTripSeineTest.java index 062ccf9..b3b008a 100644 --- a/services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripSeineTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTripSeineTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.replication; +package fr.ird.observe.services.topia.entity; /*- * #%L @@ -52,9 +52,9 @@ public class ReplicateTripSeineTest extends ReplicateTestSupport { @Test public void testReplicateAllTripSeine2() throws Exception { testReplicate(ObserveFixtures.ALL_TRIP_SEINE_COUNT, - ObserveFixtures.TRIP_SEINE_ID_1, - ObserveFixtures.TRIP_SEINE_ID_2, - ObserveFixtures.TRIP_SEINE_ID_3); + ObserveFixtures.TRIP_SEINE_ID_1, + ObserveFixtures.TRIP_SEINE_ID_2, + ObserveFixtures.TRIP_SEINE_ID_3); } @Test @@ -69,7 +69,7 @@ public class ReplicateTripSeineTest extends ReplicateTestSupport { protected void testReplicate(ImmutableMap<String, Long> expectedTablesCount, String... tripIds) throws Exception { - TopiaSqlTables tables = dataSourceResource.getTopiaApplicationContext().getTripSeineTables(); + TopiaSqlTables tables = topiaTestMethodResource.getTopiaApplicationContext().getTripSeineTables(); ReplicateTablesRequest request = createReplicateTablesRequest(DatabaseName.referentiel) diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java similarity index 63% rename from services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java index 9defab9..96bd029 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.topia.service; /*- * #%L @@ -24,15 +24,21 @@ package fr.ird.observe.services.service; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.ObserveEntity; -import fr.ird.observe.services.ApplicationContextResource; -import fr.ird.observe.services.DataSourceResource; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.topia.TopiaTestClassResource; +import fr.ird.observe.services.topia.TopiaTestMethodResource; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import fr.ird.observe.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; +import fr.ird.observe.test.ObserveTestConfiguration; +import fr.ird.observe.test.spi.DatabaseLoginConfiguration; import fr.ird.observe.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.spi.DatabasePasswordConfiguration; import fr.ird.observe.test.spi.DatabaseVersionConfiguration; import org.junit.Assert; import org.junit.ClassRule; @@ -46,31 +52,32 @@ import java.util.Date; * @author Tony Chemit - chemit@codelutin.com */ @DatabaseNameConfiguration(DatabaseName.referentiel) -@DatabaseVersionConfiguration(ObserveFixtures.DEFAULT_VERSION) +@DatabaseVersionConfiguration(ObserveTestConfiguration.MODEL_VERSION) +@DatabaseLoginConfiguration(ObserveTestConfiguration.H2_LOGIN) +@DatabasePasswordConfiguration(ObserveTestConfiguration.H2_PASSWORD) public class AbstractServiceTopiaTest { @ClassRule - public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(); + public static final TopiaTestClassResource TOPIA_TEST_CLASS_RESOURCE = new TopiaTestClassResource(); @Rule - public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource); + public final TopiaTestMethodResource topiaTestMethodResource = new TopiaTestMethodResource(TOPIA_TEST_CLASS_RESOURCE); protected <E extends ObserveEntity> Date getLastUpdateDate(Class<E> entityType) { - try (ObserveTopiaPersistenceContext persistenceContext = dataSourceResource.newPersistenceContext()) { + try (ObserveTopiaPersistenceContext persistenceContext = topiaTestMethodResource.newPersistenceContext()) { return persistenceContext.getLastUpdateDate(entityType); } } protected void loadReferenceSets(ReferentialService referentialService, Form<?> form) { - dataSourceResource.getReferentialCache().loadReferenceSets(referentialService, form.getReferentialReferenceSetsRequestName()); + topiaTestMethodResource.getReferentialCache().loadReferenceSets(referentialService, form.getReferentialReferenceSetsRequestName()); } protected <R extends ReferentialDto> ReferentialReference<R> getReference(Class<R> type, int index) throws DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { - ReferentialService referentialService = dataSourceResource.newService(ReferentialService.class); - ReferentialReferenceSet<R> referentialReferenceSet = dataSourceResource.getReferentialCache().getReferentialReferenceSet(referentialService, type); - ReferentialReference<R> reference = referentialReferenceSet.getReferenceByPosition(index); - return reference; + ReferentialService referentialService = topiaTestMethodResource.newService(ReferentialService.class); + ReferentialReferenceSet<R> referentialReferenceSet = topiaTestMethodResource.getReferentialCache().getReferentialReferenceSet(referentialService, type); + return referentialReferenceSet.getReferenceByPosition(index); } diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/AddSqlScriptProducerServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/AddSqlScriptProducerServiceTopiaTest.java similarity index 90% rename from services-topia/src/test/java/fr/ird/observe/services/service/AddSqlScriptProducerServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/AddSqlScriptProducerServiceTopiaTest.java index ca4d75d..c63b20e 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/AddSqlScriptProducerServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/AddSqlScriptProducerServiceTopiaTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.topia.service; /*- * #%L @@ -22,6 +22,8 @@ package fr.ird.observe.services.service; * #L% */ +import fr.ird.observe.services.service.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.SqlScriptProducerService; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.DatabaseNameConfiguration; @@ -48,7 +50,7 @@ public class AddSqlScriptProducerServiceTopiaTest extends AbstractServiceTopiaTe @Before public void setUp() throws Exception { - service = dataSourceResource.newService(SqlScriptProducerService.class); + service = topiaTestMethodResource.newService(SqlScriptProducerService.class); } @DatabaseNameConfiguration(DatabaseName.empty_h2) @@ -90,7 +92,7 @@ public class AddSqlScriptProducerServiceTopiaTest extends AbstractServiceTopiaTe long time = TimeLog.getTime(); - File outputFile = applicationContextResource.createTemporaryFile("-out.sql.gz"); + File outputFile = TOPIA_TEST_CLASS_RESOURCE.createTemporaryFile("-out.sql.gz"); byte[] gzContent = service.produceAddSqlScript(request).getSqlCode(); diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java similarity index 62% rename from services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java index 5ffcc4a..3ba40c7 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.topia.service; /* * #%L @@ -24,7 +24,12 @@ package fr.ird.observe.services.service; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaApplicationContext; -import fr.ird.observe.services.ObserveTopiaApplicationContextFactory; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DataSourceService; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.topia.ObserveTopiaApplicationContextFactory; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; @@ -33,7 +38,8 @@ import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationExce import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; -import fr.ird.observe.test.TestHelper; +import fr.ird.observe.test.ObserveTestConfiguration; +import fr.ird.observe.test.ObserveTestResources; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.apache.commons.logging.Log; @@ -42,10 +48,16 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import org.nuiton.topia.persistence.TopiaApplicationContext; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.TopiaPersistenceContext; import java.io.File; import java.io.IOException; +import java.lang.reflect.Modifier; import java.util.Date; +import java.util.List; /** * Created on 23/08/15. @@ -65,9 +77,9 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { @Before public void setUp() { - ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = topiaTestMethodResource.getDataSourceConfiguration(); - service = applicationContextResource.newService(dataSourceConfiguration, DataSourceService.class); + service = TOPIA_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, DataSourceService.class); } @@ -75,7 +87,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { @Test(expected = DatabaseNotFoundException.class) public void testOpenNotExistingDatabase() throws IOException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = topiaTestMethodResource.getDataSourceConfiguration(); service.open(dataSourceConfiguration); } @@ -83,7 +95,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void testCanConnect() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, InterruptedException, BabModelVersionException { - ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = topiaTestMethodResource.getDataSourceConfiguration(); try { service.checkCanConnect(dataSourceConfiguration); @@ -122,7 +134,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { ObserveDataSourceConnection dataSourceConnection = service.open(dataSourceConfiguration); // La base n'est pas encore lockée - ReferentialService referentialService = applicationContextResource.newService(dataSourceConnection, ReferentialService.class); + ReferentialService referentialService = TOPIA_TEST_CLASS_RESOURCE.newService(dataSourceConnection, ReferentialService.class); referentialService.getReferenceSet(GearDto.class, new Date()); // Base déjà en cours d'utilisation @@ -142,7 +154,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void testOpen() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, InterruptedException, BabModelVersionException { - ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = topiaTestMethodResource.getDataSourceConfiguration(); DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto(); dataSourceCreateConfiguration.setCanCreateEmptyDatabase(true); service.create(dataSourceConfiguration, dataSourceCreateConfiguration); @@ -153,7 +165,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { service.open(dataSourceConfiguration); - applicationContextResource.assertSchemaCreated(dataSourceResource.getTopiaApplicationContext()); + assertSchemaCreated(topiaTestMethodResource.getTopiaApplicationContext()); } @@ -161,12 +173,12 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void testCreateEmptyDataSource() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { - ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = topiaTestMethodResource.getDataSourceConfiguration(); DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto(); dataSourceCreateConfiguration.setCanCreateEmptyDatabase(true); service.create(dataSourceConfiguration, dataSourceCreateConfiguration); - applicationContextResource.assertSchemaCreated(dataSourceResource.getTopiaApplicationContext()); + assertSchemaCreated(topiaTestMethodResource.getTopiaApplicationContext()); } @@ -174,16 +186,16 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void testCreateDataSourceFromImportDatabase() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { - String scriptPath = applicationContextResource.getScriptPath("referentiel", ObserveFixtures.FIRST_TEST_DB_VERSION); + String scriptPath = TOPIA_TEST_CLASS_RESOURCE.getScriptPath("referentiel", ObserveTestConfiguration.getFirstModelVersion()); - byte[] dumpContent = TestHelper.getResourceContent(scriptPath); + byte[] dumpContent = ObserveTestResources.getResourceContent(scriptPath); - ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = topiaTestMethodResource.getDataSourceConfiguration(); DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto(); dataSourceCreateConfiguration.setImportDatabase(dumpContent); service.create(dataSourceConfiguration, dataSourceCreateConfiguration); - applicationContextResource.assertSchemaCreated(dataSourceResource.getTopiaApplicationContext()); + assertSchemaCreated(topiaTestMethodResource.getTopiaApplicationContext()); } @@ -192,22 +204,22 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { public void testCreateDataSourceFromImportReferential() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { // On crée un base qui fait office de source de référentiel - String scriptPath = applicationContextResource.getScriptPath("referentiel", ObserveFixtures.FIRST_TEST_DB_VERSION); - dataSourceResource.createDataSourceFromScript(scriptPath); + String scriptPath = TOPIA_TEST_CLASS_RESOURCE.getScriptPath("referentiel", ObserveTestConfiguration.getFirstModelVersion()); + createDataSourceFromScript(scriptPath); - ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = topiaTestMethodResource.getDataSourceConfiguration(); DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto(); dataSourceCreateConfiguration.setImportReferentialDataSourceConfiguration(dataSourceConfiguration); - ObserveDataSourceConfigurationTopiaH2 createdDatabaseDataSourceConfiguration = dataSourceResource.createDataSourceConfigurationH2(getClass(), "resultDatabase"); + ObserveDataSourceConfigurationTopiaH2 createdDatabaseDataSourceConfiguration = topiaTestMethodResource.createDataSourceConfigurationH2(getClass(), "resultDatabase"); - DataSourceService dataSourceService = applicationContextResource.newService(createdDatabaseDataSourceConfiguration, DataSourceService.class); + DataSourceService dataSourceService = TOPIA_TEST_CLASS_RESOURCE.newService(createdDatabaseDataSourceConfiguration, DataSourceService.class); dataSourceService.create(createdDatabaseDataSourceConfiguration, dataSourceCreateConfiguration); ObserveTopiaApplicationContext createdDatabaseTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext(createdDatabaseDataSourceConfiguration); - applicationContextResource.assertSchemaCreated(createdDatabaseTopiaApplicationContext); + assertSchemaCreated(createdDatabaseTopiaApplicationContext); } @@ -216,25 +228,25 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { public void testCreateDataSourceFromImportReferentialAndData() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { // On crée un base qui fait office de source de référentiel et de source de données (uniquement des données seine) - String scriptPath = applicationContextResource.getScriptPath("dataForTestSeine", ObserveFixtures.FIRST_TEST_DB_VERSION); - dataSourceResource.createDataSourceFromScript(scriptPath); + String scriptPath = TOPIA_TEST_CLASS_RESOURCE.getScriptPath("dataForTestSeine", ObserveTestConfiguration.getFirstModelVersion()); + createDataSourceFromScript(scriptPath); - ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = topiaTestMethodResource.getDataSourceConfiguration(); DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto(); dataSourceCreateConfiguration.setImportReferentialDataSourceConfiguration(dataSourceConfiguration); dataSourceCreateConfiguration.setImportDataConfiguration(dataSourceConfiguration, ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1)); - ObserveDataSourceConfigurationTopiaH2 createdDatabaseDataSourceConfiguration = dataSourceResource.createDataSourceConfigurationH2(getClass(), "resultDatabase"); + ObserveDataSourceConfigurationTopiaH2 createdDatabaseDataSourceConfiguration = topiaTestMethodResource.createDataSourceConfigurationH2(getClass(), "resultDatabase"); - DataSourceService dataSourceService = applicationContextResource.newService(createdDatabaseDataSourceConfiguration, DataSourceService.class); + DataSourceService dataSourceService = TOPIA_TEST_CLASS_RESOURCE.newService(createdDatabaseDataSourceConfiguration, DataSourceService.class); dataSourceService.create(createdDatabaseDataSourceConfiguration, dataSourceCreateConfiguration); ObserveTopiaApplicationContext createdDatabaseTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext(createdDatabaseDataSourceConfiguration); - applicationContextResource.assertSchemaCreated(createdDatabaseTopiaApplicationContext); - applicationContextResource.assertEntitiesExist(createdDatabaseTopiaApplicationContext, ObserveFixtures.TRIP_SEINE_ID_1); + assertSchemaCreated(createdDatabaseTopiaApplicationContext); + assertEntitiesExist(createdDatabaseTopiaApplicationContext, ObserveFixtures.TRIP_SEINE_ID_1); } protected void closeDatabase(ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration) throws InterruptedException { @@ -250,4 +262,61 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { } } + public void createDataSourceFromScript(String scriptPath) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { + + DataSourceService dataSourceService = topiaTestMethodResource.newService(DataSourceService.class); + + DataSourceCreateConfigurationDto createConfiguration = new DataSourceCreateConfigurationDto(); + byte[] databaseToImportContent = ObserveTestResources.getResourceContent(scriptPath); + createConfiguration.setImportDatabase(databaseToImportContent); + + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = topiaTestMethodResource.getDataSourceConfiguration(); + dataSourceService.create(dataSourceConfiguration, createConfiguration); + + } + + public void assertSchemaCreated(TopiaApplicationContext topiaApplicationContext) { + + try (TopiaPersistenceContext topiaPersistenceContext = topiaApplicationContext.newPersistenceContext()) { + assertSchemaCreated(topiaApplicationContext, topiaPersistenceContext, false); + } + + } + + public void assertSchemaCreated(TopiaApplicationContext topiaApplicationContext, TopiaPersistenceContext persistenceContext, boolean noData) { + + // on verifie que le schema a bien ete cree + for (Class<TopiaEntity> c : topiaApplicationContext.getContractClasses()) { + if (Modifier.isAbstract(topiaApplicationContext.getImplementationClass(c).getModifiers())) { + continue; + } + if (log.isDebugEnabled()) { + log.debug("check table exists for entity: " + c.getName()); + } + List<?> r = persistenceContext.getDao(c).findAll(); + Assert.assertNotNull(r); + if (noData) { + Assert.assertEquals(0, r.size()); + } + } + } + + public void assertEntitiesExist(TopiaApplicationContext topiaApplicationContext, String... ids) { + + try (TopiaPersistenceContext persistenceContext = topiaApplicationContext.newPersistenceContext()) { + + for (String id : ids) { + try { + persistenceContext.findByTopiaId(id); + if (log.isInfoEnabled()) { + log.info("Entity " + id + " found."); + } + } catch (TopiaException e) { + Assert.fail("Could not find entity with id: " + id); + } + } + } + } + + } diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java similarity index 86% rename from services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java index f4e2ec4..1abcf44 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.topia.service; /*- * #%L @@ -24,8 +24,14 @@ package fr.ird.observe.services.service; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.service.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.AddSqlScriptProducerResult; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.services.service.SqlScriptProducerService; import fr.ird.observe.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; +import fr.ird.observe.test.ObserveTestConfiguration; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import fr.ird.observe.test.spi.DatabaseVersionConfiguration; import org.apache.commons.io.FileUtils; @@ -45,7 +51,7 @@ import java.nio.file.Files; * @author Tony Chemit - chemit@codelutin.com */ @Ignore -@DatabaseVersionConfiguration(ObserveFixtures.PREVIOUS_DEFAULT_VERSION) +@DatabaseVersionConfiguration(ObserveTestConfiguration.PREVIOUS_VERSION) public class MigrateTestsDatabases extends AbstractServiceTopiaTest { /** @@ -57,7 +63,7 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { @Before public void setUp() throws Exception { - service = dataSourceResource.newService(SqlScriptProducerService.class); + service = topiaTestMethodResource.newService(SqlScriptProducerService.class); } @DatabaseNameConfiguration(DatabaseName.referentiel) @@ -104,12 +110,12 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { } protected void migrate(AddSqlScriptProducerResult dump) throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { - migrate(dataSourceResource.getDbName(), dump); + migrate(topiaTestMethodResource.getDbName(), dump); } protected void migrate(String dbName, AddSqlScriptProducerResult dump) throws IOException { - File databasesRootDirectory = dataSourceResource.getDataSourceConfiguration().getDatabaseFile(); + File databasesRootDirectory = topiaTestMethodResource.getDataSourceConfiguration().getDatabaseFile(); while (!"observe".equals(databasesRootDirectory.getName())) { databasesRootDirectory = databasesRootDirectory.getParentFile(); @@ -124,7 +130,7 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { .resolve("main") .resolve("resources") .resolve("db") - .resolve(ObserveFixtures.DEFAULT_VERSION) + .resolve(ObserveTestConfiguration.getModelVersion().getVersion()) .resolve(sqlFilename) .toFile(); diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java similarity index 90% rename from services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java index ebbc08c..dcfcaf0 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.topia.service; /* * #%L @@ -26,12 +26,14 @@ import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.services.binder.BinderEngine; +import fr.ird.observe.services.topia.binder.BinderEngine; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.service.DataNotFoundException; +import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -57,14 +59,14 @@ public class ReferentialServiceTopiaTest extends AbstractServiceTopiaTest { @Before public void setUp() throws Exception { - service = dataSourceResource.newService(ReferentialService.class); + service = topiaTestMethodResource.newService(ReferentialService.class); } @Test public void testLoadForm() throws Exception { - ObserveTopiaPersistenceContext persistenceContext = dataSourceResource.newPersistenceContext(); + ObserveTopiaPersistenceContext persistenceContext = topiaTestMethodResource.newPersistenceContext(); for (Class<? extends ReferentialDto> dtoType : ReferentialServiceTopia.getReferentialDtoTypes()) { @@ -78,7 +80,7 @@ public class ReferentialServiceTopiaTest extends AbstractServiceTopiaTest { @CopyDatabaseConfiguration public void testDelete() throws Exception { - ObserveTopiaPersistenceContext tx = dataSourceResource.newPersistenceContext(); + ObserveTopiaPersistenceContext tx = topiaTestMethodResource.newPersistenceContext(); delete(tx, ProgramDto.class, Program.class); delete(tx, LengthWeightParameterDto.class, LengthWeightParameter.class); diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java similarity index 55% rename from services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java index 39a3e13..5e8d969 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service; +package fr.ird.observe.services.topia.service; /*- * #%L @@ -23,30 +23,26 @@ package fr.ird.observe.services.service; */ import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider; -import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.ObserveServiceContextTopia; -import fr.ird.observe.services.ObserveServiceContextTopiaTaiste; -import fr.ird.observe.services.ObserveServiceFactoryTopia; -import fr.ird.observe.services.ObserveServiceInitializer; -import fr.ird.observe.services.ObserveSpeciesListConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.UnauthorizedException; -import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.seine.TripSeineService; -import fr.ird.observe.test.TestHelper; +import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.ObserveTestConfiguration; +import fr.ird.observe.test.spi.DatabaseLoginConfiguration; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.spi.DatabasePasswordConfiguration; import org.junit.Assert; -import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import java.io.File; -import java.util.Locale; - /** * FIXME Ca sert à quoi ? et je comprends pas le mot rigth ? * @@ -54,88 +50,42 @@ import java.util.Locale; * FIXME IT tests */ @Ignore -public class RigthTest { +@DatabaseNameConfiguration(DatabaseName.dataSourceTest) +@DatabasePasswordConfiguration(ObserveTestConfiguration.OBSTUNA_PASSWORD) +public class RigthTest extends AbstractServiceTopiaTest { public static final String TRIP_SEINE_ID = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; public static final String PROGRAM_ID = "fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234"; - protected File temporaryDirectoryRoot; - - protected ObserveServiceFactoryTopia serviceFactory; - - @Before - public void before() { - temporaryDirectoryRoot = TestHelper.newFile("testWright"); - - this.serviceFactory = new ObserveServiceFactoryTopia() { - - @Override - protected ObserveServiceContextTopia createServiceContext(ObserveServiceInitializer observeServiceInitializer) { - ObserveServiceContextTopiaTaiste serviceContext = new ObserveServiceContextTopiaTaiste(observeServiceInitializer, mainServiceFactory, this); - return serviceContext; - } - }; - serviceFactory.setMainServiceFactory(serviceFactory); - - - } - - - protected ObserveDataSourceConfigurationTopiaPG createDataSourceConfigurationH2(String login) { - - ObserveDataSourceConfigurationTopiaPG configurationTopiaPG = new ObserveDataSourceConfigurationTopiaPG(); - - configurationTopiaPG.setJdbcUrl("jdbc:postgresql://localhost:5432/obstuna"); - configurationTopiaPG.setUsername(login); - configurationTopiaPG.setPassword('a'); - configurationTopiaPG.setAutoMigrate(true); - configurationTopiaPG.setModelVersion(ObserveMigrationConfigurationProvider.get().getLastVersion()); - - return configurationTopiaPG; - + @DatabaseLoginConfiguration(ObserveTestConfiguration.OBSTUNA_ADMIN_LOGIN) + @Test + public void testAdminRight() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { + testUser(true, true, true, true); } - protected ObserveDataSourceConnection getDataSourceConnection(String login) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - - ObserveDataSourceConfigurationTopiaPG adminConfig = createDataSourceConfigurationH2(login); - - DataSourceService dataSourceServices = newService(adminConfig, DataSourceService.class); - - return dataSourceServices.open(adminConfig); - + @DatabaseLoginConfiguration(ObserveTestConfiguration.OBSTUNA_TECHNICIEN_LOGIN) + @Test + public void testTechnicienAdminRight() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { + testUser(true, true, true, true); } - public <S extends ObserveService> S newService(ObserveDataSourceConnection dataSourceConnection, Class<S> serviceType) { - ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( - Locale.FRANCE, - ReferentialLocale.FR, - temporaryDirectoryRoot, - ObserveSpeciesListConfiguration.newDefaultConfiguration(), - dataSourceConnection - ); - return serviceFactory.newService(observeServiceInitializer, serviceType); + @DatabaseLoginConfiguration(ObserveTestConfiguration.OBSTUNA_UTILISATEUR_LOGIN) + @Test + public void testUtilisateurRight() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { + testUser(true, false, true, false); } - public <S extends ObserveService> S newService(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { - ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( - Locale.FRANCE, - ReferentialLocale.FR, - temporaryDirectoryRoot, - ObserveSpeciesListConfiguration.newDefaultConfiguration(), - dataSourceConfiguration - ); - return serviceFactory.newService(observeServiceInitializer, serviceType); + @DatabaseLoginConfiguration(ObserveTestConfiguration.OBSTUNA_REFERENTIEL_LOGIN) + @Test + public void testReferentielRight() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { + testUser(false, false, true, false); } - protected void testUser(String login, boolean readData, boolean writeData, boolean readReferential, boolean writeReferential) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - - ObserveDataSourceConfigurationTopiaPG adminConfig = createDataSourceConfigurationH2(login); + private void testUser(boolean readData, boolean writeData, boolean readReferential, boolean writeReferential) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - DataSourceService service = newService(adminConfig, DataSourceService.class); - - ObserveDataSourceConnection dataSourceConnection = service.open(adminConfig); + ObserveDataSourceConnection dataSourceConnection = topiaTestMethodResource.getDataSourceConnection(); Assert.assertEquals(readData, dataSourceConnection.canReadData()); Assert.assertEquals(writeData, dataSourceConnection.canWriteData()); @@ -144,40 +94,31 @@ public class RigthTest { } - @Test - public void testAdminRight() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - testUser("admin", true, true, true, true); - } + protected ObserveDataSourceConfigurationTopiaPG createDataSourceConfigurationH2(String login) { - @Test - public void testTechnicienAdminRight() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - testUser("technicien", true, true, true, true); - } + ObserveDataSourceConfigurationTopiaPG configurationTopiaPG = new ObserveDataSourceConfigurationTopiaPG(); - @Test - public void testUtilisateurRight() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - testUser("utilisateur", true, false, true, false); - } + configurationTopiaPG.setJdbcUrl("jdbc:postgresql://localhost:5432/obstuna"); + configurationTopiaPG.setUsername(login); + configurationTopiaPG.setPassword('a'); + configurationTopiaPG.setAutoMigrate(true); + configurationTopiaPG.setModelVersion(ObserveMigrationConfigurationProvider.get().getLastVersion()); + + return configurationTopiaPG; - @Test - public void testReferentielRight() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - testUser("referentiel", false, false, true, false); } - protected void testReadData(String login) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - ObserveDataSourceConnection dataSourceConnection = getDataSourceConnection(login); + public void testReadData(String login) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - TripSeineService service = newService(dataSourceConnection, TripSeineService.class); + TripSeineService service = topiaTestMethodResource.newService(TripSeineService.class); service.loadForm(TRIP_SEINE_ID); } protected void testWriteData(String login) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - ObserveDataSourceConnection dataSourceConnection = getDataSourceConnection(login); - - TripSeineService service = newService(dataSourceConnection, TripSeineService.class); + TripSeineService service = topiaTestMethodResource.newService(TripSeineService.class); Form<TripSeineDto> tripSeineDtoForm = service.loadForm(TRIP_SEINE_ID); @@ -186,18 +127,15 @@ public class RigthTest { protected void testReadReferential(String login) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - ObserveDataSourceConnection dataSourceConnection = getDataSourceConnection(login); - - ReferentialService service = newService(dataSourceConnection, ReferentialService.class); + ReferentialService service = topiaTestMethodResource.newService(ReferentialService.class); service.loadForm(ProgramDto.class, PROGRAM_ID); } protected void testWriteReferential(String login) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - ObserveDataSourceConnection dataSourceConnection = getDataSourceConnection(login); - ReferentialService service = newService(dataSourceConnection, ReferentialService.class); + ReferentialService service = topiaTestMethodResource.newService(ReferentialService.class); Form<ProgramDto> form = service.loadForm(ProgramDto.class, PROGRAM_ID); diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java similarity index 78% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java index 3d3e97e..4b40db9 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.consolidate; +package fr.ird.observe.services.topia.service.actions.consolidate; /* * #%L @@ -24,7 +24,10 @@ package fr.ird.observe.services.service.actions.consolidate; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.services.service.AbstractServiceTopiaTest; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataResult; +import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.test.spi.DatabaseNameConfiguration; @@ -46,14 +49,14 @@ public class ConsolidateDataServiceTopiaTest extends AbstractServiceTopiaTest { @Before public void setUp() throws Exception { - service = dataSourceResource.newService(ConsolidateDataService.class); + service = topiaTestMethodResource.newService(ConsolidateDataService.class); } @Test @CopyDatabaseConfiguration public void testConsolidateTripSeines() throws Exception { - ObserveTopiaPersistenceContext persistenceContext = dataSourceResource.newPersistenceContext(); + ObserveTopiaPersistenceContext persistenceContext = topiaTestMethodResource.newPersistenceContext(); List<String> tripSeineIds = persistenceContext.getTripSeineDao().findAllIds(); diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/AbstractReportServiceTopiaTest.java similarity index 95% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/AbstractReportServiceTopiaTest.java index 8786ef6..b3ad3cc 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/AbstractReportServiceTopiaTest.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.topia.service.actions.report; import fr.ird.observe.services.dto.AbstractReference; @@ -27,7 +27,9 @@ import fr.ird.observe.services.dto.actions.report.DataMatrix; import fr.ird.observe.services.dto.actions.report.Report; import fr.ird.observe.services.dto.actions.report.ReportRequest; import fr.ird.observe.services.dto.actions.report.ReportVariable; -import fr.ird.observe.services.service.AbstractServiceTopiaTest; +import fr.ird.observe.services.service.actions.report.ReportBuilder; +import fr.ird.observe.services.service.actions.report.ReportService; +import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.DatabaseNameConfiguration; @@ -69,7 +71,7 @@ public abstract class AbstractReportServiceTopiaTest extends AbstractServiceTopi @Before public final void setUp() throws Exception { - service = dataSourceResource.newService(ReportService.class); + service = topiaTestMethodResource.newService(ReportService.class); // recuperation du report à tester report = getReport(log, getReportId()); diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatch2Test.java similarity index 99% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatch2Test.java index b672629..7f90020 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatch2Test.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.topia.service.actions.report; import fr.ird.observe.services.dto.actions.report.DataMatrix; diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroup2Test.java similarity index 98% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroup2Test.java index 4d6beac..dc84ca8 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroup2Test.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.topia.service.actions.report; import fr.ird.observe.services.dto.actions.report.DataMatrix; diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroupTest.java similarity index 98% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroupTest.java index 1cd0e4e..47a5b1f 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroupTest.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.topia.service.actions.report; import fr.ird.observe.services.dto.actions.report.DataMatrix; import fr.ird.observe.services.dto.actions.report.Report; diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchTest.java similarity index 99% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchTest.java index a8967da..d123667 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchTest.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.topia.service.actions.report; import fr.ird.observe.services.dto.actions.report.DataMatrix; diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportActivityWithCommentTest.java similarity index 99% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportActivityWithCommentTest.java index 14ef8d0..f4fe14f 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportActivityWithCommentTest.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.topia.service.actions.report; import fr.ird.observe.services.dto.actions.report.DataMatrix; import fr.ird.observe.services.dto.actions.report.Report; diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAllActivitysTest.java similarity index 99% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAllActivitysTest.java index bb0745a..cbd27f9 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAllActivitysTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.topia.service.actions.report; /* * #%L diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDailySetAndCatchTest.java similarity index 98% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDailySetAndCatchTest.java index ff7195e..e4e85de 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDailySetAndCatchTest.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.topia.service.actions.report; import fr.ird.observe.services.dto.actions.report.DataMatrix; diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDcpUsageTest.java similarity index 98% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDcpUsageTest.java index c8c85b0..91af623 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDcpUsageTest.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.topia.service.actions.report; import fr.ird.observe.services.dto.actions.report.DataMatrix; import fr.ird.observe.services.dto.actions.report.Report; diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSetByAssociationTest.java similarity index 98% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSetByAssociationTest.java index bce32a1..c1070f5 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSetByAssociationTest.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.topia.service.actions.report; import fr.ird.observe.services.dto.actions.report.DataMatrix; import fr.ird.observe.services.dto.actions.report.Report; diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetCatchByAssociationTest.java similarity index 98% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetCatchByAssociationTest.java index 47c11d1..09a8678 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetCatchByAssociationTest.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.topia.service.actions.report; import fr.ird.observe.services.dto.actions.report.DataMatrix; import fr.ird.observe.services.dto.actions.report.Report; diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetDiscardedByAssociationTest.java similarity index 98% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetDiscardedByAssociationTest.java index 39af04b..8d6ae6a 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetDiscardedByAssociationTest.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.service.actions.report; +package fr.ird.observe.services.topia.service.actions.report; import fr.ird.observe.services.dto.actions.report.DataMatrix; import fr.ird.observe.services.dto.actions.report.Report; diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java similarity index 89% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java index d1408e4..4a6eae1 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro; +package fr.ird.observe.services.topia.service.actions.synchro; /*- * #%L @@ -24,15 +24,15 @@ package fr.ird.observe.services.service.actions.synchro; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.Entities; -import fr.ird.observe.services.ApplicationContextResource; -import fr.ird.observe.services.DataSourceResource; -import fr.ird.observe.services.binder.BinderEngine; +import fr.ird.observe.services.topia.TopiaTestClassResource; +import fr.ird.observe.services.topia.TopiaTestMethodResource; +import fr.ird.observe.services.topia.binder.BinderEngine; import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; -import fr.ird.observe.services.service.AbstractServiceTopiaTest; +import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeCallbackResults; @@ -41,7 +41,7 @@ import fr.ird.observe.services.service.actions.synchro.referential.legacy.Unidir import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeResult; import fr.ird.observe.test.DatabaseName; -import fr.ird.observe.test.ObserveFixtures; +import fr.ird.observe.test.ObserveTestConfiguration; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.test.spi.DatabaseClassifier; import fr.ird.observe.test.spi.DatabaseNameConfiguration; @@ -64,26 +64,26 @@ import java.util.Set; public class UnidirectionalSynchronizeReferentialTest extends AbstractServiceTopiaTest { @ClassRule - public static final ApplicationContextResource applicationContextResourceCentral = new ApplicationContextResource(DatabaseClassifier.CENTRAL); + public static final TopiaTestClassResource TOPIA_TEST_CLASS_RESOURCE_CENTRAL = new TopiaTestClassResource(DatabaseClassifier.CENTRAL); @Rule - public final DataSourceResource dataSourceResourceCentral = new DataSourceResource(applicationContextResourceCentral); + public final TopiaTestMethodResource topiaTestMethodResourceCentral = new TopiaTestMethodResource(TOPIA_TEST_CLASS_RESOURCE_CENTRAL); private UnidirectionalReferentialSynchronizeLocalService localService; private ReferentialSynchronizeDiffsEngine diffsEngine; @Before public void setUp() throws Exception { - localService = dataSourceResource.newService(UnidirectionalReferentialSynchronizeLocalService.class); + localService = topiaTestMethodResource.newService(UnidirectionalReferentialSynchronizeLocalService.class); diffsEngine = new ReferentialSynchronizeDiffsEngine( - dataSourceResource.newService(ReferentialSynchronizeDiffService.class), - dataSourceResourceCentral.newService(ReferentialSynchronizeDiffService.class)); + topiaTestMethodResource.newService(ReferentialSynchronizeDiffService.class), + topiaTestMethodResourceCentral.newService(ReferentialSynchronizeDiffService.class)); } @DatabaseNameConfiguration(DatabaseName.empty_h2) @CopyDatabaseConfiguration @DatabaseNameConfiguration(value = DatabaseName.dataForTestSeine, classifier = DatabaseClassifier.CENTRAL) - @DatabaseVersionConfiguration(value = ObserveFixtures.DEFAULT_VERSION, classifier = DatabaseClassifier.CENTRAL) + @DatabaseVersionConfiguration(value = ObserveTestConfiguration.MODEL_VERSION, classifier = DatabaseClassifier.CENTRAL) @Test public void testSynchronizeFromEmptyDatabase() { @@ -115,7 +115,7 @@ public class UnidirectionalSynchronizeReferentialTest extends AbstractServiceTop @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @CopyDatabaseConfiguration @DatabaseNameConfiguration(value = DatabaseName.dataForTestSeine, classifier = DatabaseClassifier.CENTRAL) - @DatabaseVersionConfiguration(value = ObserveFixtures.DEFAULT_VERSION, classifier = DatabaseClassifier.CENTRAL) + @DatabaseVersionConfiguration(value = ObserveTestConfiguration.MODEL_VERSION, classifier = DatabaseClassifier.CENTRAL) @Test public void testSynchronizeWithNochange() { @@ -145,7 +145,7 @@ public class UnidirectionalSynchronizeReferentialTest extends AbstractServiceTop @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @CopyDatabaseConfiguration @DatabaseNameConfiguration(value = DatabaseName.dataForTestUnidirectionalReferentialSynchro, classifier = DatabaseClassifier.CENTRAL) - @DatabaseVersionConfiguration(value = ObserveFixtures.DEFAULT_VERSION, classifier = DatabaseClassifier.CENTRAL) + @DatabaseVersionConfiguration(value = ObserveTestConfiguration.MODEL_VERSION, classifier = DatabaseClassifier.CENTRAL) @Test public void testSynchronizeWithAllChanges() { diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java similarity index 95% rename from services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java index daf2f60..a52b5e0 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.validate; +package fr.ird.observe.services.topia.service.actions.validate; /* * #%L @@ -24,7 +24,14 @@ package fr.ird.observe.services.service.actions.validate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.service.actions.validate.ValidateDataRequest; +import fr.ird.observe.services.service.actions.validate.ValidateDataResult; +import fr.ird.observe.services.service.actions.validate.ValidateReferentialsRequest; +import fr.ird.observe.services.service.actions.validate.ValidateReferentialsResult; +import fr.ird.observe.services.service.actions.validate.ValidateResultForDto; +import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoType; +import fr.ird.observe.services.service.actions.validate.ValidateService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; @@ -93,7 +100,7 @@ import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.AbstractServiceTopiaTest; +import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.DatabaseNameConfiguration; @@ -112,7 +119,7 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { @Before public void setUp() throws Exception { - service = dataSourceResource.newService(ValidateService.class); + service = topiaTestMethodResource.newService(ValidateService.class); } @Test diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java similarity index 95% rename from services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java index 953f3b5..6d4e5cc 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.longline; +package fr.ird.observe.services.topia.service.longline; /* * #%L @@ -38,7 +38,8 @@ import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; import fr.ird.observe.services.dto.referential.longline.HookSizeDto; import fr.ird.observe.services.dto.referential.longline.HookTypeDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; -import fr.ird.observe.services.service.AbstractServiceTopiaTest; +import fr.ird.observe.services.service.longline.SetLonglineDetailCompositionService; +import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; @@ -59,7 +60,7 @@ public class SetLonglineDetailCompositionServiceTopiaTest extends AbstractServic @Before public void setUp() throws Exception { - service = dataSourceResource.newService(SetLonglineDetailCompositionService.class); + service = topiaTestMethodResource.newService(SetLonglineDetailCompositionService.class); } @@ -144,7 +145,7 @@ public class SetLonglineDetailCompositionServiceTopiaTest extends AbstractServic service.save(compositionDto); - SetLongline setLongline = dataSourceResource.findById(SetLongline.class, ObserveFixtures.SET_LONGLINE_ID_1); + SetLongline setLongline = topiaTestMethodResource.findById(SetLongline.class, ObserveFixtures.SET_LONGLINE_ID_1); Section section = setLongline.getSectionByTopiaId(sectionDto.getId()); Assert.assertEquals(sectionDto.getSettingIdentifier(), section.getSettingIdentifier()); diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopiaTest.java similarity index 88% rename from services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopiaTest.java index ebef539..ba314fe 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopiaTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -24,7 +24,8 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.service.AbstractServiceTopiaTest; +import fr.ird.observe.services.service.seine.RouteService; +import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.DatabaseNameConfiguration; @@ -44,7 +45,7 @@ public class RouteServiceTopiaTest extends AbstractServiceTopiaTest { @Before public void setUp() throws Exception { - service = dataSourceResource.newService(RouteService.class); + service = topiaTestMethodResource.newService(RouteService.class); } diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopiaTest.java similarity index 90% rename from services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopiaTest.java index 4c85ec0..d8fb85d 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopiaTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -24,7 +24,8 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.TargetSampleDto; -import fr.ird.observe.services.service.AbstractServiceTopiaTest; +import fr.ird.observe.services.service.seine.TargetSampleService; +import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; @@ -44,7 +45,7 @@ public class TargetSampleServiceTopiaTest extends AbstractServiceTopiaTest { @Before public void setUp() throws Exception { - service = dataSourceResource.newService(TargetSampleService.class); + service = topiaTestMethodResource.newService(TargetSampleService.class); } diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopiaTest.java similarity index 93% rename from services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopiaTest.java index 36f74ec..65d1712 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineGearUseServiceTopiaTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -30,7 +30,8 @@ import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; -import fr.ird.observe.services.service.AbstractServiceTopiaTest; +import fr.ird.observe.services.service.seine.TripSeineGearUseService; +import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; @@ -56,16 +57,16 @@ public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest { @Before public void setUp() throws Exception { - service = dataSourceResource.newService(TripSeineGearUseService.class); + service = topiaTestMethodResource.newService(TripSeineGearUseService.class); - referentialService = dataSourceResource.newService(ReferentialService.class); + referentialService = topiaTestMethodResource.newService(ReferentialService.class); } @Test public void loadToEditTest() { - TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); + TripSeine tripSeine = topiaTestMethodResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); Form<TripSeineGearUseDto> form = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); @@ -143,7 +144,7 @@ public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest { service.save(tripSeineGearUseDto); - GearUseFeaturesSeine gearUseFeaturesSeine = dataSourceResource.findById(GearUseFeaturesSeine.class, GEAR_USE_FEATURES_SEINE_ID); + GearUseFeaturesSeine gearUseFeaturesSeine = topiaTestMethodResource.findById(GearUseFeaturesSeine.class, GEAR_USE_FEATURES_SEINE_ID); Assert.assertEquals(gearUseFeaturesSeineDto.getId(), gearUseFeaturesSeine.getTopiaId()); assertReferenceDtoEqualsEntity(gearUseFeaturesSeineDto.getGear(), gearUseFeaturesSeine.getGear()); diff --git a/services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopiaTest.java similarity index 92% rename from services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java rename to services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopiaTest.java index f61f861..228d691 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopiaTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.seine; +package fr.ird.observe.services.topia.service.seine; /* * #%L @@ -23,7 +23,8 @@ package fr.ird.observe.services.service.seine; */ import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.ObserveServiceContextTopiaTaiste; +import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.topia.ObserveServiceContextTopiaTaiste; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; @@ -33,7 +34,7 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.AbstractServiceTopiaTest; +import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.ConcurrentModificationException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; @@ -64,9 +65,9 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { @Before public void setUp() throws Exception { - service = dataSourceResource.newService(TripSeineService.class); + service = topiaTestMethodResource.newService(TripSeineService.class); - referentialService = dataSourceResource.newService(ReferentialService.class); + referentialService = topiaTestMethodResource.newService(ReferentialService.class); } @@ -80,7 +81,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(3, stubDtos.sizeReference()); DataReference<TripSeineDto> tripSeineStubDto = stubDtos.getReferenceByPosition(0); - TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); + TripSeine tripSeine = topiaTestMethodResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); @@ -89,7 +90,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); tripSeineStubDto = stubDtos.getReferenceByPosition(1); - tripSeine = dataSourceResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_2); + tripSeine = topiaTestMethodResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_2); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); @@ -98,7 +99,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); tripSeineStubDto = stubDtos.getReferenceByPosition(2); - tripSeine = dataSourceResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_3); + tripSeine = topiaTestMethodResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_3); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); @@ -111,7 +112,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void loadFormTest() throws Exception { - TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); + TripSeine tripSeine = topiaTestMethodResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); Form<TripSeineDto> form = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); Assert.assertNotNull(form); @@ -211,7 +212,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { SaveResultDto saveResult = service.save(form.getObject()); - TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, saveResult.getId()); + TripSeine tripSeine = topiaTestMethodResource.findById(TripSeine.class, saveResult.getId()); assertReferenceDtoEqualsEntity(tripSeineDto.getCaptain(), tripSeine.getCaptain()); assertReferenceDtoEqualsEntity(tripSeineDto.getObserver(), tripSeine.getObserver()); @@ -264,7 +265,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { service.save(form.getObject()); - TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); + TripSeine tripSeine = topiaTestMethodResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); assertReferenceDtoEqualsEntity(tripSeineDto.getCaptain(), tripSeine.getCaptain()); assertReferenceDtoEqualsEntity(tripSeineDto.getObserver(), tripSeine.getObserver()); @@ -327,7 +328,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(2, tripSeineByProgram.sizeReference()); - Assert.assertFalse(dataSourceResource.exists(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1)); + Assert.assertFalse(topiaTestMethodResource.exists(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1)); Date lastUpdateAfter = getLastUpdateDate(TripSeine.class); Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.