Author: timothyjward
Date: Wed Mar 2 16:06:55 2016
New Revision: 1733320
URL: http://svn.apache.org/viewvc?rev=1733320&view=rev
Log:
[tx-control] Configuration-driven Database connections
Added:
aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/ManagedServiceFactoryImpl.java
Modified:
aries/trunk/tx-control/tx-control-itests/pom.xml
aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractTransactionTest.java
aries/trunk/tx-control/tx-control-provider-jdbc-local/pom.xml
aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapper.java
aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Activator.java
Modified: aries/trunk/tx-control/tx-control-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-itests/pom.xml?rev=1733320&r1=1733319&r2=1733320&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-itests/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-itests/pom.xml Wed Mar 2 16:06:55 2016
@@ -59,6 +59,12 @@
<version>1.0.2</version>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <scope>test</scope>
+ <version>1.8.8</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jdbc-local</artifactId>
<scope>test</scope>
Modified:
aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractTransactionTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractTransactionTest.java?rev=1733320&r1=1733319&r2=1733320&view=diff
==============================================================================
---
aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractTransactionTest.java
(original)
+++
aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractTransactionTest.java
Wed Mar 2 16:06:55 2016
@@ -24,9 +24,12 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.when;
+import java.io.File;
+import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
+import java.util.Hashtable;
import java.util.Properties;
import javax.inject.Inject;
@@ -42,8 +45,10 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.jdbc.DataSourceFactory;
import org.osgi.service.transaction.control.TransactionControl;
+import org.osgi.service.transaction.control.jdbc.JDBCConnectionProvider;
import org.osgi.service.transaction.control.jdbc.JDBCConnectionProviderFactory;
@RunWith(PaxExam.class)
@@ -51,16 +56,11 @@ import org.osgi.service.transaction.cont
public abstract class AbstractTransactionTest extends AbstractIntegrationTest {
private static final String REMOTE_DB_PROPERTY =
"org.apache.aries.tx.control.itests.remotedb";
+ private static final String CONFIGURED_PROVIDER_PROPERTY =
"org.apache.aries.tx.control.itests.configured";
@Inject
protected TransactionControl txControl;
- @Inject
- JDBCConnectionProviderFactory resourceProviderFactory;
-
- @Inject
- DataSourceFactory dsf;
-
protected Connection connection;
private Server server;
@@ -69,21 +69,24 @@ public abstract class AbstractTransactio
public void setUp() throws Exception {
Properties jdbc = new Properties();
- Boolean external = Boolean.parseBoolean(REMOTE_DB_PROPERTY);
+
+ boolean external =
System.getProperties().containsKey(REMOTE_DB_PROPERTY);
String jdbcUrl;
if(external) {
server = Server.createTcpServer("-tcpPort", "0");
server.start();
- jdbcUrl = "jdbc:h2:tcp://127.0.0.1:" + server.getPort()
+ "/target/test/db1";
+ jdbcUrl = "jdbc:h2:tcp://127.0.0.1:" + server.getPort()
+ "/" + System.getProperty(REMOTE_DB_PROPERTY);
} else {
jdbcUrl = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1";
}
jdbc.setProperty(DataSourceFactory.JDBC_URL, jdbcUrl);
- connection = resourceProviderFactory.getProviderFor(dsf, jdbc,
null).getResource(txControl);
+ boolean configuredProvider =
Boolean.getBoolean(CONFIGURED_PROVIDER_PROPERTY);
+
+ connection = configuredProvider ? configuredConnection(jdbc) :
programaticConnection(jdbc);
txControl.required(() -> {
Statement s = connection.createStatement();
@@ -94,6 +97,28 @@ public abstract class AbstractTransactio
return null;
});
}
+
+ private Connection programaticConnection(Properties jdbc) {
+
+ JDBCConnectionProviderFactory resourceProviderFactory =
context()
+
.getService(JDBCConnectionProviderFactory.class, 5000);
+
+ DataSourceFactory dsf =
context().getService(DataSourceFactory.class, 5000);
+
+ return resourceProviderFactory.getProviderFor(dsf, jdbc,
null).getResource(txControl);
+ }
+
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ private Connection configuredConnection(Properties jdbc) throws
IOException {
+
+ jdbc.setProperty(DataSourceFactory.OSGI_JDBC_DRIVER_CLASS,
"org.h2.Driver");
+ ConfigurationAdmin cm =
context().getService(ConfigurationAdmin.class, 5000);
+
+ org.osgi.service.cm.Configuration config =
cm.createFactoryConfiguration("org.apache.aries.tx.control.jdbc.local", null);
+ config.update((Hashtable)jdbc);
+
+ return context().getService(JDBCConnectionProvider.class,
5000).getResource(txControl);
+ }
@After
public void tearDown() {
@@ -101,9 +126,41 @@ public abstract class AbstractTransactio
txControl.required(() -> connection.createStatement()
.execute("DROP TABLE TEST_TABLE"));
+
+ if(Boolean.getBoolean(CONFIGURED_PROVIDER_PROPERTY)) {
+ clearConfiguration();
+ }
+
if(server != null) {
server.stop();
}
+
+ connection = null;
+ }
+
+ private void clearConfiguration() {
+ ConfigurationAdmin cm =
context().getService(ConfigurationAdmin.class, 5000);
+ org.osgi.service.cm.Configuration[] cfgs = null;
+ try {
+ cfgs = cm.listConfigurations(null);
+ } catch (Exception e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ if(cfgs != null) {
+ for(org.osgi.service.cm.Configuration cfg : cfgs) {
+ try {
+ cfg.delete();
+ } catch (Exception e) {}
+ }
+ try {
+ Thread.sleep(250);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
}
@Configuration
@@ -125,11 +182,7 @@ public abstract class AbstractTransactio
mavenBundle("org.ops4j.pax.logging",
"pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging",
"pax-logging-service").versionAsInProject()
- /*
- * vmOption
- *
("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
- * waitForFrameworkStartup(),
- */
+//
,CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
);
}
@@ -148,18 +201,51 @@ public abstract class AbstractTransactio
mavenBundle("org.apache.aries.testsupport",
"org.apache.aries.testsupport.unit").versionAsInProject(),
localTxControlService(),
localJdbcResourceProviderWithH2(),
-
systemProperty(REMOTE_DB_PROPERTY).value("true"),
+
systemProperty(REMOTE_DB_PROPERTY).value(getRemoteDBPath()),
when(testSpecificOptions !=
null).useOptions(testSpecificOptions),
mavenBundle("org.ops4j.pax.logging",
"pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging",
"pax-logging-service").versionAsInProject()
- /*
- * vmOption
- *
("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
- * waitForFrameworkStartup(),
- */
+//
,CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
);
}
+
+ @Configuration
+ public Option[] configAdminDrivenConfiguration() {
+ String localRepo = System.getProperty("maven.repo.local");
+ if (localRepo == null) {
+ localRepo =
System.getProperty("org.ops4j.pax.url.mvn.localRepository");
+ }
+
+ Option testSpecificOptions = testSpecificOptions();
+
+ return options(junitBundles(),
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+ when(localRepo != null)
+
.useOptions(CoreOptions.vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" +
localRepo)),
+ mavenBundle("org.apache.aries.testsupport",
"org.apache.aries.testsupport.unit").versionAsInProject(),
+ localTxControlService(),
+ localJdbcResourceProviderWithH2(),
+
systemProperty(REMOTE_DB_PROPERTY).value(getRemoteDBPath()),
+ mavenBundle("org.apache.felix",
"org.apache.felix.configadmin").versionAsInProject(),
+
systemProperty(CONFIGURED_PROVIDER_PROPERTY).value("true"),
+ when(testSpecificOptions !=
null).useOptions(testSpecificOptions),
+ mavenBundle("org.ops4j.pax.logging",
"pax-logging-api").versionAsInProject(),
+ mavenBundle("org.ops4j.pax.logging",
"pax-logging-service").versionAsInProject()
+
+//
,CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
+ );
+ }
+
+ private String getRemoteDBPath() {
+ String fullResourceName = getClass().getName().replace('.',
'/') + ".class";
+
+ String resourcePath =
getClass().getResource(getClass().getSimpleName() + ".class").getPath();
+
+ File testClassesDir = new File(resourcePath.substring(0,
resourcePath.length() - fullResourceName.length()));
+
+ String dbPath = new File(testClassesDir.getParentFile(),
"testdb/db1").getAbsolutePath();
+ return dbPath;
+ }
public Option localTxControlService() {
return CoreOptions.composite(
Modified: aries/trunk/tx-control/tx-control-provider-jdbc-local/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jdbc-local/pom.xml?rev=1733320&r1=1733319&r2=1733320&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jdbc-local/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-provider-jdbc-local/pom.xml Wed Mar 2
16:06:55 2016
@@ -35,6 +35,7 @@
</aries.osgi.activator>
<aries.osgi.export.pkg>
org.osgi.service.transaction.control.jdbc,
+ org.osgi.service.cm,
org.osgi.service.jdbc
</aries.osgi.export.pkg>
<aries.osgi.private.pkg>
@@ -50,6 +51,8 @@
!javassist.*,
org.osgi.service.transaction.control;version="[0.0.1,0.0.2)",
org.osgi.service.transaction.control.jdbc;version="[0.0.1,0.0.2)",
+ org.osgi.service.cm,
+ org.osgi.service.jdbc,
*
</aries.osgi.import.pkg>
<lastReleaseVersion>0.0.1-SNAPSHOT</lastReleaseVersion>
@@ -73,6 +76,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.5.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
+ <version>1.5.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
Modified:
aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapper.java
URL:
http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapper.java?rev=1733320&r1=1733319&r2=1733320&view=diff
==============================================================================
---
aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapper.java
(original)
+++
aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapper.java
Wed Mar 2 16:06:55 2016
@@ -16,7 +16,7 @@ public class TxConnectionWrapper extends
try {
delegate.setAutoCommit(false);
} catch (SQLException e) {
- throw new TransactionException("Unable to disable
autocommit");
+ throw new TransactionException("Unable to disable
autocommit", e);
}
}
Modified:
aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Activator.java
URL:
http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Activator.java?rev=1733320&r1=1733319&r2=1733320&view=diff
==============================================================================
---
aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Activator.java
(original)
+++
aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Activator.java
Wed Mar 2 16:06:55 2016
@@ -1,26 +1,34 @@
package org.apache.aries.tx.control.jdbc.local.impl;
+import static org.osgi.framework.Constants.SERVICE_PID;
+
import java.util.Dictionary;
import java.util.Hashtable;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.cm.ManagedServiceFactory;
import org.osgi.service.transaction.control.jdbc.JDBCConnectionProviderFactory;
public class Activator implements BundleActivator {
private ServiceRegistration<JDBCConnectionProviderFactory> reg;
+ private ServiceRegistration<ManagedServiceFactory> factoryReg;
@Override
public void start(BundleContext context) throws Exception {
reg =
context.registerService(JDBCConnectionProviderFactory.class,
new JDBCConnectionProviderFactoryImpl(),
getProperties());
+
+ factoryReg =
context.registerService(ManagedServiceFactory.class,
+ new ManagedServiceFactoryImpl(context),
getMSFProperties());
}
@Override
public void stop(BundleContext context) throws Exception {
reg.unregister();
+ factoryReg.unregister();
}
private Dictionary<String, Object> getProperties() {
@@ -29,4 +37,10 @@ public class Activator implements Bundle
return props;
}
+ private Dictionary<String, ?> getMSFProperties() {
+ Dictionary<String, Object> props = new Hashtable<>();
+ props.put(SERVICE_PID,
"org.apache.aries.tx.control.jdbc.local");
+ return props;
+ }
+
}
Added:
aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/ManagedServiceFactoryImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/ManagedServiceFactoryImpl.java?rev=1733320&view=auto
==============================================================================
---
aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/ManagedServiceFactoryImpl.java
(added)
+++
aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/ManagedServiceFactoryImpl.java
Wed Mar 2 16:06:55 2016
@@ -0,0 +1,225 @@
+package org.apache.aries.tx.control.jdbc.local.impl;
+
+import static java.util.Arrays.asList;
+import static java.util.Optional.ofNullable;
+import static org.osgi.framework.Constants.OBJECTCLASS;
+import static org.osgi.service.jdbc.DataSourceFactory.JDBC_DATABASE_NAME;
+import static org.osgi.service.jdbc.DataSourceFactory.JDBC_DATASOURCE_NAME;
+import static org.osgi.service.jdbc.DataSourceFactory.JDBC_DESCRIPTION;
+import static org.osgi.service.jdbc.DataSourceFactory.JDBC_NETWORK_PROTOCOL;
+import static org.osgi.service.jdbc.DataSourceFactory.JDBC_PASSWORD;
+import static org.osgi.service.jdbc.DataSourceFactory.JDBC_PORT_NUMBER;
+import static org.osgi.service.jdbc.DataSourceFactory.JDBC_ROLE_NAME;
+import static org.osgi.service.jdbc.DataSourceFactory.JDBC_SERVER_NAME;
+import static org.osgi.service.jdbc.DataSourceFactory.JDBC_URL;
+import static org.osgi.service.jdbc.DataSourceFactory.JDBC_USER;
+import static org.osgi.service.jdbc.DataSourceFactory.OSGI_JDBC_DRIVER_CLASS;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.cm.ConfigurationException;
+import org.osgi.service.cm.ManagedServiceFactory;
+import org.osgi.service.jdbc.DataSourceFactory;
+import org.osgi.service.transaction.control.jdbc.JDBCConnectionProvider;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+
+public class ManagedServiceFactoryImpl implements ManagedServiceFactory {
+
+ private static final String DSF_TARGET_FILTER =
"aries.dsf.target.filter";
+ private static final String JDBC_PROP_NAMES =
"aries.jdbc.property.names";
+ private static final List<String> JDBC_PROPERTIES =
asList(JDBC_DATABASE_NAME, JDBC_DATASOURCE_NAME,
+ JDBC_DESCRIPTION, JDBC_NETWORK_PROTOCOL, JDBC_PASSWORD,
JDBC_PORT_NUMBER, JDBC_ROLE_NAME, JDBC_SERVER_NAME,
+ JDBC_URL, JDBC_USER);
+
+ private final Map<String, ManagedJDBCResourceProvider> managedInstances
= new ConcurrentHashMap<>();
+
+ private final BundleContext context;
+
+ public ManagedServiceFactoryImpl(BundleContext context) {
+ this.context = context;
+ }
+
+ @Override
+ public String getName() {
+ return "Aries JDBCConnectionProvider (Local only) service";
+ }
+
+ @Override
+ public void updated(String pid, Dictionary<String, ?> properties)
throws ConfigurationException {
+
+ Map<String, Object> propsMap = new HashMap<>();
+
+ Enumeration<String> keys = properties.keys();
+ while (keys.hasMoreElements()) {
+ String key = keys.nextElement();
+ propsMap.put(key, properties.get(key));
+ }
+
+ Properties jdbcProps = getJdbcProps(propsMap);
+
+ try {
+ ManagedJDBCResourceProvider mjrp = new
ManagedJDBCResourceProvider(context, jdbcProps, propsMap);
+ ofNullable(managedInstances.put(pid,
mjrp)).ifPresent(ManagedJDBCResourceProvider::stop);
+ mjrp.start();
+ } catch (InvalidSyntaxException e) {
+ throw new ConfigurationException(DSF_TARGET_FILTER,
"The target filter was invalid", e);
+ }
+ }
+
+ public void stop() {
+
managedInstances.values().forEach(ManagedJDBCResourceProvider::stop);
+ }
+
+ @SuppressWarnings("unchecked")
+ private Properties getJdbcProps(Map<String, Object> properties) throws
ConfigurationException {
+
+ Object object = properties.getOrDefault(JDBC_PROP_NAMES,
JDBC_PROPERTIES);
+ Collection<String> propnames;
+ if (object instanceof String) {
+ propnames = Arrays.asList(((String) object).split(","));
+ } else if (object instanceof String[]) {
+ propnames = Arrays.asList((String[]) object);
+ } else if (object instanceof Collection) {
+ propnames = (Collection<String>) object;
+ } else {
+ throw new ConfigurationException(JDBC_PROP_NAMES,
+ "The jdbc property names must be a
String+ or comma-separated String");
+ }
+
+ Properties p = new Properties();
+
+ propnames.stream().filter(properties::containsKey)
+ .forEach(s -> p.setProperty(s,
String.valueOf(properties.get(s))));
+
+ return p;
+ }
+
+ @Override
+ public void deleted(String pid) {
+ ofNullable(managedInstances.remove(pid))
+ .ifPresent(ManagedJDBCResourceProvider::stop);
+ }
+
+ private static class ManagedJDBCResourceProvider
+ implements ServiceTrackerCustomizer<DataSourceFactory,
DataSourceFactory> {
+
+ private final BundleContext context;
+ private final Properties jdbcProperties;
+ private final Map<String, Object> providerProperties;
+ private final ServiceTracker<DataSourceFactory,
DataSourceFactory> dsfTracker;
+
+ private final AtomicReference<DataSourceFactory> activeDsf =
new AtomicReference<>();
+ private final
AtomicReference<ServiceRegistration<JDBCConnectionProvider>> serviceReg = new
AtomicReference<>();
+
+ public ManagedJDBCResourceProvider(BundleContext context,
Properties jdbcProperties,
+ Map<String, Object> providerProperties) throws
InvalidSyntaxException, ConfigurationException {
+ this.context = context;
+ this.jdbcProperties = jdbcProperties;
+ this.providerProperties = providerProperties;
+
+ String targetFilter = (String)
providerProperties.get(DSF_TARGET_FILTER);
+ if (targetFilter == null) {
+ String driver = (String)
providerProperties.get(OSGI_JDBC_DRIVER_CLASS);
+ if (driver == null) {
+ throw new
ConfigurationException(OSGI_JDBC_DRIVER_CLASS,
+ "The configuration must
specify either a target filter or a JDBC driver class");
+ }
+ targetFilter = "(" + OSGI_JDBC_DRIVER_CLASS +
"=" + driver + ")";
+ }
+
+ targetFilter = "(&(" + OBJECTCLASS + "=" +
DataSourceFactory.class.getName() + ")" + targetFilter + ")";
+
+ this.dsfTracker = new ServiceTracker<>(context,
context.createFilter(targetFilter), this);
+ }
+
+ public void start() {
+ dsfTracker.open();
+ }
+
+ public void stop() {
+ dsfTracker.close();
+ }
+
+ @Override
+ public DataSourceFactory
addingService(ServiceReference<DataSourceFactory> reference) {
+ DataSourceFactory service =
context.getService(reference);
+
+ updateService(service);
+ return service;
+ }
+
+ private void updateService(DataSourceFactory service) {
+ boolean setDsf;
+ synchronized (this) {
+ setDsf = activeDsf.compareAndSet(null, service);
+ }
+
+ if (setDsf) {
+ try {
+ JDBCConnectionProvider provider = new
JDBCConnectionProviderFactoryImpl().getProviderFor(service,
+ jdbcProperties,
providerProperties);
+
ServiceRegistration<JDBCConnectionProvider> reg = context
+
.registerService(JDBCConnectionProvider.class, provider,
getServiceProperties());
+ if (!serviceReg.compareAndSet(null,
reg)) {
+ throw new
IllegalStateException("Unable to set the JDBC connection provider
registration");
+ }
+ } catch (Exception e) {
+ activeDsf.compareAndSet(service, null);
+ }
+ }
+ }
+
+ private Dictionary<String, ?> getServiceProperties() {
+ Hashtable<String, Object> props = new Hashtable<>();
+ providerProperties.keySet().stream().filter(s ->
!JDBC_PASSWORD.equals(s))
+ .forEach(s -> props.put(s,
providerProperties.get(s)));
+ return props;
+ }
+
+ @Override
+ public void modifiedService(ServiceReference<DataSourceFactory>
reference, DataSourceFactory service) {
+ }
+
+ @Override
+ public void removedService(ServiceReference<DataSourceFactory>
reference, DataSourceFactory service) {
+ boolean dsfLeft;
+ ServiceRegistration<JDBCConnectionProvider> oldReg =
null;
+ synchronized (this) {
+ dsfLeft = activeDsf.compareAndSet(service,
null);
+ if (dsfLeft) {
+ oldReg = serviceReg.getAndSet(null);
+ }
+ }
+
+ if (oldReg != null) {
+ try {
+ oldReg.unregister();
+ } catch (IllegalStateException ise) {
+
+ }
+ }
+
+ if (dsfLeft) {
+ DataSourceFactory newDSF =
dsfTracker.getService();
+ if (newDSF != null) {
+ updateService(dsfTracker.getService());
+ }
+ }
+ }
+ }
+}
