ignite-1794 Refactored hibernate modules, switched to hibernate 5.1

apache · Apr 26, 2017 · ee1b19d · ee1b19d
1 parent c9cd761
commit ee1b19d
Show file tree

Hide file tree

Showing 99 changed files with 1,831 additions and 2,851 deletions.
diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml
@@ -127,8 +127,9 @@
                 <exclude>org.apache.ignite:ignite-hadoop</exclude>
                 <exclude>org.apache.ignite:ignite-codegen</exclude>
                 <exclude>org.apache.ignite:ignite-apache-license-gen</exclude>
-                <exclude>org.apache.ignite:ignite-hibernate</exclude>
+                <exclude>org.apache.ignite:ignite-hibernate-core</exclude>
-                <exclude>org.apache.ignite:ignite-hibernate5</exclude>
+                <exclude>org.apache.ignite:ignite-hibernate_4.2</exclude>
+                <exclude>org.apache.ignite:ignite-hibernate_5.1</exclude>
                 <exclude>org.apache.ignite:ignite-schedule</exclude>
                 <exclude>org.apache.ignite:ignite-geospatial</exclude>
                 <exclude>org.apache.ignite:ignite-appserver-test</exclude>

diff --git a/examples/pom-standalone-lgpl.xml b/examples/pom-standalone-lgpl.xml
@@ -191,7 +191,7 @@
             <dependencies>
                 <dependency>
                     <groupId>org.apache.ignite</groupId>
-                    <artifactId>ignite-hibernate</artifactId>
+                    <artifactId>ignite-hibernate_5.1</artifactId>
                     <version>to_be_replaced_by_ignite_version</version>
                 </dependency>
 

diff --git a/examples/pom-standalone.xml b/examples/pom-standalone.xml
@@ -192,7 +192,7 @@
             <dependencies>
                 <dependency>
                     <groupId>org.apache.ignite</groupId>
-                    <artifactId>ignite-hibernate</artifactId>
+                    <artifactId>ignite-hibernate_5.1</artifactId>
                     <version>to_be_replaced_by_ignite_version</version>
                 </dependency>
 

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -62,24 +62,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-hibernate</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-schedule</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-geospatial</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-spring-data</artifactId>
@@ -288,6 +270,26 @@
                 <lgpl.folder>src/main/java-lgpl</lgpl.folder>
                 <lgpl.test.folder>src/test/java-lgpl</lgpl.test.folder>
             </properties>
+
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.ignite</groupId>
+                    <artifactId>ignite-hibernate_5.1</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.ignite</groupId>
+                    <artifactId>ignite-schedule</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.ignite</groupId>
+                    <artifactId>ignite-geospatial</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+            </dependencies>
         </profile>
     </profiles>
 

