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 c518d5adf16b0a6eb49d64ea7213f54a930de5e6 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Nov 12 12:11:38 2015 +0100 afficher les erreurs de connexion au source de données (refs 7708) --- .../fr/ird/observe/ui/storage/StorageUIModel.java | 38 +++++++++++++++++++++- .../observe-application-swing_en_GB.properties | 5 +++ .../observe-application-swing_es_ES.properties | 5 +++ .../observe-application-swing_fr_FR.properties | 7 +++- .../controller/v1/ObserveWebErrorController.java | 31 ++++-------------- .../web/request/ObserveWebRequestContext.java | 6 ++-- .../ObserveWebSecurityApplicationContext.java | 6 ++++ .../observe/services/http/ObserveHttpError.java | 1 - .../security/AdminApiKeyNotFoundException.java | 2 +- .../AuthenticationTokenNotFoundException.java | 2 +- .../BadObserveWebUserPasswordException.java | 2 +- .../security/InvalidAdminKeyApiException.java | 2 +- .../InvalidAuthenticationTokenException.java | 2 +- .../ObserveWebSecurityExceptionSupport.java | 2 +- .../SecurityRequestContextNotFoundException.java | 2 +- .../security/UnknownObserveWebUserException.java | 2 +- .../UnknownObserveWebUserForDatabaseException.java | 2 +- .../security/UserLoginNotFoundException.java | 2 +- .../security/UserPasswordNotFoundException.java | 2 +- .../services/http/ObserveResponseBuilder.java | 11 +++++-- .../services/service/DataSourceServiceTopia.java | 7 +--- 21 files changed, 90 insertions(+), 49 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index 5990366..a8e958c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -38,6 +38,12 @@ import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveDbUserDto; +import fr.ird.observe.services.security.BadObserveWebUserPasswordException; +import fr.ird.observe.services.security.ObserveWebSecurityExceptionSupport; +import fr.ird.observe.services.security.UnknownObserveWebUserException; +import fr.ird.observe.services.security.UnknownObserveWebUserForDatabaseException; +import fr.ird.observe.services.security.UserLoginNotFoundException; +import fr.ird.observe.services.security.UserPasswordNotFoundException; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceDumpProducerService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; @@ -1725,7 +1731,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { Version modelServerVersion = pingService.ping(); - if (! getModelVersion().equals(modelServerVersion)) { + if (!getModelVersion().equals(modelServerVersion)) { connexionStatusError = t("observe.storage.error.serverVersionMismatch", modelServerVersion, getModelVersion()); @@ -1758,6 +1764,36 @@ public class StorageUIModel extends WizardModel<StorageStep> { } } + } catch (UnknownObserveWebUserException e) { + + connexionStatusError = t("observe.storage.error.rest.user.unknown", e.getUserLogin()); + setConnexionStatus(ConnexionStatus.FAILED); + + } catch (BadObserveWebUserPasswordException e) { + + connexionStatusError = t("observe.storage.error.rest.password.bad", e.getUserLogin()); + setConnexionStatus(ConnexionStatus.FAILED); + + } catch (UnknownObserveWebUserForDatabaseException e) { + + connexionStatusError = t("observe.storage.error.rest.database.unknownForUser", e.getDatabaseName(), e.getRole()); + setConnexionStatus(ConnexionStatus.FAILED); + + } catch (UserLoginNotFoundException e) { + + connexionStatusError = t("observe.storage.error.rest.user.required"); + setConnexionStatus(ConnexionStatus.FAILED); + + } catch (UserPasswordNotFoundException e) { + + connexionStatusError = t("observe.storage.error.rest.pasword.required"); + setConnexionStatus(ConnexionStatus.FAILED); + + } catch (ObserveWebSecurityExceptionSupport e) { + + connexionStatusError = e.getClass().getSimpleName(); + setConnexionStatus(ConnexionStatus.FAILED); + } catch (Exception e) { connexionStatusError = e.getMessage(); diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index c9145ec..d97fb75 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -1803,6 +1803,11 @@ observe.storage.detail.remote= observe.storage.detail.server= observe.storage.error.badUrl= observe.storage.error.dbVersionMismatch= +observe.storage.error.rest.database.unknownForUser= +observe.storage.error.rest.password.bad= +observe.storage.error.rest.pasword.required= +observe.storage.error.rest.user.required= +observe.storage.error.rest.user.unknown= observe.storage.error.serverVersionMismatch= observe.storage.importExternalDump.config= observe.storage.importExternalDump.description= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index a5de89f..ff0694b 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -1805,6 +1805,11 @@ observe.storage.detail.remote= observe.storage.detail.server= observe.storage.error.badUrl= observe.storage.error.dbVersionMismatch=La versión de la base remota (%s)no es compatible con la versión del modelo (%s). +observe.storage.error.rest.database.unknownForUser= +observe.storage.error.rest.password.bad= +observe.storage.error.rest.pasword.required= +observe.storage.error.rest.user.required= +observe.storage.error.rest.user.unknown= observe.storage.error.serverVersionMismatch= observe.storage.importExternalDump.config=Selección de la copia de seguridad a utilizar observe.storage.importExternalDump.description=Seleccione el archivo de una copia de seguridad (*.sql.gz). diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 137359f..0ad8cf2 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1800,6 +1800,11 @@ observe.storage.detail.remote=- URL JDBC \: %1s\n- Login \: %2s\n- Mot de passe observe.storage.detail.server=- URL serveur \: %1s\n- Login \: %2s\n- Mot de passe \: %3s \n- Base de données \: %4s observe.storage.error.badUrl=Erreur dans le format de l'URL %s observe.storage.error.dbVersionMismatch=La version de la base distante (%s) n'est pas compatible avec la version du modèle (%s) +observe.storage.error.rest.database.unknownForUser=La base de donnée "%s" n'est pas définie pour l'utilisateur "%s" +observe.storage.error.rest.password.bad=Le mot de passe est invalide +observe.storage.error.rest.pasword.required=Le mot de passe est obligatoire +observe.storage.error.rest.user.required=L'utilisateur est obligatoire +observe.storage.error.rest.user.unknown=L'utilisateur "%s" est inconnue sur le serveur observe.storage.error.serverVersionMismatch=La version du serveur distant (%s) n'est pas compatible avec la version du modèle (%s) observe.storage.importExternalDump.config=Sélection de la sauvegarde à utiliser observe.storage.importExternalDump.description=Veuillez sélectionner le fichier d'une sauvegarde (*.sql.gz). @@ -1850,7 +1855,7 @@ observe.storage.no.dbMode=Aucun type de source de données sélectionné observe.storage.noImportData.config=< Pas de configuration > observe.storage.noImportReferentiel.config=< Pas de configuration > observe.storage.remote.db=(distante) -observe.storage.remote.login=Login +observe.storage.remote.login=Utilisateur observe.storage.remote.password=Mot de passe observe.storage.remote.url=Url observe.storage.remote.useSll=mode ssl ? diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java index 1de298b..67cd792 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java @@ -22,8 +22,9 @@ package fr.ird.observe.application.web.controller.v1; * #L% */ -import fr.ird.observe.application.web.security.ObserveWebSecurityExceptionSupport; +import fr.ird.observe.services.security.ObserveWebSecurityExceptionSupport; import fr.ird.observe.services.dto.UnauthorizedException; +import fr.ird.observe.services.http.ObserveHttpError; import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.WebMotionException; import org.debux.webmotion.server.call.HttpContext; @@ -42,25 +43,7 @@ import java.util.Set; */ public class ObserveWebErrorController extends WebMotionController { - class Error { - - protected final Integer httpCode; - - protected final Class<?> exceptionType; - - protected final String message; - - protected final Throwable exception; - - Error(Integer httpCode, Class<?> exceptionType, String message, Throwable exception) { - this.httpCode = httpCode; - this.exceptionType = exceptionType; - this.message = message; - this.exception = exception; - } - } - - public Error error(HttpContext.ErrorData errorData) { + public ObserveHttpError error(HttpContext.ErrorData errorData) { @SuppressWarnings("ThrowableResultOfMethodCallIgnored") Throwable exception = errorData.getException(); @@ -112,10 +95,10 @@ public class ObserveWebErrorController extends WebMotionController { } - Error error = new Error(statusCode, - exception == null ? null : exception.getClass(), - message, - exception); + ObserveHttpError error = new ObserveHttpError(statusCode, + exception == null ? null : exception.getClass(), + message, + exception); return error; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java index 251782c..b68e7ab 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java @@ -24,9 +24,9 @@ package fr.ird.observe.application.web.request; import com.google.common.base.Optional; import fr.ird.observe.application.web.ObserveWebApplicationContext; -import fr.ird.observe.application.web.security.AdminApiKeyNotFoundException; -import fr.ird.observe.application.web.security.AuthenticationTokenNotFoundException; -import fr.ird.observe.application.web.security.InvalidAdminKeyApiException; +import fr.ird.observe.services.security.AdminApiKeyNotFoundException; +import fr.ird.observe.services.security.AuthenticationTokenNotFoundException; +import fr.ird.observe.services.security.InvalidAdminKeyApiException; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.ObserveSpeciesListConfiguration; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java index 01f1abe..39c89f6 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java @@ -35,6 +35,12 @@ import fr.ird.observe.application.web.configuration.user.ObserveWebUsers; import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection; +import fr.ird.observe.services.security.BadObserveWebUserPasswordException; +import fr.ird.observe.services.security.InvalidAuthenticationTokenException; +import fr.ird.observe.services.security.UnknownObserveWebUserException; +import fr.ird.observe.services.security.UnknownObserveWebUserForDatabaseException; +import fr.ird.observe.services.security.UserLoginNotFoundException; +import fr.ird.observe.services.security.UserPasswordNotFoundException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.version.Version; diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java b/observe-services-api/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java similarity index 91% rename from observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java rename to observe-services-api/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java index 224eb1e..faf9f3b 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java @@ -3,7 +3,6 @@ package fr.ird.observe.services.http; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -// TODO doublon avec fr.ird.observe.application.web.controller.v1.ObserveWebErrorController.Error public class ObserveHttpError { public static final String PROPERTY_HTTP_CODE = "httpCode"; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/AdminApiKeyNotFoundException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java similarity index 95% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/AdminApiKeyNotFoundException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java index 70621fb..7c35bc9 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/AdminApiKeyNotFoundException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/AuthenticationTokenNotFoundException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java similarity index 95% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/AuthenticationTokenNotFoundException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java index 6e5d666..99e156c 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/AuthenticationTokenNotFoundException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/BadObserveWebUserPasswordException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/BadObserveWebUserPasswordException.java similarity index 96% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/BadObserveWebUserPasswordException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/BadObserveWebUserPasswordException.java index 86944ad..853499a 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/BadObserveWebUserPasswordException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/BadObserveWebUserPasswordException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAdminKeyApiException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAdminKeyApiException.java similarity index 96% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAdminKeyApiException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAdminKeyApiException.java index f17bdc4..0e1e2c5 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAdminKeyApiException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAdminKeyApiException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAuthenticationTokenException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAuthenticationTokenException.java similarity index 96% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAuthenticationTokenException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAuthenticationTokenException.java index 45c9f65..f4a34f2 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAuthenticationTokenException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAuthenticationTokenException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityExceptionSupport.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/ObserveWebSecurityExceptionSupport.java similarity index 96% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityExceptionSupport.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/ObserveWebSecurityExceptionSupport.java index 3e829bc..e9be3ef 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityExceptionSupport.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/ObserveWebSecurityExceptionSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/SecurityRequestContextNotFoundException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java similarity index 95% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/SecurityRequestContextNotFoundException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java index 8148647..5a7b8bf 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/SecurityRequestContextNotFoundException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserException.java similarity index 96% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserException.java index a5dc81a..5f32d79 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserForDatabaseException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserForDatabaseException.java similarity index 96% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserForDatabaseException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserForDatabaseException.java index a3522c5..71e19be 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserForDatabaseException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserForDatabaseException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserLoginNotFoundException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java similarity index 95% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserLoginNotFoundException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java index 47b15a5..96290d0 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserLoginNotFoundException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserPasswordNotFoundException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java similarity index 95% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserPasswordNotFoundException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java index e3a7bea..834cc8c 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserPasswordNotFoundException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java index 4851de8..52af696 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java @@ -123,9 +123,16 @@ public class ObserveResponseBuilder { log.warn(String.format("Unexpected status code for url: %s\n%s", baseUrl, responseContext.responseAsString)); } - ObserveHttpError error = convertJson(responseContext.responseAsString, ObserveHttpError.class); + ObserveHttpError error; - if (error != null) { + try { + error = convertJson(responseContext.responseAsString, ObserveHttpError.class); + } catch (Exception e) { + // si le reponse n'est pas un Json on envoie la reponse tel quel; + throw new ObserveServiceRestErrorException(responseContext.statusCode + " : \n" + responseContext.responseAsString); + } + + if (error == null) { throw new ObserveServiceRestErrorException("" + responseContext.statusCode); 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 9e45824..19af79f 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 @@ -136,9 +136,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS new JdbcHelper(topiaConfiguration).runSelectOnString("SELECT 1;"); } catch (Exception e) { - // Authentification refusée - String message = l(getApplicationLocale(), "observe.services.topia.error.pg.database.badAuthentication"); - throw new DatabaseConnexionNotAuthorizedException(message, e, dataSourceConfiguration); + throw new DatabaseConnexionNotAuthorizedException(e.getMessage(), e, dataSourceConfiguration); } @@ -146,9 +144,6 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS } - // FIXME A utiliser pour generé le contenu du fichier fr/ird/observe/services/service/actions/validate/validators.json - // ValidateServiceTopia.showValidators(); - return dataSourceInformation; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.