This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 3555d2bffacfbbf8d925436ff8697dea41017eca Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Sep 16 09:30:05 2015 +0200 Ne pas recréer une configuration topia alors qu'on l'a déjà --- .../services/service/DataSourceServiceTopia.java | 30 +++++++++------------- 1 file changed, 12 insertions(+), 18 deletions(-) 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 246b848..1d401b2 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 @@ -237,7 +237,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS } - return createDataSourceConnection((ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration, topiaApplicationContext.getAuthenticationToken()); + return createDataSourceConnection((ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration, topiaApplicationContext.getConfiguration(), topiaApplicationContext.getAuthenticationToken()); } @@ -247,7 +247,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS checkCanConnect(dataSourceConfiguration); ObserveTopiaApplicationContext topiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext((ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration); - return createDataSourceConnection((ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration, topiaApplicationContext.getAuthenticationToken()); + return createDataSourceConnection((ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration, topiaApplicationContext.getConfiguration(), topiaApplicationContext.getAuthenticationToken()); } @@ -282,7 +282,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS } - protected ObserveDataSourceConnectionTopia createDataSourceConnection(ObserveDataSourceConfigurationTopiaSupport dataSourceConfiguration, String authenticationToken) { + protected ObserveDataSourceConnectionTopia createDataSourceConnection(ObserveDataSourceConfigurationTopiaSupport dataSourceConfiguration, ObserveTopiaConfiguration topiaConfiguration, String authenticationToken) { boolean readReferential; boolean writeReferential; @@ -299,15 +299,11 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS } else { - ObserveDataSourceConfigurationTopiaPG dataSourceConfigurationPG = (ObserveDataSourceConfigurationTopiaPG) dataSourceConfiguration; - - ObserveTopiaConfiguration topiaConfiguration = ObserveTopiaApplicationContextFactory.createTopiaConfiguration(dataSourceConfigurationPG, false); - ObserveJdbcHelper observeJdbcHelper = new ObserveJdbcHelper(topiaConfiguration); // on recherche les droits de l'utilisateur sur cette base - //TODO chemit 2010-10-28 : il vaudrait mieux utiliser les fonctions postgres adpéquates qui elle sont fiables... + //TODO chemit 2010-10-28 : il vaudrait mieux utiliser des fonctions postgres adéquates qui elle sont fiables... //FIXME la recuperation des meta-donnees n'est pas fiable! //FIXME en effet, sur un simple lecteur, on voit apparaître aussi //FIXME des privileges INSERT ou UPDATE... @@ -342,9 +338,9 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS if (log.isDebugEnabled()) { log.debug("User can read refererential : " + readReferential + ", " + - "write referential : " + writeReferential + ", " + - "read data : " + readData + ", " + - "write data : " + writeData + "."); + "write referential : " + writeReferential + ", " + + "read data : " + readData + ", " + + "write data : " + writeData + "."); } ObserveDataSourceConnectionTopia dataSourceConnection = new ObserveDataSourceConnectionTopia( @@ -358,17 +354,15 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS protected static boolean canWrite(Set<?> privileges) { boolean result = privileges != null && - privileges.contains("DELETE") && - privileges.contains("UPDATE") && - privileges.contains("INSERT"); + privileges.contains("DELETE") && + privileges.contains("UPDATE") && + privileges.contains("INSERT"); return result; } protected static boolean canRead(Set<?> privileges) { - // seul les utilisateurs avec au moins un droit sur les donnes - // observer peut les lire - boolean result = privileges != null && - ! privileges.isEmpty(); + // seul les utilisateurs avec au moins un droit sur les donnes observer peut les lire + boolean result = privileges != null && !privileges.isEmpty(); return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.