This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-2 in repository observe. See http://git.codelutin.com/observe.git commit 5e21e08bd3c42565bd8ea98f49fedc3461795dda Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Sep 6 23:01:44 2015 +0200 Renommage méthode de vérification de configuration de source de données --- .../fr/ird/observe/services/service/DataSourceService.java | 2 +- .../ird/observe/services/service/DataSourceServiceTopia.java | 4 ++-- .../observe/services/service/DataSourceServiceTopiaTest.java | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java index 376bed0..fd60a96 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java @@ -16,7 +16,7 @@ import fr.ird.observe.services.spi.NoDataAccess; public interface DataSourceService extends ObserveService { @NoDataAccess - void canConnect(ObserveDataSourceConfiguration dataSourceConfiguration) throws DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException; + void checkCanConnect(ObserveDataSourceConfiguration dataSourceConfiguration) throws DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException; @NoDataAccess ObserveDataSourceConnection create(ObserveDataSourceConfiguration dataSourceConfiguration, DataSourceCreateConfigurationDto dataSourceCreateConfiguration) throws IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java index 753c21d..bea9c73 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java @@ -36,7 +36,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS private static final Log log = LogFactory.getLog(DataSourceServiceTopia.class); @Override - public void canConnect(ObserveDataSourceConfiguration dataSourceConfiguration) throws DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException { + public void checkCanConnect(ObserveDataSourceConfiguration dataSourceConfiguration) throws DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException { Preconditions.checkState(dataSourceConfiguration instanceof ObserveDataSourceConfigurationTopiaSupport); ObserveDataSourceConfigurationTopiaSupport dataSourceConfigurationTopiaSupport = (ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration; @@ -220,7 +220,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS @Override public ObserveDataSourceConnectionTopia open(ObserveDataSourceConfiguration dataSourceConfiguration) throws DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException { - canConnect(dataSourceConfiguration); + checkCanConnect(dataSourceConfiguration); ObserveTopiaApplicationContext topiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext((ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration); return createDataSourceConnection((ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration, topiaApplicationContext.getAuthenticationToken()); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java index 9604405..82e60d2 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java @@ -71,7 +71,7 @@ public class DataSourceServiceTopiaTest { ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); try { - service.canConnect(dataSourceConfiguration); + service.checkCanConnect(dataSourceConfiguration); Assert.fail(); } catch (DatabaseNotFoundException e) { Assert.assertTrue(true); @@ -83,7 +83,7 @@ public class DataSourceServiceTopiaTest { // Base déjà en cours d'utilisation try { - service.canConnect(dataSourceConfiguration); + service.checkCanConnect(dataSourceConfiguration); Assert.fail(); } catch (DatabaseConnexionNotAuthorizedException e) { Assert.assertTrue(true); @@ -91,13 +91,13 @@ public class DataSourceServiceTopiaTest { closeDatabase(dataSourceConfiguration); - service.canConnect(dataSourceConfiguration); + service.checkCanConnect(dataSourceConfiguration); char[] password = dataSourceConfiguration.getPassword(); try { dataSourceConfiguration.setPassword('b'); - service.canConnect(dataSourceConfiguration); + service.checkCanConnect(dataSourceConfiguration); Assert.fail(); } catch (DatabaseConnexionNotAuthorizedException e) { Assert.assertTrue(true); @@ -112,7 +112,7 @@ public class DataSourceServiceTopiaTest { // Base déjà en cours d'utilisation try { - service.canConnect(dataSourceConfiguration); + service.checkCanConnect(dataSourceConfiguration); Assert.fail(); } catch (DatabaseConnexionNotAuthorizedException e) { Assert.assertTrue(true); @@ -120,7 +120,7 @@ public class DataSourceServiceTopiaTest { closeDatabase(dataSourceConfiguration); - service.canConnect(dataSourceConfiguration); + service.checkCanConnect(dataSourceConfiguration); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.