This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit a5f7ff953c6110db69e554518274f93666133884 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 18 16:36:49 2015 +0200 Renommage Label en Reference, introduction de Reference ReferentialReference --- .../services/service/ReferentialService.java | 4 +- .../java/fr/ird/observe/services/dto/FormDtos.java | 4 +- .../fr/ird/observe/services/dto/ReferenceDto.java | 47 +++++++++++++++ .../fr/ird/observe/services/dto/ReferenceDtos.java | 28 +++++++++ .../ird/observe/services/dto/ReferenceSetDto.java | 17 ++++++ .../ird/observe/services/dto/ReferenceSetDtos.java | 20 +++++++ ...n.java => ReferenceValueNotFoundException.java} | 11 ++-- .../dto/referential/ReferentialLabelSetDto.java | 17 ------ .../dto/referential/ReferentialLabelSetDtos.java | 20 ------- ...lLabelDto.java => ReferentialReferenceDto.java} | 63 +++++++-------------- ...abelDtos.java => ReferentialReferenceDtos.java} | 17 +++--- .../xmi/observe-services-dto-common.properties | 2 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 33042 -> 33490 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 75679 -> 75830 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 54650 -> 55982 bytes .../services/service/ReferentialServiceRest.java | 6 +- .../referential/ReferentialServiceRestTest.java | 4 +- .../services/service/ReferentialDtoBuilder.java | 10 ++-- .../services/service/ReferentialServiceTopia.java | 32 +++++------ .../service/ReferentialDtoBuilderTest.java | 17 +++--- .../service/ReferentialServiceTopiaTest.java | 14 ++--- 21 files changed, 191 insertions(+), 142 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 1ef629f..5d26659 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 @@ -3,7 +3,7 @@ package fr.ird.observe.services.service; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.spi.Write; import java.util.Collection; @@ -15,7 +15,7 @@ import java.util.Collection; */ public interface ReferentialService extends ObserveService { - <R extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<R> type); + <R extends ReferentialDto> ReferenceSetDto getReferentialReferenceSet(Class<R> type); <R extends ReferentialDto> FormDto<R> loadToRead(Class<R> type, String id) throws DataNotFoundException; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java index 530e2df..07f4d64 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java @@ -1,7 +1,5 @@ package fr.ird.observe.services.dto; -import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; - import java.util.Collection; /** @@ -16,7 +14,7 @@ public class FormDtos extends AbstractFormDtos { return result; } - public static <BeanType extends FormDto, R extends IdDto> BeanType newFormDto(Class<R> source, R form, Collection<ReferentialLabelSetDto> labels) { + public static <BeanType extends FormDto, R extends IdDto> BeanType newFormDto(Class<R> source, R form, Collection<ReferenceSetDto> labels) { BeanType result = (BeanType) new FormDto<>(source); result.setForm(form); result.setLabels(labels); diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java new file mode 100644 index 0000000..d4bac9c --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java @@ -0,0 +1,47 @@ +package fr.ird.observe.services.dto; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; + +import java.io.Serializable; + +public class ReferenceDto<D extends IdDto> extends AbstractReferenceDto { + + private static final long serialVersionUID = 1L; + + protected Class<D> type; + + protected ImmutableList<String> labelPropertyNames; + + protected Serializable[] labelPropertyValues; + + protected void init(Class<D> type, ImmutableList<String> labelPropertyNames) { + this.type = type; + this.labelPropertyNames = labelPropertyNames; + this.labelPropertyValues = new Serializable[labelPropertyNames.size()]; + } + + public Serializable getPropertyValue(String propertyName) { + int propertyIndex = getPropertyIndex(propertyName); + return labelPropertyValues[propertyIndex]; + } + + public ImmutableList<String> getPropertyNames() { + return labelPropertyNames; + } + + public void setPropertyValue(String propertyName, Serializable propertyValue) { + Preconditions.checkNotNull(propertyName, "propertyName parameter can't be null"); + int propertyIndex = getPropertyIndex(propertyName); + labelPropertyValues[propertyIndex] = propertyValue; + } + + protected int getPropertyIndex(String propertyName) { + int index = labelPropertyNames.indexOf(propertyName); + if (index == -1) { + throw new ReferenceValueNotFoundException(type, propertyName); + } + return index; + } + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDtos.java new file mode 100644 index 0000000..1012a40 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDtos.java @@ -0,0 +1,28 @@ +package fr.ird.observe.services.dto; + +import com.google.common.collect.ImmutableList; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + +import java.io.Serializable; +import java.util.Map; + +public class ReferenceDtos extends AbstractReferenceDtos { + + public static <R extends IdDto> ReferenceDto<R> newReferenceDto(Class<R> type, Object source) { + + ReferenceDto<R> dto = new ReferenceDto<>(); + + dto.init(type, ImmutableList.of("TODO")); + Binder binder = BinderFactory.newBinder(source.getClass()); + + String[] propertyNames = null; + Map<String, Object> properties = binder.obtainProperties(source, propertyNames); + for (Map.Entry<String, Object> entry : properties.entrySet()) { + String propertyName = entry.getKey(); + Object propertyValue = entry.getValue(); + dto.setPropertyValue(propertyName, (Serializable) propertyValue); + } + return dto; + } +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDto.java new file mode 100644 index 0000000..1f87fd2 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDto.java @@ -0,0 +1,17 @@ +package fr.ird.observe.services.dto; + +public class ReferenceSetDto<R extends IdDto> extends AbstractReferenceSetDto { + + private static final long serialVersionUID = 1L; + + protected final Class<R> type; + + public ReferenceSetDto(Class<R> type) { + this.type = type; + } + + public Class<R> getType() { + return type; + } + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java new file mode 100644 index 0000000..98dfbf8 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java @@ -0,0 +1,20 @@ +package fr.ird.observe.services.dto; + +import java.util.LinkedHashSet; + +public class ReferenceSetDtos extends AbstractReferenceSetDtos { + + public static <D extends IdDto> ReferenceSetDto<D> newEmptyReferenceSetDto(Class<D> type) { + ReferenceSetDto<D> dto = new ReferenceSetDto<>(type); + dto.setReference(new LinkedHashSet<ReferenceDto>()); + return dto; + } + + public static <D extends IdDto, R extends ReferenceDto<D>> ReferenceSetDto<D> newReferenceSetDto(Class<D> type, + LinkedHashSet<R> labels) { + ReferenceSetDto<D> dto = new ReferenceSetDto<>(type); + dto.setReference((LinkedHashSet) labels); + return dto; + } + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentielLabelValueNotFoundException.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java similarity index 50% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentielLabelValueNotFoundException.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java index 6a2f092..03a33e1 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentielLabelValueNotFoundException.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java @@ -1,18 +1,19 @@ -package fr.ird.observe.services.dto.referential; +package fr.ird.observe.services.dto; /** * Created on 18/08/15. * * @author Tony Chemit - chemit@codelutin.com */ -public class ReferentielLabelValueNotFoundException extends RuntimeException { +public class ReferenceValueNotFoundException extends RuntimeException { private static final long serialVersionUID = 1L; - protected final Class<? extends ReferentialDto> dtoType; + protected final Class<? extends IdDto> dtoType; + protected final String propertyName; - public ReferentielLabelValueNotFoundException(Class<? extends ReferentialDto> dtoType, String propertyName) { + public ReferenceValueNotFoundException(Class<? extends IdDto> dtoType, String propertyName) { this.dtoType = dtoType; this.propertyName = propertyName; } @@ -21,7 +22,7 @@ public class ReferentielLabelValueNotFoundException extends RuntimeException { return propertyName; } - public Class<? extends ReferentialDto> getDtoType() { + public Class<? extends IdDto> getDtoType() { return dtoType; } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDto.java deleted file mode 100644 index 2b8a45d..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDto.java +++ /dev/null @@ -1,17 +0,0 @@ -package fr.ird.observe.services.dto.referential; - -public class ReferentialLabelSetDto<R extends ReferentialDto> extends AbstractReferentialLabelSetDto { - - private static final long serialVersionUID = 1L; - - protected final Class<R> type; - - public ReferentialLabelSetDto(Class<R> type) { - this.type = type; - } - - public Class<R> getType() { - return type; - } - -} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDtos.java deleted file mode 100644 index db70705..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDtos.java +++ /dev/null @@ -1,20 +0,0 @@ -package fr.ird.observe.services.dto.referential; - -import java.util.LinkedHashSet; - -public class ReferentialLabelSetDtos extends AbstractReferentialLabelSetDtos { - - public static <R extends ReferentialDto> ReferentialLabelSetDto<R> newEmptyReferentialLabelSetDto(Class<R> type) { - ReferentialLabelSetDto<R> dto = new ReferentialLabelSetDto<>(type); - dto.setReferentialLabel(new LinkedHashSet<ReferentialLabelDto>()); - return dto; - } - - public static <R extends ReferentialDto> ReferentialLabelSetDto<R> newReferentialLabelSetDto(Class<R> type, - LinkedHashSet<ReferentialLabelDto<R>> labels) { - ReferentialLabelSetDto<R> dto = new ReferentialLabelSetDto<>(type); - dto.setReferentialLabel((LinkedHashSet)labels); - return dto; - } - -} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java similarity index 59% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDto.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java index f5550e1..60b43be 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java @@ -7,18 +7,12 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import java.io.Serializable; -public class ReferentialLabelDto<R extends ReferentialDto> extends AbstractReferentialLabelDto { +public class ReferentialReferenceDto<D extends ReferentialDto> extends AbstractReferentialReferenceDto { private static final long serialVersionUID = 1L; public static final String PROPERTY_LABEL = "label"; - protected final Class<R> type; - - protected final ImmutableList<String> labelPropertyNames; - - protected final Serializable[] labelPropertyValues; - public static final ImmutableSet<String> I18N_PROPERTY_NAMES = ImmutableSet.of( I18nReferentialDto.PROPERTY_LABEL1, I18nReferentialDto.PROPERTY_LABEL2, @@ -30,38 +24,11 @@ public class ReferentialLabelDto<R extends ReferentialDto> extends AbstractRefer I18nReferentialDto.PROPERTY_LABEL8 ); - public ReferentialLabelDto(Class<R> type, ReferentialLocale referentialLocale, String... labelPropertyNames) { - this.type = type; - String libelle = referentialLocale.getLibelle(); - ImmutableList.Builder<String> labelPropertyNamesBuilder = new ImmutableList.Builder<>(); - for (String labelPropertyName : labelPropertyNames) { - if (I18N_PROPERTY_NAMES.contains(labelPropertyName)) { - if (libelle.endsWith(labelPropertyName)) { - labelPropertyName = PROPERTY_LABEL; - } else { - continue; - } - } - labelPropertyNamesBuilder.add(labelPropertyName); - } - this.labelPropertyNames = labelPropertyNamesBuilder.build(); - this.labelPropertyValues = new Serializable[labelPropertyNames.length]; - } - - public Class<R> getType() { + public Class<D> getType() { return type; } - public Serializable getLabelPropertyValue(String propertyName) { - int propertyIndex = getPropertyIndex(propertyName); - return labelPropertyValues[propertyIndex]; - } - - public ImmutableList<String> getLabelPropertyNames() { - return labelPropertyNames; - } - - public void setLabelPropertyValue(ReferentialLocale referentialLocale, String propertyName, Serializable propertyValue) { + public void setPropertyValue(ReferentialLocale referentialLocale, String propertyName, Serializable propertyValue) { Preconditions.checkNotNull(referentialLocale, "referentialLocale parameter can't be null"); Preconditions.checkNotNull(propertyName, "propertyName parameter can't be null"); if (I18N_PROPERTY_NAMES.contains(propertyName)) { @@ -72,16 +39,26 @@ public class ReferentialLabelDto<R extends ReferentialDto> extends AbstractRefer } } if (propertyName != null) { - int propertyIndex = getPropertyIndex(propertyName); - labelPropertyValues[propertyIndex] = propertyValue; + setPropertyValue(propertyName, propertyValue); } } - protected int getPropertyIndex(String propertyName) { - int index = labelPropertyNames.indexOf(propertyName); - if (index == -1) { - throw new ReferentielLabelValueNotFoundException(type, propertyName); + protected void init(Class<D> type, ReferentialLocale referentialLocale, String... labelPropertyNames) { + + this.type = type; + String libelle = referentialLocale.getLibelle(); + ImmutableList.Builder<String> labelPropertyNamesBuilder = new ImmutableList.Builder<>(); + for (String labelPropertyName : labelPropertyNames) { + if (I18N_PROPERTY_NAMES.contains(labelPropertyName)) { + if (libelle.endsWith(labelPropertyName)) { + labelPropertyName = PROPERTY_LABEL; + } else { + continue; + } + } + labelPropertyNamesBuilder.add(labelPropertyName); } - return index; + init(type, labelPropertyNamesBuilder.build()); } + } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDtos.java similarity index 92% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDtos.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDtos.java index 779b0fb..9702e7d 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDtos.java @@ -49,7 +49,7 @@ import org.nuiton.util.beans.BinderFactory; import java.io.Serializable; import java.util.Map; -public class ReferentialLabelDtos extends AbstractReferentialLabelDtos { +public class ReferentialReferenceDtos extends AbstractReferentialReferenceDtos { /** * Les noms des propriétés à utiliser dans le label par type de référentiel. @@ -129,23 +129,20 @@ public class ReferentialLabelDtos extends AbstractReferentialLabelDtos { } - public static <R extends ReferentialDto> ReferentialLabelDto<R> newReferentialLabelDto(Class<R> type, ReferentialLocale referentialLocale) { + public static <R extends ReferentialDto> ReferentialReferenceDto<R> newReferentialReferenceDto(Class<R> type, + ReferentialLocale referentialLocale, + Object source) { String[] propertyNames = LABEL_PROPERTY_NAMES_MAPPING.get(type); - return new ReferentialLabelDto<>(type, referentialLocale, propertyNames); - } - public static <R extends ReferentialDto> ReferentialLabelDto<R> newReferentialLabelDto(Class<R> type, - ReferentialLocale referentialLocale, - Object source) { - String[] propertyNames = LABEL_PROPERTY_NAMES_MAPPING.get(type); - ReferentialLabelDto<R> dto = new ReferentialLabelDto<>(type, referentialLocale, propertyNames); + ReferentialReferenceDto<R> dto = new ReferentialReferenceDto<>(); + dto.init(type, referentialLocale, propertyNames); Binder binder = BinderFactory.newBinder(source.getClass()); Map<String, Object> properties = binder.obtainProperties(source, propertyNames); for (Map.Entry<String, Object> entry : properties.entrySet()) { String propertyName = entry.getKey(); Object propertyValue = entry.getValue(); - dto.setLabelPropertyValue(referentialLocale, propertyName, (Serializable) propertyValue); + dto.setPropertyValue(referentialLocale, propertyName, (Serializable) propertyValue); } return dto; } diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.properties b/observe-services-model/src/main/xmi/observe-services-dto-common.properties index e52b903..aa5d253 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-common.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-common.properties @@ -10,4 +10,4 @@ fr.ird.observe.services.dto.referential.Gear.attribute.gearCaracteristic.stereot fr.ird.observe.services.dto.referential.GearCaracteristic.attribute.gearCaracteristicType.stereotype=unique,ordered fr.ird.observe.services.dto.referential.Species.attribute.ocean.stereotype=unique,ordered fr.ird.observe.services.dto.referential.SpeciesList.attribute.species.stereotype=unique,ordered -fr.ird.observe.services.dto.referential.ReferentialLabelSet.attribute.referentialLabel.stereotype=unique,ordered +fr.ird.observe.services.dto.ReferenceSet.attribute.reference.stereotype=unique,ordered diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 862033a..89d3f35 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index 7208e8c..05c1fec 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index 4552de9..ac68371 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/observe-services-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 fe60d68..679c212 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.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; import java.util.Collection; @@ -16,9 +16,9 @@ import java.util.Collection; public class ReferentialServiceRest extends ObserveServiceRest implements ReferentialService { @Override - public <R extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<R> type) { + public <R extends ReferentialDto> ReferenceSetDto getReferentialReferenceSet(Class<R> type) { - return new ReferentialLabelSetDto(type); + return new ReferenceSetDto(type); } @Override 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 9aa09e7..8dbaade 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,7 +2,7 @@ package fr.ird.observe.services.service.referential; import fr.ird.observe.services.ObserveServiceContextRest; import fr.ird.observe.services.ObserveServiceMainFactory; -import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.service.ReferentialService; import org.junit.Assert; @@ -29,7 +29,7 @@ public class ReferentialServiceRestTest { @Test public void testGetReferentialLabelSet() throws Exception { - ReferentialLabelSetDto referentialLabelSet = service.getReferentialLabelSet(SexDto.class); + ReferenceSetDto referentialLabelSet = service.getReferentialReferenceSet(SexDto.class); Assert.assertNotNull(referentialLabelSet); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java index b373bca..1f24107 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java @@ -11,8 +11,8 @@ import fr.ird.observe.entities.constants.seine.SchoolType; import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelDtos; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDtos; import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; @@ -120,10 +120,10 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl } - protected <R extends ReferentialDto> ReferentialLabelDto<R> entityToRef(Class<R> dtoType, TopiaEntity entityValue) { + protected <R extends ReferentialDto> ReferentialReferenceDto<R> entityToRef(Class<R> dtoType, TopiaEntity entityValue) { referentialDtoTypesBuilder.add(dtoType); - ReferentialLabelDto<R> label = ReferentialLabelDtos.newReferentialLabelDto(dtoType, referentialLocale, entityValue); + ReferentialReferenceDto<R> label = ReferentialReferenceDtos.newReferentialReferenceDto(dtoType, referentialLocale, entityValue); label.setId(entityValue.getTopiaId()); return label; @@ -182,7 +182,7 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl Class dtoType = ReferentialServiceTopia.entityToModelTypeCache.get(type); Collection<? extends TopiaEntity> topiaEntities = (Collection<? extends TopiaEntity>) value; - LinkedHashSet<ReferentialLabelDto> models = new LinkedHashSet<>(topiaEntities.size()); + LinkedHashSet<ReferentialReferenceDto> models = new LinkedHashSet<>(topiaEntities.size()); for (TopiaEntity entityValue : topiaEntities) { models.add(entityToRef(dtoType, 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 ee9a73f..6983bdd 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 @@ -65,6 +65,8 @@ import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.FormDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -77,10 +79,8 @@ import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelDtos; -import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelSetDtos; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDtos; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; @@ -226,25 +226,25 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } @Override - public <D extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<D> dtoType) { + public <D extends ReferentialDto> ReferenceSetDto getReferentialReferenceSet(Class<D> dtoType) { Class<TopiaEntity> entityType = getEntityType(dtoType); List<TopiaEntity> entities = loadEntities(entityType); - LinkedHashSet<ReferentialLabelDto<D>> labels = new LinkedHashSet<>(); + LinkedHashSet<ReferentialReferenceDto<D>> labels = new LinkedHashSet<>(); for (TopiaEntity entity : entities) { - ReferentialLabelDto<D> dto = ReferentialLabelDtos.newReferentialLabelDto(dtoType, serviceContext.getReferentialLocale(), entity); + ReferentialReferenceDto<D> dto = ReferentialReferenceDtos.newReferentialReferenceDto(dtoType, serviceContext.getReferentialLocale(), entity); labels.add(dto); } - ReferentialLabelSetDto labelSetDto = ReferentialLabelSetDtos.newReferentialLabelSetDto(dtoType, labels); + ReferenceSetDto labelSetDto = ReferenceSetDtos.newReferenceSetDto(dtoType, labels); return labelSetDto; } - public <D extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<D> dtoType, String id) { + public <D extends ReferentialDto> ReferenceSetDto getReferentialLabelSet(Class<D> dtoType, String id) { Class<TopiaEntity> entityType = getEntityType(dtoType); TopiaEntity entity = loadEntity(dtoType, entityType, id); - LinkedHashSet<ReferentialLabelDto<D>> labels = new LinkedHashSet<>(1); - ReferentialLabelDto<D> dto = ReferentialLabelDtos.newReferentialLabelDto(dtoType, serviceContext.getReferentialLocale(), entity); + LinkedHashSet<ReferentialReferenceDto<D>> labels = new LinkedHashSet<>(1); + ReferentialReferenceDto<D> dto = ReferentialReferenceDtos.newReferentialReferenceDto(dtoType, serviceContext.getReferentialLocale(), entity); labels.add(dto); - ReferentialLabelSetDto labelSetDto = ReferentialLabelSetDtos.newReferentialLabelSetDto(dtoType, labels); + ReferenceSetDto labelSetDto = ReferenceSetDtos.newReferenceSetDto(dtoType, labels); return labelSetDto; } @@ -346,9 +346,9 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe // build label sets detected while copy ImmutableSet<Class<? extends ReferentialDto>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); - ImmutableSet.Builder<ReferentialLabelSetDto> labels = new ImmutableSet.Builder<>(); + ImmutableSet.Builder<ReferenceSetDto> labels = new ImmutableSet.Builder<>(); for (Class<? extends ReferentialDto> referenceDtoType : referentialDtoTypes) { - ReferentialLabelSetDto referentialLabelSet = getReferentialLabelSet(referenceDtoType); + ReferenceSetDto referentialLabelSet = getReferentialReferenceSet(referenceDtoType); labels.add(referentialLabelSet); } FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); @@ -366,10 +366,10 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe // build label sets detected while copy (keep the reference for each label, or nothing if value not set) ImmutableSet<Class<? extends ReferentialDto>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); - ImmutableSet.Builder<ReferentialLabelSetDto> labels = new ImmutableSet.Builder<>(); + ImmutableSet.Builder<ReferenceSetDto> labels = new ImmutableSet.Builder<>(); for (Class<? extends ReferentialDto> referentialDtoType : referentialDtoTypes) { - ReferentialLabelSetDto referentialLabelSet = ReferentialLabelSetDtos.newEmptyReferentialLabelSetDto(referentialDtoType); + ReferenceSetDto referentialLabelSet = ReferenceSetDtos.newEmptyReferenceSetDto(referentialDtoType); labels.add(referentialLabelSet); } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java index 3e54fa1..94667cd 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java @@ -7,13 +7,14 @@ 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.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceValueNotFoundException; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelDto; -import fr.ird.observe.services.dto.referential.ReferentielLabelValueNotFoundException; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import org.junit.Assert; import org.junit.Test; import org.nuiton.util.DateUtil; @@ -89,11 +90,11 @@ public class ReferentialDtoBuilderTest { Assert.assertEquals(program.getTargetDiscardsObservation(), programDto.getTargetDiscardsObservation()); // On vérife que la référence sur l'organisme a bien été copiée - ReferentialLabelDto organismDto = programDto.getOrganism(); + ReferenceDto organismDto = programDto.getOrganism(); Assert.assertNotNull(organismDto); Assert.assertEquals(organism.getTopiaId(), organismDto.getId()); - Assert.assertEquals(organism.getCode(), organismDto.getLabelPropertyValue(ReferentialDto.PROPERTY_CODE)); - Assert.assertEquals(organism.getLabel2(), organismDto.getLabelPropertyValue(ReferentialLabelDto.PROPERTY_LABEL)); + Assert.assertEquals(organism.getCode(), organismDto.getPropertyValue(ReferentialDto.PROPERTY_CODE)); + Assert.assertEquals(organism.getLabel2(), organismDto.getPropertyValue(ReferentialReferenceDto.PROPERTY_LABEL)); assertPropertyNameDoesNotFound(organismDto, I18nReferentialDto.PROPERTY_LABEL1); assertPropertyNameDoesNotFound(organismDto, I18nReferentialDto.PROPERTY_LABEL2); @@ -106,12 +107,12 @@ public class ReferentialDtoBuilderTest { } - protected void assertPropertyNameDoesNotFound(ReferentialLabelDto dto, String propertyName) { + protected void assertPropertyNameDoesNotFound(ReferenceDto dto, String propertyName) { try { - dto.getLabelPropertyValue(propertyName); + dto.getPropertyValue(propertyName); Assert.fail(); - } catch (ReferentielLabelValueNotFoundException e) { + } catch (ReferenceValueNotFoundException e) { Assert.assertTrue(true); } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java index cbcf107..0424d0e 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java @@ -11,7 +11,7 @@ import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -73,9 +73,9 @@ public class ReferentialServiceTopiaTest { log.info("Test referential of type: " + dtoType.getSimpleName() + " expected count: " + expectedCount); } - ReferentialLabelSetDto referentialLabelSet = service.getReferentialLabelSet(dtoType); + ReferenceSetDto referentialLabelSet = service.getReferentialReferenceSet(dtoType); Assert.assertNotNull(referentialLabelSet); - Assert.assertEquals(expectedCount, referentialLabelSet.sizeReferentialLabel()); + Assert.assertEquals(expectedCount, referentialLabelSet.sizeReference()); } @@ -144,8 +144,8 @@ public class ReferentialServiceTopiaTest { Assert.assertNotNull(form); Assert.assertEquals(o.getTopiaId(), form.getId()); - for (ReferentialLabelSetDto labelSetDto : formDto.getLabels()) { - Assert.assertTrue(labelSetDto.isReferentialLabelEmpty()); + for (ReferenceSetDto labelSetDto : formDto.getLabels()) { + Assert.assertTrue(labelSetDto.isReferenceEmpty()); } } @@ -173,11 +173,11 @@ public class ReferentialServiceTopiaTest { Assert.assertNotNull(form); Assert.assertEquals(o.getTopiaId(), form.getId()); - for (ReferentialLabelSetDto labelSetDto : formDto.getLabels()) { + for (ReferenceSetDto labelSetDto : formDto.getLabels()) { Class refEntityType = ReferentialServiceTopia.modelToEntityTypeCache.get(labelSetDto.getType()); long refExpected = dataSourceResource.getDataSource().getDAO(tx, refEntityType).count(); - Assert.assertEquals(refExpected, labelSetDto.sizeReferentialLabel()); + Assert.assertEquals(refExpected, labelSetDto.sizeReference()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.