Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

13 changed files:

Changes:

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesMeasurementsTableModel.java
    ... ... @@ -23,7 +23,6 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.common;
    23 23 
      */
    24 24
    25 25 
     import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport;
    26 
    -import fr.ird.observe.dto.IdDto;
    27 26 
     import fr.ird.observe.dto.data.ll.common.GearUseFeaturesMeasurementDto;
    28 27 
     import fr.ird.observe.dto.referential.common.GearCaracteristicReference;
    29 28
    ... ... @@ -132,6 +131,6 @@ public class GearUseFeaturesMeasurementsTableModel extends EditableTableWithCach
    132 131
    133 132 
         @Override
    134 133 
         protected GearUseFeaturesMeasurementDto createNewRow() {
    135 
    -        return IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date());
    134 
    +        return GearUseFeaturesMeasurementDto.newDto(new Date());
    136 135 
         }
    137 136 
     }

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUITableModel.java
    ... ... @@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableList;
    26 26 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableMeta;
    27 27 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUITableModel;
    28 28 
     import fr.ird.observe.client.util.UIHelper;
    29 
    -import fr.ird.observe.dto.IdDto;
    30 29 
     import fr.ird.observe.dto.data.ll.common.GearUseFeaturesDto;
    31 30 
     import fr.ird.observe.dto.data.ll.common.GearUseFeaturesMeasurementDto;
    32 31 
     import fr.ird.observe.dto.data.ll.common.TripGearUseFeaturesDto;
    ... ... @@ -224,7 +223,7 @@ class GearUseFeaturesUITableModel extends ContentTableUITableModel<TripGearUseFe
    224 223
    225 224 
             return gearDto.getGearCaracteristic().stream()
    226 225 
                     .map(input -> {
    227 
    -                    GearUseFeaturesMeasurementDto measurementDto = IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date());
    226 
    +                    GearUseFeaturesMeasurementDto measurementDto = GearUseFeaturesMeasurementDto.newDto(new Date());
    228 227 
                         if (input.getGearCaracteristicType().isBoolean()) {
    229 228 
                             measurementDto.setMeasurementValue(Boolean.FALSE.toString());
    230 229 
                         }

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/BasketTableModel.java
    ... ... @@ -22,7 +22,6 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    -import fr.ird.observe.dto.IdDto;
    26 25 
     import fr.ird.observe.dto.data.ll.observation.BasketDto;
    27 26 
     import fr.ird.observe.dto.data.ll.observation.SectionTemplate;
    28 27
    ... ... @@ -37,13 +36,14 @@ import java.util.Date;
    37 36 
     public class BasketTableModel extends LonglineCompositionObsTableModelSupport<BasketDto> {
    38 37
    39 38 
         public static final Class<?>[] CLASSES = {Integer.class, Integer.class, Float.class, Float.class};
    39 
    +
    40 40 
         public BasketTableModel(SetDetailCompositionUIModel model) {
    41 41 
             super(model);
    42 42 
         }
    43 43
    44 44 
         @Override
    45 45 
         public BasketDto createNewRow() {
    46 
    -        return IdDto.newDto(BasketDto.class, new Date());
    46 
    +        return BasketDto.newDto(new Date());
    47 47 
         }
    48 48
    49 49 
         @Override

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/BranchlineTableModel.java
    ... ... @@ -22,7 +22,6 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    -import fr.ird.observe.dto.IdDto;
    26 25 
     import fr.ird.observe.dto.data.ll.observation.BranchlineDto;
    27 26
    28 27 
     import java.util.Date;
    ... ... @@ -50,7 +49,7 @@ public class BranchlineTableModel extends LonglineCompositionObsTableModelSuppor
    50 49 
         @Override
    51 50 
         public BranchlineDto createNewRow() {
    52 51
    53 
    -        BranchlineDto branchline = IdDto.newDto(BranchlineDto.class, new Date());
    52 
    +        BranchlineDto branchline = BranchlineDto.newDto(new Date());
    54 53 
             branchline.setTimerTimeOnBoard(defaultDate);
    55 54 
             branchline.setTimer(useTimer);
    56 55 
             return branchline;

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SizeMeasureTableModel.java
    ... ... @@ -23,7 +23,6 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation;
    23 23 
      */
    24 24
    25 25 
     import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport;
    26 
    -import fr.ird.observe.dto.IdDto;
    27 26 
     import fr.ird.observe.dto.data.ll.observation.SizeMeasureDto;
    28 27 
     import fr.ird.observe.dto.referential.common.SizeMeasureTypeReference;
    29 28
    ... ... @@ -101,7 +100,7 @@ public class SizeMeasureTableModel extends EditableTableWithCacheTableModelSuppo
    101 100
    102 101 
         @Override
    103 102 
         protected SizeMeasureDto createNewRow() {
    104 
    -        return IdDto.newDto(SizeMeasureDto.class, new Date());
    103 
    +        return SizeMeasureDto.newDto(new Date());
    105 104 
         }
    106 105
    107 106 
     }

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/WeightMeasureTableModel.java
    ... ... @@ -23,7 +23,6 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation;
    23 23 
      */
    24 24
    25 25 
     import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport;
    26 
    -import fr.ird.observe.dto.IdDto;
    27 26 
     import fr.ird.observe.dto.data.ll.observation.WeightMeasureDto;
    28 27 
     import fr.ird.observe.dto.referential.common.WeightMeasureTypeReference;
    29 28
    ... ... @@ -57,7 +56,7 @@ public class WeightMeasureTableModel extends EditableTableWithCacheTableModelSup
    57 56
    58 57 
         @Override
    59 58 
         protected WeightMeasureDto createNewRow() {
    60 
    -        return IdDto.newDto(WeightMeasureDto.class, new Date());
    59 
    +        return WeightMeasureDto.newDto(new Date());
    61 60 
         }
    62 61
    63 62 
         @Override

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesMeasurementsTableModel.java
    ... ... @@ -23,7 +23,6 @@ package fr.ird.observe.client.datasource.editor.content.data.ps.common;
    23 23 
      */
    24 24
    25 25 
     import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport;
    26 
    -import fr.ird.observe.dto.IdDto;
    27 26 
     import fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementDto;
    28 27 
     import fr.ird.observe.dto.referential.common.GearCaracteristicReference;
    29 28
    ... ... @@ -132,6 +131,6 @@ public class GearUseFeaturesMeasurementsTableModel extends EditableTableWithCach
    132 131
    133 132 
         @Override
    134 133 
         protected GearUseFeaturesMeasurementDto createNewRow() {
    135 
    -        return IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date());
    134 
    +        return GearUseFeaturesMeasurementDto.newDto(new Date());
    136 135 
         }
    137 136 
     }

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesUITableModel.java
    ... ... @@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableList;
    26 26 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableMeta;
    27 27 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUITableModel;
    28 28 
     import fr.ird.observe.client.util.UIHelper;
    29 
    -import fr.ird.observe.dto.IdDto;
    30 29 
     import fr.ird.observe.dto.data.ps.common.GearUseFeaturesDto;
    31 30 
     import fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementDto;
    32 31 
     import fr.ird.observe.dto.data.ps.common.TripGearUseFeaturesDto;
    ... ... @@ -224,7 +223,7 @@ class GearUseFeaturesUITableModel extends ContentTableUITableModel<TripGearUseFe
    224 223
    225 224 
             return gearDto.getGearCaracteristic().stream()
    226 225 
                     .map(input -> {
    227 
    -                    GearUseFeaturesMeasurementDto measurementDto = IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date());
    226 
    +                    GearUseFeaturesMeasurementDto measurementDto = GearUseFeaturesMeasurementDto.newDto(new Date());
    228 227 
                         if (input.getGearCaracteristicType().isBoolean()) {
    229 228 
                             measurementDto.setMeasurementValue(Boolean.FALSE.toString());
    230 229 
                         }

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIHandler.java
    ... ... @@ -32,7 +32,6 @@ import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto;
    32 32 
     import fr.ird.observe.dto.data.ps.observation.FloatingObjectReference;
    33 33 
     import fr.ird.observe.dto.data.ps.observation.ObjectMaterialHierarchyDto;
    34 34 
     import fr.ird.observe.dto.data.ps.observation.TransmittingBuoyDto;
    35 
    -import fr.ird.observe.dto.data.ps.observation.TransmittingBuoyHelper;
    36 35 
     import fr.ird.observe.dto.form.Form;
    37 36 
     import fr.ird.observe.dto.referential.ps.common.ObjectOperationReference;
    38 37 
     import fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOperationDto;
    ... ... @@ -338,7 +337,7 @@ public class FloatingObjectUIHandler extends ContentEditUIHandler<FloatingObject
    338 337
    339 338 
             if (transmittingBuoy == null) {
    340 339
    341 
    -            TransmittingBuoyHelper.copyTransmittingBuoyDto(TransmittingBuoyDto.newDto(TransmittingBuoyDto.class, new Date()), editBean);
    340 
    +            TransmittingBuoyDto.newDto(new Date()).copy(editBean);
    342 341 
                 editBean.setCreateDate(new Date());
    343 342 
                 editBean.setTransmittingBuoyOperation(operation);
    344 343

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIModel.java
    ... ... @@ -91,7 +91,7 @@ public class FloatingObjectUIModel extends ContentEditUIModel<FloatingObjectDto,
    91 91 
             ImmutableSet.Builder<FloatingObjectPartDto> result = ImmutableSet.builder();
    92 92 
             Date now = new Date();
    93 93 
             for (ObjectMaterialDto o : getAllWithData()) {
    94 
    -            FloatingObjectPartDto partDto = FloatingObjectPartDto.newDto(FloatingObjectPartDto.class, now);
    94 
    +            FloatingObjectPartDto partDto = FloatingObjectPartDto.newDto(now);
    95 95 
                 partDto.setObjectMaterial(o.toReference(referentialLocale));
    96 96 
                 if (arriving) {
    97 97 
                     partDto.setWhenArriving(whenArriving.get(o));

  • common-persistence/src/main/java/fr/ird/observe/spi/context/DataDtoEntityContext.java
    ... ... @@ -23,6 +23,7 @@ package fr.ird.observe.spi.context;
    23 23 
      */
    24 24
    25 25 
     import com.google.common.collect.ImmutableSet;
    26 
    +import fr.ird.observe.dto.IdDto;
    26 27 
     import fr.ird.observe.dto.data.DataDto;
    27 28 
     import fr.ird.observe.dto.form.Form;
    28 29 
     import fr.ird.observe.dto.reference.DataDtoReference;
    ... ... @@ -130,7 +131,7 @@ public class DataDtoEntityContext<D extends DataDto, R extends DataDtoReference<
    130 131
    131 132 
         @Override
    132 133 
         public D toDto(ReferentialLocale referentialLocale, Class<D> dtoType, E entity) {
    133 
    -        D dto = Objects2.newInstance(dtoType);
    134 
    +        D dto = IdDto.newDto(dtoType, entity.getTopiaCreateDate());
    134 135 
             entity.toDto(referentialLocale, dto);
    135 136 
             return dto;
    136 137 
         }

  • dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityDto.java
    ... ... @@ -139,7 +139,7 @@ public class ActivityDto extends GeneratedActivityDto {
    139 139 
         }
    140 140
    141 141 
         public SampleReference toNewSampleReference(ReferentialLocale referentialLocale) {
    142 
    -        SampleDto sampleDto = SampleDto.newDto(SampleDto.class, new Date());
    142 
    +        SampleDto sampleDto = SampleDto.newDto(new Date());
    143 143 
             sampleDto.setTimeStamp(getStartTimeStamp());
    144 144 
             sampleDto.setLatitude(getLatitude());
    145 145 
             sampleDto.setLongitude(getLongitude());

  • templates/src/main/java/fr/ird/observe/toolkit/templates/dto/DtoTransformer.java
    ... ... @@ -61,6 +61,7 @@ import org.nuiton.eugene.models.object.xml.ObjectModelParameterImpl;
    61 61
    62 62 
     import java.util.Arrays;
    63 63 
     import java.util.Collection;
    64 
    +import java.util.Date;
    64 65 
     import java.util.LinkedHashSet;
    65 66 
     import java.util.LinkedList;
    66 67 
     import java.util.Map;
    ... ... @@ -86,10 +87,9 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract
    86 87 
         private final EugeneJavaTagValues javaTemplatesTagValues;
    87 88 
         private final BeanTransformerTagValues beanTagValues;
    88 89 
         private final ObserveTagValues observeTagValues;
    89 
    -
    90 
    -    private BeanTransformerContext context;
    91 90 
         private final Map<String, String> dtoFormMapping = new TreeMap<>();
    92 91 
         private final Map<String, String> dtoMainMapping = new TreeMap<>();
    92 
    +    private BeanTransformerContext context;
    93 93
    94 94 
         public DtoTransformer() {
    95 95 
             coreTagValues = new EugeneCoreTagValues();
    ... ... @@ -129,6 +129,10 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract
    129 129 
         protected ObjectModelClass generateGeneratedClass(ObjectModelPackage aPackage, ObjectModelClass input, String className, String mainClassName) {
    130 130 
             ObjectModelClass output = super.generateGeneratedClass(aPackage, input, className, mainClassName);
    131 131 
             boolean referential = TemplateContract.isReferentialFromPackageName(aPackage.getName());
    132 
    +        boolean notAbstract = !input.isAbstract();
    133 
    +        if (notAbstract) {
    134 
    +            addStaticFactoryMethod(output, mainClassName);
    135 
    +        }
    132 136 
             if (context.selectedClasses.contains(input)) {
    133 137
    134 138 
                 String referencesTagValue = observeTagValues.getReferencesTagValue(input);
    ... ... @@ -148,13 +152,22 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract
    148 152 
                 addInterface(output, String.format("%s<%s, %s>", DtoToReference.class.getName(), mainClassName, referenceName));
    149 153 
                 addToReferenceMethod(output, binderProperties, referenceName);
    150 154 
             }
    151 
    -        if (!input.isAbstract()) {
    155 
    +
    156 
    +        if (notAbstract) {
    152 157 
                 addFormDefinitionAttribute(input, output, referential);
    153 158 
                 addMainDtoMapping(input, referential);
    154 159 
             }
    155 160 
             return output;
    156 161 
         }
    157 162
    163 
    +    private void addStaticFactoryMethod(ObjectModelClass output, String className) {
    164 
    +        ObjectModelOperation operation = addOperation(output, "newDto", className, ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC);
    165 
    +        addParameter(operation, importAndSimplify(output, Date.class.getName()), "createDate");
    166 
    +        setOperationBody(operation, ""/*{
    167 
    +        return newDto(<%=className%>.class, createDate);
    168 
    +    }*/);
    169 
    +    }
    170 
    +
    158 171 
         private void addMainDtoMapping(ObjectModelClass input, boolean referential) {
    159 172 
             String mainDtoTagValue = observeTagValues.getMainDtoTagValue(input);
    160 173 
             if (Objects.equals("skip", mainDtoTagValue)) {
    ... ... @@ -256,7 +269,7 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract
    256 269 
         protected ObjectModel initOutputModel() {
    257 270
    258 271 
             //FIXME Override builder to avoid bad imports when using synonyms in model...
    259 
    -        builder = new JavaBuilder(getModel().getName()){
    272 
    +        builder = new JavaBuilder(getModel().getName()) {
    260 273 
                 @Override
    261 274 
                 public ObjectModelOperation addOperation(ObjectModelClassifier classifier, String name, String type, ObjectModelModifier... modifiers) {
    262 275 
                     ObjectModelOperationImpl result = new ObjectModelOperationImpl();

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.