[Git][ultreiaio/ird-observe][develop] use last toolkit and new topia api

11 May 2018

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


Commits:
0b7f4491 by Tony CHEMIT at 2018-05-11T21:18:22Z
use last toolkit and new topia api

- - - - -


7 changed files:

- client/src/test/java/fr/ird/observe/client/DataSourcesForTestManager.java
- − persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveMigrationConfigurationProvider.java
- persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveTopiaMigrationServiceAskUserToMigrate.java
- pom.xml
- services-local/src/main/java/fr/ird/observe/services/local/service/DataSourceServiceLocal.java
- services-local/src/test/java/fr/ird/observe/services/local/DataSourcesForTestManager.java
- services-local/src/test/java/fr/ird/observe/services/local/service/RigthTest.java


Changes:

=====================================
client/src/test/java/fr/ird/observe/client/DataSourcesForTestManager.java
=====================================

--- a/client/src/test/java/fr/ird/observe/client/DataSourcesForTestManager.java
+++ b/client/src/test/java/fr/ird/observe/client/DataSourcesForTestManager.java
@@ -10,23 +10,23 @@ package fr.ird.observe.client;
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
 
-import fr.ird.observe.persistence.migration.ObserveMigrationConfigurationProvider;
 import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2;
 import fr.ird.observe.test.TestHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.nuiton.topia.service.migration.resources.MigrationVersionResourceProvider;
 import org.nuiton.version.Version;
 
 import java.io.File;
@@ -100,7 +100,7 @@ public class DataSourcesForTestManager {
         configurationTopiaH2.setDirectory(localDbFile);
         configurationTopiaH2.setDbName("obstuna");
         configurationTopiaH2.setAutoMigrate(true);
-        configurationTopiaH2.setModelVersion(ObserveMigrationConfigurationProvider.get().getLastVersion());
+        configurationTopiaH2.setModelVersion(MigrationVersionResourceProvider.get().getLastVersion());
         return configurationTopiaH2;
 
     }
