IGNITE-5408: Added enabled service loading for JDBC drivers. This closes #2087.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f0605829 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f0605829 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f0605829 Branch: refs/heads/ignite-5293 Commit: f0605829e3846ac9afff0fcf0352cb3878fea58b Parents: de658ca Author: devozerov <[email protected]> Authored: Mon Jun 5 22:17:40 2017 +0300 Committer: devozerov <[email protected]> Committed: Mon Jun 5 22:17:40 2017 +0300 ---------------------------------------------------------------------- .../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 2 -- .../internal/jdbc2/JdbcComplexQuerySelfTest.java | 2 -- .../internal/jdbc2/JdbcConnectionSelfTest.java | 2 -- .../jdbc2/JdbcDistributedJoinsQueryTest.java | 2 -- .../internal/jdbc2/JdbcEmptyCacheSelfTest.java | 2 -- .../internal/jdbc2/JdbcLocalCachesSelfTest.java | 2 -- .../ignite/internal/jdbc2/JdbcMetadataSelfTest.java | 2 -- .../internal/jdbc2/JdbcNoDefaultCacheTest.java | 2 -- .../jdbc2/JdbcPreparedStatementSelfTest.java | 2 -- .../internal/jdbc2/JdbcResultSetSelfTest.java | 2 -- .../ignite/internal/jdbc2/JdbcSpringSelfTest.java | 2 -- .../internal/jdbc2/JdbcStatementSelfTest.java | 2 -- .../internal/jdbc2/JdbcStreamingSelfTest.java | 2 -- .../ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java | 2 -- .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 2 -- .../apache/ignite/jdbc/JdbcConnectionSelfTest.java | 2 -- .../apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java | 2 -- .../apache/ignite/jdbc/JdbcLocalCachesSelfTest.java | 2 -- .../apache/ignite/jdbc/JdbcMetadataSelfTest.java | 2 -- .../apache/ignite/jdbc/JdbcNoDefaultCacheTest.java | 2 -- .../ignite/jdbc/JdbcPreparedStatementSelfTest.java | 2 -- .../apache/ignite/jdbc/JdbcResultSetSelfTest.java | 2 -- .../apache/ignite/jdbc/JdbcStatementSelfTest.java | 2 -- .../thin/JdbcThinAbstractDmlStatementSelfTest.java | 2 -- .../ignite/jdbc/thin/JdbcThinAbstractSelfTest.java | 5 +---- .../jdbc/thin/JdbcThinNoDefaultSchemaTest.java | 2 -- .../src/main/java/META-INF/services/java.sql.Driver | 2 ++ .../java/org/apache/ignite/IgniteJdbcDriver.java | 9 +++------ .../org/apache/ignite/IgniteJdbcThinDriver.java | 16 +++++++++++++--- ...SqlConnectorConfigurationValidationSelfTest.java | 5 ----- 30 files changed, 19 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java index 82f9cd2..e055ee3 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java @@ -60,8 +60,6 @@ public abstract class JdbcAbstractDmlStatementSelfTest extends GridCommonAbstrac /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(3); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java index 725ec3a..1163723 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java @@ -108,8 +108,6 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { personCache.put(new AffinityKey<>("p1", "o1"), new Person(1, "John White", 25, 1)); personCache.put(new AffinityKey<>("p2", "o1"), new Person(2, "Joe Black", 35, 1)); personCache.put(new AffinityKey<>("p3", "o2"), new Person(3, "Mike Green", 40, 2)); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java index 39a3648..bd5c8e9 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java @@ -96,8 +96,6 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(GRID_CNT); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java index 6756a97..63f5a5c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java @@ -93,8 +93,6 @@ public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest { personCache.put("p1", new Person(1, "John White", 25, 1)); personCache.put("p2", new Person(2, "Joe Black", 35, 1)); personCache.put("p3", new Person(3, "Mike Green", 40, 2)); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java index 6d5181b..615658a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java @@ -76,8 +76,6 @@ public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { startGrid(); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java index 645f7b1..f096e69 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java @@ -93,8 +93,6 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest { cache2.put("key1", 3); cache2.put("key2", 4); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java index 736e343..52e68c9 100755 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java @@ -109,8 +109,6 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { personCache.put(new AffinityKey<>("p1", "o1"), new Person("John White", 25, 1)); personCache.put(new AffinityKey<>("p2", "o1"), new Person("Joe Black", 35, 1)); personCache.put(new AffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2)); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java index 545286c..e851319 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java @@ -88,8 +88,6 @@ public class JdbcNoDefaultCacheTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(GRID_CNT); - Class.forName("org.apache.ignite.IgniteJdbcDriver"); - Ignite ignite = ignite(0); IgniteCache<Integer, Integer> cache1 = ignite.cache(CACHE1_NAME); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java index 30bd018..e2939e6 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java @@ -126,8 +126,6 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { cache.put(1, o); cache.put(2, new TestObject(2)); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java index 54514c7..42134e7 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java @@ -111,8 +111,6 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { cache.put(1, o); cache.put(2, new TestObject(2)); cache.put(3, new TestObject(3)); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java index fb03ae8..7a29b13 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcSpringSelfTest.java @@ -58,8 +58,6 @@ public class JdbcSpringSelfTest extends JdbcConnectionSelfTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { startGridsWithSpringCtx(GRID_CNT, false, configURL()); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java index 99e813d..138eef5 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java @@ -93,8 +93,6 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { cache.put("p1", new Person(1, "John", "White", 25)); cache.put("p2", new Person(2, "Joe", "Black", 35)); cache.put("p3", new Person(3, "Mike", "Green", 40)); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java index 5c98b1a..5418ca0 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java @@ -91,8 +91,6 @@ public class JdbcStreamingSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { startGrids(2); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java index 6492eb0..892812f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java @@ -111,8 +111,6 @@ public abstract class AbstractJdbcPojoQuerySelfTest extends GridCommonAbstractTe IgniteCache<String, BinaryObject> cache = grid(0).cache(DEFAULT_CACHE_NAME); cache.put("0", binObj); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java index dd035b2..99bc361 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java @@ -103,8 +103,6 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { personCache.put(new AffinityKey<>("p1", "o1"), new Person(1, "John White", 25, 1)); personCache.put(new AffinityKey<>("p2", "o1"), new Person(2, "Joe Black", 35, 1)); personCache.put(new AffinityKey<>("p3", "o2"), new Person(3, "Mike Green", 40, 2)); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java index a2a83ee..466bf5d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java @@ -91,8 +91,6 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(2); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java index 42e307f..c883aa0 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java @@ -77,8 +77,6 @@ public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { startGrid(); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java index d959f3f..ad65434 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java @@ -90,8 +90,6 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest { cache2.put("key1", 3); cache2.put("key2", 4); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java index be148c4..2d1443b 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java @@ -103,8 +103,6 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { personCache.put(new AffinityKey<>("p1", "o1"), new Person("John White", 25, 1)); personCache.put(new AffinityKey<>("p2", "o1"), new Person("Joe Black", 35, 1)); personCache.put(new AffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2)); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java index 2d27637..d3d8454 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java @@ -89,8 +89,6 @@ public class JdbcNoDefaultCacheTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { startGridsMultiThreaded(GRID_CNT); - Class.forName("org.apache.ignite.IgniteJdbcDriver"); - Ignite ignite = ignite(0); IgniteCache<Integer, Integer> cache1 = ignite.cache(CACHE1_NAME); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java index 67ccdb1..0dfa0fd 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java @@ -123,8 +123,6 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { cache.put(1, o); cache.put(2, new TestObject(2)); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java index 2dac8b7..b407f3e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java @@ -106,8 +106,6 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { cache.put(1, o); cache.put(2, new TestObject(2)); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java index 360d118..be685cc 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java @@ -92,8 +92,6 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { cache.put("p1", new Person(1, "John", "White", 25)); cache.put("p2", new Person(2, "Joe", "Black", 35)); cache.put("p3", new Person(3, "Mike", "Green", 40)); - - Class.forName("org.apache.ignite.IgniteJdbcDriver"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java index b5760dd..607f557 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java @@ -55,8 +55,6 @@ public abstract class JdbcThinAbstractDmlStatementSelfTest extends JdbcThinAbstr @Override protected void beforeTestsStarted() throws Exception { super.beforeTestsStarted(); - Class.forName("org.apache.ignite.IgniteJdbcThinDriver"); - startGridsMultiThreaded(3); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java index 99b79ea..6655ed8 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java @@ -23,8 +23,5 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; * Connection test. */ public class JdbcThinAbstractSelfTest extends GridCommonAbstractTest { - /** {@inheritDoc} */ - @Override protected void beforeTestsStarted() throws Exception { - Class.forName("org.apache.ignite.IgniteJdbcThinDriver"); - } + // No-op. } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java index cea176e..ff49742 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java @@ -86,8 +86,6 @@ public class JdbcThinNoDefaultSchemaTest extends JdbcThinAbstractSelfTest { startGridsMultiThreaded(GRID_CNT); - Class.forName("org.apache.ignite.IgniteJdbcThinDriver"); - Ignite ignite = ignite(0); IgniteCache<Integer, Integer> cache1 = ignite.cache(CACHE1_NAME); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/core/src/main/java/META-INF/services/java.sql.Driver ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/META-INF/services/java.sql.Driver b/modules/core/src/main/java/META-INF/services/java.sql.Driver new file mode 100644 index 0000000..c2f62e9 --- /dev/null +++ b/modules/core/src/main/java/META-INF/services/java.sql.Driver @@ -0,0 +1,2 @@ +org.apache.ignite.IgniteJdbcDriver +org.apache.ignite.IgniteJdbcThinDriver \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java b/modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java index 345bbc3..47fe982 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java @@ -243,10 +243,7 @@ import org.apache.ignite.logger.java.JavaLogger; * </table> * <h1 class="header">Example</h1> * <pre name="code" class="java"> - * // Register JDBC driver. - * Class.forName("org.apache.ignite.IgniteJdbcDriver"); - * - * // Open JDBC connection. + * // Open JDBC connection. * Connection conn = DriverManager.getConnection("jdbc:ignite:cfg//cache=persons@file:///etc/configs/ignite-jdbc.xml"); * * // Query persons' names @@ -371,8 +368,8 @@ public class IgniteJdbcDriver implements Driver { /** Logger. */ private static final IgniteLogger LOG = new JavaLogger(); - /** - * Register driver. + /* + * Static initializer. */ static { try { http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/core/src/main/java/org/apache/ignite/IgniteJdbcThinDriver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteJdbcThinDriver.java b/modules/core/src/main/java/org/apache/ignite/IgniteJdbcThinDriver.java index 3e3511b..7766d98 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteJdbcThinDriver.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteJdbcThinDriver.java @@ -26,6 +26,7 @@ import java.sql.SQLFeatureNotSupportedException; import java.util.Arrays; import java.util.List; import java.util.Properties; +import java.util.logging.Level; import java.util.logging.Logger; import org.apache.ignite.cache.affinity.AffinityKey; import org.apache.ignite.internal.IgniteVersionUtils; @@ -101,9 +102,6 @@ import org.apache.ignite.internal.util.typedef.F; * </table> * <h1 class="header">Example</h1> * <pre name="code" class="java"> - * // Register JDBC driver. - * Class.forName("org.apache.ignite.IgniteJdbcThinDriver"); - * * // Open JDBC connection. * Connection conn = DriverManager.getConnection("jdbc:ignite:thin//localhost:10800"); * @@ -133,6 +131,18 @@ import org.apache.ignite.internal.util.typedef.F; */ @SuppressWarnings("JavadocReference") public class IgniteJdbcThinDriver implements Driver { + /* + * Static initializer. + */ + static { + try { + DriverManager.registerDriver(new IgniteJdbcThinDriver()); + } + catch (SQLException e) { + throw new RuntimeException("Failed to register " + IgniteJdbcThinDriver.class.getName(), e); + } + } + /** Major version. */ private static final int MAJOR_VER = IgniteVersionUtils.VER.major(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0605829/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/SqlConnectorConfigurationValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/SqlConnectorConfigurationValidationSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/SqlConnectorConfigurationValidationSelfTest.java index dedc5fd..da46b70 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/SqlConnectorConfigurationValidationSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/SqlConnectorConfigurationValidationSelfTest.java @@ -48,11 +48,6 @@ public class SqlConnectorConfigurationValidationSelfTest extends GridCommonAbstr private static final String CACHE_NAME = "CACHE"; /** {@inheritDoc} */ - @Override protected void beforeTestsStarted() throws Exception { - Class.forName("org.apache.ignite.IgniteJdbcThinDriver"); - } - - /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { stopAllGrids(); }
