This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 37c7478535d304721925f811438db1c2c2199b8a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Aug 24 14:03:10 2015 +0200 TripSeineServiceTopia : implantation des tests de sauvegarde. Ne pas regenérer la base de test à chacque début de test (uniquement si des modifications y sont apportées) (refs #7458). --- .../java/fr/ird/observe/services/dto/FormDto.java | 10 ++ .../ird/observe/services/dto/ReferenceSetDtos.java | 13 ++ .../service/seine/TripSeineServiceTopia.java | 15 ++- .../services/ApplicationContextResource.java | 25 ++++ .../ird/observe/services/DataSourceResource.java | 34 +++-- .../service/DataSourceServiceTopiaTest.java | 11 +- .../service/ReferentialServiceTopiaTest.java | 11 +- .../service/seine/TripSeineServiceTopiaTest.java | 137 +++++++++++++++++++-- .../resources/db/4.0.1/dataForTestLongline.sql.gz | Bin 0 -> 1520436 bytes .../resources/db/4.0.1/dataForTestSeine.sql.gz | Bin 0 -> 430098 bytes .../src/main/resources/db/4.0.1/test.sql.gz | Bin 5044065 -> 0 bytes 11 files changed, 230 insertions(+), 26 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java index 93be919..d2b7b58 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.dto; import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; public class FormDto<R extends IdDto> extends AbstractFormDto { @@ -26,4 +27,13 @@ public class FormDto<R extends IdDto> extends AbstractFormDto { public Class<R> getType() { return type; } + + public <D extends IdDto> ReferenceSetDto<D> getReferenceSetDto(Class<D> type) { + + ReferenceSetDto referenceSetDto = Iterables.find(getLabels(), ReferenceSetDtos.newTypePredicate(type)); + + return referenceSetDto; + + } + } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java index 86ae4ae..b8ddb17 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java @@ -1,8 +1,10 @@ package fr.ird.observe.services.dto; import com.google.common.base.Function; +import com.google.common.base.Predicate; import java.util.LinkedHashSet; +import java.util.Objects; public class ReferenceSetDtos extends AbstractReferenceSetDtos { @@ -37,5 +39,16 @@ public class ReferenceSetDtos extends AbstractReferenceSetDtos { } + public static <D extends IdDto, BeanType extends ReferenceSetDto> Predicate<BeanType> newTypePredicate(final Class<D> type) { + return new Predicate<BeanType>() { + + @Override + public boolean apply(BeanType input) { + return Objects.equals(type, input.getType()); + } + }; + + } + } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index 2d3c553..a3476d7 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -60,6 +60,13 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe FormDto<TripSeineDto> form = entityToEditFormDto(TripSeineDto.class, TripSeine.class, tripSeine); + TripSeineDto tripSeineDto = form.getForm(); + + if (tripSeineDto.getEndDate() == null) { + Date date = DateUtil.getEndOfDay(now()); + tripSeineDto.setEndDate(date); + } + return form; } @@ -70,15 +77,13 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe Program program = loadEntity(ProgramDto.class, Program.class, programId); - TripSeine preCreated = getDao().newInstance(); - Date date = DateUtil.getDay(now()); - preCreated.setStartDate(date); + tripSeine.setStartDate(date); - preCreated.setEndDate(date); + tripSeine.setEndDate(date); - preCreated.setProgram(program); + tripSeine.setProgram(program); FormDto<TripSeineDto> form = entityToEditFormDto(TripSeineDto.class, TripSeine.class, tripSeine); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java index 7a7a393..4b13c45 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java @@ -11,6 +11,7 @@ import org.junit.runner.Description; import org.junit.runners.model.Statement; import org.nuiton.util.version.Version; +import java.io.File; import java.nio.file.Path; /** @@ -27,6 +28,10 @@ public class ApplicationContextResource implements TestRule { protected final ObserveServiceFactoryTopia serviceFactory; + private File testDirectory; + + boolean needToReloadDataBase; + public ApplicationContextResource() { this.serviceApplicationContext = new ObserveServiceApplicationContext(); this.serviceFactory = new ObserveServiceFactoryTopia() { @@ -42,6 +47,7 @@ public class ApplicationContextResource implements TestRule { return serviceContext; } }; + needToReloadDataBase = true; } public String getScriptPath(String classifier, Version databaseVersion) { @@ -76,6 +82,14 @@ public class ApplicationContextResource implements TestRule { }; } + public boolean isNeedToReloadDataBase() { + return needToReloadDataBase; + } + + public void setNeedToReloadDataBase(boolean needToReloadDataBase) { + this.needToReloadDataBase = needToReloadDataBase; + } + protected void before(Description description) { Class<?> testClass = description.getTestClass(); @@ -99,5 +113,16 @@ public class ApplicationContextResource implements TestRule { log.debug("Ends " + testClass.getName()); } + closeServiceFactory(); + setTemporaryDirectoryRoot(null); + + } + + public File getTestDirectory() { + return testDirectory; + } + + public void setTestDirectory(File testDirectory) { + this.testDirectory = testDirectory; } } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java index e15f952..0a9b351 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java @@ -26,6 +26,7 @@ import java.io.InputStream; import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; +import java.util.List; /** * Created on 18/08/15. @@ -41,10 +42,11 @@ public class DataSourceResource implements TestRule { protected ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration; - private File testDirectory; + protected List<String> testNamesChangeDataBase; - public DataSourceResource(ApplicationContextResource applicationContextResource) { + public DataSourceResource(ApplicationContextResource applicationContextResource, List<String> testNamesChangeDataBase) { this.applicationContextResource = applicationContextResource; + this.testNamesChangeDataBase = testNamesChangeDataBase; } public ObserveDataSourceConfigurationTopiaH2 getDataSourceConfiguration() { @@ -118,10 +120,18 @@ public class DataSourceResource implements TestRule { log.debug("Starts " + testClass.getName() + "::" + methodName); } - testDirectory = TestHelper.newFile(methodName); - Path temporaryDirectoryRoot = new File(testDirectory, "tmp").toPath(); - Files.createDirectories(temporaryDirectoryRoot); - applicationContextResource.setTemporaryDirectoryRoot(temporaryDirectoryRoot); + if (applicationContextResource.isNeedToReloadDataBase()) { + + File testDirectory = TestHelper.newFile(methodName); + applicationContextResource.setTestDirectory(testDirectory); + + Path temporaryDirectoryRoot = new File(testDirectory, "tmp").toPath(); + + Files.createDirectories(temporaryDirectoryRoot); + + applicationContextResource.setTemporaryDirectoryRoot(temporaryDirectoryRoot); + + } dataSourceConfiguration = createDataSourceConfigurationH2(testClass, methodName); @@ -131,7 +141,7 @@ public class DataSourceResource implements TestRule { ObserveDataSourceConfigurationTopiaH2 configurationTopiaH2 = new ObserveDataSourceConfigurationTopiaH2(); - File localDbFile = new File(testDirectory, "localdb"); + File localDbFile = new File(applicationContextResource.getTestDirectory(), "localdb"); if (log.isInfoEnabled()) { log.info("db directory: " + localDbFile); @@ -154,8 +164,14 @@ public class DataSourceResource implements TestRule { log.debug("Ends " + testClass.getName() + "::" + methodName); } - applicationContextResource.closeServiceFactory(); - applicationContextResource.setTemporaryDirectoryRoot(null); + applicationContextResource.setNeedToReloadDataBase(testNamesChangeDataBase.contains(methodName)); + + if (applicationContextResource.isNeedToReloadDataBase()) { + + applicationContextResource.closeServiceFactory(); + applicationContextResource.setTemporaryDirectoryRoot(null); + + } } } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java index 82b61b5..377e976 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java @@ -1,5 +1,6 @@ package fr.ird.observe.services.service; +import com.google.common.collect.ImmutableList; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.migration.H2DataSourceMigration; @@ -28,8 +29,16 @@ public class DataSourceServiceTopiaTest { @ClassRule public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(); + public static final ImmutableList<String> TEST_NAMES_CHANGE_DATA_BASE = ImmutableList.of( + "testOpenNotExistingDatabase", + "testOpen", + "testCreateEmptyDataSource", + "testCreateDataSourceFromImportDatabase", + "testCreateDataSourceFromImportReferential", + "testCreateDataSourceFromImportReferentialAndData"); + @Rule - public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource); + public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource, TEST_NAMES_CHANGE_DATA_BASE); protected DataSourceService service; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java index 20128ae..e200303 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java @@ -1,5 +1,6 @@ package fr.ird.observe.services.service; +import com.google.common.collect.ImmutableList; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.referentiel.LengthWeightParameter; @@ -38,8 +39,10 @@ public class ReferentialServiceTopiaTest { @ClassRule public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(); + public static final ImmutableList<String> TEST_NAMES_CHANGE_DATA_BASE = ImmutableList.of("testDelete"); + @Rule - public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource); + public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource, TEST_NAMES_CHANGE_DATA_BASE); protected ReferentialService service; @@ -47,8 +50,10 @@ public class ReferentialServiceTopiaTest { public void setUp() throws Exception { // Create database from script - String scriptPath = applicationContextResource.getScriptPath("referentiel", H2DataSourceMigration.V_4_0_1); - dataSourceResource.createDataSourceFromScript(scriptPath); + if (applicationContextResource.isNeedToReloadDataBase()) { + String scriptPath = applicationContextResource.getScriptPath("referentiel", H2DataSourceMigration.V_4_0_1); + dataSourceResource.createDataSourceFromScript(scriptPath); + } ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index 46b379a..760bc99 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -1,10 +1,12 @@ package fr.ird.observe.services.service.seine; import com.google.common.collect.Collections2; +import com.google.common.collect.ImmutableList; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ApplicationContextResource; import fr.ird.observe.services.DataSourceResource; +import fr.ird.observe.services.ObserveServiceContextTopiaTaiste; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; @@ -13,6 +15,7 @@ import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.PersonDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.ReferentialService; @@ -22,6 +25,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.DateUtil; import java.util.Collection; @@ -33,12 +37,14 @@ public class TripSeineServiceTopiaTest { @ClassRule public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(); - public static final String TRIP_SEINE_ID = "fr.ird.observe.entities.seine.TripSeine#1412004815781#0.2859887799862254"; + 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"; + public static final ImmutableList<String> TEST_NAMES_CHANGE_DATA_BASE = ImmutableList.of("saveCreateTest", "saveUpdateTest"); + @Rule - public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource); + public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource, TEST_NAMES_CHANGE_DATA_BASE); protected TripSeineService service; @@ -47,9 +53,11 @@ public class TripSeineServiceTopiaTest { @Before public void setUp() throws Exception { - // Create database from script - String scriptPath = applicationContextResource.getScriptPath("test", H2DataSourceMigration.V_4_0_1); - dataSourceResource.createDataSourceFromScript(scriptPath); + if (applicationContextResource.isNeedToReloadDataBase()) { + // Create database from script + String scriptPath = applicationContextResource.getScriptPath("dataForTestSeine", H2DataSourceMigration.V_4_0_1); + dataSourceResource.createDataSourceFromScript(scriptPath); + } ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); @@ -69,7 +77,7 @@ public class TripSeineServiceTopiaTest { //FIXME A mieux tester, j'ai déjà fait des corrections, mais il reste des choses à revoir //FIXME Mais surtout je pense qu'il faut un autre objet qui reflete exactement le besoin //FIXME L'idée c'est de ne pas avoir des objets creux, ceux-là le sont bien... - Assert.assertEquals(13, tripSeineDtos.sizeReference()); + Assert.assertEquals(3, tripSeineDtos.sizeReference()); } @@ -168,8 +176,8 @@ public class TripSeineServiceTopiaTest { Assert.assertNull(tripSeineDto.getDepartureHarbour()); Assert.assertNull(tripSeineDto.getLandingHarbour()); Assert.assertNull(tripSeineDto.getErsId()); -// Assert.assertEquals(DateUtil.getDay(ObserveServiceContextTopiaTaiste.DATE), tripSeineDto.getStartDate()); -// Assert.assertEquals(DateUtil.getDay(ObserveServiceContextTopiaTaiste.DATE), tripSeineDto.getEndDate()); + Assert.assertEquals(DateUtil.getDay(ObserveServiceContextTopiaTaiste.DATE), tripSeineDto.getStartDate()); + Assert.assertEquals(DateUtil.getDay(ObserveServiceContextTopiaTaiste.DATE), tripSeineDto.getEndDate()); Assert.assertNull(tripSeineDto.getFormsUrl()); Assert.assertNull(tripSeineDto.getReportsUrl()); Assert.assertNull(tripSeineDto.getComment()); @@ -189,9 +197,113 @@ public class TripSeineServiceTopiaTest { } + } + + @Test + public void saveCreateTest() { + + FormDto<TripSeineDto> formDto = service.preCreate(PROGRAM_ID); + + TripSeineDto tripSeineDto = formDto.getForm(); + + ReferenceSetDto<PersonDto> personRefs = formDto.getReferenceSetDto(PersonDto.class); + ReferenceSetDto<VesselDto> vesselRefs = formDto.getReferenceSetDto(VesselDto.class); + ReferenceSetDto<OceanDto> oceanRefs = formDto.getReferenceSetDto(OceanDto.class); + ReferenceSetDto<HarbourDto> harbourRefs = formDto.getReferenceSetDto(HarbourDto.class); + + tripSeineDto.setCaptain((ReferentialReferenceDto<PersonDto>) personRefs.getReference(0)); + tripSeineDto.setObserver((ReferentialReferenceDto<PersonDto>) personRefs.getReference(1)); + tripSeineDto.setDataEntryOperator((ReferentialReferenceDto<PersonDto>) personRefs.getReference(2)); + + tripSeineDto.setVessel((ReferentialReferenceDto<VesselDto>) vesselRefs.getReference(0)); + + tripSeineDto.setOcean((ReferentialReferenceDto<OceanDto>) oceanRefs.getReference(0)); + + tripSeineDto.setDepartureHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(0)); + tripSeineDto.setLandingHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(1)); + + tripSeineDto.setErsId("ersid"); + + tripSeineDto.setStartDate(DateUtil.createDate(24, 8, 2015)); + tripSeineDto.setEndDate(DateUtil.createDate(24, 9, 2015)); + + tripSeineDto.setFormsUrl("http://une.url.com/formulaire"); + tripSeineDto.setReportsUrl("http://une.url.com/rapport"); + + tripSeineDto.setComment("Un commentaire"); + + String tripSeineId = service.save(formDto); + + TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, tripSeineId); + + assertReferenceDtoEqualsEntity(tripSeineDto.getCaptain(), tripSeine.getCaptain()); + assertReferenceDtoEqualsEntity(tripSeineDto.getObserver(), tripSeine.getObserver()); + assertReferenceDtoEqualsEntity(tripSeineDto.getDataEntryOperator(), tripSeine.getDataEntryOperator()); + assertReferenceDtoEqualsEntity(tripSeineDto.getVessel(), tripSeine.getVessel()); + assertReferenceDtoEqualsEntity(tripSeineDto.getOcean(), tripSeine.getOcean()); + assertReferenceDtoEqualsEntity(tripSeineDto.getDepartureHarbour(), tripSeine.getDepartureHarbour()); + assertReferenceDtoEqualsEntity(tripSeineDto.getLandingHarbour(), tripSeine.getLandingHarbour()); + Assert.assertEquals(tripSeineDto.getErsId(), tripSeine.getErsId()); + Assert.assertEquals(tripSeineDto.getStartDate(), tripSeine.getStartDate()); + Assert.assertEquals(tripSeineDto.getEndDate(), tripSeine.getEndDate()); + Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeine.getFormsUrl()); + Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeine.getReportsUrl()); + Assert.assertEquals(tripSeineDto.getComment(), tripSeine.getComment()); } + + + @Test + public void saveUpdateTest() { + + FormDto<TripSeineDto> formDto = service.loadToEdit(TRIP_SEINE_ID); + + TripSeineDto tripSeineDto = formDto.getForm(); + + ReferenceSetDto<PersonDto> personRefs = formDto.getReferenceSetDto(PersonDto.class); + ReferenceSetDto<OceanDto> oceanRefs = formDto.getReferenceSetDto(OceanDto.class); + ReferenceSetDto<HarbourDto> harbourRefs = formDto.getReferenceSetDto(HarbourDto.class); + + tripSeineDto.setCaptain((ReferentialReferenceDto<PersonDto>) personRefs.getReference(0)); + tripSeineDto.setDataEntryOperator((ReferentialReferenceDto<PersonDto>) personRefs.getReference(2)); + + tripSeineDto.setOcean((ReferentialReferenceDto<OceanDto>) oceanRefs.getReference(0)); + + tripSeineDto.setDepartureHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(0)); + tripSeineDto.setLandingHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(1)); + + tripSeineDto.setErsId("ersid"); + + tripSeineDto.setStartDate(DateUtil.createDate(24, 8, 2015)); + tripSeineDto.setEndDate(DateUtil.createDate(24, 9, 2015)); + + tripSeineDto.setFormsUrl("http://une.url.com/formulaire"); + tripSeineDto.setReportsUrl("http://une.url.com/rapport"); + + tripSeineDto.setComment("Un commentaire"); + + service.save(formDto); + + TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID); + + assertReferenceDtoEqualsEntity(tripSeineDto.getCaptain(), tripSeine.getCaptain()); + assertReferenceDtoEqualsEntity(tripSeineDto.getObserver(), tripSeine.getObserver()); + assertReferenceDtoEqualsEntity(tripSeineDto.getDataEntryOperator(), tripSeine.getDataEntryOperator()); + assertReferenceDtoEqualsEntity(tripSeineDto.getVessel(), tripSeine.getVessel()); + assertReferenceDtoEqualsEntity(tripSeineDto.getOcean(), tripSeine.getOcean()); + assertReferenceDtoEqualsEntity(tripSeineDto.getDepartureHarbour(), tripSeine.getDepartureHarbour()); + assertReferenceDtoEqualsEntity(tripSeineDto.getLandingHarbour(), tripSeine.getLandingHarbour()); + Assert.assertEquals(tripSeineDto.getErsId(), tripSeine.getErsId()); + Assert.assertEquals(tripSeineDto.getStartDate(), tripSeine.getStartDate()); + Assert.assertEquals(tripSeineDto.getEndDate(), tripSeine.getEndDate()); + Assert.assertEquals(tripSeineDto.getFormsUrl(), tripSeine.getFormsUrl()); + Assert.assertEquals(tripSeineDto.getReportsUrl(), tripSeine.getReportsUrl()); + Assert.assertEquals(tripSeineDto.getComment(), tripSeine.getComment()); + + } + + protected void assertEntityEqualsReferenceDto(TopiaEntity entity, ReferenceDto referenceDto) { if (entity == null) { Assert.assertNull(referenceDto); @@ -201,5 +313,14 @@ public class TripSeineServiceTopiaTest { } + protected void assertReferenceDtoEqualsEntity(ReferenceDto referenceDto, TopiaEntity entity) { + if (referenceDto == null) { + Assert.assertNull(entity); + } else { + Assert.assertEquals(referenceDto.getId(), entity.getTopiaId()); + } + + } + } diff --git a/observe-test-data/src/main/resources/db/4.0.1/dataForTestLongline.sql.gz b/observe-test-data/src/main/resources/db/4.0.1/dataForTestLongline.sql.gz new file mode 100644 index 0000000..7aae6a5 Binary files /dev/null and b/observe-test-data/src/main/resources/db/4.0.1/dataForTestLongline.sql.gz differ diff --git a/observe-test-data/src/main/resources/db/4.0.1/dataForTestSeine.sql.gz b/observe-test-data/src/main/resources/db/4.0.1/dataForTestSeine.sql.gz new file mode 100644 index 0000000..f61fb10 Binary files /dev/null and b/observe-test-data/src/main/resources/db/4.0.1/dataForTestSeine.sql.gz differ diff --git a/observe-test-data/src/main/resources/db/4.0.1/test.sql.gz b/observe-test-data/src/main/resources/db/4.0.1/test.sql.gz deleted file mode 100644 index a094b0a..0000000 Binary files a/observe-test-data/src/main/resources/db/4.0.1/test.sql.gz and /dev/null differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 0e303154f3d596f9aa06d67b988bbab539326f00 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Aug 25 08:40:32 2015 +0200 ajout d'un DTO stub pour les tripSeine et modification des service + ajout du test du delete (refs #7458). --- .../entities/constants/ReferenceLocale.java | 35 ++++++++++ .../services/service/seine/TripSeineService.java | 6 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 54397 -> 55301 bytes .../ird/observe/services/ObserveServiceTopia.java | 2 +- .../services/dto/ObserveDtosInitializer.java | 5 ++ .../service/seine/TripSeineServiceTopia.java | 25 ++++--- .../ird/observe/services/DataSourceResource.java | 12 ++++ .../services/builder/DtoToEntityBuilderTest.java | 3 +- .../service/seine/TripSeineServiceTopiaTest.java | 72 +++++++++++++++++---- 9 files changed, 132 insertions(+), 28 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java index b3f053f..6c55be8 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java @@ -123,4 +123,39 @@ public enum ReferenceLocale { } } + + public <E extends I18nReferenceEntity> String getLabel(E i18nEntity) { + + String result = null; + + switch (ordinal() + 1) { + case 1: + result = i18nEntity.getLabel1(); + break; + case 2: + result = i18nEntity.getLabel1(); + break; + case 3: + result = i18nEntity.getLabel1(); + break; + case 4: + result = i18nEntity.getLabel1(); + break; + case 5: + result = i18nEntity.getLabel1(); + break; + case 6: + result = i18nEntity.getLabel1(); + break; + case 7: + result = i18nEntity.getLabel1(); + break; + case 8: + result = i18nEntity.getLabel1(); + break; + } + + return result; + + } } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java index 6920d78..7de268c 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java @@ -2,16 +2,18 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.spi.Write; +import java.util.List; + /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface TripSeineService extends ObserveService { - ReferenceSetDto<TripSeineDto> getTripSeineByProgram(String programId); + List<TripSeineStubDto> getTripSeineByProgram(String programId); FormDto<TripSeineDto> loadToRead(String tripSeineId); diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index 8e9c65e..e36346a 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index 464a606..404a192 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -126,7 +126,7 @@ public class ObserveServiceTopia implements ObserveService { return entity; } - protected <D extends ReferentialDto, E extends TopiaEntity> void deleteEntity(Class<D> dtoType, Class<E> entityType, Iterable<String> ids) { + protected <D extends IdDto, E extends TopiaEntity> void deleteEntity(Class<D> dtoType, Class<E> entityType, Iterable<String> ids) { ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); TopiaDao<E> dao = persistenceContext.getDao(entityType); for (String id : ids) { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java index e39ad63..f1b1019 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java @@ -1522,6 +1522,11 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { TripSeineDto.PROPERTY_VESSEL); } + @Override + public void initTripSeineStubDto() { + // la logique de copie est à ecrire directement dans le service + } + protected <R extends IdDto, E extends TopiaEntity> void registerDtoType(Class<R> dtoType, Class<E> entityType) { Class<? extends TopiaEntity> entityImplementationType = ObserveEntityEnum.valueOf(entityType).getImplementation(); DTO_TO_ENTITY_TYPE_BUILDER.put(dtoType, entityType); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index a3476d7..8b74739 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -1,17 +1,18 @@ package fr.ird.observe.services.service.seine; +import com.google.common.collect.Lists; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.Program; 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.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineStubDto; import org.nuiton.util.DateUtil; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -25,22 +26,28 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public ReferenceSetDto<TripSeineDto> getTripSeineByProgram(String programId) { + public List<TripSeineStubDto> getTripSeineByProgram(String programId) { ReferenceLocale referenceLocale = getReferenceLocale(); List<TripSeine> tripSeines = getDao().findAllStubByProgramId(programId, referenceLocale); - ReferenceSetDto<TripSeineDto> result = new ReferenceSetDto<>(TripSeineDto.class); + List<TripSeineStubDto> stubs = Lists.newLinkedList(); for (TripSeine tripSeine : tripSeines) { - ReferenceDto<TripSeineDto> referenceDto = entityToReferenceDto(TripSeineDto.class, tripSeine); - result.addReference(referenceDto); + TripSeineStubDto stub = new TripSeineStubDto(); + stub.setId(tripSeine.getTopiaId()); + stub.setStartDate(tripSeine.getStartDate()); + stub.setEndDate(tripSeine.getEndDate()); + stub.setVesselLabel(referenceLocale.getLabel(tripSeine.getVessel())); + stub.setObserverLabel(tripSeine.getObserverLabel()); + + stubs.add(stub); } - return result; + return stubs; } @Override @@ -103,9 +110,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe @Override public void delete(String tripSeineId) { - TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); - - getDao().delete(tripSeine); + deleteEntity(TripSeineDto.class, TripSeine.class, Collections.singleton(tripSeineId)); } } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java index 0a9b351..30e774b 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java @@ -96,6 +96,18 @@ public class DataSourceResource implements TestRule { } + 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; + + } + @Override public Statement apply(final Statement base, final Description description) { return new Statement() { diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/builder/DtoToEntityBuilderTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/builder/DtoToEntityBuilderTest.java index 6dbf900..031cce4 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/builder/DtoToEntityBuilderTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/builder/DtoToEntityBuilderTest.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.builder; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.referentiel.Organism; import fr.ird.observe.entities.referentiel.Program; @@ -159,7 +160,7 @@ public class DtoToEntityBuilderTest { Assert.assertEquals(featuresDto.getUsedInTrip(), features.getUsedInTrip()); Assert.assertEquals(featuresDto.sizeGearUseFeaturesMeasurement(), features.sizeGearUseFeaturesMeasurement()); - GearUseFeaturesMeasurementSeine measurement = features.getGearUseFeaturesMeasurement().get(0); + GearUseFeaturesMeasurementSeine measurement = Iterables.get(features.getGearUseFeaturesMeasurement(), 0); Assert.assertEquals(measurementDto.getId(), measurement.getTopiaId()); Assert.assertEquals(measurementDto.getMeasurementValue(), measurement.getMeasurementValue()); Assert.assertNotNull(measurement.getGearCaracteristic()); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index 760bc99..657422e 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -18,6 +18,7 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.ReferentialService; import org.junit.Assert; import org.junit.Before; @@ -28,6 +29,7 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.DateUtil; import java.util.Collection; +import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -37,11 +39,16 @@ public class TripSeineServiceTopiaTest { @ClassRule public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(); - public static final String TRIP_SEINE_ID = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; + 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#1360156698296#0.6097793743126777"; + public static final String TRIP_SEINE_ID_3 = "fr.ird.observe.entities.seine.TripSeine#1359280279156#0.41771067982188215"; public static final String PROGRAM_ID = "fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234"; - public static final ImmutableList<String> TEST_NAMES_CHANGE_DATA_BASE = ImmutableList.of("saveCreateTest", "saveUpdateTest"); + public static final ImmutableList<String> TEST_NAMES_CHANGE_DATA_BASE = ImmutableList.of( + "saveCreateTest", + "saveUpdateTest", + "deleteTest"); @Rule public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource, TEST_NAMES_CHANGE_DATA_BASE); @@ -70,22 +77,46 @@ public class TripSeineServiceTopiaTest { @Test public void getTripSeineByProgramTest() { - ReferenceSetDto<TripSeineDto> tripSeineDtos = service.getTripSeineByProgram(PROGRAM_ID); + List<TripSeineStubDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); - Assert.assertNotNull(tripSeineDtos); + Assert.assertNotNull(stubDtos); - //FIXME A mieux tester, j'ai déjà fait des corrections, mais il reste des choses à revoir - //FIXME Mais surtout je pense qu'il faut un autre objet qui reflete exactement le besoin - //FIXME L'idée c'est de ne pas avoir des objets creux, ceux-là le sont bien... - Assert.assertEquals(3, tripSeineDtos.sizeReference()); + Assert.assertEquals(3, stubDtos.size()); + + TripSeineStubDto tripSeineStubDto = stubDtos.get(0); + TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); + + Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); + Assert.assertEquals(tripSeine.getStartDate(), tripSeineStubDto.getStartDate()); + Assert.assertEquals(tripSeine.getEndDate(), tripSeineStubDto.getEndDate()); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getVesselLabel()); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getObserverLabel()); + + tripSeineStubDto = stubDtos.get(1); + tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_2); + + Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); + Assert.assertEquals(tripSeine.getStartDate(), tripSeineStubDto.getStartDate()); + Assert.assertEquals(tripSeine.getEndDate(), tripSeineStubDto.getEndDate()); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getVesselLabel()); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getObserverLabel()); + + tripSeineStubDto = stubDtos.get(2); + tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_3); + + Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); + Assert.assertEquals(tripSeine.getStartDate(), tripSeineStubDto.getStartDate()); + Assert.assertEquals(tripSeine.getEndDate(), tripSeineStubDto.getEndDate()); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getVesselLabel()); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getObserverLabel()); } @Test public void loadToReadTest() throws Exception { - TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID); - FormDto<TripSeineDto> formDto = service.loadToRead(TRIP_SEINE_ID); + TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); + FormDto<TripSeineDto> formDto = service.loadToRead(TRIP_SEINE_ID_1); Assert.assertNotNull(formDto); TripSeineDto tripSeineDto = formDto.getForm(); @@ -124,8 +155,8 @@ public class TripSeineServiceTopiaTest { @Test public void loadToEditTest() throws Exception { - TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID); - FormDto<TripSeineDto> formDto = service.loadToEdit(TRIP_SEINE_ID); + TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); + FormDto<TripSeineDto> formDto = service.loadToEdit(TRIP_SEINE_ID_1); Assert.assertNotNull(formDto); TripSeineDto tripSeineDto = formDto.getForm(); @@ -257,7 +288,7 @@ public class TripSeineServiceTopiaTest { @Test public void saveUpdateTest() { - FormDto<TripSeineDto> formDto = service.loadToEdit(TRIP_SEINE_ID); + FormDto<TripSeineDto> formDto = service.loadToEdit(TRIP_SEINE_ID_1); TripSeineDto tripSeineDto = formDto.getForm(); @@ -285,7 +316,7 @@ public class TripSeineServiceTopiaTest { service.save(formDto); - TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID); + TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); assertReferenceDtoEqualsEntity(tripSeineDto.getCaptain(), tripSeine.getCaptain()); assertReferenceDtoEqualsEntity(tripSeineDto.getObserver(), tripSeine.getObserver()); @@ -303,6 +334,19 @@ public class TripSeineServiceTopiaTest { } + @Test + public void deleteTest() { + + service.delete(TRIP_SEINE_ID_1); + + List<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); + + Assert.assertEquals(2, tripSeineByProgram.size()); + + Assert.assertFalse(dataSourceResource.exists(TripSeine.class, TRIP_SEINE_ID_1)); + + } + protected void assertEntityEqualsReferenceDto(TopiaEntity entity, ReferenceDto referenceDto) { if (entity == null) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 547647069fd30b3f72ce7c0b50d9022c438854a7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 25 14:06:46 2015 +0200 Correction du type d'objet utilisé --- .../main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java | 2 +- .../main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java index 7e04f8d..0ac4103 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java @@ -3,7 +3,6 @@ package fr.ird.observe.services.builder; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeToken; -import fr.ird.observe.entities.Set; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ObserveDtoBinders; @@ -19,6 +18,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Map; +import java.util.Set; /** * Created on 19/08/15. diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java index b67145e..20e9ca9 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java @@ -4,7 +4,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.reflect.TypeToken; -import fr.ird.observe.entities.Set; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ObserveDtoBinders; import fr.ird.observe.services.dto.ReferenceDto; @@ -22,6 +21,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Map; +import java.util.Set; /** * Created on 18/08/15. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit ff17d2b0d4a86753a333bbc63a47528e7c3d793f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 25 14:16:00 2015 +0200 Suppression de la notion d'Openable sur les entitées Ajout des tag values orderBy dans le modèle d'entités Suppression des méthodes métier sur les entités (ce n'est plus à ce niveau qu'il faut coder cela) --- .../observe/entities/{Set.java => ObserveSet.java} | 2 +- .../fr/ird/observe/entities/OpenableEntities.java | 142 +++--- .../ird/observe/entities/OpenableEntityImpl.java | 35 -- .../main/java/fr/ird/observe/entities/Trip.java | 2 +- .../entities/longline/ActivityLonglineImpl.java | 24 +- .../longline/ActivityLonglineTopiaDao.java | 8 +- .../entities/longline/SectionWithTemplateImpl.java | 6 +- .../fr/ird/observe/entities/longline/Sections.java | 6 +- .../entities/longline/TripLonglineImpl.java | 142 +++--- .../entities/longline/TripLonglineTopiaDao.java | 12 +- .../migration/AbstractDataSourceMigration.java | 3 +- .../DataSourceMigrationForVersion_5_0.java | 54 +++ .../observe/entities/seine/ActivitySeineImpl.java | 23 +- .../entities/seine/ActivitySeineTopiaDao.java | 8 +- .../observe/entities/seine/FloatingObjectImpl.java | 3 +- .../fr/ird/observe/entities/seine/RouteImpl.java | 499 ++++++++++----------- .../ird/observe/entities/seine/RouteTopiaDao.java | 10 +- .../ird/observe/entities/seine/TripSeineImpl.java | 250 +++++------ .../observe/entities/seine/TripSeineTopiaDao.java | 12 +- .../main/resources/db/5.0/remove_open_field-H2.sql | 5 + .../main/resources/db/5.0/remove_open_field-PG.sql | 5 + observe-entities/src/main/xmi/observe-common.zargo | Bin 35500 -> 35191 bytes .../src/main/xmi/observe-longline.properties | 16 +- .../src/main/xmi/observe-longline.zargo | Bin 96372 -> 95691 bytes .../src/main/xmi/observe-seine.properties | 28 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 85804 -> 83247 bytes 26 files changed, 654 insertions(+), 641 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Set.java b/observe-entities/src/main/java/fr/ird/observe/entities/ObserveSet.java similarity index 95% rename from observe-entities/src/main/java/fr/ird/observe/entities/Set.java rename to observe-entities/src/main/java/fr/ird/observe/entities/ObserveSet.java index d43dd22..961497a 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Set.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/ObserveSet.java @@ -30,7 +30,7 @@ import org.nuiton.topia.persistence.TopiaEntity; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public interface Set extends TopiaEntity { +public interface ObserveSet extends TopiaEntity { void initCoordinates(); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntities.java b/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntities.java index b6ad4ed..6d2fc26 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntities.java @@ -22,12 +22,6 @@ package fr.ird.observe.entities; * #L% */ -import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.entities.seine.TripSeine; -import org.nuiton.topia.persistence.TopiaException; - -import java.util.Collection; - /** * Created on 8/25/14. * @@ -36,72 +30,72 @@ import java.util.Collection; */ public class OpenableEntities { - /** - * @param o l'objet dont on veut tester le type - * @return {@code true} si l'objet est non null et de type {@link - * OpenableEntity}, {@code false} autrement. - */ - public static boolean isOpenable(Object o) { - if (o == null) { - return false; - } - Class<?> c; - if (!Class.class.equals(o.getClass())) { - c = o.getClass(); - } else { - c = (Class<?>) o; - } - return OpenableEntity.class.isAssignableFrom(c); - } - - /** - * //FIXME Should use also a getOpenTrip for Longline model. - * @param ctxt le topia context - * @return la marée ouverte, ou <code>null</code> si pas de marée ouverte - * @if any pb - */ - public static TripSeine getOpenTrip(ObserveTopiaPersistenceContext ctxt) { - if (ctxt == null) { - throw new TopiaException("could not find a local topia" + - " context"); - } - TripSeine m = ctxt.getTripSeineDao().forOpenEquals(true).findAnyOrNull(); - return m; - } - - /** - * @param <O> le type des données de type {@link OpenableEntity} - * @param openableEntity l'openableEntity ou rechercher dans ses chils - * @return l'objet dans la liste qui est ouvert, ou <code>null</code> si - * aucun objet ouvert. - */ - public static <O extends OpenableEntity> O getOpenChild(OpenableEntity openableEntity) { - Collection<?> openables = openableEntity.getOpenableChilds(); - if (openables != null) { - for (Object o : openables) { - if (((OpenableEntity) o).isOpen()) { - return (O) o; - } - } - } - return null; - } - - /** - * @param <O> le type des données de type {@link OpenableEntity} - * @param openables une liste de données de type {@link OpenableEntity}. - * @return l'objet dans la liste qui est ouvert, ou <code>null</code> si - * aucun objet ouvert. - */ - public static <O extends OpenableEntity> O getOpenEntity( - Collection<O> openables) { - if (openables != null) { - for (O o : openables) { - if (o.isOpen()) { - return o; - } - } - } - return null; - } +// /** +// * @param o l'objet dont on veut tester le type +// * @return {@code true} si l'objet est non null et de type {@link +// * OpenableEntity}, {@code false} autrement. +// */ +// public static boolean isOpenable(Object o) { +// if (o == null) { +// return false; +// } +// Class<?> c; +// if (!Class.class.equals(o.getClass())) { +// c = o.getClass(); +// } else { +// c = (Class<?>) o; +// } +// return OpenableEntity.class.isAssignableFrom(c); +// } +// +// /** +// * //FIXME Should use also a getOpenTrip for Longline model. +// * @param ctxt le topia context +// * @return la marée ouverte, ou <code>null</code> si pas de marée ouverte +// * @if any pb +// */ +// public static TripSeine getOpenTrip(ObserveTopiaPersistenceContext ctxt) { +// if (ctxt == null) { +// throw new TopiaException("could not find a local topia" + +// " context"); +// } +// TripSeine m = ctxt.getTripSeineDao().forOpenEquals(true).findAnyOrNull(); +// return m; +// } +// +// /** +// * @param <O> le type des données de type {@link OpenableEntity} +// * @param openableEntity l'openableEntity ou rechercher dans ses chils +// * @return l'objet dans la liste qui est ouvert, ou <code>null</code> si +// * aucun objet ouvert. +// */ +// public static <O extends OpenableEntity> O getOpenChild(OpenableEntity openableEntity) { +// Collection<?> openables = openableEntity.getOpenableChilds(); +// if (openables != null) { +// for (Object o : openables) { +// if (((OpenableEntity) o).isOpen()) { +// return (O) o; +// } +// } +// } +// return null; +// } +// +// /** +// * @param <O> le type des données de type {@link OpenableEntity} +// * @param openables une liste de données de type {@link OpenableEntity}. +// * @return l'objet dans la liste qui est ouvert, ou <code>null</code> si +// * aucun objet ouvert. +// */ +// public static <O extends OpenableEntity> O getOpenEntity( +// Collection<O> openables) { +// if (openables != null) { +// for (O o : openables) { +// if (o.isOpen()) { +// return o; +// } +// } +// } +// return null; +// } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntityImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntityImpl.java deleted file mode 100644 index cbadb2d..0000000 --- a/observe-entities/src/main/java/fr/ird/observe/entities/OpenableEntityImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package fr.ird.observe.entities; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2014 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% - */ - -/** - * Created on 6/27/14. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 4.0 - */ -public abstract class OpenableEntityImpl extends OpenableEntityAbstract { - - private static final long serialVersionUID = 1L; - -} diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Trip.java b/observe-entities/src/main/java/fr/ird/observe/entities/Trip.java index dcb5fe9..0bcfbe6 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Trip.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Trip.java @@ -39,7 +39,7 @@ import java.util.Date; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public interface Trip extends OpenableEntity { +public interface Trip extends CommentableEntity { String PROPERTY_START_DATE = "startDate"; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java index 0fcfc73..247b8b0 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java @@ -24,13 +24,11 @@ package fr.ird.observe.entities.longline; import com.google.common.base.MoreObjects; import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.OpenableEntity; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.type.CoordinateHelper; import org.nuiton.util.DateUtil; import java.util.Date; -import java.util.List; import java.util.Objects; public class ActivityLonglineImpl extends ActivityLonglineAbstract { @@ -48,17 +46,17 @@ public class ActivityLonglineImpl extends ActivityLonglineAbstract { */ protected Integer quadrant; - @Override - public OpenableEntity getOpenChild() { - // sur une activity, pas d'enfant OpenableEntity - return null; - } - - @Override - public List getOpenableChilds() { - // sur une activity, pas d'enfant OpenableEntity - return null; - } +// @Override +// public OpenableEntity getOpenChild() { +// // sur une activity, pas d'enfant OpenableEntity +// return null; +// } +// +// @Override +// public List getOpenableChilds() { +// // sur une activity, pas d'enfant OpenableEntity +// return null; +// } @Override public Date getDate() { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java index eaf7a9f..9cee6fb 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java @@ -82,7 +82,7 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A String sql = "SELECT" + " a.topiaId," + " a.timestamp," + - " a.open," + +// " a.open," + " a.set," + " va." + referenceLocale.getColumnName() + " FROM observe_longline.activity a, observe_longline.vesselactivity va" + @@ -115,9 +115,9 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A ActivityLongline activity = new ActivityLonglineImpl(); activity.setTopiaId(set.getString(1)); activity.setTimeStamp(set.getTimestamp(2)); - activity.setOpen(set.getBoolean(3)); +// activity.setOpen(set.getBoolean(3)); - String setId = set.getString(4); + String setId = set.getString(3); if (setId != null) { SetLonglineImpl setLongline = new SetLonglineImpl(); @@ -126,7 +126,7 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A } VesselActivityLongline vesselActivity = new VesselActivityLonglineImpl(); - String label = set.getString(5); + String label = set.getString(4); referenceLocale.setLabel(label, vesselActivity); activity.setVesselActivityLongline(vesselActivity); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java index 3398e00..b41f52b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java @@ -24,7 +24,7 @@ package fr.ird.observe.entities.longline; import java.util.Collection; import java.util.Date; -import java.util.List; +import java.util.Set; /** * Created on 12/12/14. @@ -108,7 +108,7 @@ public class SectionWithTemplateImpl extends SectionImpl implements SectionWithT } @Override - public List<Basket> getBasket() { + public Set<Basket> getBasket() { return delegate.getBasket(); } @@ -183,7 +183,7 @@ public class SectionWithTemplateImpl extends SectionImpl implements SectionWithT } @Override - public void setBasket(List<Basket> basket) { + public void setBasket(Set<Basket> basket) { delegate.setBasket(basket); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/Sections.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/Sections.java index b9f58e8..2b452bd 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/Sections.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/Sections.java @@ -22,6 +22,8 @@ package fr.ird.observe.entities.longline; * #L% */ +import com.google.common.collect.Iterables; + /** * Created on 3/18/15. * @@ -33,14 +35,14 @@ public class Sections { public static Basket getFirstBasket(Section section) { - Basket basket = section.isBasketEmpty() ? null : section.getBasket().get(0); + Basket basket = section.isBasketEmpty() ? null : Iterables.getFirst(section.getBasket(), null); return basket; } public static Basket getLastBasket(Section section) { - Basket basket= section.isBasketEmpty() ? null : section.getBasket().get(section.sizeBasket() - 1); + Basket basket= section.isBasketEmpty() ? null : Iterables.getLast(section.getBasket()); return basket; } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java index 197155c..4edf361 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java @@ -22,10 +22,6 @@ package fr.ird.observe.entities.longline; * #L% */ -import fr.ird.observe.entities.OpenableEntities; - -import java.util.List; - /** * Created on 8/27/14. * @@ -51,76 +47,76 @@ public class TripLonglineImpl extends TripLonglineAbstract { return false; } - @Override - public ActivityLongline getOpenChild() { - return OpenableEntities.getOpenEntity(activityLongline); - } - - @Override - public List<ActivityLongline> getOpenableChilds() { - return activityLongline; - } - - @Override - public ActivityLongline getOpenActivity() { - return getOpenChild(); - } - - @Override - public ActivityLongline getPreviousActivity(ActivityLongline activity) { - - if (isActivityLonglineEmpty()) { - - // aucune route definie sur la maree - return null; - } - int index = this.activityLongline.indexOf(activity); - if (index < 1) { - - // la route donnee n'est pas definie sur cette maree ou est la - // premiere route - return null; - } - - // on retourne la route precedente - return this.activityLongline.get(index - 1); - - } - - @Override - public ActivityLongline getNextActivity(ActivityLongline activity) { - - if (isActivityLonglineEmpty()) { - - // aucune route definie sur la maree - return null; - } - int index = this.activityLongline.indexOf(activity); - if (index == -1 || index + 1 >= sizeActivityLongline()) { - - // la route n'est pas definie sur cette maree, ou c'est la - // dernière de la maree - return null; - } - - // on retourne la route suivante - return this.activityLongline.get(index + 1); - - } - - @Override - public ActivityLongline getLastActivity() { - - if (isActivityLonglineEmpty()) { - - // aucune route definie sur la maree - return null; - } - - // on retourne la dernière route de la maree - return getActivityLongline().get(sizeActivityLongline() - 1); +// @Override +// public ActivityLongline getOpenChild() { +// return OpenableEntities.getOpenEntity(activityLongline); +// } +// +// @Override +// public List<ActivityLongline> getOpenableChilds() { +// return activityLongline; +// } +// +// @Override +// public ActivityLongline getOpenActivity() { +// return getOpenChild(); +// } - } +// @Override +// public ActivityLongline getPreviousActivity(ActivityLongline activity) { +// +// if (isActivityLonglineEmpty()) { +// +// // aucune route definie sur la maree +// return null; +// } +// int index = this.activityLongline.indexOf(activity); +// if (index < 1) { +// +// // la route donnee n'est pas definie sur cette maree ou est la +// // premiere route +// return null; +// } +// +// // on retourne la route precedente +// return this.activityLongline.get(index - 1); +// +// } +// +// @Override +// public ActivityLongline getNextActivity(ActivityLongline activity) { +// +// if (isActivityLonglineEmpty()) { +// +// // aucune route definie sur la maree +// return null; +// } +// int index = this.activityLongline.indexOf(activity); +// if (index == -1 || index + 1 >= sizeActivityLongline()) { +// +// // la route n'est pas definie sur cette maree, ou c'est la +// // dernière de la maree +// return null; +// } +// +// // on retourne la route suivante +// return this.activityLongline.get(index + 1); +// +// } +// +// @Override +// public ActivityLongline getLastActivity() { +// +// if (isActivityLonglineEmpty()) { +// +// // aucune route definie sur la maree +// return null; +// } +// +// // on retourne la dernière route de la maree +// return getActivityLongline().get(sizeActivityLongline() - 1); +// +// } // @Override // public Date getEndDateTheorique() { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java index 4cbc12c..8b1a4f0 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java @@ -272,7 +272,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl " t.topiaId," + " t.startDate," + " t.endDate," + - " t.open," + +// " t.open," + " p.lastName," + " p.firstName," + " v.topiaId," + @@ -303,19 +303,19 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl trip.setTopiaId(set.getString(1)); trip.setStartDate(set.getTimestamp(2)); trip.setEndDate(set.getTimestamp(3)); - trip.setOpen(set.getBoolean(4)); +// trip.setOpen(set.getBoolean(4)); - String observerFirstName = set.getString(5); - String observerLastName = set.getString(6); + String observerFirstName = set.getString(4); + String observerLastName = set.getString(5); Person observer = new PersonImpl(); observer.setFirstName(observerFirstName); observer.setLastName(observerLastName); trip.setObserver(observer); Vessel vessel = new VesselImpl(); - String vesselId = set.getString(7); + String vesselId = set.getString(6); vessel.setTopiaId(vesselId); - String label = set.getString(8); + String label = set.getString(7); referenceLocale.setLabel(label, vessel); trip.setVessel(vessel); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java index 6294e0c..d711e3a 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java @@ -81,13 +81,14 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback public static final Version V_4_0_RC7 = Versions.valueOf("4.0-RC7"); public static final Version V_4_0 = Versions.valueOf("4.0"); + public static final Version V_5_0 = Versions.valueOf("5.0"); public static final Version V_4_0_1 = Versions.valueOf("4.0.1"); /** Les versions de mise à jour disponibles. */ public static final Version[] availableVersions = new Version[]{ V_3_1, V_3_5, V_3_7, V_3_8, V_3_9, V_3_10, V_3_11, V_3_12, V_3_14, V_3_15, V_3_16, V_4_0_RC2, - V_4_0_RC3, V_4_0_RC4, V_4_0_RC6, V_4_0_RC7, V_4_0, V_4_0_1 + V_4_0_RC3, V_4_0_RC4, V_4_0_RC6, V_4_0_RC7, V_4_0, V_4_0_1, V_5_0 }; protected ObserveTopiaApplicationContext topiaApplicationContext; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java new file mode 100644 index 0000000..f0a26ee --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java @@ -0,0 +1,54 @@ +package fr.ird.observe.entities.migration.versions; + +import fr.ird.observe.entities.migration.AbstractDataSourceMigration; +import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.entities.migration.H2DataSourceMigration; +import fr.ird.observe.entities.migration.PGDataSourceMigration; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; + +import java.util.List; + +/** + * Created on 25/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class DataSourceMigrationForVersion_5_0 extends AbstractObserveMigrationCallBack { + + public DataSourceMigrationForVersion_5_0(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_5_0, callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, + List<String> queries, + boolean showSql, + boolean showProgression) { + + // Suppression du champ open sur les entités anciennement du type Openable + // See https://forge.codelutin.com/issues/7469 + addScript("remove_open_field", queries); + + // Ajout des champs lastUpdate + // See https://forge.codelutin.com/issues/7470 + //TODO addScript("add_last_date_update", queries); + + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + } + +} diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java index 9241a8c..52b3790 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java @@ -23,7 +23,6 @@ package fr.ird.observe.entities.seine; import com.google.common.base.MoreObjects; import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.OpenableEntity; import fr.ird.observe.entities.constants.seine.SchoolType; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.util.Numbers; @@ -72,17 +71,17 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { */ protected Integer quadrant; - @Override - public OpenableEntity getOpenChild() { - // sur une activity, pas d'enfant OpenableEntity - return null; - } - - @Override - public List<?> getOpenableChilds() { - // sur une activity, pas d'enfant OpenableEntity - return null; - } +// @Override +// public OpenableEntity getOpenChild() { +// // sur une activity, pas d'enfant OpenableEntity +// return null; +// } +// +// @Override +// public List<?> getOpenableChilds() { +// // sur une activity, pas d'enfant OpenableEntity +// return null; +// } /** @return {@code true} si l'activite concerne un DCP */ @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java index a9bdcc8..6907674 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java @@ -82,7 +82,7 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit String sql = "SELECT" + " a.topiaId," + " a.time," + - " a.open," + +// " a.open," + " a.set," + " va." + referenceLocale.getColumnName() + " FROM observe_seine.activity a, observe_seine.vesselactivity va" + @@ -115,9 +115,9 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit ActivitySeine activity = new ActivitySeineImpl(); activity.setTopiaId(set.getString(1)); activity.setTime(set.getTime(2)); - activity.setOpen(set.getBoolean(3)); +// activity.setOpen(set.getBoolean(3)); - String setId = set.getString(4); + String setId = set.getString(3); if (setId != null) { SetSeine setSeine = new SetSeineImpl(); @@ -127,7 +127,7 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit } VesselActivitySeine vesselActivity = new VesselActivitySeineImpl(); - String label = set.getString(5); + String label = set.getString(4); referenceLocale.setLabel(label, vesselActivity); activity.setVesselActivitySeine(vesselActivity); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java index 57df67f..dcca89f 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.entities.seine; +import com.google.common.collect.Iterables; import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation; @@ -48,7 +49,7 @@ public class FloatingObjectImpl extends FloatingObjectAbstract { // - visite simple // - récuperation // - pose d'une nouvelle balise - TransmittingBuoy balise = transmittingBuoy.get(0); + TransmittingBuoy balise = Iterables.get(transmittingBuoy, 0); TransmittingBuoyOperation objectOperation = balise.getTransmittingBuoyOperation(); switch (Integer.valueOf(objectOperation.getCode())) { case 1: diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java index 7456fd3..aa6c125 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java @@ -55,254 +55,253 @@ public class RouteImpl extends RouteAbstract { super.setEndLogValue(endLogValue); } - @Override - public ActivitySeine getOpenChild() { - return OpenableEntities.getOpenEntity(activitySeine); - } - - @Override - public List<ActivitySeine> getOpenableChilds() { - return activitySeine; - } - - @Override - public ActivitySeine getOpenActivity() { - return getOpenChild(); - } - - /** - * @param activitySeine null - * @return l'activity precedente celle donnee ou null - */ - @Override - public ActivitySeine getPreviousActivity(ActivitySeine activitySeine) { - if (isActivitySeineEmpty()) { - - // pas d'activity definie sur la route - return null; - } - int index = this.activitySeine.indexOf(activitySeine); - if (index < 1) { - - // activity non trouvée sur cette route ou premiere activity - // donc pas d'activity précédente - return null; - } - - // on retourne l'activity precedente - return this.activitySeine.get(index - 1); - } - - /** - * @param activitySeine null - * @return l'activity suivante celle donnee ou null - */ - @Override - public ActivitySeine getNextActivity(ActivitySeine activitySeine) { - if (isActivitySeineEmpty()) { - - // pas d'activity definie sur la route - return null; - } - int index = this.activitySeine.indexOf(activitySeine); - if (index == -1 || index + 1 >= sizeActivitySeine()) { - - // l'activity n'est pas definie sur cette route, ou c'est la - // dernière de la route - return null; - } - - // on retourne l'activity suivante - return this.activitySeine.get(index + 1); - } - - /** @return la derniere activity */ - @Override - public ActivitySeine getLastActivity() { - if (isActivitySeineEmpty()) { - - // pas d'activity definie sur la route - return null; - } - - // on retourne la derniere activity - return activitySeine.get(sizeActivitySeine() - 1); - } - - @Override - public boolean isActivityFindDeVeilleFound() { - return getActivityFinDeVeille() != null; - } - - @Override - public ActivitySeine getActivityFinDeVeille() { - if (activitySeine == null || isActivitySeineEmpty()) { - return null; - } - ActivitySeine result = null; - for (ActivitySeine a : activitySeine) { - if (a.isActivityFinDeVeille()) { - - // il existe bien une activity de fin de veille - result = a; - break; - } - } - return result; - } - - @Override - public List<ActivitySeine> getActivityDebutDePechePositive() { - List<ActivitySeine> result = new ArrayList<ActivitySeine>(); - if (activitySeine != null && !isActivitySeineEmpty()) { - for (ActivitySeine a : activitySeine) { - if (a.isActivityDebutDePechePositive()) { - - // activity de debut de peche positive - result.add(a); - } - } - } - return result; - } - - @Override - public List<ActivitySeine> getActivityFinDePeche() { - List<ActivitySeine> result = new ArrayList<ActivitySeine>(); - if (activitySeine != null && !isActivitySeineEmpty()) { - for (ActivitySeine a : activitySeine) { - if (a.isActivityFinDePeche()) { - - // activity de debut de peche positive - result.add(a); - } - } - } - return result; - } - - @Override - public ActivitySeine getNextActivityFinDePeche(ActivitySeine actitiveDebut) { - if (activitySeine == null || isActivitySeineEmpty()) { - - // pas d'actitive dans la route - return null; - } - int position = activitySeine.indexOf(actitiveDebut); - if (position == -1) { - - // activity de debut non trouvee - return null; - } - - for (int i = position + 1, max = sizeActivitySeine(); i < max; i++) { - ActivitySeine a = activitySeine.get(i); - if (a.isActivityFinDePeche()) { - - // activity de fin de peche trouvee - return a; - } - } - return null; - } - - @Override - public ActivitySeine getNextActivityDebutDePechePositive(ActivitySeine actitiveDebut) { - if (activitySeine == null || isActivitySeineEmpty()) { - - // pas d'actitive dans la route - return null; - } - int position = activitySeine.indexOf(actitiveDebut); - if (position == -1) { - - // activity de debut non trouvee - return null; - } - - for (int i = position + 1, max = sizeActivitySeine(); i < max; i++) { - ActivitySeine a = activitySeine.get(i); - if (a.isActivityDebutDePechePositive()) { - - // activity de fin de peche trouvee - return a; - } - } - return null; - } - - @Override - public ActivitySeine getLastActivityDebutDePechePositiveBefore(Date actitiveDebut) { - - if (activitySeine == null || isActivitySeineEmpty()) { - - // pas d'actitive dans la route - return null; - } - - int position = getLastActivityBefore(actitiveDebut); - - if (position == -1) { - - // activity avant toute les autres ou non trouvee - return null; - } - - // on parcours en ordre inverse depuis la position jusqu'à trouver - // de debut de peche positive - ActivitySeine result = null; - for (int i = position; i > -1; i--) { - ActivitySeine a = activitySeine.get(i); - if (a.isActivityDebutDePechePositive()) { - - // on a trouve une activity de debut de peche positive - result = a; - break; - } - } - return result; - } - - //TODO A supprimer du modèle uml (pas fait pour le moment pour éviter les merges inutile de modèle...) - @Override - @Deprecated - public void updateDates() { - throw new IllegalStateException("A NE PLUS UTILISER!!!"); - } - - protected int getLastActivityBefore(Date currentTime) { - if (activitySeine == null || isActivitySeineEmpty()) { - - // pas d'actitive dans la route - return -1; - } - Iterator<ActivitySeine> itr = activitySeine.iterator(); - int i = -1; - while (itr.hasNext()) { - ActivitySeine a = itr.next(); - if (currentTime.before(a.getTime()) || - currentTime.equals(a.getTime())) { - break; - } - i++; - } - return i; - } - - @Override - public boolean isTimeAvailable(String activityId, Date time) { - boolean result = true; - if (!isActivitySeineEmpty()) { - time = DateUtil.getTime(time, false, false); - for (ActivitySeine a : getActivitySeine()) { - if (DateUtil.getTime(a.getTime(), false, false).equals(time) && - !a.getTopiaId().equals(activityId)) { - // heure observation already used - result = false; - break; - } - } - } - return result; - } +// @Override +// public ActivitySeine getOpenChild() { +// return OpenableEntities.getOpenEntity(activitySeine); +// } +// +// @Override +// public List<ActivitySeine> getOpenableChilds() { +// return activitySeine; +// } +// +// @Override +// public ActivitySeine getOpenActivity() { +// return getOpenChild(); +// } +// +// /** +// * @param activitySeine null +// * @return l'activity precedente celle donnee ou null +// */ +// @Override +// public ActivitySeine getPreviousActivity(ActivitySeine activitySeine) { +// if (isActivitySeineEmpty()) { +// +// // pas d'activity definie sur la route +// return null; +// } +// int index = this.activitySeine.indexOf(activitySeine); +// if (index < 1) { +// +// // activity non trouvée sur cette route ou premiere activity +// // donc pas d'activity précédente +// return null; +// } +// +// // on retourne l'activity precedente +// return this.activitySeine.get(index - 1); +// } +// +// /** +// * @param activitySeine null +// * @return l'activity suivante celle donnee ou null +// */ +// @Override +// public ActivitySeine getNextActivity(ActivitySeine activitySeine) { +// if (isActivitySeineEmpty()) { +// +// // pas d'activity definie sur la route +// return null; +// } +// int index = this.activitySeine.indexOf(activitySeine); +// if (index == -1 || index + 1 >= sizeActivitySeine()) { +// +// // l'activity n'est pas definie sur cette route, ou c'est la +// // dernière de la route +// return null; +// } +// +// // on retourne l'activity suivante +// return this.activitySeine.get(index + 1); +// } +// +// /** @return la derniere activity */ +// @Override +// public ActivitySeine getLastActivity() { +// if (isActivitySeineEmpty()) { +// +// // pas d'activity definie sur la route +// return null; +// } +// +// // on retourne la derniere activity +// return activitySeine.get(sizeActivitySeine() - 1); +// } + +// @Override +// public boolean isActivityFindDeVeilleFound() { +// return getActivityFinDeVeille() != null; +// } +// +// @Override +// public ActivitySeine getActivityFinDeVeille() { +// if (activitySeine == null || isActivitySeineEmpty()) { +// return null; +// } +// ActivitySeine result = null; +// for (ActivitySeine a : activitySeine) { +// if (a.isActivityFinDeVeille()) { +// +// // il existe bien une activity de fin de veille +// result = a; +// break; +// } +// } +// return result; +// } +// +// @Override +// public List<ActivitySeine> getActivityDebutDePechePositive() { +// List<ActivitySeine> result = new ArrayList<ActivitySeine>(); +// if (activitySeine != null && !isActivitySeineEmpty()) { +// for (ActivitySeine a : activitySeine) { +// if (a.isActivityDebutDePechePositive()) { +// +// // activity de debut de peche positive +// result.add(a); +// } +// } +// } +// return result; +// } +// +// @Override +// public List<ActivitySeine> getActivityFinDePeche() { +// List<ActivitySeine> result = new ArrayList<ActivitySeine>(); +// if (activitySeine != null && !isActivitySeineEmpty()) { +// for (ActivitySeine a : activitySeine) { +// if (a.isActivityFinDePeche()) { +// +// // activity de debut de peche positive +// result.add(a); +// } +// } +// } +// return result; +// } +// +// @Override +// public ActivitySeine getNextActivityFinDePeche(ActivitySeine actitiveDebut) { +// if (activitySeine == null || isActivitySeineEmpty()) { +// +// // pas d'actitive dans la route +// return null; +// } +// int position = activitySeine.indexOf(actitiveDebut); +// if (position == -1) { +// +// // activity de debut non trouvee +// return null; +// } +// +// for (int i = position + 1, max = sizeActivitySeine(); i < max; i++) { +// ActivitySeine a = activitySeine.get(i); +// if (a.isActivityFinDePeche()) { +// +// // activity de fin de peche trouvee +// return a; +// } +// } +// return null; +// } +// +// @Override +// public ActivitySeine getNextActivityDebutDePechePositive(ActivitySeine actitiveDebut) { +// if (activitySeine == null || isActivitySeineEmpty()) { +// +// // pas d'actitive dans la route +// return null; +// } +// int position = activitySeine.indexOf(actitiveDebut); +// if (position == -1) { +// +// // activity de debut non trouvee +// return null; +// } +// +// for (int i = position + 1, max = sizeActivitySeine(); i < max; i++) { +// ActivitySeine a = activitySeine.get(i); +// if (a.isActivityDebutDePechePositive()) { +// +// // activity de fin de peche trouvee +// return a; +// } +// } +// return null; +// } +// +// @Override +// public ActivitySeine getLastActivityDebutDePechePositiveBefore(Date actitiveDebut) { +// +// if (activitySeine == null || isActivitySeineEmpty()) { +// +// // pas d'actitive dans la route +// return null; +// } +// +// int position = getLastActivityBefore(actitiveDebut); +// +// if (position == -1) { +// +// // activity avant toute les autres ou non trouvee +// return null; +// } +// +// // on parcours en ordre inverse depuis la position jusqu'à trouver +// // de debut de peche positive +// ActivitySeine result = null; +// for (int i = position; i > -1; i--) { +// ActivitySeine a = activitySeine.get(i); +// if (a.isActivityDebutDePechePositive()) { +// +// // on a trouve une activity de debut de peche positive +// result = a; +// break; +// } +// } +// return result; +// } + +// @Override +// @Deprecated +// public void updateDates() { +// throw new IllegalStateException("A NE PLUS UTILISER!!!"); +// } +// +// protected int getLastActivityBefore(Date currentTime) { +// if (activitySeine == null || isActivitySeineEmpty()) { +// +// // pas d'actitive dans la route +// return -1; +// } +// Iterator<ActivitySeine> itr = activitySeine.iterator(); +// int i = -1; +// while (itr.hasNext()) { +// ActivitySeine a = itr.next(); +// if (currentTime.before(a.getTime()) || +// currentTime.equals(a.getTime())) { +// break; +// } +// i++; +// } +// return i; +// } +// +// @Override +// public boolean isTimeAvailable(String activityId, Date time) { +// boolean result = true; +// if (!isActivitySeineEmpty()) { +// time = DateUtil.getTime(time, false, false); +// for (ActivitySeine a : getActivitySeine()) { +// if (DateUtil.getTime(a.getTime(), false, false).equals(time) && +// !a.getTopiaId().equals(activityId)) { +// // heure observation already used +// result = false; +// break; +// } +// } +// } +// return result; +// } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java index 558b45f..cca633b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java @@ -61,8 +61,8 @@ public class RouteTopiaDao extends AbstractRouteTopiaDao<Route> { String sql = "SELECT" + " r.topiaId," + - " r.date," + - " r.open" + + " r.date" + +// " r.open" + " FROM observe_seine.route r" + " WHERE " + " r.trip = ?" + @@ -77,8 +77,8 @@ public class RouteTopiaDao extends AbstractRouteTopiaDao<Route> { String sql = "SELECT" + " r.topiaId," + - " r.date," + - " r.open" + + " r.date" + +// " r.open" + " FROM observe_seine.route r" + " WHERE " + " r.topiaId = ?" + @@ -107,7 +107,7 @@ public class RouteTopiaDao extends AbstractRouteTopiaDao<Route> { Route trip = new RouteImpl(); trip.setTopiaId(set.getString(1)); trip.setDate(set.getDate(2)); - trip.setOpen(set.getBoolean(3)); +// trip.setOpen(set.getBoolean(3)); return trip; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java index 6a69931..7068c30 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java @@ -25,7 +25,7 @@ import fr.ird.observe.entities.OpenableEntities; import org.nuiton.util.DateUtil; import java.util.Date; -import java.util.List; +import java.util.Set; /** * @author Tony Chemit - chemit@codelutin.com @@ -35,146 +35,144 @@ public class TripSeineImpl extends TripSeineAbstract { private static final long serialVersionUID = 1L; - @Override - public Route getOpenChild() { - return OpenableEntities.getOpenEntity(route); - } - - @Override - public List<Route> getOpenableChilds() { - return route; - } - - @Override - public Route getOpenRoute() { - return getOpenChild(); - } - - @Override - public Route getPreviousRoute(Route route) { - if (isRouteEmpty()) { - - // aucune route definie sur la maree - return null; - } - int index = this.route.indexOf(route); - if (index < 1) { - - // la route donnee n'est pas definie sur cette maree ou est la - // premiere route - return null; - } - - // on retourne la route precedente - return this.route.get(index - 1); - } - - /** - * @param route null - * @return la route suivante celle donnee ou null - */ - @Override - public Route getNextRoute(Route route) { - if (isRouteEmpty()) { - - // aucune route definie sur la maree - return null; - } - int index = this.route.indexOf(route); - if (index == -1 || index + 1 >= sizeRoute()) { - - // la route n'est pas definie sur cette maree, ou c'est la - // dernière de la maree - return null; - } - - // on retourne la route suivante - return this.route.get(index + 1); - } - - /** @return la derniere route ou null */ - @Override - public Route getLastRoute() { - if (isRouteEmpty()) { - - // aucune route definie sur la maree - return null; - } - - // on retourne la dernière route de la maree - return getRoute().get(sizeRoute() - 1); - } - - //TODO A supprimer du modèle uml (pas fait pour le moment pour éviter les merges inutile de modèle...) - @Override - @Deprecated - public Date getEndDateTheorique() { - - throw new IllegalStateException("A NE PLUS UTILISER!!!"); - -// Date d; +// @Override +// public Route getOpenChild() { +// return OpenableEntities.getOpenEntity(route); +// } +// +// @Override +// public Set<Route> getOpenableChilds() { +// return route; +// } + +// @Override +// public Route getOpenRoute() { +// return getOpenChild(); +// } +// +// @Override +// public Route getPreviousRoute(Route route) { // if (isRouteEmpty()) { // -// // pas de route, donc la date de fin est la date de debut -// d = getStartDate(); -// } else { -// List<Route> routes = new ArrayList<Route>(getRoute()); +// // aucune route definie sur la maree +// return null; +// } +// int index = this.route.indexOf(route); +// if (index < 1) { // -// // on trie la liste par jour d'observation -// Routes.sort(routes); +// // la route donnee n'est pas definie sur cette maree ou est la +// // premiere route +// return null; +// } // -// // on recupere la derniere route de la maree -// Route route = routes.get(routes.size() - 1); +// // on retourne la route precedente +// return this.route.get(index - 1); +// } // -// // son jour d'observation est la date de fin de la maree -// d = route.getDate(); +// /** +// * @param route null +// * @return la route suivante celle donnee ou null +// */ +// @Override +// public Route getNextRoute(Route route) { +// if (isRouteEmpty()) { +// +// // aucune route definie sur la maree +// return null; // } +// int index = this.route.indexOf(route); +// if (index == -1 || index + 1 >= sizeRoute()) { // -// // on conserve la date epuree (pas de notion de temps dans la date) -// d = DateUtil.getEndOfDay(d); -// return d; - } - - //TODO A supprimer du modèle uml (pas fait pour le moment pour éviter les merges inutile de modèle...) - @Override - @Deprecated - public void updateDateFin() { - - throw new IllegalStateException("A NE PLUS UTILISER!!!"); - -// // la date de fin theorique (date de la dernière route de la marée) -// Date endDate = getEndDateTheorique(); +// // la route n'est pas definie sur cette maree, ou c'est la +// // dernière de la maree +// return null; +// } // -// // la date de fin actuelle -// Date realDateFin = getEndDate(); +// // on retourne la route suivante +// return this.route.get(index + 1); +// } // -// if (realDateFin == null || endDate.after(realDateFin)) { +// /** @return la derniere route ou null */ +// @Override +// public Route getLastRoute() { +// if (isRouteEmpty()) { // -// // on utilise la nouvelle date theorique car l'ancienne n'existe pas -// // ou est antérieure à la date de fin théoriquue -// setEndDate(endDate); +// // aucune route definie sur la maree +// return null; // } - } +// +// // on retourne la dernière route de la maree +// return getRoute().get(sizeRoute() - 1); +// } + +// @Override +// @Deprecated +// public Date getEndDateTheorique() { +// +// throw new IllegalStateException("A NE PLUS UTILISER!!!"); +// +//// Date d; +//// if (isRouteEmpty()) { +//// +//// // pas de route, donc la date de fin est la date de debut +//// d = getStartDate(); +//// } else { +//// List<Route> routes = new ArrayList<Route>(getRoute()); +//// +//// // on trie la liste par jour d'observation +//// Routes.sort(routes); +//// +//// // on recupere la derniere route de la maree +//// Route route = routes.get(routes.size() - 1); +//// +//// // son jour d'observation est la date de fin de la maree +//// d = route.getDate(); +//// } +//// +//// // on conserve la date epuree (pas de notion de temps dans la date) +//// d = DateUtil.getEndOfDay(d); +//// return d; +// } + +// @Override +// @Deprecated +// public void updateDateFin() { +// +// throw new IllegalStateException("A NE PLUS UTILISER!!!"); +// +//// // la date de fin theorique (date de la dernière route de la marée) +//// Date endDate = getEndDateTheorique(); +//// +//// // la date de fin actuelle +//// Date realDateFin = getEndDate(); +//// +//// if (realDateFin == null || endDate.after(realDateFin)) { +//// +//// // on utilise la nouvelle date theorique car l'ancienne n'existe pas +//// // ou est antérieure à la date de fin théoriquue +//// setEndDate(endDate); +//// } +// } @Override public String getObserverLabel() { return observer == null ? "" : observer.getLastName() + " " + observer.getFirstName(); } - @Override - public boolean isDateAvailable(String routeId, Date date) { - boolean result = true; - if (!isRouteEmpty()) { - date = DateUtil.getDay(date); - for (Route r : getRoute()) { - if (DateUtil.getDay(r.getDate()).equals(date) && - !r.getTopiaId().equals(routeId)) { - // jour observation already used - result = false; - break; - } - } - } - return result; - } +// @Override +// public boolean isDateAvailable(String routeId, Date date) { +// boolean result = true; +// if (!isRouteEmpty()) { +// date = DateUtil.getDay(date); +// for (Route r : getRoute()) { +// if (DateUtil.getDay(r.getDate()).equals(date) && +// !r.getTopiaId().equals(routeId)) { +// // jour observation already used +// result = false; +// break; +// } +// } +// } +// return result; +// } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java index 15f58ba..b73cd39 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java @@ -214,7 +214,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { " t.topiaId," + " t.startDate," + " t.endDate," + - " t.open," + +// " t.open," + " p.lastName," + " p.firstName," + " v.topiaId," + @@ -252,19 +252,19 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { trip.setTopiaId(set.getString(1)); trip.setStartDate(set.getDate(2)); trip.setEndDate(set.getDate(3)); - trip.setOpen(set.getBoolean(4)); +// trip.setOpen(set.getBoolean(4)); - String observerLastName = set.getString(5); - String observerFirstName = set.getString(6); + String observerLastName = set.getString(4); + String observerFirstName = set.getString(5); Person observer = new PersonImpl(); observer.setFirstName(observerFirstName); observer.setLastName(observerLastName); trip.setObserver(observer); Vessel vessel = new VesselImpl(); - String vesselId = set.getString(7); + String vesselId = set.getString(6); vessel.setTopiaId(vesselId); - String label = set.getString(8); + String label = set.getString(7); referenceLocale.setLabel(label, vessel); trip.setVessel(vessel); diff --git a/observe-entities/src/main/resources/db/5.0/remove_open_field-H2.sql b/observe-entities/src/main/resources/db/5.0/remove_open_field-H2.sql new file mode 100644 index 0000000..d7da73d --- /dev/null +++ b/observe-entities/src/main/resources/db/5.0/remove_open_field-H2.sql @@ -0,0 +1,5 @@ +ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN OPEN; +ALTER TABLE OBSERVE_SEINE.ROUTE DROP COLUMN OPEN; +ALTER TABLE OBSERVE_SEINE.ACTIVITY DROP COLUMN OPEN; +ALTER TABLE OBSERVE_LONGLINE.TRIP DROP COLUMN OPEN; +ALTER TABLE OBSERVE_LONGLINE.ACTIVITY DROP COLUMN OPEN; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/5.0/remove_open_field-PG.sql b/observe-entities/src/main/resources/db/5.0/remove_open_field-PG.sql new file mode 100644 index 0000000..d7da73d --- /dev/null +++ b/observe-entities/src/main/resources/db/5.0/remove_open_field-PG.sql @@ -0,0 +1,5 @@ +ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN OPEN; +ALTER TABLE OBSERVE_SEINE.ROUTE DROP COLUMN OPEN; +ALTER TABLE OBSERVE_SEINE.ACTIVITY DROP COLUMN OPEN; +ALTER TABLE OBSERVE_LONGLINE.TRIP DROP COLUMN OPEN; +ALTER TABLE OBSERVE_LONGLINE.ACTIVITY DROP COLUMN OPEN; \ No newline at end of file diff --git a/observe-entities/src/main/xmi/observe-common.zargo b/observe-entities/src/main/xmi/observe-common.zargo index 3e25663..e30a24c 100644 Binary files a/observe-entities/src/main/xmi/observe-common.zargo and b/observe-entities/src/main/xmi/observe-common.zargo differ diff --git a/observe-entities/src/main/xmi/observe-longline.properties b/observe-entities/src/main/xmi/observe-longline.properties index 7a20051..96bc352 100644 --- a/observe-entities/src/main/xmi/observe-longline.properties +++ b/observe-entities/src/main/xmi/observe-longline.properties @@ -138,16 +138,16 @@ fr.ird.observe.entities.longline.TripLongline.attribute.gearUseFeaturesLongline. fr.ird.observe.entities.longline.GearUseFeaturesLongline.attribute.gearUseFeaturesMeasurement.tagvalue.orderBy=topiaCreateDate ############################################################################### -### Ordered ################################################################### +### Unique #################################################################### ############################################################################### -fr.ird.observe.entities.longline.SetLongline.attribute.section.stereotype=ordered -fr.ird.observe.entities.longline.SetLongline.attribute.catchLongline.stereotype=ordered -fr.ird.observe.entities.longline.Section.attribute.basket.stereotype=ordered -fr.ird.observe.entities.longline.TripLongline.attribute.activityLongline.stereotype=ordered -fr.ird.observe.entities.longline.TripLongline.attribute.gearUseFeaturesLongline.stereotype=ordered -fr.ird.observe.entities.longline.Basket.attribute.branchline.stereotype=ordered -fr.ird.observe.entities.longline.GearUseFeaturesLongline.attribute.gearUseFeaturesMeasurement.stereotype=ordered +fr.ird.observe.entities.longline.SetLongline.attribute.section.stereotype=unique +fr.ird.observe.entities.longline.SetLongline.attribute.catchLongline.stereotype=unique +fr.ird.observe.entities.longline.Section.attribute.basket.stereotype=unique +fr.ird.observe.entities.longline.TripLongline.attribute.activityLongline.stereotype=unique +fr.ird.observe.entities.longline.TripLongline.attribute.gearUseFeaturesLongline.stereotype=unique +fr.ird.observe.entities.longline.Basket.attribute.branchline.stereotype=unique +fr.ird.observe.entities.longline.GearUseFeaturesLongline.attribute.gearUseFeaturesMeasurement.stereotype=unique ############################################################################### ### NotNull ################################################################### diff --git a/observe-entities/src/main/xmi/observe-longline.zargo b/observe-entities/src/main/xmi/observe-longline.zargo index 6d7178a..fd7841b 100644 Binary files a/observe-entities/src/main/xmi/observe-longline.zargo and b/observe-entities/src/main/xmi/observe-longline.zargo differ diff --git a/observe-entities/src/main/xmi/observe-seine.properties b/observe-entities/src/main/xmi/observe-seine.properties index 969b87e..d2c9ace 100644 --- a/observe-entities/src/main/xmi/observe-seine.properties +++ b/observe-entities/src/main/xmi/observe-seine.properties @@ -129,24 +129,20 @@ fr.ird.observe.entities.seine.SchoolEstimate.attribute.species.tagvalue.naturalI ############################################################################### fr.ird.observe.entities.seine.TripSeine.attribute.gearUseFeaturesSeine.tagvalue.orderBy=topiaCreateDate -fr.ird.observe.entities.seine.GearUseFeaturesSeine.attribute.gearUseFeaturesMeasurement.tagvalue.orderBy=topiaCreateDate fr.ird.observe.entities.seine.TripSeine.attribute.route.tagvalue.orderBy=date -fr.ird.observe.entities.seine.Route.attribute.activitySeine.tagvalue.orderBy=date +fr.ird.observe.entities.seine.GearUseFeaturesSeine.attribute.gearUseFeaturesMeasurement.tagvalue.orderBy=topiaCreateDate +fr.ird.observe.entities.seine.Route.attribute.activitySeine.tagvalue.orderBy=time ############################################################################### -### Ordered ################################################################### +### Unique #################################################################### ############################################################################### -fr.ird.observe.entities.seine.TripSeine.attribute.route.stereotype=ordered -fr.ird.observe.entities.seine.TargetSample.attribute.targetLength.stereotype=ordered -fr.ird.observe.entities.seine.SetSeine.attribute.nonTargetSample.stereotype=ordered -fr.ird.observe.entities.seine.SetSeine.attribute.targetSample.stereotype=ordered -fr.ird.observe.entities.seine.Route.attribute.activitySeine.stereotype=ordered -fr.ird.observe.entities.seine.NonTargetSample.attribute.nonTargetLength.stereotype=ordered -fr.ird.observe.entities.seine.FloatingObject.attribute.transmittingBuoy.stereotype=ordered -fr.ird.observe.entities.seine.ActivitySeine.attribute.floatingObject.stereotype=ordered -fr.ird.observe.entities.seine.ActivitySeine.attribute.observedSystem.stereotype=ordered - -############################################################################### -### Unicite ############################################################### -############################################################################### +fr.ird.observe.entities.seine.TripSeine.attribute.route.stereotype=unique +fr.ird.observe.entities.seine.TargetSample.attribute.targetLength.stereotype=unique +fr.ird.observe.entities.seine.SetSeine.attribute.nonTargetSample.stereotype=unique +fr.ird.observe.entities.seine.SetSeine.attribute.targetSample.stereotype=unique +fr.ird.observe.entities.seine.Route.attribute.activitySeine.stereotype=unique +fr.ird.observe.entities.seine.NonTargetSample.attribute.nonTargetLength.stereotype=unique +fr.ird.observe.entities.seine.FloatingObject.attribute.transmittingBuoy.stereotype=unique +fr.ird.observe.entities.seine.ActivitySeine.attribute.floatingObject.stereotype=unique +fr.ird.observe.entities.seine.ActivitySeine.attribute.observedSystem.stereotype=unique diff --git a/observe-entities/src/main/xmi/observe-seine.zargo b/observe-entities/src/main/xmi/observe-seine.zargo index be07b7c..540369e 100644 Binary files a/observe-entities/src/main/xmi/observe-seine.zargo and b/observe-entities/src/main/xmi/observe-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 97e8d0b6908f67f3db65e18bb36328e8a9367066 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 25 14:47:14 2015 +0200 Changement de la version du modèle de persistence --- observe-entities/src/main/xmi/observe-common.properties | 2 +- observe-entities/src/main/xmi/observe-longline.properties | 2 +- observe-entities/src/main/xmi/observe-seine.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/observe-entities/src/main/xmi/observe-common.properties b/observe-entities/src/main/xmi/observe-common.properties index 667b4e6..301c0e4 100644 --- a/observe-entities/src/main/xmi/observe-common.properties +++ b/observe-entities/src/main/xmi/observe-common.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0.1 +model.tagvalue.version=5.0 model.tagvalue.notGenerateToString=true model.tagvalue.generateForeignKeyNames=true model.tagvalue.indexForeignKeys=true diff --git a/observe-entities/src/main/xmi/observe-longline.properties b/observe-entities/src/main/xmi/observe-longline.properties index 96bc352..0c551f7 100644 --- a/observe-entities/src/main/xmi/observe-longline.properties +++ b/observe-entities/src/main/xmi/observe-longline.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0.1 +model.tagvalue.version=5.0 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateForeignKeyNames=true diff --git a/observe-entities/src/main/xmi/observe-seine.properties b/observe-entities/src/main/xmi/observe-seine.properties index d2c9ace..58bc710 100644 --- a/observe-entities/src/main/xmi/observe-seine.properties +++ b/observe-entities/src/main/xmi/observe-seine.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=4.0.1 +model.tagvalue.version=5.0 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateForeignKeyNames=true -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.