This is an automated email from the git hooks/post-receive script. New commit to branch feature/7493_corrige_action_validation_serveur_distant in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit ba17982caf803a0520cd44dd7a460b16fcf190b1 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Fri Aug 19 17:27:18 2016 +0200 Corrige les definitions enrichies pour basket et branchline en creant des dto specifiques refs #7493 --- .../{BasketDto.java => BasketWithSectionDto.java} | 2 +- ...BranchlineDto.java => BranchlineWithBasketDto.java} | 2 +- .../dto/reference/DataReferenceSetDefinitions.java | 18 ++++++++++-------- .../services/binder/BinderEngineInitializer.java | 6 ++++++ 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionDto.java similarity index 93% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketDto.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionDto.java index 3d25677..3a046ef 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BasketWithSectionDto.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.longline; * #L% */ -public class BasketDto extends AbstractBasketDto { +public class BasketWithSectionDto extends AbstractBasketDto { private static final long serialVersionUID = 3690753995685507632L; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketDto.java similarity index 93% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineDto.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketDto.java index e627009..0adec6a 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/BranchlineWithBasketDto.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.longline; * #L% */ -public class BranchlineDto extends AbstractBranchlineDto { +public class BranchlineWithBasketDto extends AbstractBranchlineDto { private static final long serialVersionUID = 7018072108318352694L; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index 5f3c306..59f311a 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -27,7 +27,9 @@ import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BasketWithSectionDto; import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.BranchlineWithBasketDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.longline.SectionDto; @@ -148,15 +150,15 @@ public enum DataReferenceSetDefinitions { .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER)), - BASKET_WITH_SECTION(newDefinitionBuilder(BasketDto.class) - .addProperty(Integer.class, BasketDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER) - .addProperty(String.class, BasketDto.PROPERTY_SECTION)), + BASKET_WITH_SECTION(newDefinitionBuilder(BasketWithSectionDto.class) + .addProperty(Integer.class, BasketWithSectionDto.PROPERTY_HAULING_IDENTIFIER) + .addProperty(Integer.class, BasketWithSectionDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(String.class, BasketWithSectionDto.PROPERTY_SECTION)), - BRANCHLINE_WITH_BASKET(newDefinitionBuilder(BranchlineDto.class) - .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER) - .addProperty(String.class, BranchlineDto.PROPERTY_BASKET)), + BRANCHLINE_WITH_BASKET(newDefinitionBuilder(BranchlineWithBasketDto.class) + .addProperty(Integer.class, BranchlineWithBasketDto.PROPERTY_HAULING_IDENTIFIER) + .addProperty(Integer.class, BranchlineWithBasketDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(String.class, BranchlineWithBasketDto.PROPERTY_BASKET)), TDR(newDefinitionBuilder(TdrDto.class) .addProperty(String.class, TdrDto.PROPERTY_HOME_ID)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java index 61beb37..d242ddd 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java @@ -242,7 +242,9 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BasketWithSectionDto; import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.BranchlineWithBasketDto; import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; @@ -523,12 +525,16 @@ class BinderEngineInitializer implements ObserveModelInitializer { public void initBasketDto() { dataDtoToEntityTypeBuilder.put(BasketDto.class, Basket.class); dataBinderBuilder.put(BasketDto.class, new BasketBinder()); + dataDtoToEntityTypeBuilder.put(BasketWithSectionDto.class, Basket.class); + dataBinderBuilder.put(BasketWithSectionDto.class, new BasketBinder()); } @Override public void initBranchlineDto() { dataDtoToEntityTypeBuilder.put(BranchlineDto.class, Branchline.class); dataBinderBuilder.put(BranchlineDto.class, new BranchlineBinder()); + dataDtoToEntityTypeBuilder.put(BranchlineWithBasketDto.class, Branchline.class); + dataBinderBuilder.put(BranchlineWithBasketDto.class, new BranchlineBinder()); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.