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

Commits:

29 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUI.jaxx
    1 
    +<!--
    2 
    +  #%L
    3 
    +  ObServe :: Client
    4 
    +  %%
    5 
    +  Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    6 
    +  %%
    7 
    +  This program is free software: you can redistribute it and/or modify
    8 
    +  it under the terms of the GNU General Public License as
    9 
    +  published by the Free Software Foundation, either version 3 of the
    10 
    +  License, or (at your option) any later version.
    11 
    +
    12 
    +  This program is distributed in the hope that it will be useful,
    13 
    +  but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +  GNU General Public License for more details.
    16 
    +
    17 
    +  You should have received a copy of the GNU General Public
    18 
    +  License along with this program.  If not, see
    19 
    +  <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +  #L%
    21 
    +  -->
    22 
    +
    23 
    +<fr.ird.observe.client.ui.content.ref.ContentI18nReferenceUI
    24 
    +    i18nFormat="observe.common.CompagniesDto.%s"
    25 
    +    superGenericType='CompagniesDto, CompagniesReference, CompagniesUI'>
    26 
    +
    27 
    +  <style source="../ReferenceEntity.jcss"/>
    28 
    +
    29 
    +  <import>
    30 
    +    fr.ird.observe.dto.reference.ReferentialDtoReference
    31 
    +    fr.ird.observe.dto.referential.CompagniesDto
    32 
    +    fr.ird.observe.dto.referential.CompagniesReference
    33 
    +
    34 
    +    static fr.ird.observe.client.ui.util.UIHelper.getStringValue
    35 
    +    fr.ird.observe.dto.referential.ReferenceStatus
    36 
    +  </import>
    37 
    +
    38 
    +  <!-- validator -->
    39 
    +  <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.dto.referential.CompagniesDto'
    40 
    +                 context='create' errorTableModel='{getErrorTableModel()}'>
    41 
    +    <field name='label1' component='label1'/>
    42 
    +    <field name='label2' component='label2'/>
    43 
    +    <field name='label3' component='label3'/>
    44 
    +  </BeanValidator>
    45 
    +
    46 
    +  <!-- model -->
    47 
    +  <CompagniesUIModel id='model'/>
    48 
    +
    49 
    +  <!-- edit bean -->
    50 
    +  <CompagniesDto id='bean'/>
    51 
    +
    52 
    +  <Table id='editTable'>
    53 
    +
    54 
    +    <!-- uri -->
    55 
    +    <row>
    56 
    +      <cell anchor="west">
    57 
    +        <JLabel id='uriLabel'/>
    58 
    +      </cell>
    59 
    +      <cell anchor='east' weightx="1" fill="both">
    60 
    +        <JTextField id='uri'/>
    61 
    +      </cell>
    62 
    +    </row>
    63 
    +
    64 
    +    <!-- code / status -->
    65 
    +    <row>
    66 
    +      <cell anchor="west">
    67 
    +        <JLabel id='codeStatusLabel'/>
    68 
    +      </cell>
    69 
    +      <cell anchor='east' weightx="1" fill="both">
    70 
    +        <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'>
    71 
    +          <JTextField id='code' constraints='BorderLayout.WEST'/>
    72 
    +          <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus'
    73 
    +                      onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())'
    74 
    +                      constraints='BorderLayout.CENTER'/>
    75 
    +        </JPanel>
    76 
    +      </cell>
    77 
    +    </row>
    78 
    +
    79 
    +    <!-- needComment -->
    80 
    +    <row>
    81 
    +      <cell anchor='east' weightx="1" fill="both" columns="2">
    82 
    +        <JCheckBox id='needComment' onItemStateChanged='getBean().setNeedComment(needComment.isSelected())'/>
    83 
    +      </cell>
    84 
    +    </row>
    85 
    +  </Table>
    86 
    +
    87 
    +  <JTextField id='label1'/>
    88 
    +  <JTextField id='label2'/>
    89 
    +  <JTextField id='label3'/>
    90 
    +</fr.ird.observe.client.ui.content.ref.ContentI18nReferenceUI>

  • client/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUIHandler.java
    1 
    +package fr.ird.observe.client.ui.content.ref.common;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Client
    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 fr.ird.observe.client.ui.content.ref.ContentReferenceUIHandler;
    26 
    +import fr.ird.observe.dto.referential.CompagniesDto;
    27 
    +import fr.ird.observe.dto.referential.CompagniesReference;
    28 
    +import org.nuiton.jaxx.runtime.spi.UIHandler;
    29 
    +
    30 
    +/**
    31 
    + * Created on 06/12/16.
    32 
    + *
    33 
    + * @author Tony Chemit - dev@tchemit.fr
    34 
    + * @since 6.0
    35 
    + */
    36 
    +class CompagniesUIHandler extends ContentReferenceUIHandler<CompagniesDto, CompagniesReference, CompagniesUI> implements UIHandler<CompagniesUI> {
    37 
    +}

  • client/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUIModel.java
    1 
    +package fr.ird.observe.client.ui.content.ref.common;
    2 
    +
    3 
    +/*
    4 
    + * #%L
    5 
    + * ObServe :: Client
    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 fr.ird.observe.client.ui.content.ref.ContentReferenceUIModel;
    26 
    +import fr.ird.observe.dto.referential.CompagniesDto;
    27 
    +import fr.ird.observe.dto.referential.CompagniesReference;
    28 
    +
    29 
    +/**
    30 
    + * Created on 9/27/14.
    31 
    + *
    32 
    + * @author Tony Chemit - dev@tchemit.fr
    33 
    + * @since XXX
    34 
    + */
    35 
    +public class CompagniesUIModel extends ContentReferenceUIModel<CompagniesDto, CompagniesReference> {
    36 
    +
    37 
    +    private static final long serialVersionUID = 1L;
    38 
    +
    39 
    +    public CompagniesUIModel() {
    40 
    +        super(CompagniesDto.class, CompagniesReference.class);
    41 
    +    }
    42 
    +
    43 
    +}

  • dto/src/main/java/fr/ird/observe/binder/referential/common/CompagniesDtoReferenceBinder.java
    1 
    +package fr.ird.observe.binder.referential.common;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Dto
    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 fr.ird.observe.binder.referential.ReferentialDtoReferenceBinder;
    26 
    +import fr.ird.observe.dto.referential.ReferentialLocale;
    27 
    +import fr.ird.observe.dto.referential.CompagniesDto;
    28 
    +import fr.ird.observe.dto.referential.CompagniesReference;
    29 
    +
    30 
    +/**
    31 
    + * Created on 24/11/15.
    32 
    + *
    33 
    + * @author Tony Chemit - dev@tchemit.fr
    34 
    + */
    35 
    +public class CompagniesDtoReferenceBinder extends ReferentialDtoReferenceBinder<CompagniesDto, CompagniesReference> {
    36 
    +
    37 
    +    public CompagniesDtoReferenceBinder() {
    38 
    +        super(CompagniesDto.class, CompagniesReference.class);
    39 
    +    }
    40 
    +
    41 
    +    @Override
    42 
    +    public CompagniesReference toReference(ReferentialLocale referentialLocale, CompagniesDto dto) {
    43 
    +
    44 
    +        return new CompagniesReference(dto, dto.getCode(), dto.getLabel(referentialLocale));
    45 
    +
    46 
    +    }
    47 
    +}

  • dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java
    ... ... @@ -108,6 +108,8 @@ import fr.ird.observe.dto.reference.DtoReference;
    108 108 
     import fr.ird.observe.dto.reference.ReferentialDtoReference;
    109 109 
     import fr.ird.observe.dto.referential.CountryDto;
    110 110 
     import fr.ird.observe.dto.referential.CountryReference;
    111 
    +import fr.ird.observe.dto.referential.CompagniesDto;
    112 
    +import fr.ird.observe.dto.referential.CompagniesReference;
    111 113 
     import fr.ird.observe.dto.referential.DataQualityDto;
    112 114 
     import fr.ird.observe.dto.referential.DataQualityReference;
    113 115 
     import fr.ird.observe.dto.referential.FpaZoneDto;
    ... ... @@ -474,6 +476,11 @@ public class DecoratorService extends DecoratorProvider {
    474 476 
             }
    475 477
    476 478 
             @Override
    479 
    +        public void initCompagniesDto() {
    480 
    +            registerDefaultReferentialAndReferentialReferenceDecorator(CompagniesDto.class, CompagniesReference.class, libelle);
    481 
    +        }
    482 
    +
    483 
    +        @Override
    477 484 
             public void initCountryDto() {
    478 485 
                 registerDefaultReferentialAndReferentialReferenceDecorator(CountryDto.class, CountryReference.class, libelle);
    479 486 
             }

  • dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java
    ... ... @@ -78,6 +78,7 @@ import fr.ird.observe.dto.data.seine.TransmittingBuoyDto;
    78 78 
     import fr.ird.observe.dto.data.seine.TripSeineDto;
    79 79 
     import fr.ird.observe.dto.data.seine.TripSeineGearUseDto;
    80 80 
     import fr.ird.observe.dto.referential.CountryDto;
    81 
    +import fr.ird.observe.dto.referential.CompagniesDto;
    81 82 
     import fr.ird.observe.dto.referential.DataQualityDto;
    82 83 
     import fr.ird.observe.dto.referential.FpaZoneDto;
    83 84 
     import fr.ird.observe.dto.referential.GearCaracteristicDto;
    ... ... @@ -169,6 +170,7 @@ public class DtoModelClasses {
    169 170 
         public static final ImmutableSet<Class<? extends ReferentialDto>> COMMON_REFERENTIAL_TYPES = ImmutableSet.of(
    170 171 
                 VesselSizeCategoryDto.class,
    171 172 
                 CountryDto.class,
    173 
    +            CompagniesDto.class,
    172 174 
                 DataQualityDto.class,
    173 175 
                 HarbourDto.class,
    174 176 
                 ShipOwnerDto.class,

  • dto/src/main/models/Observe.model
    ... ... @@ -355,6 +355,8 @@ data.longline.WeightMeasure > data.Data | references=weightMeasureTypeLabel,weig
    355 355 
     weight + {*:1} Float
    356 356 
     weightMeasureType {*:1} fr.ird.observe.dto.referential.WeightMeasureTypeReference
    357 357
    358 
    +referential.Compagnies > referential.I18nReferential
    359 
    +
    358 360 
     referential.Country > referential.I18nReferential
    359 361 
     iso2Code + {*:1} String
    360 362 
     iso3Code + {*:1} String

  • dto/src/main/resources/i18n/dto_en_GB.properties
    ... ... @@ -26,6 +26,8 @@ observe.common.CatchFateLonglineDto.types=Catch fates
    26 26 
     observe.common.CatchLonglineDto.title=Catches
    27 27 
     observe.common.CatchLonglineDto.type=Catch
    28 28 
     observe.common.CatchLonglineDto.types=Catches
    29 
    +observe.common.CompagniesDto.type=Compagnies
    30 
    +observe.common.CompagniesDto.types=Compagnies
    29 31 
     observe.common.CountryDto.type=Country
    30 32 
     observe.common.CountryDto.types=Countries
    31 33 
     observe.common.DataQualityDto.type=Data quality

  • dto/src/main/resources/i18n/dto_es_ES.properties
    ... ... @@ -26,6 +26,8 @@ observe.common.CatchFateLonglineDto.types=Futuros de la captura
    26 26 
     observe.common.CatchLonglineDto.title=Capturas
    27 27 
     observe.common.CatchLonglineDto.type=Captura
    28 28 
     observe.common.CatchLonglineDto.types=Capturas
    29 
    +observe.common.CompagniesDto.type=Compagnies \#TODO
    30 
    +observe.common.CompagniesDto.types=Compagnies \#TODO
    29 31 
     observe.common.CountryDto.type=País
    30 32 
     observe.common.CountryDto.types=Países
    31 33 
     observe.common.DataQualityDto.type=Qualité de donnée \#TODO

  • dto/src/main/resources/i18n/dto_fr_FR.properties
    ... ... @@ -26,6 +26,8 @@ observe.common.CatchFateLonglineDto.types=Devenirs capture
    26 26 
     observe.common.CatchLonglineDto.title=Captures
    27 27 
     observe.common.CatchLonglineDto.type=Capture
    28 28 
     observe.common.CatchLonglineDto.types=Captures
    29 
    +observe.common.CompagniesDto.type=Compagnies
    30 
    +observe.common.CompagniesDto.types=Compagnies
    29 31 
     observe.common.CountryDto.type=Pays
    30 32 
     observe.common.CountryDto.types=Pays
    31 33 
     observe.common.DataQualityDto.type=Qualité de donnée

  • persistence/src/main/java/fr/ird/observe/binder/referential/common/CompagniesEntityDtoBinder.java
    1 
    +package fr.ird.observe.binder.referential.common;
    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 fr.ird.observe.binder.referential.ReferentialEntityDtoBinderSupport;
    26 
    +import fr.ird.observe.dto.referential.CompagniesDto;
    27 
    +import fr.ird.observe.dto.referential.ReferentialLocale;
    28 
    +import fr.ird.observe.entities.referentiel.Compagnies;
    29 
    +
    30 
    +/**
    31 
    + * Created on 24/11/15.
    32 
    + *
    33 
    + * @author Tony Chemit - dev@tchemit.fr
    34 
    + */
    35 
    +public class CompagniesEntityDtoBinder extends ReferentialEntityDtoBinderSupport<CompagniesDto, Compagnies> {
    36 
    +
    37 
    +    public CompagniesEntityDtoBinder() {
    38 
    +        super(Compagnies.class, CompagniesDto.class);
    39 
    +    }
    40 
    +
    41 
    +    @Override
    42 
    +    public void copyToEntity(ReferentialLocale referentialLocale, CompagniesDto dto, Compagnies entity) {
    43 
    +        copyDtoReferentialFieldsToEntity(dto, entity);
    44 
    +        copyDtoI18nFieldsToEntity(dto, entity);
    45 
    +    }
    46 
    +
    47 
    +    @Override
    48 
    +    public void copyToDto(ReferentialLocale referentialLocale, Compagnies entity, CompagniesDto dto) {
    49 
    +        copyEntityReferentialFieldsToDto(entity, dto);
    50 
    +        copyEntityI18nFieldsToDto(entity, dto);
    51 
    +    }
    52 
    +
    53 
    +}

  • persistence/src/main/java/fr/ird/observe/binder/referential/common/CompagniesEntityReferenceBinder.java
    1 
    +package fr.ird.observe.binder.referential.common;
    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 fr.ird.observe.binder.referential.ReferentialEntityReferenceBinderSupport;
    26 
    +import fr.ird.observe.dto.referential.CompagniesDto;
    27 
    +import fr.ird.observe.dto.referential.CompagniesReference;
    28 
    +import fr.ird.observe.dto.referential.ReferentialLocale;
    29 
    +import fr.ird.observe.entities.referentiel.Compagnies;
    30 
    +
    31 
    +/**
    32 
    + * Created on 24/11/15.
    33 
    + *
    34 
    + * @author Tony Chemit - dev@tchemit.fr
    35 
    + */
    36 
    +public class CompagniesEntityReferenceBinder extends ReferentialEntityReferenceBinderSupport<CompagniesDto, CompagniesReference, Compagnies> {
    37 
    +
    38 
    +    public CompagniesEntityReferenceBinder() {
    39 
    +        super(CompagniesDto.class, CompagniesReference.class, Compagnies.class);
    40 
    +    }
    41 
    +
    42 
    +    @Override
    43 
    +    public CompagniesReference toReference(ReferentialLocale referentialLocale, Compagnies dto) {
    44 
    +        return new CompagniesReference(dto, dto.getCode(), dto.getLabel(referentialLocale));
    45 
    +    }
    46 
    +}

  • persistence/src/main/java/fr/ird/observe/persistence/Entities.java
    ... ... @@ -48,6 +48,7 @@ public class Entities {
    48 48 
                 new ObserveEntityEnum[]{
    49 49 
                         ObserveEntityEnum.VesselSizeCategory,
    50 50 
                         ObserveEntityEnum.Country,
    51 
    +                    ObserveEntityEnum.Compagnies,
    51 52 
                         ObserveEntityEnum.DataQuality,
    52 53 
                         ObserveEntityEnum.ShipOwner,
    53 54 
                         ObserveEntityEnum.Harbour,

  • persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_0.java
    ... ... @@ -74,6 +74,7 @@ public class DataSourceMigrationForVersion_8_0 extends MigrationVersionResource
    74 74 
             }
    75 75 
             executor.addScript("07", "add_weight_determination_method");
    76 76 
             executor.addScript("08", "add_weight_category");
    77 
    +        executor.addScript("09", "add_compagnies");
    77 78 
         }
    78 79
    79 80 
     }

  • persistence/src/main/models/Observe.model
    ... ... @@ -421,6 +421,8 @@ longline.WeightMeasure > ObserveDataEntity | entity
    421 421 
     weight + {*:1} Float | sqlType=numeric
    422 422 
     weightMeasureType {*:1} referentiel.WeightMeasureType
    423 423
    424 
    +referentiel.Compagnies > referentiel.I18nReferentialEntity | entity
    425 
    +
    424 426 
     referentiel.Country > referentiel.I18nReferentialEntity | entity
    425 427 
     iso2Code + {*:1} String
    426 428 
     iso3Code + {*:1} String

  • persistence/src/main/resources/db/migration/8.0/09_add_compagnies-common.sql
    1 
    +CREATE TABLE observe_common.Compagnies(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255));
    2 
    +ALTER TABLE observe_common.Compagnies ADD CONSTRAINT PK_Compagnies PRIMARY KEY(topiaid);
    3 
    +INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1006', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.Compagnies', CURRENT_TIMESTAMP);

  • services-local/src/test/java/fr/ird/observe/services/local/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java
    ... ... @@ -113,6 +113,10 @@ public class UnidirectionalSynchronizeReferentialTest extends ServiceLocalTestSu
    113 113 
                     //empty
    114 114 
                     continue;
    115 115 
                 }
    116 
    +            if (ObserveEntityEnum.Compagnies.equals(referenceEntity)) {
    117 
    +                //empty
    118 
    +                continue;
    119 
    +            }
    116 120 
                 Class<? extends ReferentialDto> dtoType = DbModelHelper.fromReferentialEntity(referenceEntity).toDtoType();
    117 121 
                 Assert.assertTrue("can't find type " + dtoType, referentialNames.contains(dtoType));
    118 122 
                 Assert.assertTrue(result.getReferentialUpdated(dtoType).isEmpty());

  • services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java
    ... ... @@ -146,8 +146,8 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport {
    146 146 
                 ImmutableSet<ValidationResultDtoMessage> messages = result.getMessagesForType(type);
    147 147 
                 System.out.println("assertValidateResult(result, " + type.getSimpleName() + ".class, " + messages.size() + ");");
    148 148 
             }
    149 
    -        // no data of LengthLegnthParameter, WeightDeterminationMethod, WeightCategoryLongline
    150 
    -        Assert.assertEquals(DtoModelClasses.REFERENTIAL_TYPES.size() - 3, types.size());
    149 
    +        // no data of LengthLegnthParameter, WeightDeterminationMethod, WeightCategoryLongline, Compagnies
    150 
    +        Assert.assertEquals(DtoModelClasses.REFERENTIAL_TYPES.size() - 4, types.size());
    151 151
    152 152 
             assertValidateResult(result, DataQualityDto.class, 1);
    153 153 
             assertValidateResult(result, SpeciesGroupReleaseModeDto.class, 2);

  • test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
    ... ... @@ -62,13 +62,13 @@ public class ObserveFixtures {
    62 62
    63 63 
         public static final String SET_LONGLINE_ID_1 = "fr.ird.observe.entities.longline.SetLongline#1429538714446#0.0876020351424813";
    64 64
    65 
    -    private static final int ENTITY_BINDER_REFERENTIAL_COUNT = 68;
    65 
    +    private static final int ENTITY_BINDER_REFERENTIAL_COUNT = 69;
    66 66 
         public static final int REFERENCE_DATA_COUNT = 33;
    67 67
    68 68 
         public static final int REFERENTIAL_FORM_COUNT = ENTITY_BINDER_REFERENTIAL_COUNT;
    69 69 
         public static final int DATA_FORM_COUNT = 48;
    70 70
    71 
    -    public static final int VALIDATORS_COUNT = 194;
    71 
    +    public static final int VALIDATORS_COUNT = 196;
    72 72 
         public static final int VALIDATOR_CREATE_DATA_COUNT = 8;
    73 73 
         public static final int VALIDATOR_UPDATE_DATA_COUNT = 37;
    74 74 
         public static final int VALIDATOR_UPDATE_ENTITY_DATA_COUNT = 29;
    ... ... @@ -245,6 +245,7 @@ public class ObserveFixtures {
    245 245 
         private static final ImmutableMap<String, Long> REFERENTIAL_COMMON_TABLES_COUNT = ImmutableMap
    246 246 
                 .<String, Long>builder()
    247 247 
                 .put("observe_common.country", 72L)
    248 
    +            .put("observe_common.compagnies", 0L)
    248 249 
                 .put("observe_common.dataquality", 5L)
    249 250 
                 .put("observe_common.fpazone", 42L)
    250 251 
                 .put("observe_common.gear", 26L)
    ... ... @@ -252,7 +253,7 @@ public class ObserveFixtures {
    252 253 
                 .put("observe_common.gearcaracteristic", 22L)
    253 254 
                 .put("observe_common.gearcaracteristictype", 6L)
    254 255 
                 .put("observe_common.harbour", 74L)
    255 
    -            .put("observe_common.lastupdatedate", 106L)
    256 
    +            .put("observe_common.lastupdatedate", 107L)
    256 257 
                 .put("observe_common.lengthlengthparameter", 0L)
    257 258 
                 .put("observe_common.lengthweightparameter", 365L)
    258 259 
                 .put("observe_common.ocean", 3L)

  • test/src/main/resources/db/8.0/dataForTestLongline.sql.gz The diff for this file was not included because it is too large.
  • test/src/main/resources/db/8.0/dataForTestSeine.sql.gz The diff for this file was not included because it is too large.
  • test/src/main/resources/db/8.0/empty_h2.sql.gz
    1 1 
     CREATE SCHEMA OBSERVE_LONGLINE;
    2 2 
     CREATE SCHEMA OBSERVE_COMMON;
    3 3 
     CREATE SCHEMA OBSERVE_SEINE;
    4 
    +create table OBSERVE_COMMON.compagnies (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));
    4 5 
     create table OBSERVE_COMMON.country (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), iso2Code varchar(255), iso3Code varchar(255), primary key (topiaId));
    5 6 
     create table OBSERVE_COMMON.dataQuality (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));
    6 7 
     create table OBSERVE_COMMON.fpaZone (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), startDate timestamp, endDate timestamp, primary key (topiaId));

  • test/src/main/resources/db/8.0/empty_pg.sql.gz
    1 1 
     CREATE SCHEMA OBSERVE_LONGLINE;
    2 2 
     CREATE SCHEMA OBSERVE_COMMON;
    3 3 
     CREATE SCHEMA OBSERVE_SEINE;
    4 
    +create table OBSERVE_COMMON.compagnies (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));
    4 5 
     create table OBSERVE_COMMON.country (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), iso2Code varchar(255), iso3Code varchar(255), primary key (topiaId));
    5 6 
     create table OBSERVE_COMMON.dataQuality (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));
    6 7 
     create table OBSERVE_COMMON.fpaZone (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), startDate timestamp, endDate timestamp, primary key (topiaId));

  • test/src/main/resources/db/8.0/referentiel.sql.gz The diff for this file was not included because it is too large.
  • validation/src/main/resources/fr/ird/observe/dto/referential/CompagniesDto-create-error-validation.xml
    1 
    +<?xml version="1.0" encoding="UTF-8"?>
    2 
    +<!--
    3 
    +  #%L
    4 
    +  ObServe :: Validation
    5 
    +  %%
    6 
    +  Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    7 
    +  %%
    8 
    +  This program is free software: you can redistribute it and/or modify
    9 
    +  it under the terms of the GNU General Public License as
    10 
    +  published by the Free Software Foundation, either version 3 of the
    11 
    +  License, or (at your option) any later version.
    12 
    +
    13 
    +  This program is distributed in the hope that it will be useful,
    14 
    +  but WITHOUT ANY WARRANTY; without even the implied warranty of
    15 
    +  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16 
    +  GNU General Public License for more details.
    17 
    +
    18 
    +  You should have received a copy of the GNU General Public
    19 
    +  License along with this program.  If not, see
    20 
    +  <http://www.gnu.org/licenses/gpl-3.0.html>.
    21 
    +  #L%
    22 
    +  -->
    23 
    +
    24 
    +<!DOCTYPE validators PUBLIC
    25 
    +    "-//Apache Struts//XWork Validator 1.0.3//EN"
    26 
    +    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    27 
    +<validators>
    28 
    +
    29 
    +  <field name="code">
    30 
    +
    31 
    +    <!-- clef unique sur le code -->
    32 
    +    <field-validator type="referentialCode" short-circuit="true">
    33 
    +      <message>observe.validation.referentiel.invalid.code.uniqueKey##${code}</message>
    34 
    +    </field-validator>
    35 
    +
    36 
    +  </field>
    37 
    +
    38 
    +  <field name="label1">    <!-- pas de libelle 1 renseigne -->
    39 
    +    <field-validator type="requiredstring">
    40 
    +      <message>observe.validation.referentiel.required.label1</message>
    41 
    +    </field-validator>
    42 
    +  </field>
    43 
    +
    44 
    +  <field name="label2">
    45 
    +    <!-- pas de libelle 2 renseigne -->
    46 
    +    <field-validator type="requiredstring">
    47 
    +      <message>observe.validation.referentiel.required.label2</message>
    48 
    +    </field-validator>
    49 
    +  </field>
    50 
    +
    51 
    +  <field name="label3">
    52 
    +    <!-- pas de libelle 3 renseigne -->
    53 
    +    <field-validator type="requiredstring">
    54 
    +      <message>observe.validation.referentiel.required.label3</message>
    55 
    +    </field-validator>
    56 
    +  </field>
    57 
    +
    58 
    +</validators>

  • validation/src/main/resources/fr/ird/observe/dto/referential/CompagniesDto-create-warning-validation.xml
    1 
    +<?xml version="1.0" encoding="UTF-8"?>
    2 
    +<!--
    3 
    +  #%L
    4 
    +  ObServe :: Validation
    5 
    +  %%
    6 
    +  Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    7 
    +  %%
    8 
    +  This program is free software: you can redistribute it and/or modify
    9 
    +  it under the terms of the GNU General Public License as
    10 
    +  published by the Free Software Foundation, either version 3 of the
    11 
    +  License, or (at your option) any later version.
    12 
    +
    13 
    +  This program is distributed in the hope that it will be useful,
    14 
    +  but WITHOUT ANY WARRANTY; without even the implied warranty of
    15 
    +  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16 
    +  GNU General Public License for more details.
    17 
    +
    18 
    +  You should have received a copy of the GNU General Public
    19 
    +  License along with this program.  If not, see
    20 
    +  <http://www.gnu.org/licenses/gpl-3.0.html>.
    21 
    +  #L%
    22 
    +  -->
    23 
    +
    24 
    +<!DOCTYPE validators PUBLIC
    25 
    +    "-//Apache Struts//XWork Validator 1.0.3//EN"
    26 
    +    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    27 
    +<validators>
    28 
    +
    29 
    +  <field name="status">
    30 
    +    <!-- objet desactive -->
    31 
    +    <field-validator type="fieldexpression" short-circuit="true">
    32 
    +      <param name="expression">
    33 
    +        <![CDATA[ enabled ]]>
    34 
    +      </param>
    35 
    +      <message>observe.validation.referentiel.status.desactivated</message>
    36 
    +    </field-validator>
    37 
    +  </field>
    38 
    +
    39 
    +  <field name="uri">
    40 
    +    <!-- pas d'uri selectionne -->
    41 
    +    <field-validator type="requiredstring" short-circuit="true">
    42 
    +      <message>observe.validation.referentiel.null.uri</message>
    43 
    +    </field-validator>
    44 
    +  </field>
    45 
    +  <field name="label1">
    46 
    +    <!-- libelle 1 non traduit (egal a label2) -->
    47 
    +    <field-validator type="fieldexpression">
    48 
    +      <param name="expression">
    49 
    +        <![CDATA[ label1 == null || label1.empty || label1 != label2  ]]>
    50 
    +      </param>
    51 
    +      <message>observe.validation.referentiel.untranslated.label1</message>
    52 
    +    </field-validator>
    53 
    +  </field>
    54 
    +
    55 
    +  <field name="label3">
    56 
    +    <!-- libelle 3 non traduit (egal a label2) -->
    57 
    +    <field-validator type="fieldexpression">
    58 
    +      <param name="expression">
    59 
    +        <![CDATA[ label3 == null || label3.empty || label3 != label2  ]]>
    60 
    +      </param>
    61 
    +      <message>observe.validation.referentiel.untranslated.label3</message>
    62 
    +    </field-validator>
    63 
    +  </field>
    64 
    +
    65 
    +</validators>

  • validation/src/main/resources/fr/ird/observe/dto/referential/CompagniesDto-update-error-validation.xml
    1 
    +<?xml version="1.0" encoding="UTF-8"?>
    2 
    +<!--
    3 
    +  #%L
    4 
    +  ObServe :: Validation
    5 
    +  %%
    6 
    +  Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    7 
    +  %%
    8 
    +  This program is free software: you can redistribute it and/or modify
    9 
    +  it under the terms of the GNU General Public License as
    10 
    +  published by the Free Software Foundation, either version 3 of the
    11 
    +  License, or (at your option) any later version.
    12 
    +
    13 
    +  This program is distributed in the hope that it will be useful,
    14 
    +  but WITHOUT ANY WARRANTY; without even the implied warranty of
    15 
    +  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16 
    +  GNU General Public License for more details.
    17 
    +
    18 
    +  You should have received a copy of the GNU General Public
    19 
    +  License along with this program.  If not, see
    20 
    +  <http://www.gnu.org/licenses/gpl-3.0.html>.
    21 
    +  #L%
    22 
    +  -->
    23 
    +
    24 
    +<!DOCTYPE validators PUBLIC
    25 
    +    "-//Apache Struts//XWork Validator 1.0.3//EN"
    26 
    +    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    27 
    +<validators>
    28 
    +
    29 
    +  <field name="code">
    30 
    +
    31 
    +    <!-- clef unique sur le code -->
    32 
    +    <field-validator type="referentialCode" short-circuit="true">
    33 
    +      <message>observe.validation.referentiel.invalid.code.uniqueKey##${code}</message>
    34 
    +    </field-validator>
    35 
    +
    36 
    +  </field>
    37 
    +
    38 
    +  <field name="label1">    <!-- pas de libelle 1 renseigne -->
    39 
    +    <field-validator type="requiredstring">
    40 
    +      <message>observe.validation.referentiel.required.label1</message>
    41 
    +    </field-validator>
    42 
    +  </field>
    43 
    +
    44 
    +  <field name="label2">
    45 
    +    <!-- pas de libelle 2 renseigne -->
    46 
    +    <field-validator type="requiredstring">
    47 
    +      <message>observe.validation.referentiel.required.label2</message>
    48 
    +    </field-validator>
    49 
    +  </field>
    50 
    +
    51 
    +  <field name="label3">
    52 
    +    <!-- pas de libelle 3 renseigne -->
    53 
    +    <field-validator type="requiredstring">
    54 
    +      <message>observe.validation.referentiel.required.label3</message>
    55 
    +    </field-validator>
    56 
    +  </field>
    57 
    +
    58 
    +</validators>

  • validation/src/main/resources/fr/ird/observe/dto/referential/CompagniesDto-update-warning-validation.xml
    1 
    +<?xml version="1.0" encoding="UTF-8"?>
    2 
    +<!--
    3 
    +  #%L
    4 
    +  ObServe :: Validation
    5 
    +  %%
    6 
    +  Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    7 
    +  %%
    8 
    +  This program is free software: you can redistribute it and/or modify
    9 
    +  it under the terms of the GNU General Public License as
    10 
    +  published by the Free Software Foundation, either version 3 of the
    11 
    +  License, or (at your option) any later version.
    12 
    +
    13 
    +  This program is distributed in the hope that it will be useful,
    14 
    +  but WITHOUT ANY WARRANTY; without even the implied warranty of
    15 
    +  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16 
    +  GNU General Public License for more details.
    17 
    +
    18 
    +  You should have received a copy of the GNU General Public
    19 
    +  License along with this program.  If not, see
    20 
    +  <http://www.gnu.org/licenses/gpl-3.0.html>.
    21 
    +  #L%
    22 
    +  -->
    23 
    +
    24 
    +<!DOCTYPE validators PUBLIC
    25 
    +    "-//Apache Struts//XWork Validator 1.0.3//EN"
    26 
    +    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    27 
    +<validators>
    28 
    +
    29 
    +  <field name="status">
    30 
    +    <!-- objet desactive -->
    31 
    +    <field-validator type="fieldexpression" short-circuit="true">
    32 
    +      <param name="expression">
    33 
    +        <![CDATA[ enabled ]]>
    34 
    +      </param>
    35 
    +      <message>observe.validation.referentiel.status.desactivated</message>
    36 
    +    </field-validator>
    37 
    +  </field>
    38 
    +
    39 
    +  <field name="uri">
    40 
    +    <!-- pas d'uri selectionne -->
    41 
    +    <field-validator type="requiredstring" short-circuit="true">
    42 
    +      <message>observe.validation.referentiel.null.uri</message>
    43 
    +    </field-validator>
    44 
    +  </field>
    45 
    +  <field name="label1">
    46 
    +    <!-- libelle 1 non traduit (egal a label2) -->
    47 
    +    <field-validator type="fieldexpression">
    48 
    +      <param name="expression">
    49 
    +        <![CDATA[ label1 == null || label1.empty || label1 != label2  ]]>
    50 
    +      </param>
    51 
    +      <message>observe.validation.referentiel.untranslated.label1</message>
    52 
    +    </field-validator>
    53 
    +  </field>
    54 
    +
    55 
    +  <field name="label3">
    56 
    +    <!-- libelle 3 non traduit (egal a label2) -->
    57 
    +    <field-validator type="fieldexpression">
    58 
    +      <param name="expression">
    59 
    +        <![CDATA[ label3 == null || label3.empty || label3 != label2  ]]>
    60 
    +      </param>
    61 
    +      <message>observe.validation.referentiel.untranslated.label3</message>
    62 
    +    </field-validator>
    63 
    +  </field>
    64 
    +
    65 
    +</validators>

  • validation/src/test/java/fr/ird/observe/client/validation/BeanValidatorDetectorTest.java
    ... ... @@ -66,6 +66,7 @@ import fr.ird.observe.dto.data.seine.TransmittingBuoyDto;
    66 66 
     import fr.ird.observe.dto.data.seine.TripSeineDto;
    67 67 
     import fr.ird.observe.dto.data.seine.TripSeineGearUseDto;
    68 68 
     import fr.ird.observe.dto.referential.CountryDto;
    69 
    +import fr.ird.observe.dto.referential.CompagniesDto;
    69 70 
     import fr.ird.observe.dto.referential.DataQualityDto;
    70 71 
     import fr.ird.observe.dto.referential.FpaZoneDto;
    71 72 
     import fr.ird.observe.dto.referential.GearCaracteristicDto;
    ... ... @@ -206,6 +207,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest {
    206 207 
                     BaitSettingStatusDto.class,
    207 208 
                     BaitTypeDto.class,
    208 209 
                     CatchFateLonglineDto.class,
    210 
    +                CompagniesDto.class,
    209 211 
                     CountryDto.class,
    210 212 
                     DataQualityDto.class,
    211 213 
                     DetectionModeDto.class,
    ... ... @@ -301,6 +303,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest {
    301 303 
                     BranchlinesCompositionDto.class,
    302 304 
                     CatchFateLonglineDto.class,
    303 305 
                     CatchLonglineDto.class,
    306 
    +                CompagniesDto.class,
    304 307 
                     CountryDto.class,
    305 308 
                     DataQualityDto.class,
    306 309 
                     DetectionModeDto.class,

    • —
    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.