HHH-5765 : Wire in dialect factory and resolvers from service registry

infinispan · Jul 5, 2017 · 37ace09 · 37ace09
1 parent db6ba49
commit 37ace09
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 22 deletions.
diff --git a/...test/java/org/hibernate/test/cache/infinispan/AbstractEntityCollectionRegionTestCase.java b/...test/java/org/hibernate/test/cache/infinispan/AbstractEntityCollectionRegionTestCase.java
@@ -65,7 +65,7 @@ private void supportedAccessTypeTest() throws Exception {
       String entityCfg = "entity";
       cfg.setProperty(InfinispanRegionFactory.ENTITY_CACHE_RESOURCE_PROP, entityCfg);
       InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(
-			  getConnectionProvider(), cfg, getCacheTestSupport()
+			  getJdbcServices(), cfg, getCacheTestSupport()
 	  );
       supportedAccessTypeTest(regionFactory, cfg.getProperties());
    }
@@ -85,7 +85,7 @@ private void supportedAccessTypeTest() throws Exception {
    public void testIsTransactionAware() throws Exception {
       Configuration cfg = CacheTestUtil.buildConfiguration("test", InfinispanRegionFactory.class, true, false);
       InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(
-			  getConnectionProvider(), cfg, getCacheTestSupport()
+			  getJdbcServices(), cfg, getCacheTestSupport()
 	  );
       TransactionalDataRegion region = (TransactionalDataRegion) createRegion(regionFactory, "test/test", cfg.getProperties(), getCacheDataDescription());
       assertTrue("Region is transaction-aware", region.isTransactionAware());
@@ -94,7 +94,7 @@ public void testIsTransactionAware() throws Exception {
       // Make it non-transactional
       cfg.getProperties().remove(Environment.TRANSACTION_MANAGER_STRATEGY);
       regionFactory = CacheTestUtil.startRegionFactory(
-			  getConnectionProvider(), cfg, getCacheTestSupport()
+			  getJdbcServices(), cfg, getCacheTestSupport()
 	  );
       region = (TransactionalDataRegion) createRegion(regionFactory, "test/test", cfg.getProperties(), getCacheDataDescription());
       assertFalse("Region is not transaction-aware", region.isTransactionAware());
@@ -104,7 +104,7 @@ public void testIsTransactionAware() throws Exception {
    public void testGetCacheDataDescription() throws Exception {
       Configuration cfg = CacheTestUtil.buildConfiguration("test", InfinispanRegionFactory.class, true, false);
       InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(
-			  getConnectionProvider(), cfg, getCacheTestSupport()
+			  getJdbcServices(), cfg, getCacheTestSupport()
 	  );
       TransactionalDataRegion region = (TransactionalDataRegion) createRegion(regionFactory, "test/test", cfg.getProperties(), getCacheDataDescription());
       CacheDataDescription cdd = region.getCacheDataDescription();

diff --git a/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java b/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java
@@ -73,7 +73,7 @@ public void testEvict() throws Exception {
    private void evictOrRemoveTest() throws Exception {
       Configuration cfg = createConfiguration();
       InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(
-			  getConnectionProvider(), cfg, getCacheTestSupport()
+			  getJdbcServices(), cfg, getCacheTestSupport()
 	  );
       CacheAdapter localCache = getInfinispanCache(regionFactory);
       boolean invalidation = localCache.isClusteredInvalidation();
@@ -86,7 +86,7 @@ private void evictOrRemoveTest() throws Exception {
 
       cfg = createConfiguration();
       regionFactory = CacheTestUtil.startRegionFactory(
-			  getConnectionProvider(), cfg, getCacheTestSupport()
+			  getJdbcServices(), cfg, getCacheTestSupport()
 	  );
 
       GeneralDataRegion remoteRegion = (GeneralDataRegion) createRegion(regionFactory,
@@ -126,7 +126,7 @@ public void testEvictAll() throws Exception {
    private void evictOrRemoveAllTest(String configName) throws Exception {
       Configuration cfg = createConfiguration();
       InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(
-			  getConnectionProvider(), cfg, getCacheTestSupport()
+			  getJdbcServices(), cfg, getCacheTestSupport()
 	  );
       CacheAdapter localCache = getInfinispanCache(regionFactory);
 
@@ -138,7 +138,7 @@ private void evictOrRemoveAllTest(String configName) throws Exception {
 
       cfg = createConfiguration();
       regionFactory = CacheTestUtil.startRegionFactory(
-			  getConnectionProvider(), cfg, getCacheTestSupport()
+			  getJdbcServices(), cfg, getCacheTestSupport()
 	  );
       CacheAdapter remoteCache = getInfinispanCache(regionFactory);
 

diff --git a/...nate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java b/...nate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java
@@ -548,13 +548,13 @@ protected void setUp() throws Exception {
 
          localCfg = createConfiguration(configName, configResource);
          localRegionFactory = CacheTestUtil.startRegionFactory(
-				 serviceRegistryHolder.getJdbcServicesImpl().getConnectionProvider(),
+				 serviceRegistryHolder.getJdbcServicesImpl(),
 				 localCfg
 		 );
 
          remoteCfg = createConfiguration(configName, configResource);
          remoteRegionFactory = CacheTestUtil.startRegionFactory(
-				 serviceRegistryHolder.getJdbcServicesImpl().getConnectionProvider(),
+				 serviceRegistryHolder.getJdbcServicesImpl(),
 				 remoteCfg
 		 );
       }

diff --git a/...st/java/org/hibernate/test/cache/infinispan/collection/TransactionalExtraAPITestCase.java b/...st/java/org/hibernate/test/cache/infinispan/collection/TransactionalExtraAPITestCase.java
@@ -55,7 +55,7 @@ protected void setUp() throws Exception {
        if (getCollectionAccessStrategy() == null) {
            Configuration cfg = createConfiguration();
            InfinispanRegionFactory rf  = CacheTestUtil.startRegionFactory(
-				   getConnectionProvider(), cfg, getCacheTestSupport()
+				   getJdbcServices(), cfg, getCacheTestSupport()
 		   );
 
            // Sleep a bit to avoid concurrent FLUSH problem

diff --git a/...rg/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java b/...rg/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java
@@ -665,13 +665,13 @@ protected void setUp() throws Exception {
 
          localCfg = createConfiguration(configName);
          localRegionFactory = CacheTestUtil.startRegionFactory(
-				 serviceRegistryHolder.getJdbcServicesImpl().getConnectionProvider(),
+				 serviceRegistryHolder.getJdbcServicesImpl(),
 				 localCfg
 		 );
 
          remoteCfg = createConfiguration(configName);
          remoteRegionFactory = CacheTestUtil.startRegionFactory(
-				 serviceRegistryHolder.getJdbcServicesImpl().getConnectionProvider(),
+				 serviceRegistryHolder.getJdbcServicesImpl(),
 				 remoteCfg
 		 );
       }

diff --git a/src/test/java/org/hibernate/test/cache/infinispan/entity/TransactionalExtraAPITestCase.java b/src/test/java/org/hibernate/test/cache/infinispan/entity/TransactionalExtraAPITestCase.java
@@ -61,7 +61,7 @@ protected void setUp() throws Exception {
        if (getEntityAccessStrategy() == null) {
            Configuration cfg = createConfiguration();
            InfinispanRegionFactory rf  = CacheTestUtil.startRegionFactory(
-				   getConnectionProvider(), cfg, getCacheTestSupport()
+				   getJdbcServices(), cfg, getCacheTestSupport()
 		   );
 
            // Sleep a bit to avoid concurrent FLUSH problem

diff --git a/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java b/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java
@@ -91,7 +91,7 @@ public void testPutDoesNotBlockGet() throws Exception {
    private void putDoesNotBlockGetTest() throws Exception {
       Configuration cfg = createConfiguration();
       InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(
-			  getConnectionProvider(), cfg, getCacheTestSupport());
+			  getJdbcServices(), cfg, getCacheTestSupport());
 
       // Sleep a bit to avoid concurrent FLUSH problem
       avoidConcurrentFlush();
@@ -177,7 +177,7 @@ public void testGetDoesNotBlockPut() throws Exception {
    private void getDoesNotBlockPutTest() throws Exception {
       Configuration cfg = createConfiguration();
       InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(
-			  getConnectionProvider(), cfg, getCacheTestSupport()
+			  getJdbcServices(), cfg, getCacheTestSupport()
 	  );
 
       // Sleep a bit to avoid concurrent FLUSH problem

diff --git a/...test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java b/...test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
@@ -87,14 +87,14 @@ protected CacheAdapter getInfinispanCache(InfinispanRegionFactory regionFactory)
    public void testClearTimestampsRegionInIsolated() throws Exception {
       Configuration cfg = createConfiguration();
       InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(
-			  getConnectionProvider(), cfg, getCacheTestSupport()
+			  getJdbcServices(), cfg, getCacheTestSupport()
 	  );
       // Sleep a bit to avoid concurrent FLUSH problem
       avoidConcurrentFlush();
 
       Configuration cfg2 = createConfiguration();
       InfinispanRegionFactory regionFactory2 = CacheTestUtil.startRegionFactory(
-			  getConnectionProvider(), cfg2, getCacheTestSupport()
+			  getJdbcServices(), cfg2, getCacheTestSupport()
 	  );
       // Sleep a bit to avoid concurrent FLUSH problem
       avoidConcurrentFlush();

diff --git a/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestUtil.java b/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestUtil.java
@@ -36,6 +36,7 @@
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
 import org.hibernate.cfg.Settings;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.service.spi.ServicesRegistry;
 
@@ -73,11 +74,11 @@ public static Configuration buildCustomQueryCacheConfiguration(String regionPref
       return cfg;
    }
 
-   public static InfinispanRegionFactory startRegionFactory(ConnectionProvider connectionProvider,
+   public static InfinispanRegionFactory startRegionFactory(JdbcServices jdbcServices,
 															Configuration cfg)
 		   throws ClassNotFoundException, InstantiationException, IllegalAccessException {
 
-      Settings settings = cfg.buildSettings( connectionProvider );
+      Settings settings = cfg.buildSettings( jdbcServices );
       Properties properties = cfg.getProperties();
 
       String factoryType = cfg.getProperty(Environment.CACHE_REGION_FACTORY);
@@ -89,11 +90,11 @@ public static InfinispanRegionFactory startRegionFactory(ConnectionProvider conn
       return regionFactory;
    }
 
-   public static InfinispanRegionFactory startRegionFactory(ConnectionProvider connectionProvider,
+   public static InfinispanRegionFactory startRegionFactory(JdbcServices jdbcServices,
 															Configuration cfg,
 															CacheTestSupport testSupport)
             throws ClassNotFoundException, InstantiationException, IllegalAccessException {
-      InfinispanRegionFactory factory = startRegionFactory(connectionProvider, cfg);
+      InfinispanRegionFactory factory = startRegionFactory(jdbcServices, cfg);
       testSupport.registerFactory(factory);
       return factory;
    }