@@ -116,7 +116,7 @@ public class DataSourcesForTestManager {
     private void deleteDirectory(Path directory) {
         try {
             log.debug(String.format("Delete directory: %s", directory));
-            Files.walk(directory).filter(f->!f.equals(directory)).forEach(f -> {
+            Files.walk(directory).filter(f -> !f.equals(directory)).forEach(f -> {
                 try {
                     if (Files.isDirectory(f)) {
                         deleteDirectory(f);


=====================================
persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveMigrationConfigurationProvider.java deleted
=====================================
--- a/persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveMigrationConfigurationProvider.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package fr.ird.observe.persistence.migration;
-
-/*-
- * #%L
- * ObServe :: Persistence
- * %%
- * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import com.google.common.collect.ImmutableList;
-import org.nuiton.topia.service.migration.resources.MigrationVersionResourceProvider;
-import org.nuiton.version.Version;
-import org.nuiton.version.VersionBuilder;
-
-import java.util.List;
-
-/**
- * Created on 01/08/16.
- *
- * @author Tony Chemit - dev@tchemit.fr
- * @since 5.0
- */
-public final class ObserveMigrationConfigurationProvider {
-
-    private static ObserveMigrationConfigurationProvider INSTANCE;
-
-    private final MigrationVersionResourceProvider resourceProvider;
-
-    private ObserveMigrationConfigurationProvider() {
-        resourceProvider = new MigrationVersionResourceProvider();
-    }
-
-    public static ObserveMigrationConfigurationProvider get() {
-        if (INSTANCE == null) {
-            INSTANCE = new ObserveMigrationConfigurationProvider();
-        }
-        return INSTANCE;
-    }
-
-    public List<Version> getAvailableVersions() {
-        return resourceProvider.getAvailableVersions();
-    }
-
-    public Version getLastVersion() {
-        return resourceProvider.getLastVersion();
-    }
-
-    public ImmutableList<Version> getVersionsAfter(Version current) {
-        return resourceProvider.getVersionsAfter(current);
-    }
-
-    public Version getMinimumVersion() {
-        return VersionBuilder.create("3.0").build();
-    }
-
-}


=====================================
persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveTopiaMigrationServiceAskUserToMigrate.java
=====================================
--- a/persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveTopiaMigrationServiceAskUserToMigrate.java
+++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveTopiaMigrationServiceAskUserToMigrate.java
@@ -35,12 +35,13 @@ import java.util.List;
  * @author Tony Chemit - dev@tchemit.fr
  */
 @AutoService(TopiaMigrationServiceAskUserToMigrate.class)
+@SuppressWarnings("WeakerAccess")
 public class ObserveTopiaMigrationServiceAskUserToMigrate implements TopiaMigrationServiceAskUserToMigrate {
 
-    private final Version minimumVersion = VersionBuilder.create("3.0").build();
+    private static final Version MINIMUM_VERSION = VersionBuilder.create("3.0").build();
 
-    public Version getMinimumVersion() {
-        return minimumVersion;
+    public static Version getMinimumVersion() {
+        return MINIMUM_VERSION;
     }
 
     @Override


=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/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.4-SNAPSHOT</observeToolkitVersion>
+    <observeToolkitVersion>3.5-SNAPSHOT</observeToolkitVersion>
 
     <!--<lib.version.java4all.jaxx>3.0-alpha-31</lib.version.java4all.jaxx>-->
     <!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->


=====================================
services-local/src/main/java/fr/ird/observe/services/local/service/DataSourceServiceLocal.java
=====================================
--- a/services-local/src/main/java/fr/ird/observe/services/local/service/DataSourceServiceLocal.java
+++ b/services-local/src/main/java/fr/ird/observe/services/local/service/DataSourceServiceLocal.java
@@ -33,7 +33,7 @@ import fr.ird.observe.persistence.ObserveEntityEnum;
 import fr.ird.observe.persistence.ObserveTopiaApplicationContext;
 import fr.ird.observe.persistence.ObserveTopiaConfiguration;
 import fr.ird.observe.persistence.ObserveTopiaConfigurationFactory;
-import fr.ird.observe.persistence.migration.ObserveMigrationConfigurationProvider;
+import fr.ird.observe.persistence.migration.ObserveTopiaMigrationServiceAskUserToMigrate;
 import fr.ird.observe.services.configuration.DataSourceCreateConfigurationDto;
 import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException;
 import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException;
@@ -61,6 +61,7 @@ import org.nuiton.topia.persistence.jdbc.JdbcHelper;
 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.service.migration.resources.MigrationVersionResourceProvider;
 import org.nuiton.version.Version;
 import org.nuiton.version.Versions;
 
@@ -614,13 +615,13 @@ public class DataSourceServiceLocal extends ObserveServiceLocal implements DataS
                     "write data : " + writeData + ".");
         }
 
-        ObserveMigrationConfigurationProvider observeMigrationConfigurationProvider = ObserveMigrationConfigurationProvider.get();
+        MigrationVersionResourceProvider observeMigrationConfigurationProvider = MigrationVersionResourceProvider.get();
         return new ObserveDataSourceInformation(
                 true,
                 writeReferential,
                 readData,
                 writeData,
-                observeMigrationConfigurationProvider.getMinimumVersion(),
+                ObserveTopiaMigrationServiceAskUserToMigrate.getMinimumVersion(),
                 version,
                 observeMigrationConfigurationProvider.getVersionsAfter(version));
     }


=====================================
services-local/src/test/java/fr/ird/observe/services/local/DataSourcesForTestManager.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/services/local/DataSourcesForTestManager.java
+++ b/services-local/src/test/java/fr/ird/observe/services/local/DataSourcesForTestManager.java
@@ -10,23 +10,23 @@ package fr.ird.observe.services.local;
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
 
-import fr.ird.observe.persistence.migration.ObserveMigrationConfigurationProvider;
 import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2;
 import fr.ird.observe.test.TestHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.nuiton.topia.service.migration.resources.MigrationVersionResourceProvider;
 import org.nuiton.version.Version;
 
 import java.io.File;
@@ -100,7 +100,7 @@ public class DataSourcesForTestManager {
         configurationTopiaH2.setDirectory(localDbFile);
         configurationTopiaH2.setDbName("obstuna");
         configurationTopiaH2.setAutoMigrate(true);
-        configurationTopiaH2.setModelVersion(ObserveMigrationConfigurationProvider.get().getLastVersion());
+        configurationTopiaH2.setModelVersion(MigrationVersionResourceProvider.get().getLastVersion());
         return configurationTopiaH2;
 
     }


=====================================
services-local/src/test/java/fr/ird/observe/services/local/service/RigthTest.java
=====================================
--- a/services-local/src/test/java/fr/ird/observe/services/local/service/RigthTest.java
+++ b/services-local/src/test/java/fr/ird/observe/services/local/service/RigthTest.java
@@ -10,12 +10,12 @@ package fr.ird.observe.services.local.service;
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -25,7 +25,6 @@ package fr.ird.observe.services.local.service;
 import fr.ird.observe.dto.data.seine.TripSeineDto;
 import fr.ird.observe.dto.form.Form;
 import fr.ird.observe.dto.referential.ProgramDto;
-import fr.ird.observe.persistence.migration.ObserveMigrationConfigurationProvider;
 import fr.ird.observe.services.configuration.ObserveDataSourceConnection;
 import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG;
 import fr.ird.observe.services.security.UnauthorizedException;
@@ -42,6 +41,7 @@ import fr.ird.observe.test.spi.DatabasePasswordConfiguration;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.nuiton.topia.service.migration.resources.MigrationVersionResourceProvider;
 
 /**
  * FIXME Ca sert à quoi ? et je comprends pas le mot rigth ?
@@ -102,13 +102,12 @@ public class RigthTest extends ServiceLocalTestSupport {
         configurationTopiaPG.setUsername(login);
         configurationTopiaPG.setPassword('a');
         configurationTopiaPG.setAutoMigrate(true);
-        configurationTopiaPG.setModelVersion(ObserveMigrationConfigurationProvider.get().getLastVersion());
+        configurationTopiaPG.setModelVersion(MigrationVersionResourceProvider.get().getLastVersion());
 
         return configurationTopiaPG;
 
     }
 
-
     public void testReadData(String login) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException {
 
         TripSeineService service = localTestMethodResource.newService(TripSeineService.class);



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0b7f449156c2ddbc8202c2828564...

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

    

Tony CHEMIT

tags

participants (1)