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

Commits:

3 changed files:

Changes:

  • models/persistence/definition/src/main/models/Observe/persistence/class/naturalIdMutable.properties
    1
    +###
    
    2
    +# #%L
    
    3
    +# ObServe Models :: Persistence :: Definition
    
    4
    +# %%
    
    5
    +# Copyright (C) 2008 - 2021 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
    +referential.common.LengthLengthParameter=true
    
    23
    +referential.common.LengthWeightParameter=true
    
    24
    +referential.common.Person=true
    
    25
    +referential.common.ShipOwner=true
    
    26
    +referential.common.Species=true
    
    27
    +referential.common.VesselSizeCategory=true

  • pom.xml
    ... ... @@ -154,7 +154,7 @@
    154 154
         <lib.version.h2>1.4.196</lib.version.h2>
    
    155 155
         <lib.version.nuiton.utils>3.0</lib.version.nuiton.utils>
    
    156 156
     
    
    157
    -    <lib.version.java4all.topia>1.39</lib.version.java4all.topia>
    
    157
    +    <lib.version.java4all.topia>1.40</lib.version.java4all.topia>
    
    158 158
         <!--    <lib.version.java4all.eugene>3.0-alpha-38</lib.version.java4all.eugene>-->
    
    159 159
         <!--            <lib.version.java4all.jaxx>3.0-alpha-92</lib.version.java4all.jaxx>-->
    
    160 160
         <!--<lib.version.java4all.application-context>1.0.3-SNAPSHOT</lib.version.java4all.application-context>-->
    

  • toolkit/persistence/src/main/java/fr/ird/observe/entities/AbstractObserveTopiaDao.java
    ... ... @@ -24,6 +24,7 @@ package fr.ird.observe.entities;
    24 24
     
    
    25 25
     import fr.ird.observe.dto.IdDto;
    
    26 26
     import org.nuiton.topia.persistence.HqlAndParametersBuilder;
    
    27
    +import org.nuiton.topia.persistence.TopiaEntity;
    
    27 28
     import org.nuiton.topia.persistence.TopiaEntityEnum;
    
    28 29
     import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep;
    
    29 30
     import org.nuiton.topia.persistence.internal.AbstractTopiaDao;
    
    ... ... @@ -77,4 +78,28 @@ public abstract class AbstractObserveTopiaDao<E extends Entity> extends Abstract
    77 78
                 }
    
    78 79
             });
    
    79 80
         }
    
    81
    +
    
    82
    +    @Override
    
    83
    +    public <R extends TopiaEntity> List<R> findUsages(Class<R> type, E entity) {
    
    84
    +        // No more used by us, prefer use the TopiaUsageService which is more performant
    
    85
    +        return null;
    
    86
    +    }
    
    87
    +
    
    88
    +    @Override
    
    89
    +    public Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> findAllUsages(E entity) {
    
    90
    +        // No more used by us, prefer use the TopiaUsageService which is more performant
    
    91
    +        return null;
    
    92
    +    }
    
    93
    +
    
    94
    +    @Override
    
    95
    +    public List<TopiaEntity> getComposite(E entity) {
    
    96
    +        // Never wants to use this, prefer use TopiaMetadataModel
    
    97
    +        return null;
    
    98
    +    }
    
    99
    +
    
    100
    +    @Override
    
    101
    +    public List<TopiaEntity> getAggregate(E entity) {
    
    102
    +        // Never wants to use this, prefer use TopiaMetadataModel
    
    103
    +        return null;
    
    104
    +    }
    
    80 105
     }