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

Commits:

22 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeNode.java
    ... ... @@ -183,7 +183,6 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im
    183 183
     
    
    184 184
         private void getShell(ImmutableSet.Builder<FloatingObjectPartsTreeNode> allNodesBuilder) {
    
    185 185
             allNodesBuilder.add(this);
    
    186
    -
    
    187 186
             for (FloatingObjectPartsTreeNode child : this) {
    
    188 187
                 child.getShell(allNodesBuilder);
    
    189 188
             }
    
    ... ... @@ -195,7 +194,6 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im
    195 194
         }
    
    196 195
     
    
    197 196
         void computeNeedAtLeastOnSelectValidState(boolean whenArriving, boolean whenLeaving) {
    
    198
    -
    
    199 197
             boolean needSelect = isEditable();
    
    200 198
             FloatingObjectPartsTreeNodeContext userObject = getUserObject();
    
    201 199
             if (whenArriving) {
    
    ... ... @@ -204,7 +202,6 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im
    204 202
             if (whenLeaving) {
    
    205 203
                 userObject.needOneSelectionOnLeaving = (!needSelect || withValue(2)) && isAtLeastOneSelected(2);
    
    206 204
             }
    
    207
    -
    
    208 205
             if (userObject.needOneSelectionOnArriving || userObject.needOneSelectionOnLeaving) {
    
    209 206
                 log.info("Validate node " + this);
    
    210 207
             }
    
    ... ... @@ -244,7 +241,6 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im
    244 241
             if (userObject.getValueAt(1) != null || userObject.getValueAt(2) != null) {
    
    245 242
                 log.info("Validate node " + this);
    
    246 243
             }
    
    247
    -
    
    248 244
         }
    
    249 245
     
    
    250 246
     //    void computeFormulaValidState(boolean whenArriving, boolean whenLeaving) {
    
    ... ... @@ -359,8 +355,7 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im
    359 355
                 // enabled if parent is enabled and dto is enabled
    
    360 356
                 this.enabled = parent.enabled && dto.isEnabled();
    
    361 357
                 // editable if dto is selectable (we also make sure that the object material type is here too)
    
    362
    -            this.editable = dto.isSelectable() && dto.getObjectMaterialType() != null;
    
    363
    -
    
    358
    +            this.editable = dto.getObjectMaterialType() != null;
    
    364 359
                 this.useValidation = enabled && editable && dto.withValidation();
    
    365 360
                 if (!useValidation) {
    
    366 361
                     valueValidOnArriving = true;
    

  • client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jaxx
    ... ... @@ -127,14 +127,6 @@
    127 127
           </cell>
    
    128 128
         </row>
    
    129 129
     
    
    130
    -    <!-- selectable -->
    
    131
    -    <row>
    
    132
    -      <cell anchor='east' weightx="1" fill="both" columns="2">
    
    133
    -        <JCheckBox id='selectable' styleClass="i18n"
    
    134
    -                   onItemStateChanged='getBean().setSelectable(selectable.isSelected())'/>
    
    135
    -      </cell>
    
    136
    -    </row>
    
    137
    -
    
    138 130
         <!-- childrenMultiSelectable / childSelectionMandatory -->
    
    139 131
         <row>
    
    140 132
           <cell anchor='east' weightx="1" fill="both" columns="2">
    

  • client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jcss
    ... ... @@ -50,10 +50,6 @@
    50 50
       _propertyName:{ObjectMaterialDto.PROPERTY_VALIDATION};
    
    51 51
     }
    
    52 52
     
    
    53
    -#selectable {
    
    54
    -  selected:{bean.isSelectable()};
    
    55
    -}
    
    56
    -
    
    57 53
     #childrenMultiSelectable {
    
    58 54
       selected:{bean.isChildrenMultiSelectable()};
    
    59 55
     }
    

  • client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUIModel.java
    ... ... @@ -44,7 +44,6 @@ public class ObjectMaterialUIModel extends ContentReferenceUIModel<ObjectMateria
    44 44
                           ObjectMaterialDto.PROPERTY_STANDARD_CODE,
    
    45 45
                           ObjectMaterialDto.PROPERTY_OBJECT_MATERIAL_TYPE,
    
    46 46
                           ObjectMaterialDto.PROPERTY_VALIDATION,
    
    47
    -                      ObjectMaterialDto.PROPERTY_SELECTABLE,
    
    48 47
                           ObjectMaterialDto.PROPERTY_CHILD_SELECTION_MANDATORY,
    
    49 48
                           ObjectMaterialDto.PROPERTY_CHILDREN_MULTI_SELECTABLE
    
    50 49
                   },
    
    ... ... @@ -54,7 +53,6 @@ public class ObjectMaterialUIModel extends ContentReferenceUIModel<ObjectMateria
    54 53
                           ObjectMaterialUI.BINDING_LEGACY_CODE_TEXT,
    
    55 54
                           ObjectMaterialUI.BINDING_STANDARD_CODE_TEXT,
    
    56 55
                           ObjectMaterialUI.BINDING_VALIDATION_TEXT,
    
    57
    -                      ObjectMaterialUI.BINDING_SELECTABLE_SELECTED,
    
    58 56
                           ObjectMaterialUI.BINDING_CHILD_SELECTION_MANDATORY_SELECTED,
    
    59 57
                           ObjectMaterialUI.BINDING_CHILDREN_MULTI_SELECTABLE_SELECTED
    
    60 58
                   });
    

  • client/src/main/resources/i18n/client_en_GB.properties
    ... ... @@ -944,7 +944,6 @@ observe.common.ObjectMaterialDto.childSelectionMandatory=child selection mandato
    944 944
     observe.common.ObjectMaterialDto.childrenMultiSelectable=children multi selectable
    
    945 945
     observe.common.ObjectMaterialDto.legacyCodeStandardCode=Legacy code / Standard code
    
    946 946
     observe.common.ObjectMaterialDto.parentCode=Parent
    
    947
    -observe.common.ObjectMaterialDto.selectable=Selectable
    
    948 947
     observe.common.ObjectMaterialDto.validationInformation=Validation formula must contains variable x
    
    949 948
     observe.common.ObjectObservedSpeciesDto.action.create=Insert this object observed species
    
    950 949
     observe.common.ObjectObservedSpeciesDto.action.create.tip=Insert this object observed species
    

  • client/src/main/resources/i18n/client_es_ES.properties
    ... ... @@ -944,7 +944,6 @@ observe.common.ObjectMaterialDto.childSelectionMandatory=Sélection d'un fils ob
    944 944
     observe.common.ObjectMaterialDto.childrenMultiSelectable=Sélection multiple des fils \#TODO
    
    945 945
     observe.common.ObjectMaterialDto.legacyCodeStandardCode=Ancien code / Code standard \#TODO
    
    946 946
     observe.common.ObjectMaterialDto.parentCode=Parent \#TODO
    
    947
    -observe.common.ObjectMaterialDto.selectable=Sélectionnable \#TODO
    
    948 947
     observe.common.ObjectMaterialDto.validationInformation=La formule de validation doit contenir la variable x \#TODO
    
    949 948
     observe.common.ObjectObservedSpeciesDto.action.create=Insertar
    
    950 949
     observe.common.ObjectObservedSpeciesDto.action.create.tip=Insertar la especie de fauna observada
    

  • client/src/main/resources/i18n/client_fr_FR.properties
    ... ... @@ -944,7 +944,6 @@ observe.common.ObjectMaterialDto.childSelectionMandatory=Sélection d'un fils ob
    944 944
     observe.common.ObjectMaterialDto.childrenMultiSelectable=Sélection multiple des fils
    
    945 945
     observe.common.ObjectMaterialDto.legacyCodeStandardCode=Ancien code / Code standard
    
    946 946
     observe.common.ObjectMaterialDto.parentCode=Parent
    
    947
    -observe.common.ObjectMaterialDto.selectable=Sélectionnable
    
    948 947
     observe.common.ObjectMaterialDto.validationInformation=La formule de validation doit contenir la variable x
    
    949 948
     observe.common.ObjectObservedSpeciesDto.action.create=Insérer
    
    950 949
     observe.common.ObjectObservedSpeciesDto.action.create.tip=Insérer l'espèce faune observée
    

  • dto/src/main/java/fr/ird/observe/dto/referential/seine/ObjectMaterialDto.java
    ... ... @@ -55,4 +55,5 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto {
    55 55
             ObjectMaterialReference parent = getParent();
    
    56 56
             return parent != null && parent.getParentId() != null;
    
    57 57
         }
    
    58
    +
    
    58 59
     }

  • dto/src/main/models/Observe-02-referential-seine.model
    ... ... @@ -9,7 +9,6 @@ referential.seine.NonTargetCatchReleasingTime > referential.I18nReferential
    9 9
     referential.seine.ObjectMaterial > referential.I18nReferential | references=code,label,parentId,objectMaterialTypeId,validation,biodegradable,nonEntangling
    
    10 10
     legacyCode + {*:1} String
    
    11 11
     standardCode + {*:1} String
    
    12
    -selectable + {*:1} boolean
    
    13 12
     biodegradable + {*:1} boolean
    
    14 13
     nonEntangling + {*:1} boolean
    
    15 14
     childrenMultiSelectable + {*:1} boolean
    

  • persistence/src/main/java/fr/ird/observe/binder/referential/seine/ObjectMaterialEntityDtoBinder.java
    ... ... @@ -47,7 +47,6 @@ public class ObjectMaterialEntityDtoBinder extends ReferentialEntityDtoBinderSup
    47 47
             entity.setStandardCode(dto.getStandardCode());
    
    48 48
             entity.setParent(toEntity(dto.getParent()));
    
    49 49
             entity.setObjectMaterialType(toEntity(dto.getObjectMaterialType()));
    
    50
    -        entity.setSelectable(dto.isSelectable());
    
    51 50
             entity.setValidation(dto.getValidation());
    
    52 51
             entity.setChildrenMultiSelectable(dto.isChildrenMultiSelectable());
    
    53 52
             entity.setChildSelectionMandatory(dto.isChildSelectionMandatory());
    
    ... ... @@ -64,7 +63,6 @@ public class ObjectMaterialEntityDtoBinder extends ReferentialEntityDtoBinderSup
    64 63
             dto.setParent(toReferentialReference(referentialLocale, entity.getParent()));
    
    65 64
             dto.setObjectMaterialType(toReferentialReference(referentialLocale, entity.getObjectMaterialType()));
    
    66 65
             dto.setValidation(entity.getValidation());
    
    67
    -        dto.setSelectable(entity.isSelectable());
    
    68 66
             dto.setChildrenMultiSelectable(entity.isChildrenMultiSelectable());
    
    69 67
             dto.setChildSelectionMandatory(entity.isChildSelectionMandatory());
    
    70 68
     
    

  • persistence/src/main/models/Observe-02-referential-seine.model
    ... ... @@ -15,7 +15,6 @@ referentiel.seine.NonTargetCatchReleasingTime > referentiel.I18nReferentialEntit
    15 15
     referentiel.seine.ObjectMaterial > referentiel.I18nReferentialEntity | entity
    
    16 16
     legacyCode + {*:1} String | hibernateAttributeType=text
    
    17 17
     standardCode + {*:1} String
    
    18
    -selectable + {*:1} boolean | notNull
    
    19 18
     biodegradable + {*:1} boolean | notNull
    
    20 19
     nonEntangling + {*:1} boolean | notNull
    
    21 20
     childrenMultiSelectable + {*:1} boolean | notNull
    

  • persistence/src/main/resources/db/migration/6.1/12_update_object_material-common.sql
    ... ... @@ -41,4 +41,4 @@ INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate
    41 41
     UPDATE observe_seine.objectmaterial SET legacyCode ='22*, 23*', topiaVersion = topiaVersion + 1 WHERE topiaid = 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3';
    
    42 42
     UPDATE observe_seine.objectmaterial SET legacyCode = NULL, topiaVersion = topiaVersion + 1   WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2';
    
    43 43
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ( 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.100', 0, CURRENT_DATE, CURRENT_TIMESTAMP, true,  0, '16', null, '6-6' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77' , ' Raft or buoy drifting', 'Radeau ou bouée en dérive','Parilla o buoy a la deriva', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL, false, false);
    
    44
    -
    44
    +ALTER TABLE observe_seine.objectmaterial DROP COLUMN selectable;
    \ No newline at end of file

  • persistence/src/test/java/fr/ird/observe/persistence/migration/GenerateReferentialObjectMaterial.java deleted
    1
    -package fr.ird.observe.persistence.migration;
    
    2
    -
    
    3
    -/*-
    
    4
    - * #%L
    
    5
    - * ObServe :: Persistence
    
    6
    - * %%
    
    7
    - * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    
    8
    - * %%
    
    9
    - * This program is free software: you can redistribute it and/or modify
    
    10
    - * it under the terms of the GNU General Public License as
    
    11
    - * published by the Free Software Foundation, either version 3 of the
    
    12
    - * License, or (at your option) any later version.
    
    13
    - * 
    
    14
    - * This program is distributed in the hope that it will be useful,
    
    15
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    16
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    17
    - * GNU General Public License for more details.
    
    18
    - * 
    
    19
    - * You should have received a copy of the GNU General Public
    
    20
    - * License along with this program.  If not, see
    
    21
    - * <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    22
    - * #L%
    
    23
    - */
    
    24
    -
    
    25
    -import com.google.common.collect.ImmutableMap;
    
    26
    -import fr.ird.observe.dto.referential.ReferenceStatus;
    
    27
    -import fr.ird.observe.entities.referentiel.seine.ObjectMaterial;
    
    28
    -import fr.ird.observe.entities.referentiel.seine.ObjectMaterialImpl;
    
    29
    -import org.apache.commons.lang3.mutable.MutableInt;
    
    30
    -import org.apache.logging.log4j.Logger;
    
    31
    -import org.apache.logging.log4j.LogManager;
    
    32
    -import org.junit.Test;
    
    33
    -import org.nuiton.csv.Common;
    
    34
    -import org.nuiton.csv.Import;
    
    35
    -import org.nuiton.csv.ext.AbstractImportModel;
    
    36
    -
    
    37
    -import java.io.BufferedReader;
    
    38
    -import java.io.BufferedWriter;
    
    39
    -import java.io.File;
    
    40
    -import java.io.IOException;
    
    41
    -import java.nio.file.Files;
    
    42
    -import java.nio.file.Path;
    
    43
    -import java.util.Collection;
    
    44
    -
    
    45
    -/**
    
    46
    - * Created by tchemit on 31/07/17.
    
    47
    - *
    
    48
    - * @author Tony Chemit - dev@tchemit.fr
    
    49
    - */
    
    50
    -public class GenerateReferentialObjectMaterial {
    
    51
    -
    
    52
    -    // Lines to fxi and readd to file
    
    53
    -
    
    54
    -
    
    55
    -    /** Logger. */
    
    56
    -    private static final Logger log = LogManager.getLogger(GenerateReferentialObjectMaterial.class);
    
    57
    -
    
    58
    -    private static final String INSERT = "INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values (%-65s, 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  %s, %-15s, %-10s, %-15s, %-65s, %-50s, %-50s, %-50s, %-5s, %-5s, %-5s, %-66s, %-30s, %-5s, %-5s);";
    
    59
    -
    
    60
    -    @Test
    
    61
    -    public void generate() throws IOException {
    
    62
    -
    
    63
    -
    
    64
    -        Path dir = new File("").getAbsoluteFile().toPath()
    
    65
    -                .resolve("src")
    
    66
    -                .resolve("main")
    
    67
    -                .resolve("resources")
    
    68
    -                .resolve("db")
    
    69
    -                .resolve("migration")
    
    70
    -                .resolve("6.6.1");
    
    71
    -
    
    72
    -        Path sourcePath = dir.resolve("referential-ObjectMaterial.csv");
    
    73
    -        Path targetPath = dir.resolve("09_fill_object_material-common.sql");
    
    74
    -
    
    75
    -        Collection<ObjectMaterial> data = loadData(sourcePath);
    
    76
    -
    
    77
    -        try (BufferedWriter writer = Files.newBufferedWriter(targetPath)) {
    
    78
    -
    
    79
    -            for (ObjectMaterial datum : data) {
    
    80
    -
    
    81
    -                String row = String.format(INSERT
    
    82
    -                        , getValue(datum.getTopiaId())
    
    83
    -                        , datum.getStatus().ordinal()
    
    84
    -                        , getValue(datum.getLegacyCode())
    
    85
    -                        , getValue(datum.getStandardCode())
    
    86
    -                        , getValue(datum.getCode())
    
    87
    -                        , getValue(datum.getParent() == null ? "" : datum.getParent().getTopiaId())
    
    88
    -                        , getValue(datum.getLabel1())
    
    89
    -                        , getValue(datum.getLabel2())
    
    90
    -                        , getValue(datum.getLabel3())
    
    91
    -                        , datum.isSelectable()
    
    92
    -                        , datum.isChildrenMultiSelectable()
    
    93
    -                        , datum.isChildSelectionMandatory()
    
    94
    -                        , getValue(datum.getLabel5() == null ? "" : datum.getLabel5())
    
    95
    -                        , getValue(datum.getValidation())
    
    96
    -                        , datum.isBiodegradable()
    
    97
    -                        , datum.isNonEntangling()
    
    98
    -                );
    
    99
    -                writer.append(row);
    
    100
    -                writer.newLine();
    
    101
    -
    
    102
    -            }
    
    103
    -        }
    
    104
    -
    
    105
    -    }
    
    106
    -
    
    107
    -    private String getValue(String value) {
    
    108
    -        return value.isEmpty() ? "NULL" : ("'" + value + "'");
    
    109
    -    }
    
    110
    -
    
    111
    -    private Collection<ObjectMaterial> loadData(Path sourcePath) throws IOException {
    
    112
    -
    
    113
    -        ImmutableMap.Builder<String, ObjectMaterial> result = ImmutableMap.builder();
    
    114
    -        MutableInt idIndex = new MutableInt(0);
    
    115
    -        try (BufferedReader reader = Files.newBufferedReader(sourcePath)) {
    
    116
    -            Import.newImport(new ImportModel(), reader).forEach(objectMaterial -> {
    
    117
    -
    
    118
    -                objectMaterial.setTopiaId("fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0." + idIndex.incrementAndGet());
    
    119
    -
    
    120
    -                log.info(String.format("Loading %s (%s)", objectMaterial.getCode(), objectMaterial.getTopiaId()));
    
    121
    -                String dataType = objectMaterial.getLabel5();
    
    122
    -                objectMaterial.setLabel5(null);
    
    123
    -                if (dataType != null) {
    
    124
    -                    switch (dataType.trim().toLowerCase()) {
    
    125
    -                        case "boolean":
    
    126
    -                            objectMaterial.setLabel5("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0");
    
    127
    -                            break;
    
    128
    -                        case "integer":
    
    129
    -                            objectMaterial.setLabel5("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2");
    
    130
    -                            break;
    
    131
    -                        case "string":
    
    132
    -                            objectMaterial.setLabel5("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#3");
    
    133
    -                            break;
    
    134
    -                        case "float1":
    
    135
    -                            objectMaterial.setLabel5("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#1");
    
    136
    -                            break;
    
    137
    -
    
    138
    -                    }
    
    139
    -                }
    
    140
    -                String status = objectMaterial.getLabel6();
    
    141
    -                objectMaterial.setLabel6(null);
    
    142
    -                Boolean statusB = status == null ? null : Boolean.valueOf(status);
    
    143
    -                objectMaterial.setStatus(statusB != null && statusB ? ReferenceStatus.enabled : ReferenceStatus.disabled);
    
    144
    -                result.put(objectMaterial.getCode(), objectMaterial);
    
    145
    -            });
    
    146
    -        }
    
    147
    -        ImmutableMap<String, ObjectMaterial> map = result.build();
    
    148
    -        for (ObjectMaterial objectMaterial : map.values()) {
    
    149
    -            String parentCode = objectMaterial.getLabel4();
    
    150
    -            objectMaterial.setLabel4(null);
    
    151
    -            if (parentCode != null) {
    
    152
    -                ObjectMaterial parent = map.get(parentCode);
    
    153
    -                objectMaterial.setParent(parent);
    
    154
    -            }
    
    155
    -        }
    
    156
    -        return map.values();
    
    157
    -    }
    
    158
    -
    
    159
    -    private static class ImportModel extends AbstractImportModel<ObjectMaterial> {
    
    160
    -
    
    161
    -        ImportModel() {
    
    162
    -            super(',');
    
    163
    -            newMandatoryColumn(ObjectMaterial.PROPERTY_CODE);
    
    164
    -            newMandatoryColumn(ObjectMaterial.PROPERTY_LEGACY_CODE);
    
    165
    -            newMandatoryColumn(ObjectMaterial.PROPERTY_STANDARD_CODE);
    
    166
    -            newMandatoryColumn(ObjectMaterial.PROPERTY_BIODEGRADABLE, Common.PRIMITIVE_BOOLEAN);
    
    167
    -            newMandatoryColumn(ObjectMaterial.PROPERTY_NON_ENTANGLING, Common.PRIMITIVE_BOOLEAN);
    
    168
    -            newMandatoryColumn(ObjectMaterial.PROPERTY_SELECTABLE, Common.PRIMITIVE_BOOLEAN);
    
    169
    -            newMandatoryColumn(ObjectMaterial.PROPERTY_CHILD_SELECTION_MANDATORY, Common.PRIMITIVE_BOOLEAN);
    
    170
    -            newMandatoryColumn(ObjectMaterial.PROPERTY_CHILDREN_MULTI_SELECTABLE, Common.PRIMITIVE_BOOLEAN);
    
    171
    -            newMandatoryColumn(ObjectMaterial.PROPERTY_LABEL1);
    
    172
    -            newMandatoryColumn(ObjectMaterial.PROPERTY_LABEL2);
    
    173
    -            newMandatoryColumn(ObjectMaterial.PROPERTY_LABEL3);
    
    174
    -            newMandatoryColumn(ObjectMaterial.PROPERTY_VALIDATION);
    
    175
    -            newMandatoryColumn("parent", ObjectMaterial.PROPERTY_LABEL4);
    
    176
    -            newMandatoryColumn("dataType", ObjectMaterial.PROPERTY_LABEL5);
    
    177
    -            newMandatoryColumn("status", ObjectMaterial.PROPERTY_LABEL6);
    
    178
    -        }
    
    179
    -
    
    180
    -        @Override
    
    181
    -        public ObjectMaterial newEmptyInstance() {
    
    182
    -            return new ObjectMaterialImpl();
    
    183
    -        }
    
    184
    -    }
    
    185
    -}

  • test/src/main/resources/db/7.0/dataForTestLongline.sql.gz The diff for this file was not included because it is too large.
  • test/src/main/resources/db/7.0/dataForTestSeine.sql.gz The diff for this file was not included because it is too large.
  • test/src/main/resources/db/7.0/empty_h2.sql.gz
    ... ... @@ -89,7 +89,7 @@ create table OBSERVE_SEINE.nonTargetCatchReleaseStatus (topiaId varchar(255) not
    89 89
     create table OBSERVE_SEINE.nonTargetCatchReleasingTime (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    
    90 90
     create table OBSERVE_SEINE.nonTargetLength (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, length numeric, isLengthComputed boolean, picturesReferences varchar(255), weight numeric, isWeightComputed boolean, count integer, acquisitionMode integer, tagNumber varchar(255), species varchar(255), sex varchar(255), speciesFate varchar(255), sizeMeasureType varchar(255), nonTargetSample varchar(255), nonTargetSample_idx integer, primary key (topiaId));
    
    91 91
     create table OBSERVE_SEINE.nonTargetSample (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), set varchar(255), primary key (topiaId));
    
    92
    -create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode varchar(2147483647), standardCode varchar(255), selectable boolean not null, biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
    
    92
    +create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode varchar(2147483647), standardCode varchar(255), biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
    
    93 93
     create table OBSERVE_SEINE.objectMaterialType (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    
    94 94
     create table OBSERVE_SEINE.objectObservedSpecies (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, count integer, statut integer, species varchar(255), speciesStatus varchar(255), floatingObject varchar(255), primary key (topiaId));
    
    95 95
     create table OBSERVE_SEINE.objectOperation (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), whenArriving boolean not null, whenLeaving boolean not null, primary key (topiaId));
    

  • test/src/main/resources/db/7.0/empty_pg.sql.gz
    ... ... @@ -89,7 +89,7 @@ create table OBSERVE_SEINE.nonTargetCatchReleaseStatus (topiaId varchar(255) not
    89 89
     create table OBSERVE_SEINE.nonTargetCatchReleasingTime (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    
    90 90
     create table OBSERVE_SEINE.nonTargetLength (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, length numeric, isLengthComputed boolean, picturesReferences varchar(255), weight numeric, isWeightComputed boolean, count int4, acquisitionMode int4, tagNumber varchar(255), species varchar(255), sex varchar(255), speciesFate varchar(255), sizeMeasureType varchar(255), nonTargetSample varchar(255), nonTargetSample_idx int4, primary key (topiaId));
    
    91 91
     create table OBSERVE_SEINE.nonTargetSample (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, set varchar(255), primary key (topiaId));
    
    92
    -create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode text, standardCode varchar(255), selectable boolean not null, biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
    
    92
    +create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode text, standardCode varchar(255), biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
    
    93 93
     create table OBSERVE_SEINE.objectMaterialType (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    
    94 94
     create table OBSERVE_SEINE.objectObservedSpecies (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, count int4, statut int4, species varchar(255), speciesStatus varchar(255), floatingObject varchar(255), primary key (topiaId));
    
    95 95
     create table OBSERVE_SEINE.objectOperation (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), whenArriving boolean not null, whenLeaving boolean not null, primary key (topiaId));
    

  • test/src/main/resources/db/7.4/dataForTestLongline.sql.gz The diff for this file was not included because it is too large.
  • test/src/main/resources/db/7.4/dataForTestSeine.sql.gz The diff for this file was not included because it is too large.
  • test/src/main/resources/db/7.4/empty_h2.sql.gz
    ... ... @@ -113,7 +113,7 @@ create table OBSERVE_SEINE.nonTargetCatchReleaseStatus (topiaId varchar(255) not
    113 113
     create table OBSERVE_SEINE.nonTargetCatchReleasingTime (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    
    114 114
     create table OBSERVE_SEINE.nonTargetLength (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, length numeric, isLengthComputed boolean, picturesReferences varchar(255), weight numeric, isWeightComputed boolean, count integer, acquisitionMode integer, tagNumber varchar(255), species varchar(255), sex varchar(255), speciesFate varchar(255), sizeMeasureType varchar(255), weightMeasureMethod varchar(255), lengthMeasureMethod varchar(255), nonTargetSample varchar(255), nonTargetSample_idx integer, primary key (topiaId));
    
    115 115
     create table OBSERVE_SEINE.nonTargetSample (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), set varchar(255), primary key (topiaId));
    
    116
    -create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode varchar(2147483647), standardCode varchar(255), selectable boolean not null, biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
    
    116
    +create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode varchar(2147483647), standardCode varchar(255), biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
    
    117 117
     create table OBSERVE_SEINE.objectMaterialType (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    
    118 118
     create table OBSERVE_SEINE.objectObservedSpecies (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, count integer, statut integer, species varchar(255), speciesStatus varchar(255), floatingObject varchar(255), primary key (topiaId));
    
    119 119
     create table OBSERVE_SEINE.objectOperation (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), whenArriving boolean not null, whenLeaving boolean not null, primary key (topiaId));
    

  • test/src/main/resources/db/7.4/empty_pg.sql.gz
    ... ... @@ -113,7 +113,7 @@ create table OBSERVE_SEINE.nonTargetCatchReleaseStatus (topiaId varchar(255) not
    113 113
     create table OBSERVE_SEINE.nonTargetCatchReleasingTime (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    
    114 114
     create table OBSERVE_SEINE.nonTargetLength (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, length numeric, isLengthComputed boolean, picturesReferences varchar(255), weight numeric, isWeightComputed boolean, count int4, acquisitionMode int4, tagNumber varchar(255), species varchar(255), sex varchar(255), speciesFate varchar(255), sizeMeasureType varchar(255), weightMeasureMethod varchar(255), lengthMeasureMethod varchar(255), nonTargetSample varchar(255), nonTargetSample_idx int4, primary key (topiaId));
    
    115 115
     create table OBSERVE_SEINE.nonTargetSample (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, set varchar(255), primary key (topiaId));
    
    116
    -create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode text, standardCode varchar(255), selectable boolean not null, biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
    
    116
    +create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode text, standardCode varchar(255), biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
    
    117 117
     create table OBSERVE_SEINE.objectMaterialType (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    
    118 118
     create table OBSERVE_SEINE.objectObservedSpecies (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, count int4, statut int4, species varchar(255), speciesStatus varchar(255), floatingObject varchar(255), primary key (topiaId));
    
    119 119
     create table OBSERVE_SEINE.objectOperation (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), whenArriving boolean not null, whenLeaving boolean not null, primary key (topiaId));
    

  • test/src/main/resources/db/7.4/referentiel.sql.gz The diff for this file was not included because it is too large.