branch feature/7457 updated (e706104 -> cce3a40)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7457 in repository observe. See http://git.codelutin.com/observe.git discards e706104 Renommage Model en Dto new cce3a40 Renommage Model en Dto This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e706104) \ N -- N -- N refs/heads/feature/7457 (cce3a40) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit cce3a40d74764009121e5bfa3da920bc4803ecd7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 17 13:24:34 2015 +0200 Renommage Model en Dto Summary of changes: .../observe/services/model/AbstractObserveDto.java | 34 ++++ .../model/referential/ReferentialFormDto.java | 33 ++++ .../model/referential/ReferentialFormDtos.java | 15 ++ .../services/service/ReferentialDtoBuilder.java | 171 +++++++++++++++++++++ .../service/ReferentialDtoBuilderTest.java | 72 +++++++++ 5 files changed, 325 insertions(+) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveDto.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDto.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDtos.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java -- 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 feature/7457 in repository observe. See http://git.codelutin.com/observe.git commit cce3a40d74764009121e5bfa3da920bc4803ecd7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 17 13:24:34 2015 +0200 Renommage Model en Dto --- .../services/service/ReferentialService.java | 20 +-- ...ctObserveModel.java => AbstractObserveDto.java} | 2 +- ...ntialFormModel.java => ReferentialFormDto.java} | 8 +- .../model/referential/ReferentialFormDtos.java | 15 ++ .../model/referential/ReferentialFormModels.java | 10 -- .../xmi/observe-services-model-common.properties | 6 +- .../xmi/observe-services-model-longline.properties | 6 +- .../xmi/observe-services-model-seine.properties | 6 +- .../services/service/ReferentialServiceRest.java | 22 +-- .../referential/ReferentialServiceRestTest.java | 6 +- ...odelBuilder.java => ReferentialDtoBuilder.java} | 24 ++-- .../services/service/ReferentialServiceTopia.java | 158 +++++++++++---------- ...derTest.java => ReferentialDtoBuilderTest.java} | 8 +- .../referential/ReferentialServiceTopiaTest.java | 6 +- 14 files changed, 152 insertions(+), 145 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java index 69f4dec..5225689 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java @@ -1,9 +1,9 @@ package fr.ird.observe.services.service; import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.model.referential.ReferentialFormModel; -import fr.ird.observe.services.model.referential.ReferentialLabelSetModel; -import fr.ird.observe.services.model.referential.ReferentialModel; +import fr.ird.observe.services.model.referential.ReferentialDto; +import fr.ird.observe.services.model.referential.ReferentialFormDto; +import fr.ird.observe.services.model.referential.ReferentialLabelSetDto; import fr.ird.observe.services.spi.Write; import java.util.Collection; @@ -15,21 +15,21 @@ import java.util.Collection; */ public interface ReferentialService extends ObserveService { - <R extends ReferentialModel> ReferentialLabelSetModel getReferentialLabelSet(Class<R> type); + <R extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<R> type); - <R extends ReferentialModel> ReferentialFormModel<R> loadToRead(Class<R> type, String id); + <R extends ReferentialDto> ReferentialFormDto<R> loadToRead(Class<R> type, String id); - <R extends ReferentialModel> ReferentialFormModel<R> loadToEdit(Class<R> type, String id); + <R extends ReferentialDto> ReferentialFormDto<R> loadToEdit(Class<R> type, String id); - <R extends ReferentialModel> ReferentialFormModel<R> preCreate(Class<R> type); + <R extends ReferentialDto> ReferentialFormDto<R> preCreate(Class<R> type); @Write - <R extends ReferentialModel> String save(ReferentialFormModel<R> form); + <R extends ReferentialDto> String save(ReferentialFormDto<R> form); @Write - <R extends ReferentialModel> void delete(Class<R> type, String id); + <R extends ReferentialDto> void delete(Class<R> type, String id); @Write - <R extends ReferentialModel> void delete(Class<R> type, Collection<String> ids); + <R extends ReferentialDto> void delete(Class<R> type, Collection<String> ids); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveModel.java b/observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveDto.java similarity index 89% rename from observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveModel.java rename to observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveDto.java index 8be1ffe..5046273 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveModel.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveDto.java @@ -12,7 +12,7 @@ import java.util.Collection; * @author Tony Chemit - chemit@codelutin.com * @since 7.0 */ -public abstract class AbstractObserveModel extends AbstractSerializableBean implements JavaBeanObject { +public abstract class AbstractObserveDto extends AbstractSerializableBean implements JavaBeanObject { private static final long serialVersionUID = 1L; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormModel.java b/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDto.java similarity index 70% rename from observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormModel.java rename to observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDto.java index 229b027..d9155fb 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormModel.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDto.java @@ -2,22 +2,22 @@ package fr.ird.observe.services.model.referential; import com.google.common.base.Preconditions; -public class ReferentialFormModel<R extends ReferentialModel> extends AbstractReferentialFormModel { +public class ReferentialFormDto<R extends ReferentialDto> extends AbstractReferentialFormDto { private static final long serialVersionUID = 1L; protected final Class<R> type; - public ReferentialFormModel(Class<R> type) { + public ReferentialFormDto(Class<R> type) { this.type = type; } - public ReferentialFormModel() { + public ReferentialFormDto() { this(null); } @Override - public void setForm(ReferentialModel form) { + public void setForm(ReferentialDto form) { Preconditions.checkArgument(form.getClass().isAssignableFrom(type), "Bad form type, should be " + type.getName()); super.setForm(form); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDtos.java new file mode 100644 index 0000000..015d758 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDtos.java @@ -0,0 +1,15 @@ +package fr.ird.observe.services.model.referential; + +/** + * Created on 17/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ReferentialFormDtos extends AbstractReferentialFormDtos { + + public static <BeanType extends ReferentialFormDto, R extends ReferentialDto> BeanType newReferentialFormDto(Class<R> source) { + BeanType result = (BeanType) new ReferentialFormDto<>(source); + return result; + } + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormModels.java b/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormModels.java deleted file mode 100644 index 7b7e339..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormModels.java +++ /dev/null @@ -1,10 +0,0 @@ -package fr.ird.observe.services.model.referential; - -public class ReferentialFormModels extends AbstractReferentialFormModels { - - public static <BeanType extends ReferentialFormModel, R extends ReferentialModel> BeanType newReferentialFormModel(Class<R> source) { - BeanType result = (BeanType) new ReferentialFormModel<>(source); - return result; - } - -} diff --git a/observe-services-model/src/main/xmi/observe-services-model-common.properties b/observe-services-model/src/main/xmi/observe-services-model-common.properties index f9e7fd1..cbb0b5c 100644 --- a/observe-services-model/src/main/xmi/observe-services-model-common.properties +++ b/observe-services-model/src/main/xmi/observe-services-model-common.properties @@ -1,8 +1,8 @@ model.tagvalue.version=7.0 -model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model.AbstractObserveModel -model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Models -model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Model +model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model.AbstractObserveDto +model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos +model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto package.fr.ird.observe.services.model.stereotype=bean diff --git a/observe-services-model/src/main/xmi/observe-services-model-longline.properties b/observe-services-model/src/main/xmi/observe-services-model-longline.properties index f01b4ae..3736c79 100644 --- a/observe-services-model/src/main/xmi/observe-services-model-longline.properties +++ b/observe-services-model/src/main/xmi/observe-services-model-longline.properties @@ -1,7 +1,7 @@ model.tagvalue.version=7.0 -model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model.AbstractObserveModel -model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Models -model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Model +model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model.AbstractObserveDto +model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos +model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto package.fr.ird.observe.services.model.stereotype=bean diff --git a/observe-services-model/src/main/xmi/observe-services-model-seine.properties b/observe-services-model/src/main/xmi/observe-services-model-seine.properties index f01b4ae..3736c79 100644 --- a/observe-services-model/src/main/xmi/observe-services-model-seine.properties +++ b/observe-services-model/src/main/xmi/observe-services-model-seine.properties @@ -1,7 +1,7 @@ model.tagvalue.version=7.0 -model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model.AbstractObserveModel -model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Models -model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Model +model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model.AbstractObserveDto +model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos +model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto package.fr.ird.observe.services.model.stereotype=bean diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java index b12d613..e00ae53 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java @@ -2,9 +2,9 @@ package fr.ird.observe.services.service; import fr.ird.observe.services.ObserveServiceContext; import fr.ird.observe.services.ObserveServiceRest; -import fr.ird.observe.services.model.referential.ReferentialFormModel; -import fr.ird.observe.services.model.referential.ReferentialLabelSetModel; -import fr.ird.observe.services.model.referential.ReferentialModel; +import fr.ird.observe.services.model.referential.ReferentialDto; +import fr.ird.observe.services.model.referential.ReferentialFormDto; +import fr.ird.observe.services.model.referential.ReferentialLabelSetDto; import java.util.Collection; @@ -16,38 +16,38 @@ import java.util.Collection; public class ReferentialServiceRest extends ObserveServiceRest implements ReferentialService { @Override - public <R extends ReferentialModel> ReferentialLabelSetModel getReferentialLabelSet(Class<R> type) { + public <R extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<R> type) { - return new ReferentialLabelSetModel(); + return new ReferentialLabelSetDto(); } @Override - public <R extends ReferentialModel> ReferentialFormModel<R> loadToRead(Class<R> type, String id) { + public <R extends ReferentialDto> ReferentialFormDto<R> loadToRead(Class<R> type, String id) { return null; } @Override - public <R extends ReferentialModel> ReferentialFormModel<R> loadToEdit(Class<R> type, String id) { + public <R extends ReferentialDto> ReferentialFormDto<R> loadToEdit(Class<R> type, String id) { return null; } @Override - public <R extends ReferentialModel> ReferentialFormModel<R> preCreate(Class<R> type) { + public <R extends ReferentialDto> ReferentialFormDto<R> preCreate(Class<R> type) { return null; } @Override - public <R extends ReferentialModel> String save(ReferentialFormModel<R> form) { + public <R extends ReferentialDto> String save(ReferentialFormDto<R> form) { return null; } @Override - public <R extends ReferentialModel> void delete(Class<R> type, String id) { + public <R extends ReferentialDto> void delete(Class<R> type, String id) { } @Override - public <R extends ReferentialModel> void delete(Class<R> type, Collection<String> ids) { + public <R extends ReferentialDto> void delete(Class<R> type, Collection<String> ids) { } diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java index b93dfcf..f870be7 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java @@ -2,8 +2,8 @@ package fr.ird.observe.services.service.referential; import fr.ird.observe.services.ObserveServiceContextRest; import fr.ird.observe.services.ObserveServiceMainFactory; -import fr.ird.observe.services.model.referential.ReferentialLabelSetModel; -import fr.ird.observe.services.model.referential.SexModel; +import fr.ird.observe.services.model.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.model.referential.SexDto; import fr.ird.observe.services.service.ReferentialService; import org.junit.Assert; import org.junit.Before; @@ -29,7 +29,7 @@ public class ReferentialServiceRestTest { @Test public void testGetReferentialLabelSet() throws Exception { - ReferentialLabelSetModel referentialLabelSet = service.getReferentialLabelSet(SexModel.class); + ReferentialLabelSetDto referentialLabelSet = service.getReferentialLabelSet(SexDto.class); Assert.assertNotNull(referentialLabelSet); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialModelBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java similarity index 85% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialModelBuilder.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java index 9152e71..c95b04d 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialModelBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java @@ -5,9 +5,9 @@ import com.google.common.collect.ImmutableMap; import fr.ird.observe.entities.constants.GearType; import fr.ird.observe.entities.constants.ReferenceStatus; import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.services.model.referential.ReferentialLabelModel; -import fr.ird.observe.services.model.referential.ReferentialLabelModels; -import fr.ird.observe.services.model.referential.ReferentialModel; +import fr.ird.observe.services.model.referential.ReferentialDto; +import fr.ird.observe.services.model.referential.ReferentialLabelDto; +import fr.ird.observe.services.model.referential.ReferentialLabelDtos; import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; @@ -22,7 +22,7 @@ import java.util.LinkedHashSet; * * @author Tony Chemit - chemit@codelutin.com */ -public class ReferentialModelBuilder<M extends ReferentialModel> implements Closeable { +public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeable { private M result; @@ -32,7 +32,7 @@ public class ReferentialModelBuilder<M extends ReferentialModel> implements Clos private final EntityVisitor visitor; - public static <M extends ReferentialModel> ReferentialModelBuilder<M> create(Class<M> modelType) { + public static <M extends ReferentialDto> ReferentialDtoBuilder<M> create(Class<M> modelType) { Preconditions.checkNotNull(modelType, "modelType can't be null."); M result; @@ -41,11 +41,11 @@ public class ReferentialModelBuilder<M extends ReferentialModel> implements Clos } catch (InstantiationException | IllegalAccessException e) { throw new IllegalStateException("Could not instanciate model of type: " + modelType.getName()); } - ReferentialModelBuilder<M> visitor = new ReferentialModelBuilder<>(result); + ReferentialDtoBuilder<M> visitor = new ReferentialDtoBuilder<>(result); return visitor; } - public ReferentialModelBuilder<M> copyEntity(TopiaEntity entity) { + public ReferentialDtoBuilder<M> copyEntity(TopiaEntity entity) { entity.accept(visitor); return this; } @@ -58,7 +58,7 @@ public class ReferentialModelBuilder<M extends ReferentialModel> implements Clos } - protected ReferentialModelBuilder(M result) { + protected ReferentialDtoBuilder(M result) { this.result = result; this.binder = (Binder<M, M>) BinderFactory.newBinder(result.getClass()); this.valuesBuilder = new ImmutableMap.Builder<>(); @@ -69,7 +69,7 @@ public class ReferentialModelBuilder<M extends ReferentialModel> implements Clos protected void putPropertyValue(String propertyName, Object propertyValue) { if (TopiaEntity.TOPIA_ID.equals(propertyName)) { - propertyName = ReferentialModel.PROPERTY_ID; + propertyName = ReferentialDto.PROPERTY_ID; } else if (Program.PROPERTY_GEAR_TYPE.equals(propertyName)) { GearType entityGearType = (GearType) propertyValue; @@ -87,9 +87,9 @@ public class ReferentialModelBuilder<M extends ReferentialModel> implements Clos } - protected ReferentialLabelModel entityToRef(TopiaEntity entityValue) { + protected ReferentialLabelDto entityToRef(TopiaEntity entityValue) { - ReferentialLabelModel label = ReferentialLabelModels.newReferentialLabelModel(); + ReferentialLabelDto label = ReferentialLabelDtos.newReferentialLabelDto(); label.setId(entityValue.getTopiaId()); return label; @@ -144,7 +144,7 @@ public class ReferentialModelBuilder<M extends ReferentialModel> implements Clos if (TopiaEntity.class.isAssignableFrom(type)) { Collection<? extends TopiaEntity> topiaEntities = (Collection<? extends TopiaEntity>) value; - LinkedHashSet<ReferentialLabelModel> models = new LinkedHashSet<>(topiaEntities.size()); + LinkedHashSet<ReferentialLabelDto> models = new LinkedHashSet<>(topiaEntities.size()); for (TopiaEntity entityValue : topiaEntities) { models.add(entityToRef(entityValue)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index 7a2ae10..fd3a7f1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -20,28 +20,28 @@ import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselSizeCategory; import fr.ird.observe.entities.referentiel.VesselType; import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.model.referential.CountryModel; -import fr.ird.observe.services.model.referential.FpaZoneModel; -import fr.ird.observe.services.model.referential.GearCaracteristicModel; -import fr.ird.observe.services.model.referential.GearCaracteristicTypeModel; -import fr.ird.observe.services.model.referential.GearModel; -import fr.ird.observe.services.model.referential.HarbourModel; -import fr.ird.observe.services.model.referential.LengthWeightParameterModel; -import fr.ird.observe.services.model.referential.OceanModel; -import fr.ird.observe.services.model.referential.OrganismModel; -import fr.ird.observe.services.model.referential.PersonModel; -import fr.ird.observe.services.model.referential.ProgramModel; -import fr.ird.observe.services.model.referential.ReferentialFormModel; -import fr.ird.observe.services.model.referential.ReferentialFormModels; -import fr.ird.observe.services.model.referential.ReferentialLabelSetModel; -import fr.ird.observe.services.model.referential.ReferentialModel; -import fr.ird.observe.services.model.referential.SexModel; -import fr.ird.observe.services.model.referential.SpeciesGroupModel; -import fr.ird.observe.services.model.referential.SpeciesListModel; -import fr.ird.observe.services.model.referential.SpeciesModel; -import fr.ird.observe.services.model.referential.VesselModel; -import fr.ird.observe.services.model.referential.VesselSizeCategoryModel; -import fr.ird.observe.services.model.referential.VesselTypeModel; +import fr.ird.observe.services.model.referential.CountryDto; +import fr.ird.observe.services.model.referential.FpaZoneDto; +import fr.ird.observe.services.model.referential.GearCaracteristicDto; +import fr.ird.observe.services.model.referential.GearCaracteristicTypeDto; +import fr.ird.observe.services.model.referential.GearDto; +import fr.ird.observe.services.model.referential.HarbourDto; +import fr.ird.observe.services.model.referential.LengthWeightParameterDto; +import fr.ird.observe.services.model.referential.OceanDto; +import fr.ird.observe.services.model.referential.OrganismDto; +import fr.ird.observe.services.model.referential.PersonDto; +import fr.ird.observe.services.model.referential.ProgramDto; +import fr.ird.observe.services.model.referential.ReferentialDto; +import fr.ird.observe.services.model.referential.ReferentialFormDto; +import fr.ird.observe.services.model.referential.ReferentialFormDtos; +import fr.ird.observe.services.model.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.model.referential.SexDto; +import fr.ird.observe.services.model.referential.SpeciesDto; +import fr.ird.observe.services.model.referential.SpeciesGroupDto; +import fr.ird.observe.services.model.referential.SpeciesListDto; +import fr.ird.observe.services.model.referential.VesselDto; +import fr.ird.observe.services.model.referential.VesselSizeCategoryDto; +import fr.ird.observe.services.model.referential.VesselTypeDto; import org.nuiton.topia.persistence.TopiaEntity; import java.util.Collection; @@ -55,24 +55,24 @@ import java.util.Map; public class ReferentialServiceTopia extends ObserveServiceTopia implements ReferentialService { protected static final ImmutableMap<Class<?>, Class<?>> entityToModelTypeCache = new ImmutableMap.Builder<Class<?>, Class<?>>() - .put(VesselSizeCategory.class, VesselSizeCategoryModel.class) - .put(Country.class, CountryModel.class) - .put(Harbour.class, HarbourModel.class) - .put(VesselType.class, VesselTypeModel.class) - .put(Vessel.class, VesselModel.class) - .put(SpeciesGroup.class, SpeciesGroupModel.class) - .put(Species.class, SpeciesModel.class) - .put(Sex.class, SexModel.class) - .put(FpaZone.class, FpaZoneModel.class) - .put(SpeciesList.class, SpeciesListModel.class) - .put(Person.class, PersonModel.class) - .put(Ocean.class, OceanModel.class) - .put(Organism.class, OrganismModel.class) - .put(LengthWeightParameter.class, LengthWeightParameterModel.class) - .put(Program.class, ProgramModel.class) - .put(GearCaracteristicType.class, GearCaracteristicTypeModel.class) - .put(GearCaracteristic.class, GearCaracteristicModel.class) - .put(Gear.class, GearModel.class) + .put(VesselSizeCategory.class, VesselSizeCategoryDto.class) + .put(Country.class, CountryDto.class) + .put(Harbour.class, HarbourDto.class) + .put(VesselType.class, VesselTypeDto.class) + .put(Vessel.class, VesselDto.class) + .put(SpeciesGroup.class, SpeciesGroupDto.class) + .put(Species.class, SpeciesDto.class) + .put(Sex.class, SexDto.class) + .put(FpaZone.class, FpaZoneDto.class) + .put(SpeciesList.class, SpeciesListDto.class) + .put(Person.class, PersonDto.class) + .put(Ocean.class, OceanDto.class) + .put(Organism.class, OrganismDto.class) + .put(LengthWeightParameter.class, LengthWeightParameterDto.class) + .put(Program.class, ProgramDto.class) + .put(GearCaracteristicType.class, GearCaracteristicTypeDto.class) + .put(GearCaracteristic.class, GearCaracteristicDto.class) + .put(Gear.class, GearDto.class) // .put(VesselActivitySeine.class, VesselActivitySeineModel.class) // .put(SurroundingActivity.class, SurroundingActivityModel.class) @@ -133,86 +133,88 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } @Override - public <R extends ReferentialModel> ReferentialLabelSetModel getReferentialLabelSet(Class<R> type) { - Class<? extends TopiaEntity> entityType = getEntityType(type); - return new ReferentialLabelSetModel(); + public <D extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<D> dtoType) { + Class<? extends TopiaEntity> entityType = getEntityType(dtoType); + return new ReferentialLabelSetDto(); } @Override - public <R extends ReferentialModel> ReferentialFormModel<R> loadToRead(Class<R> type, String id) { - Class<? extends TopiaEntity> entityType = getEntityType(type); + public <D extends ReferentialDto> ReferentialFormDto<D> loadToRead(Class<D> dtoType, String id) { + Class<? extends TopiaEntity> entityType = getEntityType(dtoType); TopiaEntity entity = null; - ReferentialFormModel<R> model = entityToReferentialFormModel(type, entity); - return model; + ReferentialFormDto<D> form = entityToReferentialFormDto(dtoType, entity); + return form; } @Override - public <R extends ReferentialModel> ReferentialFormModel<R> loadToEdit(Class<R> type, String id) { - Class<? extends TopiaEntity> entityType = getEntityType(type); + public <D extends ReferentialDto> ReferentialFormDto<D> loadToEdit(Class<D> dtoType, String id) { + Class<? extends TopiaEntity> entityType = getEntityType(dtoType); TopiaEntity entity = null; - ReferentialFormModel<R> model = entityToReferentialFormModel(type, entity); - return model; + ReferentialFormDto<D> form = entityToReferentialFormDto(dtoType, entity); + return form; } @Override - public <R extends ReferentialModel> ReferentialFormModel<R> preCreate(Class<R> type) { - Class<? extends TopiaEntity> entityType = getEntityType(type); + public <D extends ReferentialDto> ReferentialFormDto<D> preCreate(Class<D> dtoType) { + Class<? extends TopiaEntity> entityType = getEntityType(dtoType); TopiaEntity entity = null; - ReferentialFormModel<R> model = entityToReferentialFormModel(type, entity); - return model; + ReferentialFormDto<D> form = entityToReferentialFormDto(dtoType, entity); + return form; } @Override - public <R extends ReferentialModel> String save(ReferentialFormModel<R> form) { - Class<R> type = form.getType(); - Class<? extends TopiaEntity> entityType = getEntityType(type); - TopiaEntity entity = referentialModelToEntity(form.getForm()); - // Save - ReferentialFormModel<R> model = entityToReferentialFormModel(type, entity); + public <D extends ReferentialDto> String save(ReferentialFormDto<D> form) { + Class<D> dtoType= form.getType(); + TopiaEntity entity = referentialDtoToEntity(form.getForm()); + // TODO Save + ReferentialFormDto<D> model = entityToReferentialFormDto(dtoType, entity); return model.getForm().getId(); } @Override - public <R extends ReferentialModel> void delete(Class<R> type, String id) { - Class<? extends TopiaEntity> entityType = getEntityType(type); + public <D extends ReferentialDto> void delete(Class<D> dtoType, String id) { + Class<? extends TopiaEntity> entityType = getEntityType(dtoType); } @Override - public <R extends ReferentialModel> void delete(Class<R> type, Collection<String> ids) { - Class<? extends TopiaEntity> entityType = getEntityType(type); + public <D extends ReferentialDto> void delete(Class<D> dtoType, Collection<String> ids) { + Class<? extends TopiaEntity> entityType = getEntityType(dtoType); } - protected <R extends ReferentialModel> ReferentialFormModel<R> entityToReferentialFormModel(Class<R> type, TopiaEntity entity) { - R referentialModel = toModel(type, entity); - ReferentialFormModel<R> referentialFormModel = ReferentialFormModels.newReferentialFormModel(type); - referentialFormModel.setForm(referentialModel); - return referentialFormModel; + protected <D extends ReferentialDto> ReferentialFormDto<D> entityToReferentialFormDto(Class<D> dtoType, TopiaEntity entity) { + D dto = toDto(dtoType, entity); + ReferentialFormDto<D> form = ReferentialFormDtos.newReferentialFormDto(dtoType); + form.setForm(dto); + return form; } - protected <R extends ReferentialModel, E extends TopiaEntity> E referentialModelToEntity(R model) { + protected <D extends ReferentialDto, E extends TopiaEntity> E referentialDtoToEntity(D dto) { + Class<D> aClass = (Class<D>) dto.getClass(); + Class<TopiaEntity> entityType = getEntityType(aClass); E entity = null; return null; } - protected <M extends ReferentialModel, E extends TopiaEntity> Class<E> getEntityType(Class<M> type) { - Class<?> entityType = entityToModelTypeCache.get(type); + protected <D extends ReferentialDto, E extends TopiaEntity> Class<E> getEntityType(Class<D> dtoType) { + Class<?> entityType = entityToModelTypeCache.get(dtoType); return (Class<E>) entityType; } - protected <E extends TopiaEntity, M extends ReferentialModel > Class<M> getModelType(Class<E> entityType) { + protected <E extends TopiaEntity, M extends ReferentialDto> Class<M> getDtoType(Class<E> entityType) { Class<?> modelType = modelToEntityTypeCache.get(entityType); return (Class<M>) modelType; } - protected <M extends ReferentialModel> M toModel(Class<M> modelType, TopiaEntity entity) { + protected <D extends ReferentialDto> D toDto(Class<D> dtoType, TopiaEntity entity) { - try (ReferentialModelBuilder<M> modelBuilder = ReferentialModelBuilder.create(modelType)) { - modelBuilder.copyEntity(entity); - M model = modelBuilder.build(); + try (ReferentialDtoBuilder<D> dtoBuilder = ReferentialDtoBuilder.create(dtoType)) { + dtoBuilder.copyEntity(entity); + D model = dtoBuilder.build(); return model; } } + } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialModelBuilderTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java similarity index 91% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialModelBuilderTest.java rename to observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java index 1f87ee2..9a4d45b 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialModelBuilderTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java @@ -6,7 +6,7 @@ import fr.ird.observe.entities.referentiel.Organism; import fr.ird.observe.entities.referentiel.OrganismImpl; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.referentiel.ProgramImpl; -import fr.ird.observe.services.model.referential.ProgramModel; +import fr.ird.observe.services.model.referential.ProgramDto; import org.junit.Assert; import org.junit.Test; import org.nuiton.util.DateUtil; @@ -16,7 +16,7 @@ import org.nuiton.util.DateUtil; * * @author Tony Chemit - chemit@codelutin.com */ -public class ReferentialModelBuilderTest { +public class ReferentialDtoBuilderTest { @Test public void testCopy() { @@ -42,9 +42,9 @@ public class ReferentialModelBuilderTest { organism.setTopiaId("Oraganism1"); program.setOrganism(organism); - ReferentialModelBuilder<ProgramModel> builder = ReferentialModelBuilder.create(ProgramModel.class); + ReferentialDtoBuilder<ProgramDto> builder = ReferentialDtoBuilder.create(ProgramDto.class); builder.copyEntity(program); - ProgramModel programModel = builder.build(); + ProgramDto programModel = builder.build(); Assert.assertEquals(program.getCode(), programModel.getCode()); Assert.assertEquals(program.isNeedComment(), programModel.isNeedComment()); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceTopiaTest.java index 00e9d75..3ae5f96 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceTopiaTest.java @@ -2,8 +2,8 @@ package fr.ird.observe.services.service.referential; import fr.ird.observe.services.ObserveServiceContextTopia; import fr.ird.observe.services.ObserveServiceMainFactory; -import fr.ird.observe.services.model.referential.ReferentialLabelSetModel; -import fr.ird.observe.services.model.referential.SexModel; +import fr.ird.observe.services.model.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.model.referential.SexDto; import fr.ird.observe.services.service.ReferentialService; import org.junit.Assert; import org.junit.Before; @@ -29,7 +29,7 @@ public class ReferentialServiceTopiaTest { @Test public void testGetReferentialLabelSet() throws Exception { - ReferentialLabelSetModel referentialLabelSet = service.getReferentialLabelSet(SexModel.class); + ReferentialLabelSetDto referentialLabelSet = service.getReferentialLabelSet(SexDto.class); Assert.assertNotNull(referentialLabelSet); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm