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 cc0f39c14e1b19806719b2226adee324a4ad6f62 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:54:19 2015 +0200 Revue injecteurs de configuration --- .../application/web/ObserveWebApplicationListener.java | 2 +- .../ObserveDataSourceConfigurationInjector.java | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java index d6b357d..eedbd98 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java @@ -35,7 +35,7 @@ public class ObserveWebApplicationListener implements WebMotionServerListener { Gson gson = applicationContext.getGsonSupplier().get(); - context.addInjector(new ObserveDataSourceConfigurationInjector(gson)); + context.addInjector(new ObserveDataSourceConfigurationInjector()); context.addInjector(new IdDtoInjector(gson)); context.addInjector(new FormDtoInjector(gson)); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java index 683b7b0..19fcbb9 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java @@ -1,8 +1,7 @@ package fr.ird.observe.application.web.injector; -import com.google.gson.Gson; +import fr.ird.observe.application.web.request.ObserveWebRequestContext; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.debux.webmotion.server.call.Call; @@ -21,24 +20,16 @@ public class ObserveDataSourceConfigurationInjector implements ExecutorParameter /** Logger. */ private static final Log log = LogFactory.getLog(ObserveDataSourceConfigurationInjector.class); - protected final Gson gson; - - public ObserveDataSourceConfigurationInjector(Gson gson) { - this.gson = gson; - } - @Override public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { ObserveDataSourceConfiguration dataSourceConfiguration = null; if (type.equals(ObserveDataSourceConfiguration.class)) { - Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); - - String gsonContent = ((String[]) parameterTree.getValue())[0]; + // on recupère la configuration de source de données depuis le requestContext + ObserveWebRequestContext requestContext = ObserveWebRequestContext.getRequestContext(call.getContext()); - // On récupère obligatoirement une configuration de type rest - dataSourceConfiguration = gson.fromJson(gsonContent, ObserveDataSourceConfigurationRest.class); + dataSourceConfiguration = requestContext.getDataSourceConfiguration(); if (log.isInfoEnabled()) { log.info("Inject dataSourceConfiguration: " + dataSourceConfiguration); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.