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 b6555d5db5362d399dd73cbbb928cfe1b5df6155 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 22:03:30 2015 +0200 Possibilité d'utiliser la connexion pour obtenir un service --- .../ird/observe/services/ObserveServiceMainFactory.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java index 7f5cd95..24f1168 100644 --- a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java +++ b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java @@ -57,11 +57,17 @@ public class ObserveServiceMainFactory implements ObserveServiceFactory { public <S extends ObserveService> S newService(ObserveServiceInitializer observeServiceInitializer, Class<S> serviceType) { Preconditions.checkNotNull(observeServiceInitializer, "observeServiceInitializerContext can't be null."); - ObserveDataSourceConfiguration dataSourceConfiguration = observeServiceInitializer.getDataSourceConfiguration(); - Preconditions.checkNotNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); Preconditions.checkNotNull(serviceType, "serviceType can't be null."); - ObserveServiceFactory factory = getFactory(dataSourceConfiguration, serviceType); + ObserveServiceFactory factory; + if (observeServiceInitializer.withDataSourceConnection()) { + factory = getFactory(observeServiceInitializer.getDataSourceConnection(), serviceType); + } else if (observeServiceInitializer.withDataSourceConfiguration()) { + factory = getFactory(observeServiceInitializer.getDataSourceConfiguration(), serviceType); + } else { + throw new IllegalStateException("No dataSourceConnection, nor dataSourceConfiguration given."); + } + Preconditions.checkNotNull(factory, "factory can't be null."); if (log.isDebugEnabled()) { @@ -84,9 +90,11 @@ public class ObserveServiceMainFactory implements ObserveServiceFactory { for (ObserveServiceFactory delegateFactory : delegateFactories) { delegateFactory.close(); } + } protected ObserveServiceMainFactory() { + if (log.isInfoEnabled()) { log.info("Init MainServiceFactory."); } @@ -99,8 +107,10 @@ public class ObserveServiceMainFactory implements ObserveServiceFactory { } factory.setMainServiceFactory(this); builder.add(factory); + } delegateFactories = builder.build(); + } protected <S extends ObserveService> ObserveServiceFactory getFactory(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.