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

Commits:

8 changed files:

Changes:

  • persistence/src/main/java/fr/ird/observe/entities/referentiel/SpeciesTopiaDao.java
    ... ... @@ -45,7 +45,7 @@ public class SpeciesTopiaDao extends AbstractSpeciesTopiaDao<Species> {
    45 45 
                                 " WHERE main.topiaId=secondary.catch AND secondary.predator='" + entity.getTopiaId() + "'";
    46 46 
                 List<CatchLonglineObs> list = hibernateSession
    47 47 
                         .createSQLQuery(sql)
    48 
    -                    .addEntity("main", ObserveEntityEnum.CatchLonglineObs.getImplementation())
    48 
    +                    .addEntity("main", ObserveEntityEnum.ll_observation_CatchLonglineObs.getImplementation())
    49 49 
                         .list();
    50 50
    51 51 
                 for (CatchLonglineObs item : list) {

  • persistence/src/main/java/fr/ird/observe/persistence/Entities.java
    ... ... @@ -46,139 +46,139 @@ public class Entities {
    46 46
    47 47 
         public static final ObserveEntityEnum[] REFERENCE_ENTITIES =
    48 48 
                 new ObserveEntityEnum[]{
    49 
    -                    ObserveEntityEnum.VesselSizeCategory,
    50 
    -                    ObserveEntityEnum.Country,
    51 
    -                    ObserveEntityEnum.Compagnies,
    52 
    -                    ObserveEntityEnum.LengthMeasureMethod,
    53 
    -                    ObserveEntityEnum.WeightMeasureMethod,
    54 
    -                    ObserveEntityEnum.DataQuality,
    55 
    -                    ObserveEntityEnum.ShipOwner,
    56 
    -                    ObserveEntityEnum.Harbour,
    57 
    -                    ObserveEntityEnum.VesselType,
    58 
    -                    ObserveEntityEnum.Vessel,
    59 
    -                    ObserveEntityEnum.NonTargetCatchReleaseConformity,
    60 
    -                    ObserveEntityEnum.NonTargetCatchReleaseStatus,
    61 
    -                    ObserveEntityEnum.NonTargetCatchReleasingTime,
    62 
    -                    ObserveEntityEnum.SpeciesGroupReleaseMode,
    63 
    -                    ObserveEntityEnum.SpeciesGroup,
    64 
    -                    ObserveEntityEnum.Ocean,
    65 
    -                    ObserveEntityEnum.SizeMeasureType,
    66 
    -                    ObserveEntityEnum.WeightMeasureType,
    67 
    -                    ObserveEntityEnum.Wind,
    68 
    -                    ObserveEntityEnum.Species,
    69 
    -                    ObserveEntityEnum.Sex,
    70 
    -                    ObserveEntityEnum.FpaZone,
    71 
    -                    ObserveEntityEnum.SpeciesList,
    72 
    -                    ObserveEntityEnum.Person,
    73 
    -                    ObserveEntityEnum.Organism,
    74 
    -                    ObserveEntityEnum.LengthLengthParameter,
    75 
    -                    ObserveEntityEnum.LengthWeightParameter,
    76 
    -                    ObserveEntityEnum.Program,
    77 
    -                    ObserveEntityEnum.GearCaracteristicType,
    78 
    -                    ObserveEntityEnum.GearCaracteristic,
    79 
    -                    ObserveEntityEnum.Gear,
    80 
    -                    ObserveEntityEnum.LastUpdateDate,
    49 
    +                    ObserveEntityEnum.common_VesselSizeCategory,
    50 
    +                    ObserveEntityEnum.common_Country,
    51 
    +                    ObserveEntityEnum.common_Compagnies,
    52 
    +                    ObserveEntityEnum.common_LengthMeasureMethod,
    53 
    +                    ObserveEntityEnum.common_WeightMeasureMethod,
    54 
    +                    ObserveEntityEnum.common_DataQuality,
    55 
    +                    ObserveEntityEnum.common_ShipOwner,
    56 
    +                    ObserveEntityEnum.common_Harbour,
    57 
    +                    ObserveEntityEnum.common_VesselType,
    58 
    +                    ObserveEntityEnum.common_Vessel,
    59 
    +                    ObserveEntityEnum.ps_observation_NonTargetCatchReleaseConformity,
    60 
    +                    ObserveEntityEnum.ps_observation_NonTargetCatchReleaseStatus,
    61 
    +                    ObserveEntityEnum.ps_observation_NonTargetCatchReleasingTime,
    62 
    +                    ObserveEntityEnum.common_SpeciesGroupReleaseMode,
    63 
    +                    ObserveEntityEnum.common_SpeciesGroup,
    64 
    +                    ObserveEntityEnum.common_Ocean,
    65 
    +                    ObserveEntityEnum.common_SizeMeasureType,
    66 
    +                    ObserveEntityEnum.common_WeightMeasureType,
    67 
    +                    ObserveEntityEnum.common_Wind,
    68 
    +                    ObserveEntityEnum.common_Species,
    69 
    +                    ObserveEntityEnum.common_Sex,
    70 
    +                    ObserveEntityEnum.common_FpaZone,
    71 
    +                    ObserveEntityEnum.common_SpeciesList,
    72 
    +                    ObserveEntityEnum.common_Person,
    73 
    +                    ObserveEntityEnum.common_Organism,
    74 
    +                    ObserveEntityEnum.common_LengthLengthParameter,
    75 
    +                    ObserveEntityEnum.common_LengthWeightParameter,
    76 
    +                    ObserveEntityEnum.common_Program,
    77 
    +                    ObserveEntityEnum.common_GearCaracteristicType,
    78 
    +                    ObserveEntityEnum.common_GearCaracteristic,
    79 
    +                    ObserveEntityEnum.common_Gear,
    80 
    +                    ObserveEntityEnum.common_LastUpdateDate,
    81 81
    82 
    -                    ObserveEntityEnum.VesselActivitySeine,
    83 
    -                    ObserveEntityEnum.SurroundingActivity,
    84 
    -                    ObserveEntityEnum.ReasonForNullSet,
    85 
    -                    ObserveEntityEnum.ReasonForNoFishing,
    86 
    -                    ObserveEntityEnum.SpeciesFate,
    87 
    -                    ObserveEntityEnum.WeightCategorySeine,
    88 
    -                    ObserveEntityEnum.DetectionMode,
    89 
    -                    ObserveEntityEnum.TransmittingBuoyOperation,
    90 
    -                    ObserveEntityEnum.ObjectOperation,
    91 
    -                    ObserveEntityEnum.ObjectMaterialType,
    92 
    -                    ObserveEntityEnum.ObjectMaterial,
    93 
    -                    ObserveEntityEnum.ReasonForDiscard,
    94 
    -                    ObserveEntityEnum.SpeciesStatus,
    95 
    -                    ObserveEntityEnum.ObservedSystem,
    96 
    -                    ObserveEntityEnum.TransmittingBuoyType,
    82 
    +                    ObserveEntityEnum.ps_observation_VesselActivitySeine,
    83 
    +                    ObserveEntityEnum.ps_observation_SurroundingActivity,
    84 
    +                    ObserveEntityEnum.ps_observation_ReasonForNullSet,
    85 
    +                    ObserveEntityEnum.ps_observation_ReasonForNoFishing,
    86 
    +                    ObserveEntityEnum.ps_common_SpeciesFate,
    87 
    +                    ObserveEntityEnum.ps_observation_WeightCategorySeine,
    88 
    +                    ObserveEntityEnum.ps_observation_DetectionMode,
    89 
    +                    ObserveEntityEnum.ps_common_TransmittingBuoyOperation,
    90 
    +                    ObserveEntityEnum.ps_observation_ObjectOperation,
    91 
    +                    ObserveEntityEnum.ps_observation_ObjectMaterialType,
    92 
    +                    ObserveEntityEnum.ps_observation_ObjectMaterial,
    93 
    +                    ObserveEntityEnum.ps_observation_ReasonForDiscard,
    94 
    +                    ObserveEntityEnum.ps_observation_SpeciesStatus,
    95 
    +                    ObserveEntityEnum.ps_observation_ObservedSystem,
    96 
    +                    ObserveEntityEnum.ps_common_TransmittingBuoyType,
    97 97
    98 
    -                    ObserveEntityEnum.BaitHaulingStatus,
    99 
    -                    ObserveEntityEnum.BaitSettingStatus,
    100 
    -                    ObserveEntityEnum.BaitType,
    101 
    -                    ObserveEntityEnum.CatchFateLongline,
    102 
    -                    ObserveEntityEnum.EncounterType,
    103 
    -                    ObserveEntityEnum.Healthness,
    104 
    -                    ObserveEntityEnum.HookPosition,
    105 
    -                    ObserveEntityEnum.HookSize,
    106 
    -                    ObserveEntityEnum.HookType,
    107 
    -                    ObserveEntityEnum.ItemVerticalPosition,
    108 
    -                    ObserveEntityEnum.ItemHorizontalPosition,
    109 
    -                    ObserveEntityEnum.LightsticksColor,
    110 
    -                    ObserveEntityEnum.LightsticksType,
    111 
    -                    ObserveEntityEnum.LineType,
    112 
    -                    ObserveEntityEnum.MaturityStatus,
    113 
    -                    ObserveEntityEnum.MitigationType,
    114 
    -                    ObserveEntityEnum.ObservationMethod,
    115 
    -                    ObserveEntityEnum.SensorBrand,
    116 
    -                    ObserveEntityEnum.SensorDataFormat,
    117 
    -                    ObserveEntityEnum.SensorType,
    118 
    -                    ObserveEntityEnum.SettingShape,
    119 
    -                    ObserveEntityEnum.StomacFullness,
    120 
    -                    ObserveEntityEnum.WeightCategoryLongline,
    121 
    -                    ObserveEntityEnum.WeightDeterminationMethod,
    122 
    -                    ObserveEntityEnum.VesselActivityLongline,
    123 
    -                    ObserveEntityEnum.Conservation,
    124 
    -                    ObserveEntityEnum.OnBoardProcessing,
    125 
    -                    ObserveEntityEnum.DataSource,
    126 
    -                    ObserveEntityEnum.TripType
    98 
    +                    ObserveEntityEnum.ll_observation_BaitHaulingStatus,
    99 
    +                    ObserveEntityEnum.ll_common_BaitSettingStatus,
    100 
    +                    ObserveEntityEnum.ll_common_BaitType,
    101 
    +                    ObserveEntityEnum.ll_common_CatchFateLongline,
    102 
    +                    ObserveEntityEnum.ll_observation_EncounterType,
    103 
    +                    ObserveEntityEnum.ll_common_Healthness,
    104 
    +                    ObserveEntityEnum.ll_observation_HookPosition,
    105 
    +                    ObserveEntityEnum.ll_common_HookSize,
    106 
    +                    ObserveEntityEnum.ll_common_HookType,
    107 
    +                    ObserveEntityEnum.ll_observation_ItemVerticalPosition,
    108 
    +                    ObserveEntityEnum.ll_observation_ItemHorizontalPosition,
    109 
    +                    ObserveEntityEnum.ll_common_LightsticksColor,
    110 
    +                    ObserveEntityEnum.ll_common_LightsticksType,
    111 
    +                    ObserveEntityEnum.ll_common_LineType,
    112 
    +                    ObserveEntityEnum.ll_observation_MaturityStatus,
    113 
    +                    ObserveEntityEnum.ll_common_MitigationType,
    114 
    +                    ObserveEntityEnum.ll_common_ObservationMethod,
    115 
    +                    ObserveEntityEnum.ll_observation_SensorBrand,
    116 
    +                    ObserveEntityEnum.ll_observation_SensorDataFormat,
    117 
    +                    ObserveEntityEnum.ll_observation_SensorType,
    118 
    +                    ObserveEntityEnum.ll_common_SettingShape,
    119 
    +                    ObserveEntityEnum.ll_observation_StomacFullness,
    120 
    +                    ObserveEntityEnum.ll_common_WeightCategoryLongline,
    121 
    +                    ObserveEntityEnum.ll_common_WeightDeterminationMethod,
    122 
    +                    ObserveEntityEnum.ll_common_VesselActivityLongline,
    123 
    +                    ObserveEntityEnum.ll_landing_Conservation,
    124 
    +                    ObserveEntityEnum.ll_common_OnBoardProcessing,
    125 
    +                    ObserveEntityEnum.ll_landing_DataSource,
    126 
    +                    ObserveEntityEnum.ll_common_TripType
    127 127 
                 };
    128 128 
         public static final List<ObserveEntityEnum> REFERENCE_ENTITIES_LIST =
    129 129 
                 Collections.unmodifiableList(Arrays.asList(REFERENCE_ENTITIES));
    130 130 
         public static final ObserveEntityEnum[] DATA_ENTITIES =
    131 131 
                 new ObserveEntityEnum[]{
    132 
    -                    ObserveEntityEnum.TargetSample,
    133 
    -                    ObserveEntityEnum.TargetLength,
    134 
    -                    ObserveEntityEnum.NonTargetSample,
    135 
    -                    ObserveEntityEnum.NonTargetLength,
    136 
    -                    ObserveEntityEnum.NonTargetCatchRelease,
    137 
    -                    ObserveEntityEnum.NonTargetCatch,
    138 
    -                    ObserveEntityEnum.SetSeine,
    139 
    -                    ObserveEntityEnum.TargetCatch,
    140 
    -                    ObserveEntityEnum.TransmittingBuoy,
    141 
    -                    ObserveEntityEnum.ObjectObservedSpecies,
    142 
    -                    ObserveEntityEnum.SchoolEstimate,
    143 
    -                    ObserveEntityEnum.ObjectSchoolEstimate,
    144 
    -                    ObserveEntityEnum.FloatingObjectPart,
    145 
    -                    ObserveEntityEnum.FloatingObject,
    146 
    -                    ObserveEntityEnum.ActivitySeine,
    147 
    -                    ObserveEntityEnum.Route,
    148 
    -                    ObserveEntityEnum.GearUseFeaturesMeasurementSeine,
    149 
    -                    ObserveEntityEnum.GearUseFeaturesSeine,
    150 
    -                    ObserveEntityEnum.TripSeine,
    132 
    +                    ObserveEntityEnum.ps_observation_TargetSample,
    133 
    +                    ObserveEntityEnum.ps_observation_TargetLength,
    134 
    +                    ObserveEntityEnum.ps_observation_NonTargetSample,
    135 
    +                    ObserveEntityEnum.ps_observation_NonTargetLength,
    136 
    +                    ObserveEntityEnum.ps_observation_NonTargetCatchRelease,
    137 
    +                    ObserveEntityEnum.ps_observation_NonTargetCatch,
    138 
    +                    ObserveEntityEnum.ps_observation_SetSeine,
    139 
    +                    ObserveEntityEnum.ps_observation_TargetCatch,
    140 
    +                    ObserveEntityEnum.ps_observation_TransmittingBuoy,
    141 
    +                    ObserveEntityEnum.ps_observation_ObjectObservedSpecies,
    142 
    +                    ObserveEntityEnum.ps_observation_SchoolEstimate,
    143 
    +                    ObserveEntityEnum.ps_observation_ObjectSchoolEstimate,
    144 
    +                    ObserveEntityEnum.ps_observation_FloatingObjectPart,
    145 
    +                    ObserveEntityEnum.ps_observation_FloatingObject,
    146 
    +                    ObserveEntityEnum.ps_observation_ActivitySeine,
    147 
    +                    ObserveEntityEnum.ps_observation_Route,
    148 
    +                    ObserveEntityEnum.ps_common_GearUseFeaturesMeasurementSeine,
    149 
    +                    ObserveEntityEnum.ps_common_GearUseFeaturesSeine,
    150 
    +                    ObserveEntityEnum.ps_common_TripSeine,
    151 151
    152 
    -                    ObserveEntityEnum.HooksCompositionObs,
    153 
    -                    ObserveEntityEnum.BranchlinesCompositionObs,
    154 
    -                    ObserveEntityEnum.BaitsCompositionObs,
    155 
    -                    ObserveEntityEnum.FloatlinesCompositionObs,
    156 
    -                    ObserveEntityEnum.HooksCompositionLogbook,
    157 
    -                    ObserveEntityEnum.BranchlinesCompositionLogbook,
    158 
    -                    ObserveEntityEnum.BaitsCompositionLogbook,
    159 
    -                    ObserveEntityEnum.FloatlinesCompositionLogbook,
    160 
    -                    ObserveEntityEnum.SizeMeasureObs,
    161 
    -                    ObserveEntityEnum.WeightMeasureObs,
    162 
    -                    ObserveEntityEnum.SetLonglineObs,
    163 
    -                    ObserveEntityEnum.SamplePartLogbook,
    164 
    -                    ObserveEntityEnum.SampleLogbook,
    165 
    -                    ObserveEntityEnum.SetLonglineLogbook,
    166 
    -                    ObserveEntityEnum.BranchlineObs,
    167 
    -                    ObserveEntityEnum.BasketObs,
    168 
    -                    ObserveEntityEnum.SectionObs,
    169 
    -                    ObserveEntityEnum.CatchLonglineObs,
    170 
    -                    ObserveEntityEnum.CatchLonglineLogbook,
    171 
    -                    ObserveEntityEnum.TdrObs,
    172 
    -                    ObserveEntityEnum.EncounterObs,
    173 
    -                    ObserveEntityEnum.SensorUsedObs,
    174 
    -                    ObserveEntityEnum.LandingPartLongline,
    175 
    -                    ObserveEntityEnum.LandingLongline,
    176 
    -                    ObserveEntityEnum.ActivityLonglineObs,
    177 
    -                    ObserveEntityEnum.ActivityLonglineLogbook,
    178 
    -                    ObserveEntityEnum.TdrRecordObs,
    179 
    -                    ObserveEntityEnum.GearUseFeaturesMeasurementLongline,
    180 
    -                    ObserveEntityEnum.GearUseFeaturesLongline,
    181 
    -                    ObserveEntityEnum.TripLongline
    152 
    +                    ObserveEntityEnum.ll_observation_HooksCompositionObs,
    153 
    +                    ObserveEntityEnum.ll_observation_BranchlinesCompositionObs,
    154 
    +                    ObserveEntityEnum.ll_observation_BaitsCompositionObs,
    155 
    +                    ObserveEntityEnum.ll_observation_FloatlinesCompositionObs,
    156 
    +                    ObserveEntityEnum.ll_logbook_HooksCompositionLogbook,
    157 
    +                    ObserveEntityEnum.ll_logbook_BranchlinesCompositionLogbook,
    158 
    +                    ObserveEntityEnum.ll_logbook_BaitsCompositionLogbook,
    159 
    +                    ObserveEntityEnum.ll_logbook_FloatlinesCompositionLogbook,
    160 
    +                    ObserveEntityEnum.ll_observation_SizeMeasureObs,
    161 
    +                    ObserveEntityEnum.ll_observation_WeightMeasureObs,
    162 
    +                    ObserveEntityEnum.ll_observation_SetLonglineObs,
    163 
    +                    ObserveEntityEnum.ll_logbook_SamplePartLogbook,
    164 
    +                    ObserveEntityEnum.ll_logbook_SampleLogbook,
    165 
    +                    ObserveEntityEnum.ll_logbook_SetLonglineLogbook,
    166 
    +                    ObserveEntityEnum.ll_observation_BranchlineObs,
    167 
    +                    ObserveEntityEnum.ll_observation_BasketObs,
    168 
    +                    ObserveEntityEnum.ll_observation_SectionObs,
    169 
    +                    ObserveEntityEnum.ll_observation_CatchLonglineObs,
    170 
    +                    ObserveEntityEnum.ll_logbook_CatchLonglineLogbook,
    171 
    +                    ObserveEntityEnum.ll_observation_TdrObs,
    172 
    +                    ObserveEntityEnum.ll_observation_EncounterObs,
    173 
    +                    ObserveEntityEnum.ll_observation_SensorUsedObs,
    174 
    +                    ObserveEntityEnum.ll_landing_LandingPartLongline,
    175 
    +                    ObserveEntityEnum.ll_landing_LandingLongline,
    176 
    +                    ObserveEntityEnum.ll_observation_ActivityLonglineObs,
    177 
    +                    ObserveEntityEnum.ll_logbook_ActivityLonglineLogbook,
    178 
    +                    ObserveEntityEnum.ll_observation_TdrRecordObs,
    179 
    +                    ObserveEntityEnum.ll_common_GearUseFeaturesMeasurementLongline,
    180 
    +                    ObserveEntityEnum.ll_common_GearUseFeaturesLongline,
    181 
    +                    ObserveEntityEnum.ll_common_TripLongline
    182 182 
                 };
    183 183 
         /**
    184 184 
          * FIXME : cela n'est pas vrai !!! (voir l'algortihme de replication qui

  • persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java
    ... ... @@ -272,7 +272,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat
    272 272
    273 273 
             if (tripSeineTables == null) {
    274 274 
                 log.debug("Loading tripSeineTables.");
    275 
    -            tripSeineTables = topiaSqlTablesFactory.newReplicateEntityTables(new TripReplicateTablesPredicate(), ObserveEntityEnum.TripSeine);
    275 
    +            tripSeineTables = topiaSqlTablesFactory.newReplicateEntityTables(new TripReplicateTablesPredicate(), ObserveEntityEnum.ps_common_TripSeine);
    276 276 
                 log.info(String.format("For TripSeine, found %d tables to use.", tripSeineTables.size()));
    277 277 
             }
    278 278 
             return tripSeineTables;
    ... ... @@ -282,7 +282,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat
    282 282
    283 283 
             if (tripLonglineTables == null) {
    284 284 
                 log.debug("Loading tripLonglineTables.");
    285 
    -            tripLonglineTables = topiaSqlTablesFactory.newReplicateEntityTables(new TripReplicateTablesPredicate(), ObserveEntityEnum.TripLongline);
    285 
    +            tripLonglineTables = topiaSqlTablesFactory.newReplicateEntityTables(new TripReplicateTablesPredicate(), ObserveEntityEnum.ll_common_TripLongline);
    286 286 
                 log.info(String.format("For TripLongline, found %d tables to use.", tripLonglineTables.size()));
    287 287 
                 TopiaSqlTable basketTable = tripLonglineTables.getTable("ll_observation.basket");
    288 288
    ... ... @@ -341,12 +341,12 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat
    341 341
    342 342 
             private final Set<TopiaMetadataEntity> dones = new LinkedHashSet<>();
    343 343 
             private final Set<String> sections = ImmutableSet.of(
    344 
    -                ObserveEntityEnum.BranchlineObs.name(),
    345 
    -                ObserveEntityEnum.BasketObs.name(),
    346 
    -                ObserveEntityEnum.SectionObs.name());
    344 
    +                ObserveEntityEnum.ll_observation_BranchlineObs.name(),
    345 
    +                ObserveEntityEnum.ll_observation_BasketObs.name(),
    346 
    +                ObserveEntityEnum.ll_observation_SectionObs.name());
    347 347 
             private final Set<String> sectionsHolders = ImmutableSet.of(
    348 
    -                ObserveEntityEnum.CatchLonglineObs.name(),
    349 
    -                ObserveEntityEnum.TdrObs.name());
    348 
    +                ObserveEntityEnum.ll_observation_CatchLonglineObs.name(),
    349 
    +                ObserveEntityEnum.ll_observation_TdrObs.name());
    350 350
    351 351 
             @Override
    352 352 
             public boolean acceptEntity(TopiaMetadataEntity metadataEntity) {
    ... ... @@ -360,7 +360,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat
    360 360
    361 361 
             @Override
    362 362 
             public boolean acceptReversedAssociation(TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) {
    363 
    -            return !(ObserveEntityEnum.ActivityLonglineObs.name().equals(propertyType.getType()) && ObserveEntityEnum.ActivityLonglineLogbook.name().equals(metadataEntity.getType()));
    363 
    +            return !(ObserveEntityEnum.ll_observation_ActivityLonglineObs.name().equals(propertyType.getType()) && ObserveEntityEnum.ll_logbook_ActivityLonglineLogbook.name().equals(metadataEntity.getType()));
    364 364
    365 365 
             }
    366 366

  • pom.xml
    ... ... @@ -156,7 +156,7 @@
    156 156 
         <buildDate>${maven.build.timestamp}</buildDate>
    157 157
    158 158 
         <observeToolkitVersion>4.9</observeToolkitVersion>
    159 
    -    <!--<lib.version.java4all.topia>1.1.9</lib.version.java4all.topia>-->
    159 
    +    <lib.version.java4all.topia>1.2-SNAPSHOT</lib.version.java4all.topia>
    160 160 
         <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
    161 161 
         <!--<lib.version.java4all.jaxx>3.0-alpha-45-SNAPSHOT</lib.version.java4all.jaxx>-->
    162 162 
         <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->

  • services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceLocal.java
    ... ... @@ -109,7 +109,7 @@ public class ReferentialSynchronizeDiffServiceLocal extends ObserveServiceLocal
    109 109
    110 110 
             ReferentialDataSourceStates referentialStates = new ReferentialDataSourceStates();
    111 111 
             for (ObserveEntityEnum referenceEntity : Entities.REFERENCE_ENTITIES) {
    112 
    -            if (ObserveEntityEnum.LastUpdateDate.equals(referenceEntity)) {
    112 
    +            if (ObserveEntityEnum.common_LastUpdateDate.equals(referenceEntity)) {
    113 113 
                     continue;
    114 114 
                 }
    115 115 
                 //noinspection unchecked

  • services-local/src/main/java/fr/ird/observe/services/local/service/sql/SqlScriptProducerServiceLocal.java
    ... ... @@ -117,7 +117,7 @@ public class SqlScriptProducerServiceLocal extends ObserveServiceLocal implement
    117 117 
                 ListMultimap<Class<? extends ReferentialDtoReference>, String> referentialIds = request.getReferentialIds();
    118 118
    119 119 
                 for (ObserveEntityEnum entityEnum : REFERENCE_ENTITIES_LIST) {
    120 
    -                if (ObserveEntityEnum.LastUpdateDate.equals(entityEnum)) {
    120 
    +                if (ObserveEntityEnum.common_LastUpdateDate.equals(entityEnum)) {
    121 121 
                         continue;
    122 122 
                     }
    123 123 
                     Class entityType = entityEnum.getContract();

  • services-local/src/test/java/fr/ird/observe/services/local/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java
    ... ... @@ -99,21 +99,21 @@ public class UnidirectionalSynchronizeReferentialTest extends ServiceLocalTestSu
    99 99 
             Assert.assertFalse(referentialNames.isEmpty());
    100 100
    101 101 
             for (ObserveEntityEnum referenceEntity : Entities.REFERENCE_ENTITIES) {
    102 
    -            if (ObserveEntityEnum.LastUpdateDate.equals(referenceEntity)) {
    102 
    +            if (ObserveEntityEnum.common_LastUpdateDate.equals(referenceEntity)) {
    103 103 
                     continue;
    104 104 
                 }
    105 
    -            if (ObserveEntityEnum.LengthLengthParameter.equals(referenceEntity)) {
    105 
    +            if (ObserveEntityEnum.common_LengthLengthParameter.equals(referenceEntity)) {
    106 106 
                     //empty
    107 107 
                     continue;
    108 108 
                 }
    109 
    -            if (ObserveEntityEnum.WeightDeterminationMethod.equals(referenceEntity)) {
    109 
    +            if (ObserveEntityEnum.ll_common_WeightDeterminationMethod.equals(referenceEntity)) {
    110 110 
                     //empty
    111 111 
                     continue;
    112 
    -            }if (ObserveEntityEnum.WeightCategoryLongline.equals(referenceEntity)) {
    112 
    +            }if (ObserveEntityEnum.ll_common_WeightCategoryLongline.equals(referenceEntity)) {
    113 113 
                     //empty
    114 114 
                     continue;
    115 115 
                 }
    116 
    -            if (ObserveEntityEnum.Compagnies.equals(referenceEntity)) {
    116 
    +            if (ObserveEntityEnum.common_Compagnies.equals(referenceEntity)) {
    117 117 
                     //empty
    118 118 
                     continue;
    119 119 
                 }
    ... ... @@ -145,7 +145,7 @@ public class UnidirectionalSynchronizeReferentialTest extends ServiceLocalTestSu
    145 145 
             Assert.assertTrue(referentialNames.isEmpty());
    146 146
    147 147 
             for (ObserveEntityEnum referenceEntity : Entities.REFERENCE_ENTITIES) {
    148 
    -            if (ObserveEntityEnum.LastUpdateDate.equals(referenceEntity)) {
    148 
    +            if (ObserveEntityEnum.common_LastUpdateDate.equals(referenceEntity)) {
    149 149 
                     continue;
    150 150 
                 }
    151 151 
                 Class<? extends ReferentialDto> dtoType = DbModelHelper.fromReferentialEntity(referenceEntity).toDtoType();

  • test/src/main/resources/fixtures/count-referential-longline.properties
    ... ... @@ -35,13 +35,13 @@ ll_common.lightstickstype=2
    35 35 
     ll_common.linetype=9
    36 36 
     ll_observation.maturitystatus=12
    37 37 
     ll_common.mitigationtype=15
    38 
    -ll_common.observationMethod=2
    38 
    +ll_common.observationmethod=2
    39 39 
     ll_observation.sensorbrand=4
    40 40 
     ll_observation.sensordataformat=2
    41 41 
     ll_observation.sensortype=4
    42 42 
     ll_common.settingshape=6
    43 43 
     ll_observation.stomacfullness=7
    44 
    -ll_common.vesselActivity=12
    44 
    +ll_common.vesselactivity=12
    45 45 
     ll_common.weightcategory=0
    46 46 
     ll_landing.datasource=20
    47 47 
     ll_common.triptype=2

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