[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: use topia-extension project

18 Sep 2018


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


Commits:
5c9c11d4 by Tony CHEMIT at 2018-09-18T20:14:39Z
use topia-extension project

- - - - -
c44187cc by Tony CHEMIT at 2018-09-18T20:27:56Z
clean stream api

- - - - -


11 changed files:

- client/pom.xml
- dto/src/main/java/fr/ird/observe/dto/data/seine/RouteDto.java
- persistence/pom.xml
- pom.xml
- server/pom.xml
- services-client/pom.xml
- services-local/pom.xml
- services-local/src/main/java/fr/ird/observe/services/local/service/DataSourceServiceLocal.java
- services/pom.xml
- services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerRequest.java
- services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java


Changes:

=====================================
client/pom.xml
=====================================
@@ -376,12 +376,12 @@
       <artifactId>common-service</artifactId>
     </dependency>
     <dependency>
-      <groupId>fr.ird.observe.toolkit</groupId>
-      <artifactId>topia-extension</artifactId>
+      <groupId>io.ultreia.java4all.topia</groupId>
+      <artifactId>persistence</artifactId>
     </dependency>
     <dependency>
-      <groupId>fr.ird.observe.toolkit</groupId>
-      <artifactId>topia-extension-migration</artifactId>
+      <groupId>io.ultreia.java4all.topia</groupId>
+      <artifactId>service-migration</artifactId>
     </dependency>
 
     <dependency>


=====================================
dto/src/main/java/fr/ird/observe/dto/data/seine/RouteDto.java
=====================================
@@ -24,8 +24,8 @@ package fr.ird.observe.dto.data.seine;
 
 import com.google.common.collect.Iterables;
 import fr.ird.observe.dto.IdHelper;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.nuiton.util.DateUtil;
 
 import java.util.Date;
@@ -47,9 +47,9 @@ public class RouteDto extends GeneratedRouteDto {
     public boolean isTimeAvailable(String activitySeineId, Date time) {
         Date currentTime = DateUtil.getTime(time, false, false);
 
-        return !getActivitySeine()
+        return getActivitySeine()
                 .stream()
-                .anyMatch(activity ->
+                .noneMatch(activity ->
                                   Objects.equals(currentTime, activity.getTimeSecond())
                                           && !Objects.equals(activitySeineId, activity.getId()));
     }


=====================================
persistence/pom.xml
=====================================
@@ -50,16 +50,16 @@
     </dependency>
 
     <dependency>
-      <groupId>fr.ird.observe.toolkit</groupId>
-      <artifactId>topia-extension</artifactId>
+      <groupId>io.ultreia.java4all.topia</groupId>
+      <artifactId>persistence</artifactId>
     </dependency>
     <dependency>
-      <groupId>fr.ird.observe.toolkit</groupId>
-      <artifactId>topia-extension-migration</artifactId>
+      <groupId>io.ultreia.java4all.topia</groupId>
+      <artifactId>service-migration</artifactId>
     </dependency>
     <dependency>
-      <groupId>fr.ird.observe.toolkit</groupId>
-      <artifactId>topia-extension-script</artifactId>
+      <groupId>io.ultreia.java4all.topia</groupId>
+      <artifactId>service-script</artifactId>
     </dependency>
 
     <dependency>
@@ -206,9 +206,9 @@
               <version>${project.version}</version>
             </dependency>
             <dependency>
-              <groupId>fr.ird.observe.toolkit</groupId>
-              <artifactId>topia-templates-extension</artifactId>
-              <version>${observeToolkitVersion}</version>
+              <groupId>io.ultreia.java4all.topia</groupId>
+              <artifactId>templates</artifactId>
+              <version>${lib.version.java4all.topia}</version>
               <scope>compile</scope>
             </dependency>
             <dependency>


=====================================
pom.xml
=====================================
@@ -152,7 +152,7 @@
     <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
     <buildDate>${maven.build.timestamp}</buildDate>
 
-    <observeToolkitVersion>3.7.7</observeToolkitVersion>
+    <observeToolkitVersion>3.7.8-SNAPSHOT</observeToolkitVersion>
     <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>-->
     <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
     <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->
@@ -200,30 +200,6 @@
   <dependencyManagement>
     <dependencies>
 
-      <dependency>
-        <groupId>fr.ird.observe.toolkit</groupId>
-        <artifactId>topia-extension</artifactId>
-        <version>${observeToolkitVersion}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>fr.ird.observe.toolkit</groupId>
-        <artifactId>topia-extension-migration</artifactId>
-        <version>${observeToolkitVersion}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>fr.ird.observe.toolkit</groupId>
-        <artifactId>topia-extension-script</artifactId>
-        <version>${observeToolkitVersion}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>fr.ird.observe.toolkit</groupId>
-        <artifactId>topia-templates-extension</artifactId>
-        <version>${observeToolkitVersion}</version>
-      </dependency>
-
       <dependency>
         <groupId>fr.ird.observe.toolkit</groupId>
         <artifactId>common-dto</artifactId>


=====================================
server/pom.xml
=====================================
@@ -76,8 +76,8 @@
       <artifactId>common-service</artifactId>
     </dependency>
     <dependency>
-      <groupId>fr.ird.observe.toolkit</groupId>
-      <artifactId>topia-extension</artifactId>
+      <groupId>io.ultreia.java4all.topia</groupId>
+      <artifactId>persistence</artifactId>
     </dependency>
 
     <dependency>


=====================================
services-client/pom.xml
=====================================
@@ -65,8 +65,8 @@
       <artifactId>common-service</artifactId>
     </dependency>
     <dependency>
-      <groupId>fr.ird.observe.toolkit</groupId>
-      <artifactId>topia-extension</artifactId>
+      <groupId>io.ultreia.java4all.topia</groupId>
+      <artifactId>persistence</artifactId>
     </dependency>
     <dependency>
       <groupId>io.ultreia.java4all</groupId>


=====================================
services-local/pom.xml
=====================================
@@ -79,12 +79,12 @@
       <artifactId>common-service</artifactId>
     </dependency>
     <dependency>
-      <groupId>fr.ird.observe.toolkit</groupId>
-      <artifactId>topia-extension-migration</artifactId>
+      <groupId>io.ultreia.java4all.topia</groupId>
+      <artifactId>service-migration</artifactId>
     </dependency>
     <dependency>
-      <groupId>fr.ird.observe.toolkit</groupId>
-      <artifactId>topia-extension-script</artifactId>
+      <groupId>io.ultreia.java4all.topia</groupId>
+      <artifactId>service-script</artifactId>
     </dependency>
 
     <dependency>
@@ -150,9 +150,8 @@
       <artifactId>topia-service-migration</artifactId>
     </dependency>
     <dependency>
-      <groupId>fr.ird.observe.toolkit</groupId>
-      <artifactId>topia-extension</artifactId>
-      <version>${observeToolkitVersion}</version>
+      <groupId>io.ultreia.java4all.topia</groupId>
+      <artifactId>persistence</artifactId>
     </dependency>
 
     <dependency>


=====================================
services-local/src/main/java/fr/ird/observe/services/local/service/DataSourceServiceLocal.java
=====================================
@@ -27,7 +27,6 @@ import com.google.common.collect.ImmutableSet;
 import fr.ird.observe.dto.ObserveDbRole;
 import fr.ird.observe.dto.db.ObserveDbUserDto;
 import fr.ird.observe.dto.reference.ReferentialDtoReference;
-import org.nuiton.topia.persistence.script.TopiaSqlScript;
 import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
 import fr.ird.observe.persistence.ObserveEntityEnum;
 import fr.ird.observe.persistence.ObserveTopiaApplicationContext;
@@ -54,13 +53,14 @@ import fr.ird.observe.services.service.DatabaseNotFoundException;
 import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest;
 import fr.ird.observe.services.service.sql.SqlScriptProducerService;
 import fr.ird.observe.spi.DbModelHelper;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.nuiton.topia.persistence.jdbc.JdbcHelper;
+import org.nuiton.topia.persistence.jdbc.JdbcPostgresHelper;
 import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity;
 import org.nuiton.topia.persistence.metadata.TopiaMetadataModel;
 import org.nuiton.topia.persistence.metadata.TopiaMetadataModelVisitor;
-import org.nuiton.topia.persistence.jdbc.JdbcPostgresHelper;
+import org.nuiton.topia.persistence.script.TopiaSqlScript;
 import org.nuiton.topia.service.migration.resources.MigrationVersionResourceProvider;
 import org.nuiton.topia.service.migration.version.TMSVersion;
 import org.nuiton.topia.service.migration.version.TMSVersionHibernateDao;
@@ -618,12 +618,12 @@ public class DataSourceServiceLocal extends ObserveServiceLocal implements DataS
         }
 
         @Override
-        public void visitEntiyStart(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity) {
+        public void visitEntityStart(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity) {
 
         }
 
         @Override
-        public void visitEntiyEnd(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity) {
+        public void visitEntityEnd(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity) {
 
         }
 


=====================================
services/pom.xml
=====================================
@@ -59,8 +59,8 @@
       <artifactId>common-service</artifactId>
     </dependency>
     <dependency>
-      <groupId>fr.ird.observe.toolkit</groupId>
-      <artifactId>topia-extension</artifactId>
+      <groupId>io.ultreia.java4all.topia</groupId>
+      <artifactId>persistence</artifactId>
     </dependency>
 
     <!-- nuiton dependencies -->


=====================================
services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerRequest.java
=====================================
@@ -32,7 +32,6 @@ import fr.ird.observe.dto.reference.ReferentialDtoReference;
 import org.nuiton.version.Version;
 
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * Created on 31/12/15.
@@ -135,8 +134,8 @@ public class AddSqlScriptProducerRequest implements ObserveDto {
                 .add("addReferential", addReferential)
                 .add("addSomeReferential", addSomeReferential)
                 .add("addData", addData)
-                .add("dataIds", dataIds == null ? "" : "[" + dataIds.stream().collect(Collectors.joining(", ")) + "]")
-                .add("referentialIds", referentialIds.isEmpty() ? "" : "[" + referentialIds.values().stream().collect(Collectors.joining(", ")) + "]")
+                .add("dataIds", dataIds == null ? "" : "[" + String.join(", ", dataIds) + "]")
+                .add("referentialIds", referentialIds.isEmpty() ? "" : "[" + String.join(", ", referentialIds.values()) + "]")
                 .toString();
     }
 }


=====================================
services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java
=====================================
@@ -27,7 +27,6 @@ import com.google.common.collect.ImmutableSet;
 import fr.ird.observe.dto.ObserveDto;
 
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * Created on 31/12/15.
@@ -65,7 +64,7 @@ public class DeleteSqlScriptProducerRequest implements ObserveDto {
     public String toString() {
         return MoreObjects.toStringHelper(this)
                 .add("deleteData", deleteData)
-                .add("dataIds", dataIds == null ? "" : "[" + dataIds.stream().collect(Collectors.joining(", ")) + "]")
+                .add("dataIds", dataIds == null ? "" : "[" + String.join(", ", dataIds) + "]")
                 .toString();
     }
 }



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e5843b1b41c9640071fcc736321...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e5843b1b41c9640071fcc736321...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)