branch feature/7457 updated (fd5eccb -> e706104)
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 from fd5eccb On repousse une map concrete pour la transformation entre entité et model new e706104 Renommage Model en Dto 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 e7061049c654fe39899140010552ef831d3335cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 17 13:24:34 2015 +0200 Renommage Model en Dto Summary of changes: .../services/service/ReferentialService.java | 20 +-- .../services/model/AbstractObserveModel.java | 34 ---- .../model/referential/ReferentialFormModel.java | 33 ---- .../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 +- .../services/service/ReferentialModelBuilder.java | 171 --------------------- .../services/service/ReferentialServiceTopia.java | 158 +++++++++---------- .../service/ReferentialModelBuilderTest.java | 72 --------- .../referential/ReferentialServiceTopiaTest.java | 6 +- 13 files changed, 116 insertions(+), 434 deletions(-) delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveModel.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormModel.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormModels.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialModelBuilder.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialModelBuilderTest.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 e7061049c654fe39899140010552ef831d3335cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 17 13:24:34 2015 +0200 Renommage Model en Dto --- .../services/service/ReferentialService.java | 20 +-- .../services/model/AbstractObserveModel.java | 34 ---- .../model/referential/ReferentialFormModel.java | 33 ---- .../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 +- .../services/service/ReferentialModelBuilder.java | 171 --------------------- .../services/service/ReferentialServiceTopia.java | 158 +++++++++---------- .../service/ReferentialModelBuilderTest.java | 72 --------- .../referential/ReferentialServiceTopiaTest.java | 6 +- 13 files changed, 116 insertions(+), 434 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/AbstractObserveModel.java deleted file mode 100644 index 8be1ffe..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveModel.java +++ /dev/null @@ -1,34 +0,0 @@ -package fr.ird.observe.services.model; - -import org.jdesktop.beans.AbstractSerializableBean; -import org.nuiton.jaxx.application.bean.JavaBeanObject; -import org.nuiton.util.CollectionUtil; - -import java.util.Collection; - -/** - * Created on 14/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 7.0 - */ -public abstract class AbstractObserveModel extends AbstractSerializableBean implements JavaBeanObject { - - private static final long serialVersionUID = 1L; - - protected void firePropertyChange(String propertyName, Object newValue) { - firePropertyChange(propertyName, null, newValue); - } - - protected <B> B getChild(Collection<B> child, int index) { - return CollectionUtil.getOrNull(child, index); - } - - @Override - public void firePropertyChanged(String propertyName, - Object oldValue, - Object newValue) { - firePropertyChange(propertyName, oldValue, newValue); - } - -} \ No newline at end of file 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/ReferentialFormModel.java deleted file mode 100644 index 229b027..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormModel.java +++ /dev/null @@ -1,33 +0,0 @@ -package fr.ird.observe.services.model.referential; - -import com.google.common.base.Preconditions; - -public class ReferentialFormModel<R extends ReferentialModel> extends AbstractReferentialFormModel { - - private static final long serialVersionUID = 1L; - - protected final Class<R> type; - - public ReferentialFormModel(Class<R> type) { - this.type = type; - } - - public ReferentialFormModel() { - this(null); - } - - @Override - public void setForm(ReferentialModel form) { - Preconditions.checkArgument(form.getClass().isAssignableFrom(type), "Bad form type, should be " + type.getName()); - super.setForm(form); - } - - @Override - public R getForm() { - return (R) super.getForm(); - } - - public Class<R> getType() { - return type; - } -} 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/ReferentialModelBuilder.java deleted file mode 100644 index 9152e71..0000000 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialModelBuilder.java +++ /dev/null @@ -1,171 +0,0 @@ -package fr.ird.observe.services.service; - -import com.google.common.base.Preconditions; -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 org.nuiton.topia.persistence.EntityVisitor; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; - -import java.io.Closeable; -import java.util.Collection; -import java.util.LinkedHashSet; - -/** - * Created on 16/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ReferentialModelBuilder<M extends ReferentialModel> implements Closeable { - - private M result; - - private ImmutableMap.Builder<String, Object> valuesBuilder; - - private Binder<M, M> binder; - - private final EntityVisitor visitor; - - public static <M extends ReferentialModel> ReferentialModelBuilder<M> create(Class<M> modelType) { - - Preconditions.checkNotNull(modelType, "modelType can't be null."); - M result; - try { - result = modelType.newInstance(); - } catch (InstantiationException | IllegalAccessException e) { - throw new IllegalStateException("Could not instanciate model of type: " + modelType.getName()); - } - ReferentialModelBuilder<M> visitor = new ReferentialModelBuilder<>(result); - return visitor; - } - - public ReferentialModelBuilder<M> copyEntity(TopiaEntity entity) { - entity.accept(visitor); - return this; - } - - public M build() { - - ImmutableMap<String, Object> properties = valuesBuilder.build(); - binder.injectProperties(properties, result); - return result; - - } - - protected ReferentialModelBuilder(M result) { - this.result = result; - this.binder = (Binder<M, M>) BinderFactory.newBinder(result.getClass()); - this.valuesBuilder = new ImmutableMap.Builder<>(); - this.visitor = new ToModelVisitor(); - } - - - protected void putPropertyValue(String propertyName, Object propertyValue) { - - if (TopiaEntity.TOPIA_ID.equals(propertyName)) { - propertyName = ReferentialModel.PROPERTY_ID; - } else if (Program.PROPERTY_GEAR_TYPE.equals(propertyName)) { - - GearType entityGearType = (GearType) propertyValue; - propertyValue = fr.ird.observe.services.model.constants.GearType.valueOf(entityGearType.name()); - - } else if (Program.PROPERTY_STATUS.equals(propertyName)) { - - ReferenceStatus entityGearType = (ReferenceStatus) propertyValue; - propertyValue = fr.ird.observe.services.model.constants.ReferenceStatus.valueOf(entityGearType.name()); - - } - - //TODO Ajouter les autres exceptions de transformations - valuesBuilder.put(propertyName, propertyValue); - - } - - protected ReferentialLabelModel entityToRef(TopiaEntity entityValue) { - - ReferentialLabelModel label = ReferentialLabelModels.newReferentialLabelModel(); - label.setId(entityValue.getTopiaId()); - return label; - - } - - @Override - public void close() { - valuesBuilder = null; - result = null; - binder = null; - visitor.clear(); - } - - class ToModelVisitor implements EntityVisitor { - - @Override - public void start(TopiaEntity entity) { - visit(entity, TopiaEntity.TOPIA_ID, String.class, entity.getTopiaId()); - //visit(entity, TopiaEntity.TOPIA_VERSION, long.class, entity.getTopiaVersion()); - //visit(entity, TopiaEntity.TOPIA_CREATE_DATE, Date.class, entity.getTopiaCreateDate()); - } - - @Override - public void end(TopiaEntity entity) { - } - - @Override - public void visit(TopiaEntity entity, String propertyName, Class<?> type, Object value) { - - if (value != null) { - - Object valueToAdd = value; - if (value instanceof TopiaEntity) { - - TopiaEntity entityValue = (TopiaEntity) value; - valueToAdd = entityToRef(entityValue); - - } - - putPropertyValue(propertyName, valueToAdd); - - } - - } - - @Override - public void visit(TopiaEntity entity, String propertyName, Class<?> collectionType, Class<?> type, Object value) { - - if (value != null) { - - Object valueToAdd = value; - if (TopiaEntity.class.isAssignableFrom(type)) { - - Collection<? extends TopiaEntity> topiaEntities = (Collection<? extends TopiaEntity>) value; - LinkedHashSet<ReferentialLabelModel> models = new LinkedHashSet<>(topiaEntities.size()); - for (TopiaEntity entityValue : topiaEntities) { - - models.add(entityToRef(entityValue)); - } - valueToAdd = models; - - } - - putPropertyValue(propertyName, valueToAdd); - - } - - } - - @Override - public void visit(TopiaEntity entity, String propertyName, Class<?> collectionType, Class<?> type, int index, Object value) { - } - - @Override - public void clear() { - - } - } -} 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/ReferentialModelBuilderTest.java deleted file mode 100644 index 1f87ee2..0000000 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialModelBuilderTest.java +++ /dev/null @@ -1,72 +0,0 @@ -package fr.ird.observe.services.service; - -import fr.ird.observe.entities.constants.GearType; -import fr.ird.observe.entities.constants.ReferenceStatus; -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 org.junit.Assert; -import org.junit.Test; -import org.nuiton.util.DateUtil; - -/** - * Created on 17/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ReferentialModelBuilderTest { - - @Test - public void testCopy() { - - Program program = new ProgramImpl(); - program.setCode("code"); - program.setNeedComment(true); - program.setStatus(ReferenceStatus.enabled); - program.setLabel1("label1"); - program.setLabel2("label2"); - program.setLabel3("label3"); - program.setLabel4("label4"); - program.setLabel5("label5"); - program.setLabel6("label6"); - program.setLabel7("label7"); - program.setLabel8("label8"); - program.setTopiaId("Program1"); - program.setStartDate(DateUtil.createDate(1, 1, 1)); - program.setEndDate(DateUtil.createDate(1, 1, 2)); - program.setGearType(GearType.seine); - program.setTargetDiscardsObservation(1); - Organism organism = new OrganismImpl(); - organism.setTopiaId("Oraganism1"); - program.setOrganism(organism); - - ReferentialModelBuilder<ProgramModel> builder = ReferentialModelBuilder.create(ProgramModel.class); - builder.copyEntity(program); - ProgramModel programModel = builder.build(); - - Assert.assertEquals(program.getCode(), programModel.getCode()); - Assert.assertEquals(program.isNeedComment(), programModel.isNeedComment()); - Assert.assertNotNull(programModel.getStatus()); - Assert.assertEquals(program.getStatus().name(), programModel.getStatus().name()); - - Assert.assertEquals(program.getLabel1(), programModel.getLabel1()); - Assert.assertEquals(program.getLabel2(), programModel.getLabel2()); - Assert.assertEquals(program.getLabel3(), programModel.getLabel3()); - Assert.assertEquals(program.getLabel4(), programModel.getLabel4()); - Assert.assertEquals(program.getLabel5(), programModel.getLabel5()); - Assert.assertEquals(program.getLabel6(), programModel.getLabel6()); - Assert.assertEquals(program.getLabel7(), programModel.getLabel7()); - Assert.assertEquals(program.getLabel8(), programModel.getLabel8()); - Assert.assertEquals(program.getTopiaId(), programModel.getId()); - Assert.assertNotNull(programModel.getGearType()); - Assert.assertEquals(program.getGearType().name(), programModel.getGearType().name()); - Assert.assertEquals(program.getTargetDiscardsObservation(), programModel.getTargetDiscardsObservation()); - Assert.assertNotNull(programModel.getOrganism()); - Assert.assertEquals(program.getOrganism().getTopiaId(), programModel.getOrganism().getId()); - - } - - -} \ No newline at end of file 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