This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 30b65be57dcc05c15c8c28babe0f3e3a3da7c217 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 10:17:55 2016 +0200 Intrudcion PmfmId2 et renommahe de certainnes méthodes (See #8270) --- .../tutti/persistence/TuttiPersistenceImpl.java | 4 +- .../persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../persistence/dao/referential/pmfm/PmfmId2.java | 168 +++++++++++++++++++++ .../CaracteristicPersistenceService.java | 10 +- .../CaracteristicPersistenceServiceImpl.java | 15 +- .../i18n/tutti-persistence_en_GB.properties | 3 + .../i18n/tutti-persistence_fr_FR.properties | 3 + .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 2 +- 9 files changed, 190 insertions(+), 21 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java index a319038..b2cf9ab 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java @@ -434,8 +434,8 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public Caracteristic getCpsTypeCaracteristic() { - return getCaracteristicService().getCpsTypeCaracteristic(); + public Caracteristic getCalcifiedStructureCaracteristic() { + return getCaracteristicService().getCalcifiedStructureCaracteristic(); } @Override diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java index abf9daa..ea0eba0 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java @@ -313,7 +313,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public Caracteristic getCpsTypeCaracteristic() { + public Caracteristic getCalcifiedStructureCaracteristic() { throw notImplemented(); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/referential/pmfm/PmfmId2.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/referential/pmfm/PmfmId2.java new file mode 100644 index 0000000..1a71346 --- /dev/null +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/referential/pmfm/PmfmId2.java @@ -0,0 +1,168 @@ +package fr.ifremer.tutti.persistence.dao.referential.pmfm; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; +import fr.ifremer.adagio.core.dao.technical.AdagioEnumerationDef; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import static org.nuiton.i18n.I18n.n; + +/** + * L'extension de {@link PmfmId} pour les pmfm non encore géré dans adagio. + * + * Created on 25/04/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 4.5 + */ +public enum PmfmId2 implements Serializable, AdagioEnumerationDef<Integer> { + + /** TODO: Model Documentation for Enumeration Literal SAMPLE_ID value 1435 */ + SAMPLE_ID( + "adagio.enumeration.PmfmId.SAMPLE_ID", + n("adagio.enumeration.PmfmId.SAMPLE_ID.description"), + 1435), + /** TODO: Model Documentation for Enumeration Literal COPY_METHOD value 1762 */ + COPY_METHOD( + "adagio.enumeration.PmfmId.COPY_METHOD", + n("adagio.enumeration.PmfmId.COPY_METHOD.description"), + 1762), + + /** TODO: Model Documentation for Enumeration Literal CALCIFIED_STRUCTURE value 1807 */ + CALCIFIED_STRUCTURE( + "adagio.enumeration.PmfmId.CALCIFIED_STRUCTURE", + n("adagio.enumeration.PmfmId.CALCIFIED_STRUCTURE.description"), + 1807); + + private static final long serialVersionUID = 1L; + + private String key; + private String description; + private Integer enumValue; + + private PmfmId2(String key, String description, Integer value) { + this.key = key; + this.description = description; + this.enumValue = value; + } + + @Override + public void setValue(Integer newValue) { + if (newValue != null && !this.enumValue.equals(newValue)) { + // Update static lists + values.remove(this.enumValue); + literals.remove(this.enumValue); + this.enumValue = newValue; + values.put(this.enumValue, this); + literals.add(this.enumValue); + } + } + + + @Override + public String getValueAsString() { + return String.valueOf(this.enumValue); + } + + /** + * Retrieves an instance of PmfmId2 from <code>its name</code>. + * + * @param name the name to create the PmfmId2 from. + * @return The enumeration literal named after the 'name' argument + */ + public static PmfmId2 fromString(String name) { + return PmfmId2.valueOf(name); + } + + /** + * Returns an enumeration literal Integer <code>value</code>. + * Required by JAXB2 enumeration implementation + * + * @return Integer with corresponding value + */ + public Integer value() { + return this.enumValue; + } + + /** + * Returns an instance of PmfmId2 from Integer <code>value</code>. + * Required by JAXB2 enumeration implementation + * + * @param value the value to create the PmfmId2 from. + * @return static Enumeration with corresponding value + */ + public static PmfmId2 fromValue(Integer value) { + for (PmfmId2 enumName : PmfmId2.values()) { + if (enumName.getValue().equals(value)) { + return enumName; + } + } + throw new IllegalArgumentException("PmfmId2.fromValue(" + value.toString() + ')'); + } + + /** + * Gets the underlying value of this type safe enumeration. + * This method is necessary to comply with DaoBase implementation. + * + * @return The name of this literal. + */ + public Integer getValue() { + return this.enumValue; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public String getKey() { + return key; + } + + @Override + public Class<?> getType() { + return Integer.class; + } + + /** + * Returns an unmodifiable list containing the literals that are known by this enumeration. + * + * @return A List containing the actual literals defined by this enumeration, this list + * can not be modified. + */ + public static List<Integer> literals() { + return PmfmId2.literals; + } + + /** + * Returns an unmodifiable list containing the names of the literals that are known + * by this enumeration. + * + * @return A List containing the actual names of the literals defined by this + * enumeration, this list can not be modified. + */ + public static List<String> names() { + return PmfmId2.names; + } + + private static final Map<Integer, PmfmId2> values = ImmutableMap + .<Integer, PmfmId2>builder() + .put(SAMPLE_ID.enumValue, SAMPLE_ID) + .put(COPY_METHOD.enumValue, COPY_METHOD) + .put(CALCIFIED_STRUCTURE.enumValue, CALCIFIED_STRUCTURE) + .build(); + + private static final List<Integer> literals = ImmutableList.of(SAMPLE_ID.enumValue, + COPY_METHOD.enumValue, + CALCIFIED_STRUCTURE.enumValue); + + private static final List<String> names = ImmutableList.of("SAMPLE_ID", + "COPY_METHOD", + "CALCIFIED_STRUCTURE"); + +} \ No newline at end of file diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceService.java index 85d5538..dae6d97 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceService.java @@ -43,14 +43,6 @@ import java.util.List; @Transactional(readOnly = true) public interface CaracteristicPersistenceService extends TuttiPersistenceServiceImplementor { - //FIXME A remplacer par celui que l'Ifremer doit fournir - //FIXME A déplacer dand adagio - Integer CPS_TYPE_PMFM_ID = 6; - - //FIXME A déplacer dand adagio - Integer COPY_INDIVIDUAL_OBSERVATION_MODE_PMFM_ID = 1762; - Integer SAMPLE_CODE_PMFM_ID = 1435; - /** * @return all caracteristics of the system. * @since 1.0 @@ -99,7 +91,7 @@ public interface CaracteristicPersistenceService extends TuttiPersistenceService Caracteristic getDeadOrAliveCaracteristic(); - Caracteristic getCpsTypeCaracteristic(); + Caracteristic getCalcifiedStructureCaracteristic(); Caracteristic getPmfmIdCaracteristic(); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java index 478ac48..652db23 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java @@ -31,6 +31,7 @@ import com.google.common.collect.Sets; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; import fr.ifremer.adagio.core.dao.referential.pmfm.UnitId; +import fr.ifremer.tutti.persistence.dao.referential.pmfm.PmfmId2; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchs; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -89,7 +90,8 @@ public class CaracteristicPersistenceServiceImpl extends ReferentialPersistenceS PmfmId.SURVEY_PART.getValue(), PmfmId.SORTED_UNSORTED.getValue(), PmfmId.ID_PMFM.getValue(), - COPY_INDIVIDUAL_OBSERVATION_MODE_PMFM_ID + PmfmId2.COPY_METHOD.getValue(), + PmfmId2.CALCIFIED_STRUCTURE.getValue() ); } @@ -224,9 +226,8 @@ public class CaracteristicPersistenceServiceImpl extends ReferentialPersistenceS } @Override - public Caracteristic getCpsTypeCaracteristic() { - //FIXME psfm à larrache en attendant que l'IFREMER nous fournisse le bon - Integer pmfmId = CPS_TYPE_PMFM_ID; + public Caracteristic getCalcifiedStructureCaracteristic() { + Integer pmfmId = PmfmId2.CALCIFIED_STRUCTURE.getValue(); return thisService.getCaracteristic(pmfmId); } @@ -244,12 +245,14 @@ public class CaracteristicPersistenceServiceImpl extends ReferentialPersistenceS @Override public Caracteristic getCopyIndividualObservationModeCaracteristic() { - return thisService.getCaracteristic(COPY_INDIVIDUAL_OBSERVATION_MODE_PMFM_ID); + Integer pmfmId = PmfmId2.COPY_METHOD.getValue(); + return thisService.getCaracteristic(pmfmId); } @Override public Caracteristic getSampleCodeCaracteristic() { - return thisService.getCaracteristic(SAMPLE_CODE_PMFM_ID); + Integer pmfmId = PmfmId2.SAMPLE_ID.getValue(); + return thisService.getCaracteristic(pmfmId); } @Override diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties index 7dd397c..63fc236 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties @@ -1,3 +1,6 @@ +adagio.enumeration.PmfmId.CALCIFIED_STRUCTURE.description= +adagio.enumeration.PmfmId.COPY_METHOD.description= +adagio.enumeration.PmfmId.SAMPLE_ID.description= application.common.unit=Unit application.common.unit.g=Gram application.common.unit.kg=Kilogram diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties index 713c0cc..48dbc98 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties @@ -1,3 +1,6 @@ +adagio.enumeration.PmfmId.CALCIFIED_STRUCTURE.description= +adagio.enumeration.PmfmId.COPY_METHOD.description= +adagio.enumeration.PmfmId.SAMPLE_ID.description= application.common.unit=Unité application.common.unit.g=Gramme application.common.unit.kg=Kilogramme diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java index bcfb6cb..c7928e0 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java @@ -873,8 +873,8 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public Caracteristic getCpsTypeCaracteristic() { - return driver.getCpsTypeCaracteristic(); + public Caracteristic getCalcifiedStructureCaracteristic() { + return driver.getCalcifiedStructureCaracteristic(); } @Override diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java index 10f0753..b534bac 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java @@ -743,7 +743,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { if (log.isInfoEnabled()) { log.info("Loading cpsTypeValues"); } - cpsTypeValues = service.getCpsTypeCaracteristic().getQualitativeValue(); + cpsTypeValues = service.getCalcifiedStructureCaracteristic().getQualitativeValue(); } return cpsTypeValues; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.