Skip to content

Commit d658720

Browse files
author
Christoph Läubrich
committed
Add TCK showing using external bundle (h2) and a pax warapped (sqlite)
1 parent 89cf4e3 commit d658720

File tree

10 files changed

+423
-30
lines changed

10 files changed

+423
-30
lines changed

‎pax-jdbc-common/src/main/java/org/ops4j/pax/jdbc/common/BeanConfig.java‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,14 @@ private static Map<String, Method> findSettersForBean(Object bean) {
5656
* properties to set.
5757
*/
5858
public static void configure(Object bean, Properties props) {
59+
configure(bean, props, true);
60+
}
61+
public static void configure(Object bean, Properties props, boolean failOnMissing) {
5962
final Map<String, String> map = new HashMap<>();
6063
for (String key : props.stringPropertyNames()) {
6164
map.put(key, props.getProperty(key));
6265
}
63-
BeanConfig.configure(bean, map);
66+
BeanConfig.configure(bean, map, failOnMissing);
6467
}
6568

6669
/**
@@ -72,18 +75,24 @@ public static void configure(Object bean, Properties props) {
7275
* properties to set. The keys in the Map have to match the bean property names.
7376
*/
7477
public static void configure(Object bean, Map<String, String> props) {
78+
79+
}
80+
public static void configure(Object bean, Map<String, String> props, boolean failOnMissing) {
7581
BeanConfig beanConfig = new BeanConfig(bean);
7682
for (String key : props.keySet()) {
77-
beanConfig.trySetProperty(key, props.get(key));
83+
beanConfig.trySetProperty(key, props.get(key), failOnMissing);
7884
}
7985
}
8086

81-
private void trySetProperty(String key, String value) {
87+
private void trySetProperty(String key, String value, boolean failOnMissing) {
8288
try {
8389
Method method = setters.get(key);
8490
if (method == null) {
91+
if (failOnMissing) {
8592
throw new IllegalArgumentException("No setter in " + bean.getClass()
8693
+ " for property " + key);
94+
}
95+
return;
8796
}
8897
Class<?> paramClass = method.getParameterTypes()[0];
8998
if (paramClass == int.class || paramClass == Integer.class) {

‎pax-jdbc-mariadb/src/main/java/org/ops4j/pax/jdbc/mariadb/impl/Activator.java‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,26 @@ public class Activator implements BundleActivator {
2828
@Override
2929
public void start(BundleContext context) throws Exception {
3030
MariaDbDataSourceFactory dsf = new MariaDbDataSourceFactory();
31-
Dictionary<String, String> props = new Hashtable<String, String>();
31+
Dictionary<String, Object> props = new Hashtable<>();
3232
props.put(DataSourceFactory.OSGI_JDBC_DRIVER_CLASS, Driver.class.getName());
3333
props.put(DataSourceFactory.OSGI_JDBC_DRIVER_NAME, "mariadb");
34+
props.put(DataSourceFactory.OSGI_JDBC_CAPABILITY, new String[] {
35+
DataSourceFactory.OSGI_JDBC_CAPABILITY_DRIVER,
36+
DataSourceFactory.OSGI_JDBC_CAPABILITY_DATASOURCE,
37+
DataSourceFactory.OSGI_JDBC_CAPABILITY_CONNECTIONPOOLDATASOURCE,
38+
DataSourceFactory.OSGI_JDBC_CAPABILITY_XADATASOURCE
39+
});
3440
context.registerService(DataSourceFactory.class.getName(), dsf, props);
35-
Dictionary<String, String> props2 = new Hashtable<String, String>();
41+
Dictionary<String, Object> props2 = new Hashtable<>();
42+
//TODO this seems wrong if we want to emulate mysql we should use a different driver class!
3643
props2.put(DataSourceFactory.OSGI_JDBC_DRIVER_CLASS, Driver.class.getName());
3744
props2.put(DataSourceFactory.OSGI_JDBC_DRIVER_NAME, "mysql");
45+
props2.put(DataSourceFactory.OSGI_JDBC_CAPABILITY, new String[] {
46+
DataSourceFactory.OSGI_JDBC_CAPABILITY_DRIVER,
47+
DataSourceFactory.OSGI_JDBC_CAPABILITY_DATASOURCE,
48+
DataSourceFactory.OSGI_JDBC_CAPABILITY_CONNECTIONPOOLDATASOURCE,
49+
DataSourceFactory.OSGI_JDBC_CAPABILITY_XADATASOURCE
50+
});
3851
context.registerService(DataSourceFactory.class.getName(), dsf, props2);
3952
}
4053

‎pax-jdbc-mariadb/src/main/java/org/ops4j/pax/jdbc/mariadb/impl/MariaDbDataSourceFactory.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public DataSource createDataSource(Properties props) throws SQLException {
3737
}
3838

3939
private void setProperties(MariaDbDataSource ds, Properties properties) throws SQLException {
40+
if (properties==null) {
41+
return;
42+
}
4043
Properties props = (Properties) properties.clone();
4144
String url = (String) props.remove(DataSourceFactory.JDBC_URL);
4245
if (url != null) {
@@ -66,7 +69,7 @@ private void setProperties(MariaDbDataSource ds, Properties properties) throws S
6669
ds.setUser(user);
6770

6871
if (!props.isEmpty()) {
69-
BeanConfig.configure(ds, props);
72+
BeanConfig.configure(ds, props, false);
7073
}
7174
}
7275

‎pax-jdbc-oracle/src/main/java/org/ops4j/pax/jdbc/oracle/impl/OracleDataSourceFactory.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ public Driver createDriver(Properties props) throws SQLException {
7575

7676
private void setProperties(oracle.jdbc.datasource.OracleDataSource ds, Properties properties)
7777
throws Exception {
78+
if (properties==null) {
79+
return;
80+
}
7881
Properties props = (Properties) properties.clone();
7982

8083
String url = (String) props.remove(DataSourceFactory.JDBC_URL);

‎pax-jdbc-sqlite/src/main/java/org/ops4j/pax/jdbc/sqlite/impl/Activator.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ public class Activator implements BundleActivator {
2828
@Override
2929
public void start(BundleContext context) throws Exception {
3030
SqliteDataSourceFactory dsf = new SqliteDataSourceFactory();
31-
Dictionary<String, String> props = new Hashtable<String, String>();
31+
Dictionary<String, Object> props = new Hashtable<>();
3232
props.put(DataSourceFactory.OSGI_JDBC_DRIVER_CLASS, JDBC.class.getName());
3333
props.put(DataSourceFactory.OSGI_JDBC_DRIVER_NAME, "sqlite");
34+
props.put(DataSourceFactory.OSGI_JDBC_CAPABILITY, new String[] {DataSourceFactory.OSGI_JDBC_CAPABILITY_DATASOURCE, DataSourceFactory.OSGI_JDBC_CAPABILITY_DRIVER});
3435
context.registerService(DataSourceFactory.class.getName(), dsf, props);
3536
}
3637

‎pax-jdbc-sqlite/src/main/java/org/ops4j/pax/jdbc/sqlite/impl/SqliteDataSourceFactory.java‎

Lines changed: 47 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.ops4j.pax.jdbc.sqlite.impl;
1717

18+
import java.sql.Connection;
1819
import java.sql.Driver;
1920
import java.sql.SQLException;
2021
import java.util.Properties;
@@ -30,33 +31,60 @@
3031

3132
public class SqliteDataSourceFactory implements DataSourceFactory {
3233

33-
@Override
34-
public DataSource createDataSource(Properties props) throws SQLException {
35-
SQLiteDataSource dataSource = new SQLiteDataSource();
36-
String url = props.getProperty(JDBC_URL);
37-
if (url == null) {
38-
dataSource.setUrl("jdbc:sqlite:" + props.getProperty(JDBC_DATABASE_NAME));
39-
props.remove(JDBC_DATABASE_NAME);
40-
} else {
41-
dataSource.setUrl(url);
42-
props.remove(JDBC_URL);
43-
}
34+
private final class SQLiteDataSourceExtension extends SQLiteDataSource {
35+
private String username;
36+
private String password;
4437

45-
if (!props.isEmpty()) {
46-
BeanConfig.configure(dataSource, props);
47-
}
48-
return dataSource;
49-
}
38+
public SQLiteDataSourceExtension(String username, String password) {
39+
this.username = username;
40+
this.password = password;
41+
}
5042

51-
@Override
43+
@Override
44+
public Connection getConnection() throws SQLException {
45+
return super.getConnection(username, password);
46+
}
47+
}
48+
49+
@Override
50+
public DataSource createDataSource(Properties props) throws SQLException {
51+
String username = removeProperty(props, JDBC_USER);
52+
String password = removeProperty(props, JDBC_PASSWORD);
53+
SQLiteDataSource dataSource = new SQLiteDataSourceExtension(username, password);
54+
if (props != null) {
55+
String url = props.getProperty(JDBC_URL);
56+
if (url == null) {
57+
dataSource.setUrl("jdbc:sqlite:" + props.getProperty(JDBC_DATABASE_NAME));
58+
props.remove(JDBC_DATABASE_NAME);
59+
} else {
60+
dataSource.setUrl(url);
61+
props.remove(JDBC_URL);
62+
}
63+
if (!props.isEmpty()) {
64+
BeanConfig.configure(dataSource, props, false);
65+
}
66+
}
67+
return dataSource;
68+
}
69+
70+
private String removeProperty(Properties props, String property) {
71+
if (props != null) {
72+
String value = props.getProperty(property);
73+
props.remove(property);
74+
return value;
75+
}
76+
return null;
77+
}
78+
79+
@Override
5280
public ConnectionPoolDataSource createConnectionPoolDataSource(Properties props)
5381
throws SQLException {
54-
throw new UnsupportedOperationException();
82+
throw new SQLException();
5583
}
5684

5785
@Override
5886
public XADataSource createXADataSource(Properties props) throws SQLException {
59-
throw new UnsupportedOperationException();
87+
throw new SQLException();
6088
}
6189

6290
@Override

‎pax-jdbc-tck/pom.xml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
<parent>
4+
<groupId>org.ops4j.pax</groupId>
5+
<artifactId>jdbc</artifactId>
6+
<version>1.5.6-SNAPSHOT</version>
7+
</parent>
8+
<artifactId>pax-jdbc-tck</artifactId>
9+
<name>OSGi-TCK Tests</name>
10+
<dependencies>
11+
<!-- units under test with embedded factories -->
12+
<dependency>
13+
<groupId>com.h2database</groupId>
14+
<artifactId>h2</artifactId>
15+
<scope>test</scope>
16+
</dependency>
17+
<!-- units under test wrapped by pax-jdbc-->
18+
<dependency>
19+
<groupId>org.ops4j.pax.jdbc</groupId>
20+
<artifactId>pax-jdbc-sqlite</artifactId>
21+
</dependency>
22+
<dependency>
23+
<groupId>org.ops4j.pax.jdbc</groupId>
24+
<artifactId>pax-jdbc-db2</artifactId>
25+
</dependency>
26+
<dependency>
27+
<groupId>org.ops4j.pax.jdbc</groupId>
28+
<artifactId>pax-jdbc-mariadb</artifactId>
29+
</dependency>
30+
<!-- Dependencies for performing the test -->
31+
<dependency>
32+
<groupId>org.osgi</groupId>
33+
<artifactId>org.osgi.test.cases.jdbc</artifactId>
34+
<scope>test</scope>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.osgi</groupId>
38+
<artifactId>org.osgi.service.jdbc</artifactId>
39+
<scope>test</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>de.laeubisoft</groupId>
43+
<artifactId>osgi-test-framework</artifactId>
44+
<scope>test</scope>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.eclipse.platform</groupId>
48+
<artifactId>org.eclipse.osgi</artifactId>
49+
</dependency>
50+
</dependencies>
51+
</project>

‎pax-jdbc-tck/src/test/java/org/ops4j/pax/jdbc/tck/JdbcTckTest.java‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Copyright 2022 OPS4J.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.ops4j.pax.jdbc.tck;
17+
18+
import org.junit.jupiter.api.extension.ExtendWith;
19+
import org.osgi.test.cases.jdbc.junit.JDBCTestCase;
20+
21+
import de.laeubisoft.osgi.junit5.framework.annotations.WithBundle;
22+
import de.laeubisoft.osgi.junit5.framework.extension.FrameworkExtension;
23+
24+
//#### JDBC services to test ####
25+
//some drivers that already have a custom implementation and we just want to include them to make sure they comply
26+
@WithBundle(value = "com.h2database", start = true, isolated = true)
27+
//pax-jdbc-sqlite
28+
@WithBundle(value = "org.ops4j.pax.jdbc.sqlite", start = true, isolated = true)
29+
@WithBundle(value = "org.xerial.sqlite-jdbc", start = true, isolated = true)
30+
//pax-jdbc-mariadb --> actually obsolete see: https://github.com/ops4j/org.ops4j.pax.jdbc/issues/277
31+
@WithBundle(value = "org.ops4j.pax.jdbc.mariadb", start = true, isolated = true)
32+
@WithBundle(value = "org.mariadb.jdbc", start = true, isolated = true)
33+
//pax-db2 TODO how to test? seems not OpenSource?
34+
// @WithBundle(value = "org.ops4j.pax.jdbc.db2", start = true, isolated = true)
35+
36+
//### basic setup ###
37+
@ExtendWith(FrameworkExtension.class)
38+
@WithBundle("org.osgi.service.jdbc")
39+
public class JdbcTckTest extends JDBCTestCase {
40+
41+
}

0 commit comments

Comments
 (0)