Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
0af25629
by Tony CHEMIT at 2018-05-04T08:15:42Z
8 changed files:
- + dto/.mvn/compiler-add-parameters
- dto/pom.xml
- pom.xml
- + server/.mvn/compiler-add-parameters
- server/pom.xml
- + services/.mvn/compiler-add-parameters
- services/pom.xml
- services/src/main/java/fr/ird/observe/services/validation/validators/NonTargetCatchObservedSystemValidator.java
Changes:
| ... | ... | @@ -226,16 +226,6 @@ |
| 226 | 226 |
</plugin>
|
| 227 | 227 |
|
| 228 | 228 |
<plugin>
|
| 229 |
- <groupId>org.apache.maven.plugins</groupId>
|
|
| 230 |
- <artifactId>maven-compiler-plugin</artifactId>
|
|
| 231 |
- <configuration>
|
|
| 232 |
- <compilerArgs>
|
|
| 233 |
- <arg>-parameters</arg>
|
|
| 234 |
- </compilerArgs>
|
|
| 235 |
- </configuration>
|
|
| 236 |
- </plugin>
|
|
| 237 |
- |
|
| 238 |
- <plugin>
|
|
| 239 | 229 |
<groupId>io.ultreia.java4all.eugene</groupId>
|
| 240 | 230 |
<artifactId>eugene-maven-plugin</artifactId>
|
| 241 | 231 |
<executions>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>io.ultreia.maven</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>2018.31</version>
|
|
| 29 |
+ <version>2018.33</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<groupId>fr.ird.observe</groupId>
|
| ... | ... | @@ -154,16 +154,15 @@ |
| 154 | 154 |
|
| 155 | 155 |
<observeToolkitVersion>3.1</observeToolkitVersion>
|
| 156 | 156 |
|
| 157 |
- <lib.version.java4all.jaxx>3.0-alpha-31</lib.version.java4all.jaxx>
|
|
| 157 |
+ <!--<lib.version.java4all.jaxx>3.0-alpha-31</lib.version.java4all.jaxx>-->
|
|
| 158 | 158 |
<lib.version.nuiton.topia>3.3.1</lib.version.nuiton.topia>
|
| 159 | 159 |
<lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
|
| 160 |
- <lib.version.java4all.config>1.0.3</lib.version.java4all.config>
|
|
| 160 |
+ <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->
|
|
| 161 | 161 |
<xworkVersion>2.3.34</xworkVersion>
|
| 162 | 162 |
<!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>-->
|
| 163 | 163 |
<!--can't use 1.4.197 (date has changed + blob also-->
|
| 164 | 164 |
<lib.version.h2>1.4.196</lib.version.h2>
|
| 165 |
- <!--can't use 3.0.0 (hibernate we are using is not compatible (missing shutdown method)-->
|
|
| 166 |
- <!--<lib.version.hikariCP>2.7.9</lib.version.hikariCP>-->
|
|
| 165 |
+ <lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>
|
|
| 167 | 166 |
|
| 168 | 167 |
<!-- license header configuration -->
|
| 169 | 168 |
<license.licenseName>gpl_v3</license.licenseName>
|
| ... | ... | @@ -233,7 +233,7 @@ |
| 233 | 233 |
<dependency>
|
| 234 | 234 |
<groupId>com.google.guava</groupId>
|
| 235 | 235 |
<artifactId>guava</artifactId>
|
| 236 |
- <version>${lib.version.guava}</version>
|
|
| 236 |
+ <version>${lib.version.google.guava}</version>
|
|
| 237 | 237 |
</dependency>
|
| 238 | 238 |
</dependencies>
|
| 239 | 239 |
</plugin>
|
| ... | ... | @@ -243,29 +243,6 @@ |
| 243 | 243 |
<plugins>
|
| 244 | 244 |
|
| 245 | 245 |
<plugin>
|
| 246 |
- <groupId>org.apache.maven.plugins</groupId>
|
|
| 247 |
- <artifactId>maven-compiler-plugin</artifactId>
|
|
| 248 |
- <configuration>
|
|
| 249 |
- <compilerArgs>
|
|
| 250 |
- <arg>-parameters</arg>
|
|
| 251 |
- </compilerArgs>
|
|
| 252 |
- </configuration>
|
|
| 253 |
- </plugin>
|
|
| 254 |
- |
|
| 255 |
- <plugin>
|
|
| 256 |
- <groupId>io.ultreia.java4all.i18n</groupId>
|
|
| 257 |
- <artifactId>i18n-maven-plugin</artifactId>
|
|
| 258 |
- <dependencies>
|
|
| 259 |
- <!--FIXME Si on ne rajoute pas ça, alors une vieille version de nuiton-utils est prise où il manque des dépendances-->
|
|
| 260 |
- <!--<dependency>-->
|
|
| 261 |
- <!--<groupId>org.nuiton</groupId>-->
|
|
| 262 |
- <!--<artifactId>nuiton-utils</artifactId>-->
|
|
| 263 |
- <!--<version>${lib.version.nuiton.utils}</version>-->
|
|
| 264 |
- <!--</dependency>-->
|
|
| 265 |
- </dependencies>
|
|
| 266 |
- </plugin>
|
|
| 267 |
- |
|
| 268 |
- <plugin>
|
|
| 269 | 246 |
<groupId>org.mortbay.jetty</groupId>
|
| 270 | 247 |
<artifactId>jetty-maven-plugin</artifactId>
|
| 271 | 248 |
<configuration>
|
| ... | ... | @@ -149,20 +149,4 @@ |
| 149 | 149 |
|
| 150 | 150 |
</dependencies>
|
| 151 | 151 |
|
| 152 |
- <build>
|
|
| 153 |
- |
|
| 154 |
- <plugins>
|
|
| 155 |
- |
|
| 156 |
- <plugin>
|
|
| 157 |
- <groupId>org.apache.maven.plugins</groupId>
|
|
| 158 |
- <artifactId>maven-compiler-plugin</artifactId>
|
|
| 159 |
- <configuration>
|
|
| 160 |
- <compilerArgs>
|
|
| 161 |
- <arg>-parameters</arg>
|
|
| 162 |
- </compilerArgs>
|
|
| 163 |
- </configuration>
|
|
| 164 |
- </plugin>
|
|
| 165 |
- |
|
| 166 |
- </plugins>
|
|
| 167 |
- </build>
|
|
| 168 | 152 |
</project>
|
| ... | ... | @@ -55,7 +55,7 @@ public class NonTargetCatchObservedSystemValidator extends FieldValidatorSupport |
| 55 | 55 |
Collection<String> requiredObservedSystemBySpeciesId = seineBycatchObservedSystemConfig.getRequiredObservedSystemBySpeciesId(speciesReference.getTopiaId());
|
| 56 | 56 |
if (!requiredObservedSystemBySpeciesId.isEmpty()) {
|
| 57 | 57 |
|
| 58 |
- log.info("Required observed system: "+requiredObservedSystemBySpeciesId);
|
|
| 58 |
+ log.debug("Required observed system: " + requiredObservedSystemBySpeciesId);
|
|
| 59 | 59 |
// must check that at least one of those observed system are in
|
| 60 | 60 |
boolean found = false;
|
| 61 | 61 |
for (ObservedSystemReference observedSystemReference : activitySeineDto.getObservedSystem()) {
|
| ... | ... | @@ -68,15 +68,15 @@ public class NonTargetCatchObservedSystemValidator extends FieldValidatorSupport |
| 68 | 68 |
if (!found) {
|
| 69 | 69 |
|
| 70 | 70 |
List<ObservedSystemReference> observedSystems = (List<ObservedSystemReference>) getFieldValue("observedSystems", object);
|
| 71 |
- log.info("references: " + observedSystems);
|
|
| 71 |
+ log.debug("references: " + observedSystems);
|
|
| 72 | 72 |
DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService");
|
| 73 | 73 |
ImmutableMap<String, ObservedSystemReference> map = Maps.uniqueIndex(observedSystems, ObservedSystemReference::getId);
|
| 74 | 74 |
ReferentialReferenceDecorator<ObservedSystemReference> decorator = decoratorService.getReferentialReferenceDecorator(ObservedSystemReference.class);
|
| 75 | 75 |
List<String> labels = new LinkedList<>();
|
| 76 | 76 |
for (String observedSystemId : requiredObservedSystemBySpeciesId) {
|
| 77 | 77 |
ObservedSystemReference ref = map.get(observedSystemId);
|
| 78 |
- log.info("Required observed system id: "+observedSystemId);
|
|
| 79 |
- log.info("Required observed system: "+ref);
|
|
| 78 |
+ log.debug("Required observed system id: " + observedSystemId);
|
|
| 79 |
+ log.debug("Required observed system: " + ref);
|
|
| 80 | 80 |
labels.add(decorator.toString(ref));
|
| 81 | 81 |
}
|
| 82 | 82 |
stack.set("observedSystemLabels", labels);
|