This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit ac539a758093c3c46ee599349f0f22a6e87bcd8a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 20 09:48:04 2015 +0100 Suppression de la méthode loadForRead et renommage de l'autre en loadForm --- .../open/impl/seine/TripSeineUIHandler.java | 14 +-- .../v1/seine/TripSeineServiceController.java | 9 +- .../services/service/seine/TripSeineService.java | 12 +-- .../service/seine/TripSeineServiceTopia.java | 54 +++++------ .../service/seine/TripSeineServiceTopiaTest.java | 104 ++++++--------------- 5 files changed, 65 insertions(+), 128 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index 5eeee20..4167254 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -185,21 +185,13 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { } formDto = getTripSeineService().preCreate(programId); - } else if (mode == ContentMode.READ) { - - // read mode - if (log.isInfoEnabled()) { - log.info(prefix + "read existing trip " + tripId); - } - formDto = getTripSeineService().loadToRead(tripId); - } else { - // edit mode + // update mode if (log.isInfoEnabled()) { - log.info(prefix + "edit existing trip " + tripId); + log.info(prefix + "load existing trip " + tripId); } - formDto = getTripSeineService().loadToEdit(tripId); + formDto = getTripSeineService().loadForm(tripId); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java index 9f5fdaf..7734e25 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java @@ -68,18 +68,13 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public FormDto<TripSeineDto> loadToRead(String tripSeineId) { - return service.loadToRead(tripSeineId); - } - - @Override public boolean exists(String tripSeineId) { return service.exists(tripSeineId); } @Override - public FormDto<TripSeineDto> loadToEdit(String tripSeineId) { - return service.loadToEdit(tripSeineId); + public FormDto<TripSeineDto> loadForm(String tripSeineId) { + return service.loadForm(tripSeineId); } @Override 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 47e2d1f..6d4856e 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 @@ -42,6 +42,7 @@ import java.util.List; */ public interface TripSeineService extends ObserveService { + @ReadDataPermission ReferenceSetDto<TripSeineDto> getAllTripSeine(); @ReadDataPermission @@ -51,13 +52,13 @@ public interface TripSeineService extends ObserveService { int getTripSeinePositionInProgram(String programId, String tripSeineId); @ReadDataPermission - TripSeineDto loadDto(String tripSeineId); - - @ReadDataPermission TripMapDto getTripSeineMap(String tripSeineId); + @WriteDataPermission + FormDto<TripSeineDto> loadForm(String tripSeineId); + @ReadDataPermission - FormDto<TripSeineDto> loadToRead(String tripSeineId); + TripSeineDto loadDto(String tripSeineId); @ReadDataPermission ReferenceDto<TripSeineDto> loadReferenceToRead(String tripSeineId); @@ -66,9 +67,6 @@ public interface TripSeineService extends ObserveService { boolean exists(String tripSeineId); @WriteDataPermission - FormDto<TripSeineDto> loadToEdit(String tripSeineId); - - @WriteDataPermission FormDto<TripSeineDto> preCreate(String programId); @Write 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 c309822..4473b56 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 @@ -22,6 +22,7 @@ package fr.ird.observe.services.service.seine; * #L% */ +import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.constants.ReferenceLocale; @@ -59,7 +60,6 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe @Override public ReferenceSetDto<TripSeineDto> getAllTripSeine() { - ReferenceLocale referenceLocale = getReferenceLocale(); List<TripSeine> tripSeines = loadEntities(TripSeine.class); @@ -67,6 +67,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe for (TripSeine tripSeine : tripSeines) { + //FIXME Utiliser les définitions de références ReferenceDto<TripSeineDto> stub = entityToReferenceDto(TripSeineDto.class, tripSeine); stubs.add(stub); @@ -92,6 +93,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe for (TripSeine tripSeine : tripSeines) { + //FIXME Utiliser les définitions de références ReferenceDto<TripSeineDto> stub = entityToReferenceDto(TripSeineDto.class, tripSeine); stubs.add(stub); @@ -109,6 +111,27 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override + public FormDto<TripSeineDto> loadForm(String tripSeineId) { + + TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); + + FormDto<TripSeineDto> form = entityToEditFormDto(TripSeineDto.class, TripSeine.class, tripSeine); + //FIXME Remove labels building from the entityToEditFormDto method + form.setLabels(ImmutableList.<ReferenceSetDto>of()); + + form.setReferentialReferenceSetRequestName(ObserveReferenceSetRequestDefinitions.TRIP_SEINE_FORM.name()); + + TripSeineDto tripSeineDto = form.getForm(); + + if (tripSeineDto.getEndDate() == null) { + Date date = DateUtil.getEndOfDay(now()); + tripSeineDto.setEndDate(date); + } + + return form; + } + + @Override public TripSeineDto loadDto(String tripSeineId) { TripSeineDto dto= loadEntityToDto(TripSeineDto.class, tripSeineId); @@ -130,17 +153,6 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public FormDto<TripSeineDto> loadToRead(String tripSeineId) { - - TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); - - FormDto<TripSeineDto> form = entityToReadFormDto(TripSeineDto.class, TripSeine.class, tripSeine); - form.setReferentialReferenceSetRequestName(ObserveReferenceSetRequestDefinitions.TRIP_SEINE_FORM.name()); - - return form; - } - - @Override public ReferenceDto<TripSeineDto> loadReferenceToRead(String tripSeineId) { TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); @@ -155,24 +167,6 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public FormDto<TripSeineDto> loadToEdit(String tripSeineId) { - - TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); - - FormDto<TripSeineDto> form = entityToEditFormDto(TripSeineDto.class, TripSeine.class, tripSeine); - form.setReferentialReferenceSetRequestName(ObserveReferenceSetRequestDefinitions.TRIP_SEINE_FORM.name()); - - TripSeineDto tripSeineDto = form.getForm(); - - if (tripSeineDto.getEndDate() == null) { - Date date = DateUtil.getEndOfDay(now()); - tripSeineDto.setEndDate(date); - } - - return form; - } - - @Override public FormDto<TripSeineDto> preCreate(String programId) { TripSeine tripSeine = newEntity(TripSeine.class); 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 2628c00..3879f16 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 @@ -23,8 +23,6 @@ package fr.ird.observe.services.service.seine; */ import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceContextTopiaTaiste; import fr.ird.observe.services.dto.FormDto; @@ -36,12 +34,12 @@ 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.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.services.service.ConcurrentModificationException; +import fr.ird.observe.services.service.ReferenceSetService; import fr.ird.observe.services.service.ReferentialService; import org.junit.Assert; import org.junit.Test; @@ -60,6 +58,8 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { protected ReferentialService referentialService; + protected ReferenceSetService referenceSetService; + @Override public Set<String> getTestNamesChangeDataBase() { return ImmutableSet.of( @@ -80,6 +80,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { service = newService(TripSeineService.class); referentialService = newService(ReferentialService.class); + referenceSetService = newService(ReferenceSetService.class); } @@ -122,10 +123,10 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { } @Test - public void loadToReadTest() throws Exception { + public void loadFormTest() throws Exception { TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); - FormDto<TripSeineDto> formDto = service.loadToRead(TRIP_SEINE_ID_1); + FormDto<TripSeineDto> formDto = service.loadForm(TRIP_SEINE_ID_1); Assert.assertNotNull(formDto); TripSeineDto tripSeineDto = formDto.getForm(); @@ -145,39 +146,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeine.getComment(), tripSeineDto.getComment()); Assert.assertEquals(tripSeine.getLastUpdate(), tripSeineDto.getLastUpdate()); - assertTripFormLabels(formDto); - - for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { - - Assert.assertEquals(0, referenceSetDto.sizeReference()); - - } - - } - - @Test - public void loadToEditTest() throws Exception { - - 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(); - - assertEntityEqualsReferenceDto(tripSeine.getCaptain(), tripSeineDto.getCaptain()); - assertEntityEqualsReferenceDto(tripSeine.getObserver(), tripSeineDto.getObserver()); - assertEntityEqualsReferenceDto(tripSeine.getDataEntryOperator(), tripSeineDto.getDataEntryOperator()); - assertEntityEqualsReferenceDto(tripSeine.getVessel(), tripSeineDto.getVessel()); - assertEntityEqualsReferenceDto(tripSeine.getOcean(), tripSeineDto.getOcean()); - assertEntityEqualsReferenceDto(tripSeine.getDepartureHarbour(), tripSeineDto.getDepartureHarbour()); - assertEntityEqualsReferenceDto(tripSeine.getLandingHarbour(), tripSeineDto.getLandingHarbour()); - Assert.assertEquals(tripSeine.getErsId(), tripSeineDto.getErsId()); - Assert.assertEquals(tripSeine.getStartDate(), tripSeineDto.getStartDate()); - Assert.assertEquals(tripSeine.getEndDate(), tripSeineDto.getEndDate()); - Assert.assertEquals(tripSeine.getFormsUrl(), tripSeineDto.getFormsUrl()); - Assert.assertEquals(tripSeine.getReportsUrl(), tripSeineDto.getReportsUrl()); - Assert.assertEquals(tripSeine.getComment(), tripSeineDto.getComment()); - Assert.assertEquals(tripSeine.getLastUpdate(), tripSeineDto.getLastUpdate()); + loadReferenceSets(referenceSetService, formDto); assertTripFormLabels(formDto); @@ -228,21 +197,16 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { 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.setCaptain(getReference(formDto, PersonDto.class, TripSeine.PROPERTY_CAPTAIN, 0)); + tripSeineDto.setObserver(getReference(formDto, PersonDto.class, TripSeine.PROPERTY_OBSERVER, 0)); + tripSeineDto.setDataEntryOperator(getReference(formDto, PersonDto.class, TripSeine.PROPERTY_DATA_ENTRY_OPERATOR, 0)); - tripSeineDto.setVessel((ReferentialReferenceDto<VesselDto>) vesselRefs.getReference(0)); + tripSeineDto.setVessel(getReference(formDto, VesselDto.class, TripSeine.PROPERTY_VESSEL, 0)); - tripSeineDto.setOcean((ReferentialReferenceDto<OceanDto>) oceanRefs.getReference(0)); + tripSeineDto.setOcean(getReference(formDto, OceanDto.class, TripSeine.PROPERTY_OCEAN, 0)); - tripSeineDto.setDepartureHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(0)); - tripSeineDto.setLandingHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(1)); + tripSeineDto.setDepartureHarbour(getReference(formDto, HarbourDto.class, TripSeine.PROPERTY_DEPARTURE_HARBOUR, 0)); + tripSeineDto.setLandingHarbour(getReference(formDto, HarbourDto.class, TripSeine.PROPERTY_LANDING_HARBOUR, 0)); tripSeineDto.setErsId("ersid"); @@ -282,21 +246,19 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void saveUpdateTest() { - FormDto<TripSeineDto> formDto = service.loadToEdit(TRIP_SEINE_ID_1); + FormDto<TripSeineDto> formDto = service.loadForm(TRIP_SEINE_ID_1); - TripSeineDto tripSeineDto = formDto.getForm(); + loadReferenceSets(referenceSetService, formDto); - ReferenceSetDto<PersonDto> personRefs = formDto.getReferenceSetDto(PersonDto.class); - ReferenceSetDto<OceanDto> oceanRefs = formDto.getReferenceSetDto(OceanDto.class); - ReferenceSetDto<HarbourDto> harbourRefs = formDto.getReferenceSetDto(HarbourDto.class); + TripSeineDto tripSeineDto = formDto.getForm(); - tripSeineDto.setCaptain((ReferentialReferenceDto<PersonDto>) personRefs.getReference(0)); - tripSeineDto.setDataEntryOperator((ReferentialReferenceDto<PersonDto>) personRefs.getReference(2)); + tripSeineDto.setCaptain(getReference(formDto, PersonDto.class, TripSeine.PROPERTY_CAPTAIN, 0)); + tripSeineDto.setDataEntryOperator(getReference(formDto, PersonDto.class, TripSeine.PROPERTY_DATA_ENTRY_OPERATOR, 0)); - tripSeineDto.setOcean((ReferentialReferenceDto<OceanDto>) oceanRefs.getReference(0)); + tripSeineDto.setOcean(getReference(formDto, OceanDto.class, TripSeine.PROPERTY_OCEAN, 0)); - tripSeineDto.setDepartureHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(0)); - tripSeineDto.setLandingHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(1)); + tripSeineDto.setDepartureHarbour(getReference(formDto, HarbourDto.class, TripSeine.PROPERTY_DEPARTURE_HARBOUR, 0)); + tripSeineDto.setLandingHarbour(getReference(formDto, HarbourDto.class, TripSeine.PROPERTY_LANDING_HARBOUR, 0)); tripSeineDto.setErsId("ersid"); @@ -335,31 +297,27 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { } - - @Test(expected = ConcurrentModificationException.class) public void saveConcurrentTest() { - FormDto<TripSeineDto> formDto = service.loadToEdit(TRIP_SEINE_ID_1); + FormDto<TripSeineDto> formDto = service.loadForm(TRIP_SEINE_ID_1); 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); + loadReferenceSets(referenceSetService, formDto); - tripSeineDto.setCaptain((ReferentialReferenceDto<PersonDto>) personRefs.getReference(0)); - tripSeineDto.setDataEntryOperator((ReferentialReferenceDto<PersonDto>) personRefs.getReference(2)); + tripSeineDto.setCaptain(getReference(formDto, PersonDto.class, TripSeine.PROPERTY_CAPTAIN, 0)); + tripSeineDto.setDataEntryOperator(getReference(formDto, PersonDto.class, TripSeine.PROPERTY_DATA_ENTRY_OPERATOR, 0)); - tripSeineDto.setOcean((ReferentialReferenceDto<OceanDto>) oceanRefs.getReference(0)); + tripSeineDto.setOcean(getReference(formDto, OceanDto.class, TripSeine.PROPERTY_OCEAN, 0)); - tripSeineDto.setDepartureHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(0)); - tripSeineDto.setLandingHarbour((ReferentialReferenceDto<HarbourDto>) harbourRefs.getReference(1)); + tripSeineDto.setDepartureHarbour(getReference(formDto, HarbourDto.class, TripSeine.PROPERTY_DEPARTURE_HARBOUR, 0)); + tripSeineDto.setLandingHarbour(getReference(formDto, HarbourDto.class, TripSeine.PROPERTY_LANDING_HARBOUR, 0)); // on fait croire que notre version est plus ancienne Calendar calendar = Calendar.getInstance(); calendar.setTime(tripSeineDto.getLastUpdate()); - calendar.add(Calendar.HOUR, - 1); + calendar.add(Calendar.HOUR, -1); tripSeineDto.setLastUpdate(calendar.getTime()); service.save(formDto.getForm()); @@ -388,7 +346,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertNotNull(formDto.getLabels()); - Set<Class> types = Sets.newLinkedHashSet(Iterables.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction())); + Set<Class<?>> types = ReferenceSetDtos.getTypes(formDto.getLabels()); Assert.assertTrue(types.contains(PersonDto.class)); Assert.assertTrue(types.contains(VesselDto.class)); Assert.assertTrue(types.contains(OceanDto.class)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.