diff --git a/...main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java b/...main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
@@ -31,9 +31,9 @@
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.service.ServiceRegistryBuilder;
 import org.hibernate.stat.SecondLevelCacheStatistics;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@ -226,14 +226,14 @@ private static IgniteCache createCache(String name, CacheAtomicityMode atomicity
      * @return New Hibernate {@link SessionFactory}.
      */
     private static SessionFactory createHibernateSessionFactory(URL hibernateCfg) {
-        ServiceRegistryBuilder builder = new ServiceRegistryBuilder();
+        StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder();
 
         builder.applySetting("hibernate.connection.url", JDBC_URL);
         builder.applySetting("hibernate.show_sql", true);
 
-        return new Configuration()
+        builder.configure(hibernateCfg);
-            .configure(hibernateCfg)
+
-            .buildSessionFactory(builder.buildServiceRegistry());
+        return new MetadataSources(builder.build()).buildMetadata().buildSessionFactory();
     }
 
     /**

diff --git a/modules/hibernate/README.txt → modules/hibernate-4.2/README.txt b/modules/hibernate/README.txt → modules/hibernate-4.2/README.txt
@@ -24,7 +24,7 @@ interested in):
         ...
         <dependency>
             <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-hibernate</artifactId>
+            <artifactId>ignite-hibernate_4.2</artifactId>
             <version>${ignite.version}</version>
         </dependency>
         ...

diff --git a/modules/hibernate/licenses/apache-2.0.txt → ...les/hibernate-4.2/licenses/apache-2.0.txt b/modules/hibernate/licenses/apache-2.0.txt → ...les/hibernate-4.2/licenses/apache-2.0.txt
diff --git a/modules/hibernate/pom.xml → modules/hibernate-4.2/pom.xml b/modules/hibernate/pom.xml → modules/hibernate-4.2/pom.xml
@@ -30,7 +30,7 @@
         <relativePath>../../parent</relativePath>
     </parent>
 
-    <artifactId>ignite-hibernate</artifactId>
+    <artifactId>ignite-hibernate_4.2</artifactId>
     <version>2.0.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
@@ -41,10 +41,16 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-hibernate-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>4.2.6.Final</version>
+            <version>4.2.21.Final</version>
         </dependency>
 
         <dependency>
@@ -117,6 +123,13 @@
             <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.8</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...ibernateAbstractRegionAccessStrategy.java → ...ibernateAbstractRegionAccessStrategy.java b/...ibernateAbstractRegionAccessStrategy.java → ...ibernateAbstractRegionAccessStrategy.java
@@ -27,12 +27,12 @@
  */
 public abstract class HibernateAbstractRegionAccessStrategy implements RegionAccessStrategy {
     /** */
-    protected final HibernateAccessStrategyAdapter stgy;
+    final HibernateAccessStrategyAdapter stgy;
 
     /**
      * @param stgy Access strategy implementation.
      */
-    protected HibernateAbstractRegionAccessStrategy(HibernateAccessStrategyAdapter stgy) {
+    HibernateAbstractRegionAccessStrategy(HibernateAccessStrategyAdapter stgy) {
         this.stgy = stgy;
     }
 
@@ -58,22 +58,26 @@ protected HibernateAbstractRegionAccessStrategy(HibernateAccessStrategyAdapter s
 
     /** {@inheritDoc} */
     @Nullable @Override public SoftLock lockItem(Object key, Object ver) throws CacheException {
-        return stgy.lock(key);
+        stgy.lock(key);
+
+        return null;
     }
 
     /** {@inheritDoc} */
     @Nullable @Override public SoftLock lockRegion() throws CacheException {
-        return stgy.lockRegion();
+        stgy.lockRegion();
+
+        return null;
     }
 
     /** {@inheritDoc} */
     @Override public void unlockRegion(SoftLock lock) throws CacheException {
-        stgy.unlockRegion(lock);
+        stgy.unlockRegion();
     }
 
     /** {@inheritDoc} */
     @Override public void unlockItem(Object key, SoftLock lock) throws CacheException {
-        stgy.unlock(key, lock);
+        stgy.unlock(key);
     }
 
     /** {@inheritDoc} */

diff --git a/.../hibernate/HibernateCollectionRegion.java → .../hibernate/HibernateCollectionRegion.java b/.../hibernate/HibernateCollectionRegion.java → .../hibernate/HibernateCollectionRegion.java
@@ -70,7 +70,7 @@ public class HibernateCollectionRegion extends HibernateTransactionalDataRegion
      * @param cache Region cache.
      * @param dataDesc Region data description.
      */
-    public HibernateCollectionRegion(HibernateRegionFactory factory, String name,
+    HibernateCollectionRegion(HibernateRegionFactory factory, String name,
         Ignite ignite, HibernateCacheProxy cache, CacheDataDescription dataDesc) {
         super(factory, name, ignite, cache, dataDesc);
     }

diff --git a/...ache/hibernate/HibernateEntityRegion.java → ...ache/hibernate/HibernateEntityRegion.java b/...ache/hibernate/HibernateEntityRegion.java → ...ache/hibernate/HibernateEntityRegion.java
@@ -60,7 +60,7 @@ public class HibernateEntityRegion extends HibernateTransactionalDataRegion impl
      * @param cache Region cache,
      * @param dataDesc Region data description.
      */
-    public HibernateEntityRegion(HibernateRegionFactory factory, String name, Ignite ignite,
+    HibernateEntityRegion(HibernateRegionFactory factory, String name, Ignite ignite,
         HibernateCacheProxy cache, CacheDataDescription dataDesc) {
         super(factory, name, ignite, cache, dataDesc);
     }
@@ -106,7 +106,7 @@ private AccessStrategy(HibernateAccessStrategyAdapter stgy) {
         /** {@inheritDoc} */
         @Override public boolean afterUpdate(Object key, Object val, Object currVer, Object previousVer, SoftLock lock)
             throws CacheException {
-            return stgy.afterUpdate(key, val, lock);
+            return stgy.afterUpdate(key, val);
         }
     }
 }
diff --git a/...hibernate/HibernateGeneralDataRegion.java → ...hibernate/HibernateGeneralDataRegion.java b/...hibernate/HibernateGeneralDataRegion.java → ...hibernate/HibernateGeneralDataRegion.java
@@ -36,7 +36,7 @@ public class HibernateGeneralDataRegion extends HibernateRegion implements Gener
      * @param ignite Grid.
      * @param cache Region cache.
      */
-    public HibernateGeneralDataRegion(HibernateRegionFactory factory, String name,
+    HibernateGeneralDataRegion(HibernateRegionFactory factory, String name,
         Ignite ignite, HibernateCacheProxy cache) {
         super(factory, name, ignite, cache);
     }
@@ -66,6 +66,11 @@ public HibernateGeneralDataRegion(HibernateRegionFactory factory, String name,
 
     /** {@inheritDoc} */
     @Override public void evictAll() throws CacheException {
-        HibernateAccessStrategyAdapter.evictAll(cache);
+        try {
+            HibernateAccessStrategyAdapter.evictAll(cache);
+        }
+        catch (IgniteCheckedException e) {
+            throw HibernateRegionFactory.EXCEPTION_CONVERTER.convert(e);
+        }
     }
 }
diff --git a/.../cache/hibernate/HibernateKeyWrapper.java → .../cache/hibernate/HibernateKeyWrapper.java b/.../cache/hibernate/HibernateKeyWrapper.java → .../cache/hibernate/HibernateKeyWrapper.java
@@ -17,12 +17,13 @@
 
 package org.apache.ignite.cache.hibernate;
 
+import java.io.Serializable;
 import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
  * Hibernate cache key wrapper.
  */
-public class HibernateKeyWrapper {
+public class HibernateKeyWrapper implements Serializable {
     /** Key. */
     private final Object key;
 

diff --git a/...e/hibernate/HibernateNaturalIdRegion.java → ...e/hibernate/HibernateNaturalIdRegion.java b/...e/hibernate/HibernateNaturalIdRegion.java → ...e/hibernate/HibernateNaturalIdRegion.java
@@ -50,8 +50,11 @@ public class HibernateNaturalIdRegion extends HibernateTransactionalDataRegion i
      * @param cache Region cache,
      * @param dataDesc Region data description.
      */
-    public HibernateNaturalIdRegion(HibernateRegionFactory factory, String name,
+    HibernateNaturalIdRegion(HibernateRegionFactory factory,
-        Ignite ignite, HibernateCacheProxy cache, CacheDataDescription dataDesc) {
+        String name,
+        Ignite ignite,
+        HibernateCacheProxy cache,
+        CacheDataDescription dataDesc) {
         super(factory, name, ignite, cache, dataDesc);
     }
 
@@ -94,7 +97,7 @@ private AccessStrategy(HibernateAccessStrategyAdapter stgy) {
 
         /** {@inheritDoc} */
         @Override public boolean afterUpdate(Object key, Object val, SoftLock lock) throws CacheException {
-            return stgy.afterUpdate(key, val, lock);
+            return stgy.afterUpdate(key, val);
         }
     }
 }
diff --git a/...ibernate/HibernateQueryResultsRegion.java → ...ibernate/HibernateQueryResultsRegion.java b/...ibernate/HibernateQueryResultsRegion.java → ...ibernate/HibernateQueryResultsRegion.java
@@ -56,14 +56,14 @@
  * values. For this reason, the query cache should always be used in conjunction with
  * the second-level cache for those entities expected to be cached as part of a query result cache
  */
-public class HibernateQueryResultsRegion extends HibernateGeneralDataRegion implements QueryResultsRegion {
+class HibernateQueryResultsRegion extends HibernateGeneralDataRegion implements QueryResultsRegion {
     /**
      * @param factory Region factory.
      * @param name Region name.
      * @param ignite Grid.
      * @param cache Region cache.
      */
-    public HibernateQueryResultsRegion(HibernateRegionFactory factory, String name,
+    HibernateQueryResultsRegion(HibernateRegionFactory factory, String name,
         Ignite ignite, HibernateCacheProxy cache) {
         super(factory, name, ignite, cache);
     }

diff --git a/...nite/cache/hibernate/HibernateRegion.java → ...nite/cache/hibernate/HibernateRegion.java b/...nite/cache/hibernate/HibernateRegion.java → ...nite/cache/hibernate/HibernateRegion.java
@@ -45,7 +45,7 @@ public class HibernateRegion implements Region {
      * @param ignite Grid.
      * @param cache Region cache.
      */
-    public HibernateRegion(HibernateRegionFactory factory, String name, Ignite ignite, HibernateCacheProxy cache) {
+    HibernateRegion(HibernateRegionFactory factory, String name, Ignite ignite, HibernateCacheProxy cache) {
         this.factory = factory;
         this.name = name;
         this.ignite = ignite;