You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by mm...@apache.org on 2022/05/06 11:01:36 UTC
[ignite] branch master updated: IGNITE-16908 Move ignite-hibernate to the Ignite Extensions project (#10012)
This is an automated email from the ASF dual-hosted git repository.
mmuzaf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new bcde8aa3719 IGNITE-16908 Move ignite-hibernate to the Ignite Extensions project (#10012)
bcde8aa3719 is described below
commit bcde8aa37197e19a5ac802626cf29ceace050821
Author: Maxim Muzafarov <ma...@gmail.com>
AuthorDate: Fri May 6 14:01:29 2022 +0300
IGNITE-16908 Move ignite-hibernate to the Ignite Extensions project (#10012)
---
assembly/dependencies-apache-ignite-slim.xml | 4 -
assembly/dependencies-apache-ignite.xml | 4 -
assembly/libs/README.txt | 2 -
docs/_data/toc.yaml | 2 -
.../hibernate-l2-cache.adoc | 19 +-
docs/_docs/setup.adoc | 12 +-
examples/README.txt | 2 +-
examples/config/hibernate/README.txt | 8 -
.../hibernate/example-hibernate-L2-cache.xml | 64 -
examples/pom-standalone-lgpl.xml | 6 -
examples/pom-standalone.xml | 6 -
examples/pom.xml | 6 -
.../hibernate/HibernateL2CacheExample.java | 305 ---
.../ignite/examples/datagrid/hibernate/Post.java | 130 --
.../ignite/examples/datagrid/hibernate/User.java | 154 --
.../examples/datagrid/hibernate/package-info.java | 22 -
.../store/hibernate/CacheHibernatePersonStore.java | 122 --
.../hibernate/CacheHibernateStoreExample.java | 164 --
.../datagrid/store/hibernate/Person.hbm.xml | 34 -
.../datagrid/store/hibernate/hibernate.cfg.xml | 44 -
.../datagrid/store/hibernate/package-info.java | 22 -
.../HibernateL2CacheExampleMultiNodeSelfTest.java | 31 -
.../examples/HibernateL2CacheExampleSelfTest.java | 33 -
.../IgniteLgplExamplesSelfTestSuite.java | 4 -
modules/bom/pom.xml | 5 -
.../org/apache/ignite/cache/store/CacheStore.java | 2 +-
.../cache/store/CacheStoreSessionListener.java | 4 +-
modules/dev-utils/ignite-modules-test/build.gradle | 4 -
modules/geospatial/README.txt | 1 -
modules/hibernate-4.2/README.txt | 48 -
modules/hibernate-4.2/licenses/apache-2.0.txt | 202 --
modules/hibernate-4.2/pom.xml | 201 --
.../HibernateAbstractRegionAccessStrategy.java | 102 -
.../cache/hibernate/HibernateCollectionRegion.java | 100 -
.../cache/hibernate/HibernateEntityRegion.java | 112 --
.../hibernate/HibernateGeneralDataRegion.java | 76 -
.../cache/hibernate/HibernateKeyWrapper.java | 80 -
.../cache/hibernate/HibernateNaturalIdRegion.java | 103 -
.../hibernate/HibernateQueryResultsRegion.java | 70 -
.../ignite/cache/hibernate/HibernateRegion.java | 99 -
.../cache/hibernate/HibernateRegionFactory.java | 179 --
.../cache/hibernate/HibernateTimestampsRegion.java | 39 -
.../HibernateTransactionalDataRegion.java | 84 -
.../ignite/cache/hibernate/package-info.java | 25 -
.../store/hibernate/CacheHibernateBlobStore.java | 546 ------
.../hibernate/CacheHibernateBlobStoreEntry.hbm.xml | 31 -
.../hibernate/CacheHibernateBlobStoreEntry.java | 89 -
.../hibernate/CacheHibernateBlobStoreFactory.java | 235 ---
.../CacheHibernateStoreSessionListener.java | 222 ---
.../ignite/cache/store/hibernate/package-info.java | 23 -
.../src/test/config/factory-cache.xml | 59 -
.../src/test/config/factory-cache1.xml | 61 -
.../test/config/factory-incorrect-store-cache.xml | 60 -
.../HibernateL2CacheConfigurationSelfTest.java | 390 ----
.../hibernate/HibernateL2CacheMultiJvmTest.java | 441 -----
.../cache/hibernate/HibernateL2CacheSelfTest.java | 1945 -------------------
.../HibernateL2CacheStrategySelfTest.java | 594 ------
.../HibernateL2CacheTransactionalSelfTest.java | 153 --
...bernateL2CacheTransactionalUseSyncSelfTest.java | 31 -
.../CacheHibernateBlobStoreNodeRestartTest.java | 47 -
.../hibernate/CacheHibernateBlobStoreSelfTest.java | 109 --
.../CacheHibernateStoreFactorySelfTest.java | 292 ---
...CacheHibernateStoreSessionListenerSelfTest.java | 238 ---
.../ignite/cache/store/hibernate/hibernate.cfg.xml | 42 -
.../ignite/cache/store/hibernate/package-info.java | 23 -
.../testsuites/IgniteHibernateTestSuite.java | 54 -
modules/hibernate-5.1/README.txt | 48 -
modules/hibernate-5.1/licenses/apache-2.0.txt | 202 --
modules/hibernate-5.1/pom.xml | 214 ---
.../HibernateAbstractRegionAccessStrategy.java | 103 -
.../cache/hibernate/HibernateCollectionRegion.java | 114 --
.../cache/hibernate/HibernateEntityRegion.java | 135 --
.../hibernate/HibernateGeneralDataRegion.java | 79 -
.../cache/hibernate/HibernateKeyWrapper.java | 109 --
.../cache/hibernate/HibernateNaturalIdRegion.java | 113 --
.../hibernate/HibernateQueryResultsRegion.java | 70 -
.../ignite/cache/hibernate/HibernateRegion.java | 99 -
.../cache/hibernate/HibernateRegionFactory.java | 168 --
.../cache/hibernate/HibernateTimestampsRegion.java | 39 -
.../HibernateTransactionalDataRegion.java | 84 -
.../ignite/cache/hibernate/package-info.java | 25 -
.../store/hibernate/CacheHibernateBlobStore.java | 547 ------
.../hibernate/CacheHibernateBlobStoreEntry.hbm.xml | 31 -
.../hibernate/CacheHibernateBlobStoreEntry.java | 89 -
.../hibernate/CacheHibernateBlobStoreFactory.java | 235 ---
.../CacheHibernateStoreSessionListener.java | 224 ---
.../ignite/cache/store/hibernate/package-info.java | 23 -
.../src/test/config/factory-cache.xml | 59 -
.../src/test/config/factory-cache1.xml | 61 -
.../test/config/factory-incorrect-store-cache.xml | 60 -
.../HibernateL2CacheConfigurationSelfTest.java | 389 ----
.../hibernate/HibernateL2CacheMultiJvmTest.java | 431 -----
.../cache/hibernate/HibernateL2CacheSelfTest.java | 1949 -------------------
.../HibernateL2CacheStrategySelfTest.java | 566 ------
.../HibernateL2CacheTransactionalSelfTest.java | 153 --
...bernateL2CacheTransactionalUseSyncSelfTest.java | 31 -
.../CacheHibernateBlobStoreNodeRestartTest.java | 47 -
.../hibernate/CacheHibernateBlobStoreSelfTest.java | 115 --
.../CacheHibernateStoreFactorySelfTest.java | 260 ---
...CacheHibernateStoreSessionListenerSelfTest.java | 242 ---
.../ignite/cache/store/hibernate/hibernate.cfg.xml | 42 -
.../ignite/cache/store/hibernate/package-info.java | 23 -
.../testsuites/IgniteHibernate5TestSuite.java | 54 -
modules/hibernate-5.3/licenses/apache-2.0.txt | 202 --
modules/hibernate-5.3/pom.xml | 212 ---
.../cache/hibernate/HibernateKeyWrapper.java | 109 --
.../ignite/cache/hibernate/HibernateRegion.java | 74 -
.../cache/hibernate/HibernateRegionFactory.java | 154 --
.../hibernate/IgniteCachedDomainDataAccess.java | 132 --
.../hibernate/IgniteCollectionDataAccess.java | 75 -
.../cache/hibernate/IgniteDomainDataRegion.java | 190 --
.../cache/hibernate/IgniteEntityDataAccess.java | 100 -
.../cache/hibernate/IgniteGeneralDataRegion.java | 89 -
.../cache/hibernate/IgniteNaturalIdDataAccess.java | 98 -
.../cache/hibernate/IgniteQueryResultsRegion.java | 70 -
.../cache/hibernate/IgniteTimestampsRegion.java | 40 -
.../ignite/cache/hibernate/package-info.java | 25 -
.../store/hibernate/CacheHibernateBlobStore.java | 545 ------
.../hibernate/CacheHibernateBlobStoreEntry.java | 89 -
.../hibernate/CacheHibernateBlobStoreFactory.java | 235 ---
.../CacheHibernateStoreSessionListener.java | 226 ---
.../ignite/cache/store/hibernate/package-info.java | 23 -
.../hibernate/CacheHibernateBlobStoreEntry.hbm.xml | 31 -
.../src/test/config/factory-cache.xml | 59 -
.../src/test/config/factory-cache1.xml | 61 -
.../test/config/factory-incorrect-store-cache.xml | 60 -
.../HibernateL2CacheConfigurationSelfTest.java | 414 ----
.../hibernate/HibernateL2CacheMultiJvmTest.java | 436 -----
.../cache/hibernate/HibernateL2CacheSelfTest.java | 1988 --------------------
.../HibernateL2CacheStrategySelfTest.java | 573 ------
.../HibernateL2CacheTransactionalSelfTest.java | 155 --
...bernateL2CacheTransactionalUseSyncSelfTest.java | 31 -
.../CacheHibernateBlobStoreNodeRestartTest.java | 47 -
.../hibernate/CacheHibernateBlobStoreSelfTest.java | 115 --
.../CacheHibernateStoreFactorySelfTest.java | 332 ----
...CacheHibernateStoreSessionListenerSelfTest.java | 242 ---
.../ignite/cache/store/hibernate/hibernate.cfg.xml | 41 -
.../ignite/cache/store/hibernate/package-info.java | 23 -
.../testsuites/IgniteHibernate53TestSuite.java | 50 -
.../ignite/cache/store/hibernate/hibernate.cfg.xml | 41 -
modules/hibernate-core/pom.xml | 83 -
.../hibernate/HibernateAccessStrategyAdapter.java | 352 ----
.../hibernate/HibernateAccessStrategyFactory.java | 269 ---
.../cache/hibernate/HibernateCacheProxy.java | 770 --------
.../hibernate/HibernateExceptionConverter.java | 29 -
.../cache/hibernate/HibernateKeyTransformer.java | 29 -
.../HibernateNonStrictAccessStrategy.java | 236 ---
.../hibernate/HibernateReadOnlyAccessStrategy.java | 109 --
.../HibernateReadWriteAccessStrategy.java | 358 ----
.../HibernateTransactionalAccessStrategy.java | 155 --
.../ignite/cache/hibernate/package-info.java | 25 -
modules/osgi-karaf/src/main/resources/features.xml | 14 +-
.../osgi/IgniteKarafFeaturesInstallationTest.java | 3 +-
modules/schedule/README.txt | 1 -
pom.xml | 7 -
155 files changed, 29 insertions(+), 25452 deletions(-)
diff --git a/assembly/dependencies-apache-ignite-slim.xml b/assembly/dependencies-apache-ignite-slim.xml
index c5795e8fc0b..9da7de0aeb0 100644
--- a/assembly/dependencies-apache-ignite-slim.xml
+++ b/assembly/dependencies-apache-ignite-slim.xml
@@ -128,10 +128,6 @@
<exclude>${project.groupId}:ignite-visor-plugins</exclude>
<exclude>${project.groupId}:ignite-hadoop</exclude>
<exclude>${project.groupId}:ignite-codegen</exclude>
- <exclude>${project.groupId}:ignite-hibernate-core</exclude>
- <exclude>${project.groupId}:ignite-hibernate_4.2</exclude>
- <exclude>${project.groupId}:ignite-hibernate_5.1</exclude>
- <exclude>${project.groupId}:ignite-hibernate_5.3</exclude>
<exclude>${project.groupId}:ignite-schedule</exclude>
<exclude>${project.groupId}:ignite-geospatial</exclude>
<exclude>${project.groupId}:ignite-appserver-test</exclude>
diff --git a/assembly/dependencies-apache-ignite.xml b/assembly/dependencies-apache-ignite.xml
index 31ae5068727..2a02dc57135 100644
--- a/assembly/dependencies-apache-ignite.xml
+++ b/assembly/dependencies-apache-ignite.xml
@@ -128,10 +128,6 @@
<exclude>${project.groupId}:ignite-visor-console_2.10</exclude>
<exclude>${project.groupId}:ignite-visor-plugins</exclude>
<exclude>${project.groupId}:ignite-codegen</exclude>
- <exclude>${project.groupId}:ignite-hibernate-core</exclude>
- <exclude>${project.groupId}:ignite-hibernate_4.2</exclude>
- <exclude>${project.groupId}:ignite-hibernate_5.1</exclude>
- <exclude>${project.groupId}:ignite-hibernate_5.3</exclude>
<exclude>${project.groupId}:ignite-schedule</exclude>
<exclude>${project.groupId}:ignite-geospatial</exclude>
<exclude>${project.groupId}:ignite-appserver-test</exclude>
diff --git a/assembly/libs/README.txt b/assembly/libs/README.txt
index 657045a00d5..6da7c65a137 100644
--- a/assembly/libs/README.txt
+++ b/assembly/libs/README.txt
@@ -74,8 +74,6 @@ The following modules are available:
- ignite-aop (for AOP-based grid-enabling)
- ignite-cassandra (for Apache Cassandra integration)
- ignite-cloud (for Apache JClouds integration)
-- ignite-hibernate (for Hibernate integration)
-- ignite-hibernate5 (for Hibernate5 integration)
- ignite-indexing (for SQL querying and indexing)
- ignite-jcl (for Apache Commons logging)
- ignite-jta (for XA integration)
diff --git a/docs/_data/toc.yaml b/docs/_data/toc.yaml
index b3baa914270..295dc9990a9 100644
--- a/docs/_data/toc.yaml
+++ b/docs/_data/toc.yaml
@@ -515,8 +515,6 @@
url: extensions-and-integrations/ignite-for-spark/spark-shell
- title: Troubleshooting
url: extensions-and-integrations/ignite-for-spark/troubleshooting
- - title: Hibernate L2 Cache
- url: extensions-and-integrations/hibernate-l2-cache
- title: MyBatis L2 Cache
url: extensions-and-integrations/mybatis-l2-cache
- title: Streaming
diff --git a/docs/_docs/extensions-and-integrations/hibernate-l2-cache.adoc b/docs/_docs/extensions-and-integrations/hibernate-l2-cache.adoc
index 8570df9e229..39fa4efcaca 100644
--- a/docs/_docs/extensions-and-integrations/hibernate-l2-cache.adoc
+++ b/docs/_docs/extensions-and-integrations/hibernate-l2-cache.adoc
@@ -12,6 +12,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+
= Apache Ignite Hibernate L2 Cache
== Overview
@@ -45,11 +46,17 @@ In the section below we cover these steps in more detail.
== L2 Cache Configuration
+[CAUTION]
+====
+[discrete]
+The `ignite-hibernate` module has been moved to the Apache Ignite Extensions project since the Apache Ignite 2.14 version.
+====
+
To configure Ignite with as a Hibernate L2 cache, without any changes required to the existing Hibernate code, you need to:
-* Add either `ignite-hibernate_5.3` or `ignite-hibernate_4.2` module as a dependency to your project depending on whether
+* Add the `ignite-hibernate` module version `5.3.0`, `5.1.0` or `4.2.0` as a dependency to your project depending on whether
Hibernate 5 or Hibernate 4 is used. Alternatively, you can copy JAR files of the same name from
-`+{apache_ignite_relese}/libs/optional+` to `+{apache_ignite_relese}/libs+` folder if you start an Apache Ignite node
+`+{apache_ignite_release}/libs/optional+` to `+{apache_ignite_release}/libs+` folder if you start an Apache Ignite node
from a command line.
* Configure Hibernate itself to use Ignite as an L2 cache.
* Configure Ignite caches appropriately.
@@ -65,8 +72,8 @@ tab:Hibernate 5[]
----
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-hibernate_5.3</artifactId>
- <version>${ignite.version}</version>
+ <artifactId>ignite-hibernate-ext</artifactId>
+ <version>5.3.0</version>
</dependency>
----
tab:Hibernate 4[]
@@ -74,8 +81,8 @@ tab:Hibernate 4[]
----
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-hibernate_4.2</artifactId>
- <version>${ignite.version}</version>
+ <artifactId>ignite-hibernate-ext</artifactId>
+ <version>4.2.0</version>
</dependency>
----
--
diff --git a/docs/_docs/setup.adoc b/docs/_docs/setup.adoc
index dfa436373b6..ca5cdacfcbd 100644
--- a/docs/_docs/setup.adoc
+++ b/docs/_docs/setup.adoc
@@ -180,20 +180,26 @@ your application.
The following modules have LGPL dependencies and, therefore, can't be deployed on the Maven Central repository:
-* ignite-hibernate
+* ignite-hibernate (Apache Ignite Extensions)
* ignite-geospatial
* ignite-schedule
To use these modules, you will need to build them from sources and add to your project.
-For example, to install `ignite-hibernate` into your local repository, run this command in the Ignite source package:
+For example, to install `ignite-geospatial` into your local repository, run this command in the Ignite source:
[source, shell]
----
-./mvnw clean install -DskipTests -Plgpl -pl modules/hibernate -am
+./mvnw clean install -DskipTests -Plgpl -pl modules/geospatial -am
----
+To install the `ignite-hibernate` into your local repository and create distribution binaries,
+run the following command from the Ignite Extensions sources:
+[source, shell]
+----
+mvn clean install -DskipTests -f modules/hibernate-ext -Pextension-release
+----
The following modules are available:
diff --git a/examples/README.txt b/examples/README.txt
index f1e8caeb740..b7868212fa8 100644
--- a/examples/README.txt
+++ b/examples/README.txt
@@ -27,7 +27,7 @@ LGPL
=====
LGPL examples can be activated by turning lgpl profile on.
-lgpl profile required some lgpl-based libs, for example: ignite-hibernate & ignite-schedule.
+lgpl profile required some lgpl-based libs, for example: ignite-schedule.
In case these libs can not be found by this maven project please download Apache Ignite sources
at https://ignite.apache.org/download.cgi#sources.
diff --git a/examples/config/hibernate/README.txt b/examples/config/hibernate/README.txt
deleted file mode 100644
index 5b7ab295271..00000000000
--- a/examples/config/hibernate/README.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Hibernate L2 Cache Configuration Example
-----------------------------------------
-
-This folder contains example-hibernate-L2-cache.xml file that demonstrates
-how to configure Hibernate to use Apache Ignite cache as an L2 cache provider.
-
-This file is also used in Hibernate example located in org.apache.ignite.examples.datagrid.hibernate
-package.
diff --git a/examples/config/hibernate/example-hibernate-L2-cache.xml b/examples/config/hibernate/example-hibernate-L2-cache.xml
deleted file mode 100644
index a2f7e892587..00000000000
--- a/examples/config/hibernate/example-hibernate-L2-cache.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-
-<!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
-
-<!--
- Configuration file for HibernateL2CacheExample.
--->
-
-<hibernate-configuration>
- <session-factory>
- <!-- Database connection settings -->
- <property name="connection.url">jdbc:h2:mem:example;DB_CLOSE_DELAY=-1</property>
-
- <!-- Drop and re-create the database schema on startup. -->
- <property name="hbm2ddl.auto">create</property>
-
- <!-- Enable L2 cache. -->
- <property name="cache.use_second_level_cache">true</property>
-
- <!-- Enable query cache. -->
- <property name="cache.use_query_cache">true</property>
-
- <!-- Generate L2 cache statistics. -->
- <property name="generate_statistics">true</property>
-
- <!-- Specify Ignite as L2 cache provider. -->
- <property name="cache.region.factory_class">org.apache.ignite.cache.hibernate.HibernateRegionFactory</property>
-
- <!-- Specify connection release mode. -->
- <property name="connection.release_mode">on_close</property>
-
- <!-- Set default L2 cache access type. -->
- <property name="org.apache.ignite.hibernate.default_access_type">READ_ONLY</property>
-
- <!-- Specify the entity classes for mapping. -->
- <mapping class="org.apache.ignite.examples.datagrid.hibernate.User"/>
- <mapping class="org.apache.ignite.examples.datagrid.hibernate.Post"/>
-
- <!-- Per-class L2 cache settings. -->
- <class-cache class="org.apache.ignite.examples.datagrid.hibernate.User" usage="read-only"/>
- <class-cache class="org.apache.ignite.examples.datagrid.hibernate.Post" usage="read-only"/>
- <collection-cache collection="org.apache.ignite.examples.datagrid.hibernate.User.posts" usage="read-only"/>
- </session-factory>
-</hibernate-configuration>
diff --git a/examples/pom-standalone-lgpl.xml b/examples/pom-standalone-lgpl.xml
index ab919b8f43f..7f3e0bba478 100644
--- a/examples/pom-standalone-lgpl.xml
+++ b/examples/pom-standalone-lgpl.xml
@@ -215,12 +215,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-hibernate_5.1</artifactId>
- <version>to_be_replaced_by_ignite_version</version>
- </dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ignite-schedule</artifactId>
diff --git a/examples/pom-standalone.xml b/examples/pom-standalone.xml
index d9c7dfe12ae..b240050deaa 100644
--- a/examples/pom-standalone.xml
+++ b/examples/pom-standalone.xml
@@ -216,12 +216,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-hibernate_5.1</artifactId>
- <version>to_be_replaced_by_ignite_version</version>
- </dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ignite-schedule</artifactId>
diff --git a/examples/pom.xml b/examples/pom.xml
index 1eb18d284f3..2826aaade9d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -314,12 +314,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-hibernate_5.1</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ignite-schedule</artifactId>
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
deleted file mode 100644
index f56e0879359..00000000000
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.datagrid.hibernate;
-
-import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.Ignition;
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.examples.ExampleNodeStartup;
-import org.apache.ignite.examples.ExamplesUtils;
-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.stat.SecondLevelCacheStatistics;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
-
-/**
- * This example demonstrates the use of Ignite In-Memory Data Ignite cluster as a Hibernate
- * Second-Level cache provider.
- * <p>
- * The Hibernate Second-Level cache (or "L2 cache" shortly) lets you significantly
- * reduce the number of requests to the underlying SQL database. Because database
- * access is known to be an expansive operation, using L2 cache may improve
- * performance dramatically.
- * <p>
- * This example defines 2 entity classes: {@link User} and {@link Post}, with
- * 1 <-> N relation, and marks them with appropriate annotations for Hibernate
- * object-relational mapping to SQL tables of an underlying H2 in-memory database.
- * The example launches node in the same JVM and registers it in
- * Hibernate configuration as an L2 cache implementation. It then stores and
- * queries instances of the entity classes to and from the database, having
- * Hibernate SQL output, L2 cache statistics output, and Ignite cache metrics
- * output enabled.
- * <p>
- * When running example, it's easy to notice that when an object is first
- * put into a database, the L2 cache is not used and it's contents is empty.
- * However, when an object is first read from the database, it is immediately
- * stored in L2 cache (which is Ignite In-Memory Data Ignite cluster in fact), which can
- * be seen in stats output. Further requests of the same object only read the data
- * from L2 cache and do not hit the database.
- * <p>
- * In this example, the Hibernate query cache is also enabled. Query cache lets you
- * avoid hitting the database in case of repetitive queries with the same parameter
- * values. You may notice that when the example runs the same query repeatedly in
- * loop, only the first query hits the database and the successive requests take the
- * data from L2 cache.
- * <p>
- * Note: this example uses {@link AccessType#READ_ONLY} L2 cache access type, but you
- * can experiment with other access types by modifying the Hibernate configuration file
- * {@code IGNITE_HOME/examples/config/hibernate/example-hibernate-L2-cache.xml}, used by the example.
- * <p>
- * Remote nodes should always be started with special configuration file which
- * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-ignite.xml'}.
- * <p>
- * Alternatively you can run {@link ExampleNodeStartup} in another JVM which will
- * start node with {@code examples/config/example-ignite.xml} configuration.
- */
-public class HibernateL2CacheExample {
- /** JDBC URL for backing database (an H2 in-memory database is used). */
- private static final String JDBC_URL = "jdbc:h2:mem:example;DB_CLOSE_DELAY=-1";
-
- /** Path to hibernate configuration file (will be resolved from application {@code CLASSPATH}). */
- private static final String HIBERNATE_CFG = "hibernate/example-hibernate-L2-cache.xml";
-
- /** Entity names for stats output. */
- private static final List<String> ENTITY_NAMES =
- Arrays.asList(User.class.getName(), Post.class.getName(), User.class.getName() + ".posts");
-
- /** Caches' names. */
- private static final String USER_CACHE_NAME = "org.apache.ignite.examples.datagrid.hibernate.User";
-
- /** */
- private static final String USER_POSTS_CACHE_NAME = "org.apache.ignite.examples.datagrid.hibernate.User.posts";
-
- /** */
- private static final String POST_CACHE_NAME = "org.apache.ignite.examples.datagrid.hibernate.Post";
-
- /**
- * Executes example.
- *
- * @param args Command line arguments, none required.
- * @throws IgniteException If example execution failed.
- */
- public static void main(String[] args) throws IgniteException {
- // Start the node, run the example, and stop the node when finished.
- try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
- // We use a single session factory, but create a dedicated session
- // for each transaction or query. This way we ensure that L1 cache
- // is not used (L1 cache has per-session scope only).
- System.out.println();
- System.out.println(">>> Hibernate L2 cache example started.");
-
- // Auto-close cache at the end of the example.
- try (
- // Create all required caches.
- IgniteCache c1 = createCache(timestampsCacheName(), ATOMIC);
- IgniteCache c2 = createCache(queryResultsCacheName(), ATOMIC);
- IgniteCache c3 = createCache(USER_CACHE_NAME, TRANSACTIONAL);
- IgniteCache c4 = createCache(USER_POSTS_CACHE_NAME, TRANSACTIONAL);
- IgniteCache c5 = createCache(POST_CACHE_NAME, TRANSACTIONAL)
- ) {
- URL hibernateCfg = ExamplesUtils.url(HIBERNATE_CFG);
-
- try (SessionFactory sesFactory = createHibernateSessionFactory(hibernateCfg)) {
- System.out.println();
- System.out.println(">>> Creating objects.");
-
- final long userId;
-
- Session ses = sesFactory.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- User user = new User("jedi", "Luke", "Skywalker");
-
- user.getPosts().add(new Post(user, "Let the Force be with you."));
-
- ses.save(user);
-
- tx.commit();
-
- // Create a user object, store it in DB, and save the database-generated
- // object ID. You may try adding more objects in a similar way.
- userId = user.getId();
- }
- finally {
- ses.close();
- }
-
- // Output L2 cache and Ignite cache stats. You may notice that
- // at this point the object is not yet stored in L2 cache, because
- // the read was not yet performed.
- printStats(sesFactory);
-
- System.out.println();
- System.out.println(">>> Querying object by ID.");
-
- // Query user by ID several times. First time we get an L2 cache
- // miss, and the data is queried from DB, but it is then stored
- // in cache and successive queries hit the cache and return
- // immediately, no SQL query is made.
- for (int i = 0; i < 3; i++) {
- ses = sesFactory.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- User user = (User)ses.get(User.class, userId);
-
- System.out.println("User: " + user);
-
- for (Post post : user.getPosts())
- System.out.println("\tPost: " + post);
-
- tx.commit();
- }
- finally {
- ses.close();
- }
- }
-
- // Output the stats. We should see 1 miss and 2 hits for
- // User and Collection object (stored separately in L2 cache).
- // The Post is loaded with the collection, so it won't imply
- // a miss.
- printStats(sesFactory);
- }
- }
- finally {
- // Distributed cache could be removed from cluster only by #destroyCache() call.
- ignite.destroyCache(timestampsCacheName());
- ignite.destroyCache(queryResultsCacheName());
- ignite.destroyCache(USER_CACHE_NAME);
- ignite.destroyCache(USER_POSTS_CACHE_NAME);
- ignite.destroyCache(POST_CACHE_NAME);
- }
- }
- }
-
- /**
- * Creates cache.
- *
- * @param name Cache name.
- * @param atomicityMode Atomicity mode.
- * @return Cache configuration.
- */
- private static IgniteCache createCache(String name, CacheAtomicityMode atomicityMode) {
- CacheConfiguration ccfg = new CacheConfiguration(name);
-
- ccfg.setAtomicityMode(atomicityMode);
- ccfg.setWriteSynchronizationMode(FULL_SYNC);
-
- return Ignition.ignite().getOrCreateCache(ccfg);
- }
-
- /**
- * Creates a new Hibernate {@link SessionFactory} using a programmatic
- * configuration.
- *
- * @param hibernateCfg Hibernate configuration file.
- * @return New Hibernate {@link SessionFactory}.
- */
- private static SessionFactory createHibernateSessionFactory(URL hibernateCfg) {
- StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder();
-
- builder.applySetting("hibernate.connection.url", JDBC_URL);
- builder.applySetting("hibernate.show_sql", true);
-
- builder.configure(hibernateCfg);
-
- return new MetadataSources(builder.build()).buildMetadata().buildSessionFactory();
- }
-
- /**
- * Prints Hibernate L2 cache statistics to standard output.
- *
- * @param sesFactory Hibernate {@link SessionFactory}, for which to print
- * statistics.
- */
- private static void printStats(SessionFactory sesFactory) {
- System.out.println("=== Hibernate L2 cache statistics ===");
-
- for (String entityName : ENTITY_NAMES) {
- System.out.println("\tEntity: " + entityName);
-
- SecondLevelCacheStatistics stats =
- sesFactory.getStatistics().getSecondLevelCacheStatistics(entityName);
-
- System.out.println("\t\tPuts: " + stats.getPutCount());
- System.out.println("\t\tHits: " + stats.getHitCount());
- System.out.println("\t\tMisses: " + stats.getMissCount());
- }
-
- System.out.println("=====================================");
- }
-
- /**
- * Returns the name of the timestamps cache to a specific version of apache-hibernate.
- *
- * @return Name of the update timestamps cache.
- */
- private static String timestampsCacheName() {
- return isIgniteHibernate51orBelowEnabled() ?
- // Represents the name of timestamps region specific to hibernate 5.1 {@see HibernateTimestampsRegion}.
- "org.hibernate.cache.spi.UpdateTimestampsCache" :
- // Represents the name of timestamps region specific to hibernate 5.3 {@see IgniteTimestampsRegion}.
- "default-update-timestamps-region";
- }
-
- /**
- * Returns the name of the query results cache to a specific version of apache-hibernate.
- *
- * @return Name of the update timestamps cache.
- */
- private static String queryResultsCacheName() {
- return isIgniteHibernate51orBelowEnabled() ?
- // Represents the name of query results region specific to hibernate 5.1 {@see HibernateQueryResultsRegion}.
- "org.hibernate.cache.internal.StandardQueryCache" :
- // Represents the name of query results region specific to hibernate 5.3 {@see IgniteQueryResultsRegion}.
- "default-query-results-region";
- }
-
- /**
- * Returns {@code true} if ignite-hibernate 5.1 is enabled.
- *
- * @return {@code true} if ignite-hibernate 5.1 is enabled.
- */
- private static boolean isIgniteHibernate51orBelowEnabled() {
- try {
- Class.forName("org.apache.ignite.cache.hibernate.HibernateTimestampsRegion");
-
- return true;
- }
- catch (ClassNotFoundException ignore) {
- return false;
- }
- }
-}
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/Post.java b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/Post.java
deleted file mode 100644
index 1ee4ec11295..00000000000
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/Post.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.datagrid.hibernate;
-
-import java.util.Date;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-
-/**
- * An entity class representing a post, that a
- * {@link User} has made on some public service.
- */
-@Entity
-class Post {
- /** ID. */
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- private long id;
-
- /** Author. */
- @ManyToOne
- private User author;
-
- /** Text. */
- private String text;
-
- /** Created timestamp. */
- private Date created;
-
- /**
- * Default constructor (required by Hibernate).
- */
- Post() {
- // No-op.
- }
-
- /**
- * Constructor.
- *
- * @param author Author.
- * @param text Text.
- */
- Post(User author, String text) {
- this.author = author;
- this.text = text;
- created = new Date();
- }
-
- /**
- * @return ID.
- */
- public long getId() {
- return id;
- }
-
- /**
- * @param id New ID.
- */
- public void setId(long id) {
- this.id = id;
- }
-
- /**
- * @return Author.
- */
- public User getAuthor() {
- return author;
- }
-
- /**
- * @param author New author.
- */
- public void setAuthor(User author) {
- this.author = author;
- }
-
- /**
- * @return Text.
- */
- public String getText() {
- return text;
- }
-
- /**
- * @param text New text.
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * @return Created timestamp.
- */
- public Date getCreated() {
- return (Date)created.clone();
- }
-
- /**
- * @param created New created timestamp.
- */
- public void setCreated(Date created) {
- this.created = (Date)created.clone();
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return "Post [id=" + id +
- ", text=" + text +
- ", created=" + created +
- ']';
- }
-}
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/User.java b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/User.java
deleted file mode 100644
index df16924e0eb..00000000000
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/User.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.datagrid.hibernate;
-
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import org.hibernate.annotations.NaturalId;
-
-/**
- * A user entity class. Represents a user of some public service,
- * having a number of personal information fields as well as a
- * number of posts written.
- */
-@Entity
-class User {
- /** ID. */
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- private long id;
-
- /** Login. */
- @NaturalId
- private String login;
-
- /** First name. */
- private String firstName;
-
- /** Last name. */
- private String lastName;
-
- /** Posts. */
- @OneToMany(mappedBy = "author", cascade = CascadeType.ALL)
- private Set<Post> posts = new HashSet<>();
-
- /**
- * Default constructor (required by Hibernate).
- */
- User() {
- // No-op.
- }
-
- /**
- * Constructor.
- *
- * @param login Login.
- * @param firstName First name.
- * @param lastName Last name.
- */
- User(String login, String firstName, String lastName) {
- this.login = login;
- this.firstName = firstName;
- this.lastName = lastName;
- }
-
- /**
- * @return ID.
- */
- public long getId() {
- return id;
- }
-
- /**
- * @param id New ID.
- */
- public void setId(long id) {
- this.id = id;
- }
-
- /**
- * @return Login.
- */
- public String getLogin() {
- return login;
- }
-
- /**
- * @param login New login.
- */
- public void setLogin(String login) {
- this.login = login;
- }
-
- /**
- * @return First name.
- */
- public String getFirstName() {
- return firstName;
- }
-
- /**
- * @param firstName New first name.
- */
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
-
- /**
- * @return Last name.
- */
- public String getLastName() {
- return lastName;
- }
-
- /**
- * @param lastName New last name.
- */
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
-
- /**
- * @return Posts.
- */
- public Set<Post> getPosts() {
- return posts;
- }
-
- /**
- * @param posts New posts.
- */
- public void setPosts(Set<Post> posts) {
- this.posts = posts;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return "User [id=" + id +
- ", login=" + login +
- ", firstName=" + firstName +
- ", lastName=" + lastName +
- ']';
- }
-}
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/package-info.java b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/package-info.java
deleted file mode 100644
index 7bddaafde76..00000000000
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/hibernate/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * <!-- Package description. -->
- * Hibernate example.
- */
-package org.apache.ignite.examples.datagrid.hibernate;
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
deleted file mode 100644
index ade5d1891c8..00000000000
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.datagrid.store.hibernate;
-
-import java.util.List;
-import java.util.UUID;
-import javax.cache.integration.CacheLoaderException;
-import javax.cache.integration.CacheWriterException;
-import org.apache.ignite.cache.store.CacheStore;
-import org.apache.ignite.cache.store.CacheStoreAdapter;
-import org.apache.ignite.cache.store.CacheStoreSession;
-import org.apache.ignite.examples.model.Person;
-import org.apache.ignite.lang.IgniteBiInClosure;
-import org.apache.ignite.resources.CacheStoreSessionResource;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-
-/**
- * Example of {@link CacheStore} implementation that uses Hibernate
- * and deals with maps {@link UUID} to {@link Person}.
- */
-public class CacheHibernatePersonStore extends CacheStoreAdapter<Long, Person> {
- /** Auto-injected store session. */
- @CacheStoreSessionResource
- private CacheStoreSession ses;
-
- /** {@inheritDoc} */
- @Override public Person load(Long key) {
- System.out.println(">>> Store load [key=" + key + ']');
-
- Session hibSes = ses.attachment();
-
- try {
- return (Person)hibSes.get(Person.class, key);
- }
- catch (HibernateException e) {
- throw new CacheLoaderException("Failed to load value from cache store [key=" + key + ']', e);
- }
- }
-
- /** {@inheritDoc} */
- @Override public void write(javax.cache.Cache.Entry<? extends Long, ? extends Person> entry) {
- Long key = entry.getKey();
- Person val = entry.getValue();
-
- System.out.println(">>> Store write [key=" + key + ", val=" + val + ']');
-
- Session hibSes = ses.attachment();
-
- try {
- hibSes.saveOrUpdate(val);
- }
- catch (HibernateException e) {
- throw new CacheWriterException("Failed to put value to cache store [key=" + key + ", val" + val + "]", e);
- }
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"JpaQueryApiInspection"})
- @Override public void delete(Object key) {
- System.out.println(">>> Store delete [key=" + key + ']');
-
- Session hibSes = ses.attachment();
-
- try {
- hibSes.createQuery("delete " + Person.class.getSimpleName() + " where key = :key").
- setParameter("key", key).
- executeUpdate();
- }
- catch (HibernateException e) {
- throw new CacheWriterException("Failed to remove value from cache store [key=" + key + ']', e);
- }
- }
-
- /** {@inheritDoc} */
- @Override public void loadCache(IgniteBiInClosure<Long, Person> clo, Object... args) {
- if (args == null || args.length == 0 || args[0] == null)
- throw new CacheLoaderException("Expected entry count parameter is not provided.");
-
- final int entryCnt = (Integer)args[0];
-
- Session hibSes = ses.attachment();
-
- try {
- int cnt = 0;
-
- List list = hibSes.createCriteria(Person.class).
- setMaxResults(entryCnt).
- list();
-
- if (list != null) {
- for (Object obj : list) {
- Person person = (Person)obj;
-
- clo.apply(person.id, person);
-
- cnt++;
- }
- }
-
- System.out.println(">>> Loaded " + cnt + " values into cache.");
- }
- catch (HibernateException e) {
- throw new CacheLoaderException("Failed to load values from cache store.", e);
- }
- }
-}
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
deleted file mode 100644
index 54b692ff090..00000000000
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernateStoreExample.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.datagrid.store.hibernate;
-
-import java.util.UUID;
-import javax.cache.configuration.Factory;
-import javax.cache.configuration.FactoryBuilder;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.Ignition;
-import org.apache.ignite.cache.store.CacheStoreSessionListener;
-import org.apache.ignite.cache.store.hibernate.CacheHibernateStoreSessionListener;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.examples.ExampleNodeStartup;
-import org.apache.ignite.examples.ExamplesUtils;
-import org.apache.ignite.examples.model.Person;
-import org.apache.ignite.examples.util.DbH2ServerStartup;
-import org.apache.ignite.transactions.Transaction;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-
-/**
- * Demonstrates usage of cache with underlying persistent store configured.
- * <p>
- * This example uses {@link CacheHibernatePersonStore} as a persistent store.
- * <p>
- * To start the example, you should:
- * <ul>
- * <li>Start H2 database TCP server using {@link DbH2ServerStartup}.</li>
- * <li>Start a few nodes using {@link ExampleNodeStartup}.</li>
- * <li>Start example using {@link CacheHibernateStoreExample}.</li>
- * </ul>
- * <p>
- * Remote nodes can be started with {@link ExampleNodeStartup} in another JVM which will
- * start node with {@code examples/config/example-ignite.xml} configuration.
- */
-public class CacheHibernateStoreExample {
- /** Hibernate configuration resource path. */
- private static final String HIBERNATE_CFG =
- "/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml";
-
- /** Cache name. */
- private static final String CACHE_NAME = CacheHibernateStoreExample.class.getSimpleName();
-
- /** Heap size required to run this example. */
- public static final int MIN_MEMORY = 1024 * 1024 * 1024;
-
- /** Number of entries to load. */
- private static final int ENTRY_COUNT = 100_000;
-
- /** Global person ID to use across entire example. */
- private static final Long id = Math.abs(UUID.randomUUID().getLeastSignificantBits());
-
- /**
- * Executes example.
- *
- * @param args Command line arguments, none required.
- * @throws IgniteException If example execution failed.
- */
- public static void main(String[] args) throws IgniteException {
- ExamplesUtils.checkMinMemory(MIN_MEMORY);
-
- // To start ignite with desired configuration uncomment the appropriate line.
- try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
- System.out.println();
- System.out.println(">>> Cache store example started.");
-
- CacheConfiguration<Long, Person> cacheCfg = new CacheConfiguration<>(CACHE_NAME);
-
- // Set atomicity as transaction, since we are showing transactions in example.
- cacheCfg.setAtomicityMode(TRANSACTIONAL);
-
- // Configure Hibernate store.
- cacheCfg.setCacheStoreFactory(FactoryBuilder.factoryOf(CacheHibernatePersonStore.class));
-
- // Configure Hibernate session listener.
- cacheCfg.setCacheStoreSessionListenerFactories(new Factory<CacheStoreSessionListener>() {
- @Override public CacheStoreSessionListener create() {
- CacheHibernateStoreSessionListener lsnr = new CacheHibernateStoreSessionListener();
-
- lsnr.setHibernateConfigurationPath(HIBERNATE_CFG);
-
- return lsnr;
- }
- });
-
- cacheCfg.setReadThrough(true);
- cacheCfg.setWriteThrough(true);
-
- // Auto-close cache at the end of the example.
- try (IgniteCache<Long, Person> cache = ignite.getOrCreateCache(cacheCfg)) {
- // Make initial cache loading from persistent store. This is a
- // distributed operation and will call CacheStore.loadCache(...)
- // method on all nodes in topology.
- loadCache(cache);
-
- // Start transaction and execute several cache operations with
- // read/write-through to persistent store.
- executeTransaction(cache);
- }
- finally {
- // Distributed cache could be removed from cluster only by #destroyCache() call.
- ignite.destroyCache(CACHE_NAME);
- }
- }
- }
-
- /**
- * Makes initial cache loading.
- *
- * @param cache Cache to load.
- */
- private static void loadCache(IgniteCache<Long, Person> cache) {
- long start = System.currentTimeMillis();
-
- // Start loading cache from persistent store on all caching nodes.
- cache.loadCache(null, ENTRY_COUNT);
-
- long end = System.currentTimeMillis();
-
- System.out.println(">>> Loaded " + cache.size() + " keys with backups in " + (end - start) + "ms.");
- }
-
- /**
- * Executes transaction with read/write-through to persistent store.
- *
- * @param cache Cache to execute transaction on.
- */
- private static void executeTransaction(IgniteCache<Long, Person> cache) {
- try (Transaction tx = Ignition.ignite().transactions().txStart()) {
- Person val = cache.get(id);
-
- System.out.println("Read value: " + val);
-
- val = cache.getAndPut(id, new Person(id, "Isaac", "Newton"));
-
- System.out.println("Overwrote old value: " + val);
-
- val = cache.get(id);
-
- System.out.println("Read value: " + val);
-
- tx.commit();
- }
-
- System.out.println("Read value after commit: " + cache.get(id));
- }
-}
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
deleted file mode 100644
index 0728a037a78..00000000000
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping default-access="field">
- <class name="org.apache.ignite.examples.model.Person" table="PERSON">
- <!-- ID. -->
- <id name="id"/>
-
- <!-- We only map data we are interested in. -->
- <property name="firstName" column="first_name"/>
- <property name="lastName" column="last_name"/>
- </class>
-</hibernate-mapping>
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
deleted file mode 100644
index 7bf70af8850..00000000000
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
-
-<!--
- Hibernate configuration.
--->
-<hibernate-configuration>
- <session-factory>
- <!-- Database connection URL. -->
- <property name="connection.url">jdbc:h2:tcp://localhost/mem:ExampleDb</property>
-
- <!-- Database connection username. -->
- <property name="connection.username">sa</property>
-
- <!-- Only validate the database schema on startup in production mode. -->
- <property name="hbm2ddl.auto">update</property>
-
- <!-- Do not output SQL. -->
- <property name="show_sql">false</property>
-
- <!-- Mappings. -->
- <mapping resource="org/apache/ignite/examples/datagrid/store/hibernate/Person.hbm.xml"/>
- </session-factory>
-</hibernate-configuration>
diff --git a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/package-info.java b/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/package-info.java
deleted file mode 100644
index 7210b497934..00000000000
--- a/examples/src/main/java-lgpl/org/apache/ignite/examples/datagrid/store/hibernate/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * <!-- Package description. -->
- * Contains Hibernate-based cache store implementation.
- */
-package org.apache.ignite.examples.datagrid.store.hibernate;
diff --git a/examples/src/test/java-lgpl/org/apache/ignite/examples/HibernateL2CacheExampleMultiNodeSelfTest.java b/examples/src/test/java-lgpl/org/apache/ignite/examples/HibernateL2CacheExampleMultiNodeSelfTest.java
deleted file mode 100644
index 8a40d4af295..00000000000
--- a/examples/src/test/java-lgpl/org/apache/ignite/examples/HibernateL2CacheExampleMultiNodeSelfTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.datagrid.hibernate.HibernateL2CacheExample;
-
-/**
- * Multi-node test for {@link HibernateL2CacheExample}.
- */
-public class HibernateL2CacheExampleMultiNodeSelfTest extends HibernateL2CacheExampleSelfTest {
- /** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- for (int i = 0; i < RMT_NODES_CNT; i++)
- startGrid("node-" + i, "examples/config/example-ignite.xml");
- }
-}
diff --git a/examples/src/test/java-lgpl/org/apache/ignite/examples/HibernateL2CacheExampleSelfTest.java b/examples/src/test/java-lgpl/org/apache/ignite/examples/HibernateL2CacheExampleSelfTest.java
deleted file mode 100644
index 93e24b0694c..00000000000
--- a/examples/src/test/java-lgpl/org/apache/ignite/examples/HibernateL2CacheExampleSelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.datagrid.hibernate.HibernateL2CacheExample;
-import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
-import org.junit.Test;
-
-/**
- * Tests the {@link HibernateL2CacheExample}.
- */
-public class HibernateL2CacheExampleSelfTest extends GridAbstractExamplesTest {
- /** */
- @Test
- public void testHibernateL2CacheExample() {
- HibernateL2CacheExample.main(EMPTY_ARGS);
- }
-}
diff --git a/examples/src/test/java-lgpl/org/apache/ignite/testsuites/IgniteLgplExamplesSelfTestSuite.java b/examples/src/test/java-lgpl/org/apache/ignite/testsuites/IgniteLgplExamplesSelfTestSuite.java
index f7be8801999..6f4a1c3a07f 100644
--- a/examples/src/test/java-lgpl/org/apache/ignite/testsuites/IgniteLgplExamplesSelfTestSuite.java
+++ b/examples/src/test/java-lgpl/org/apache/ignite/testsuites/IgniteLgplExamplesSelfTestSuite.java
@@ -19,8 +19,6 @@ package org.apache.ignite.testsuites;
import org.apache.ignite.examples.ComputeScheduleExampleMultiNodeSelfTest;
import org.apache.ignite.examples.ComputeScheduleExampleSelfTest;
-import org.apache.ignite.examples.HibernateL2CacheExampleMultiNodeSelfTest;
-import org.apache.ignite.examples.HibernateL2CacheExampleSelfTest;
import org.apache.ignite.examples.SpatialQueryExampleMultiNodeSelfTest;
import org.apache.ignite.examples.SpatialQueryExampleSelfTest;
import org.apache.ignite.testframework.GridTestUtils;
@@ -35,12 +33,10 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
- HibernateL2CacheExampleSelfTest.class,
SpatialQueryExampleSelfTest.class,
ComputeScheduleExampleSelfTest.class,
// Multi-node.
- HibernateL2CacheExampleMultiNodeSelfTest.class,
SpatialQueryExampleMultiNodeSelfTest.class,
ComputeScheduleExampleMultiNodeSelfTest.class,
})
diff --git a/modules/bom/pom.xml b/modules/bom/pom.xml
index e591f017fea..4e90f383390 100644
--- a/modules/bom/pom.xml
+++ b/modules/bom/pom.xml
@@ -71,11 +71,6 @@
<artifactId>ignite-direct-io</artifactId>
<version>${revision}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-hibernate-core</artifactId>
- <version>${revision}</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ignite-indexing</artifactId>
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
index b7d9c293c81..a88a536656f 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
@@ -46,7 +46,7 @@ import org.jetbrains.annotations.Nullable;
* <p>
* Provided implementations may be used for test purposes:
* <ul>
- * <li>{@ignitelink org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStore}</li>
+ * <li>{@code org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStore}</li>
* <li>{@link CacheJdbcBlobStore}</li>
* </ul>
* <p>
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSessionListener.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSessionListener.java
index 9496d2019f7..9261f5d9df9 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSessionListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSessionListener.java
@@ -59,14 +59,14 @@ import org.apache.ignite.configuration.IgniteConfiguration;
* when session ends.
* </li>
* <li>
- * {@ignitelink org.apache.ignite.cache.store.spring.CacheSpringStoreSessionListener} -
+ * {@code org.apache.ignite.cache.store.spring.CacheSpringStoreSessionListener} -
* session listener based on Spring transaction management.
* It starts a new DB transaction for each session and commits
* (or rolls back) it when session ends. If there is no ongoing
* cache transaction, this listener is no-op.
* </li>
* <li>
- * {@ignitelink org.apache.ignite.cache.store.hibernate.CacheHibernateStoreSessionListener} -
+ * {@code org.apache.ignite.cache.store.hibernate.CacheHibernateStoreSessionListener} -
* Hibernate-based session listener. It creates a new Hibernate
* session for each Ignite session. If there is an ongoing cache
* transaction, a corresponding Hibernate transaction is created
diff --git a/modules/dev-utils/ignite-modules-test/build.gradle b/modules/dev-utils/ignite-modules-test/build.gradle
index 2b8f6bfb152..395a4d2f285 100644
--- a/modules/dev-utils/ignite-modules-test/build.gradle
+++ b/modules/dev-utils/ignite-modules-test/build.gradle
@@ -93,10 +93,6 @@ dependencies {
exclude group: "org.slf4j", module: "slf4j-log4j12"
}
- // todo https://issues.apache.org/jira/browse/IGNITE-11485
- // compile group: 'org.apache.ignite', name: 'ignite-hibernate_5.3', version: ignVer
-
-
// todo https://issues.apache.org/jira/browse/IGNITE-11486
compile (group: 'org.apache.ignite', name: 'ignite-zookeeper', version: ignVer) {
exclude group: "org.slf4j", module: "slf4j-log4j12"
diff --git a/modules/geospatial/README.txt b/modules/geospatial/README.txt
index d8096dc3a23..3f8f715557d 100644
--- a/modules/geospatial/README.txt
+++ b/modules/geospatial/README.txt
@@ -37,7 +37,6 @@ LGPL dependencies
-----------------
Ignite includes the following optional LGPL dependencies:
- - Hibernate L2 Cache Integration, http://hibernate.org/orm/
- JTS Topology Suite for Geospatial indexing, http://tsusiatsoftware.net/jts/main.html
- cron4j for cron-based task scheduling, http://www.sauronsoftware.it/projects/cron4j
diff --git a/modules/hibernate-4.2/README.txt b/modules/hibernate-4.2/README.txt
deleted file mode 100644
index ed1518b636d..00000000000
--- a/modules/hibernate-4.2/README.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-Apache Ignite Hibernate Module
-------------------------------
-
-Apache Ignite Hibernate module provides Hibernate second-level cache (L2 cache) implementation based
-on Apache Ignite In-Memory Data Grid.
-
-To enable Hibernate module when starting a standalone node, move 'optional/ignite-hibernate' folder to
-'libs' folder before running 'ignite.{sh|bat}' script. The content of the module folder will
-be added to classpath in this case.
-
-Importing Hibernate Module In Maven Project
--------------------------------------------
-
-If you are using Maven to manage dependencies of your project, you can add Hibernate module
-dependency like this (replace '${ignite.version}' with actual Ignite version you are
-interested in):
-
-<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
- http://maven.apache.org/xsd/maven-4.0.0.xsd">
- ...
- <dependencies>
- ...
- <dependency>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-hibernate_4.2</artifactId>
- <version>${ignite.version}</version>
- </dependency>
- ...
- </dependencies>
- ...
-</project>
-
-
-LGPL dependencies
------------------
-
-Ignite includes the following optional LGPL dependencies:
- - Hibernate L2 Cache Integration, http://hibernate.org/orm/
- - JTS Topology Suite for Geospatial indexing, http://tsusiatsoftware.net/jts/main.html
- - cron4j for cron-based task scheduling, http://www.sauronsoftware.it/projects/cron4j
-
-Apache binary releases cannot include LGPL dependencies. If you would like include
-optional LGPL dependencies into your release, you should download the source release
-from Ignite website and do the build with the following maven command:
-
-./mvnw clean package -DskipTests -Prelease,lgpl
diff --git a/modules/hibernate-4.2/licenses/apache-2.0.txt b/modules/hibernate-4.2/licenses/apache-2.0.txt
deleted file mode 100644
index d6456956733..00000000000
--- a/modules/hibernate-4.2/licenses/apache-2.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/modules/hibernate-4.2/pom.xml b/modules/hibernate-4.2/pom.xml
deleted file mode 100644
index a89da24eded..00000000000
--- a/modules/hibernate-4.2/pom.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
- POM file.
--->
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-parent-internal</artifactId>
- <version>${revision}</version>
- <relativePath>../../parent-internal/pom.xml</relativePath>
- </parent>
-
- <artifactId>ignite-hibernate_4.2</artifactId>
-
- <url>http://ignite.apache.org</url>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-hibernate-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>4.2.21.Final</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-jta</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ow2.jotm</groupId>
- <artifactId>jotm-core</artifactId>
- <version>${jotm.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>${commons.dbcp.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${h2.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <version>1.5</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-tools</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-spring</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-log4j</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <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>
-
- <!-- JDK9+ -->
-
- <dependency>
- <groupId>org.jboss.spec.javax.rmi</groupId>
- <artifactId>jboss-rmi-api_1.0_spec</artifactId>
- <version>${jboss.rmi.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb.api.version}</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <profiles>
- <profile>
- <id>lgpl</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/main/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- <testResource>
- <directory>src/test/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
-
- <plugins>
- <!-- Generate the OSGi MANIFEST.MF for this bundle. -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateAbstractRegionAccessStrategy.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateAbstractRegionAccessStrategy.java
deleted file mode 100644
index f9c96c830c0..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateAbstractRegionAccessStrategy.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.access.RegionAccessStrategy;
-import org.hibernate.cache.spi.access.SoftLock;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Implementation of L2 cache access strategy delegating to {@link HibernateAccessStrategyAdapter}.
- */
-public abstract class HibernateAbstractRegionAccessStrategy implements RegionAccessStrategy {
- /** */
- final HibernateAccessStrategyAdapter stgy;
-
- /**
- * @param stgy Access strategy implementation.
- */
- HibernateAbstractRegionAccessStrategy(HibernateAccessStrategyAdapter stgy) {
- this.stgy = stgy;
- }
-
- /** {@inheritDoc} */
- @Nullable @Override public Object get(Object key, long txTs) throws CacheException {
- return stgy.get(key);
- }
-
- /** {@inheritDoc} */
- @Override public boolean putFromLoad(Object key, Object val, long txTs, Object ver) throws CacheException {
- stgy.putFromLoad(key, val);
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean putFromLoad(Object key, Object val, long txTs, Object ver, boolean minimalPutOverride)
- throws CacheException {
- stgy.putFromLoad(key, val, minimalPutOverride);
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Nullable @Override public SoftLock lockItem(Object key, Object ver) throws CacheException {
- stgy.lock(key);
-
- return null;
- }
-
- /** {@inheritDoc} */
- @Nullable @Override public SoftLock lockRegion() throws CacheException {
- stgy.lockRegion();
-
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public void unlockRegion(SoftLock lock) throws CacheException {
- stgy.unlockRegion();
- }
-
- /** {@inheritDoc} */
- @Override public void unlockItem(Object key, SoftLock lock) throws CacheException {
- stgy.unlock(key);
- }
-
- /** {@inheritDoc} */
- @Override public void remove(Object key) throws CacheException {
- stgy.remove(key);
- }
-
- /** {@inheritDoc} */
- @Override public void removeAll() throws CacheException {
- stgy.removeAll();
- }
-
- /** {@inheritDoc} */
- @Override public void evict(Object key) throws CacheException {
- stgy.evict(key);
- }
-
- /** {@inheritDoc} */
- @Override public void evictAll() throws CacheException {
- stgy.evictAll();
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateCollectionRegion.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateCollectionRegion.java
deleted file mode 100644
index 4e18c14ada1..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateCollectionRegion.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import org.apache.ignite.Ignite;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.CacheDataDescription;
-import org.hibernate.cache.spi.CollectionRegion;
-import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;
-
-/**
- * Implementation of {@link CollectionRegion}. This region is used to store collection data.
- * <p>
- * L2 cache for collection can be enabled in the Hibernate configuration file:
- * <pre name="code" class="xml">
- * <hibernate-configuration>
- * <!-- Enable L2 cache. -->
- * <property name="cache.use_second_level_cache">true</property>
- *
- * <!-- Use Ignite as L2 cache provider. -->
- * <property name="cache.region.factory_class">org.apache.ignite.cache.hibernate.HibernateRegionFactory</property>
- *
- * <!-- Specify entities. -->
- * <mapping class="com.example.Entity"/>
- * <mapping class="com.example.ChildEntity"/>
- *
- * <!-- Enable L2 cache with nonstrict-read-write access strategy for entities and collection. -->
- * <collection-cache collection="com.example.Entity" usage="nonstrict-read-write"/>
- * <collection-cache collection="com.example.ChildEntity" usage="nonstrict-read-write"/>
- * <collection-cache collection="com.example.Entity.children" usage="nonstrict-read-write"/>
- * </hibernate-configuration>
- * </pre>
- * Also cache for collection can be enabled using annotations:
- * <pre name="code" class="java">
- * @javax.persistence.Entity
- * public class Entity {
- * ...
- *
- * @javax.persistence.OneToMany(cascade=CascadeType.ALL, fetch=FetchType.EAGER)
- * @javax.persistence.JoinColumn(name="PARENT_ID")
- * @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
- * public List<ChildEntity> getChildren() {...}
- * }
- * </pre>
- * Note: the collection cache does not cache the state of the actual entities in the cache, it caches only identifier
- * values. For this reason, the collection cache should always be used in conjunction with
- * the second-level cache for those entities expected to be cached as part of a collection cache.
- */
-public class HibernateCollectionRegion extends HibernateTransactionalDataRegion implements CollectionRegion {
- /**
- * @param factory Region factory.
- * @param name Region name.
- * @param ignite Grid.
- * @param cache Region cache.
- * @param dataDesc Region data description.
- */
- HibernateCollectionRegion(HibernateRegionFactory factory, String name,
- Ignite ignite, HibernateCacheProxy cache, CacheDataDescription dataDesc) {
- super(factory, name, ignite, cache, dataDesc);
- }
-
- /** {@inheritDoc} */
- @Override public CollectionRegionAccessStrategy buildAccessStrategy(AccessType accessType) throws CacheException {
- return new AccessStrategy(createAccessStrategy(accessType));
- }
-
- /**
- * Collection region access strategy.
- */
- private class AccessStrategy extends HibernateAbstractRegionAccessStrategy
- implements CollectionRegionAccessStrategy {
- /**
- * @param stgy Access strategy implementation.
- */
- private AccessStrategy(HibernateAccessStrategyAdapter stgy) {
- super(stgy);
- }
-
- /** {@inheritDoc} */
- @Override public CollectionRegion getRegion() {
- return HibernateCollectionRegion.this;
- }
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateEntityRegion.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateEntityRegion.java
deleted file mode 100644
index 44ef6b357cf..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateEntityRegion.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import org.apache.ignite.Ignite;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.CacheDataDescription;
-import org.hibernate.cache.spi.EntityRegion;
-import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cache.spi.access.EntityRegionAccessStrategy;
-import org.hibernate.cache.spi.access.SoftLock;
-
-/**
- * Implementation of {@link EntityRegion}. This region is used to store entity data.
- * <p>
- * L2 cache for entity can be enabled in the Hibernate configuration file:
- * <pre name="code" class="xml">
- * <hibernate-configuration>
- * <!-- Enable L2 cache. -->
- * <property name="cache.use_second_level_cache">true</property>
- *
- * <!-- Use Ignite as L2 cache provider. -->
- * <property name="cache.region.factory_class">org.apache.ignite.cache.hibernate.HibernateRegionFactory</property>
- *
- * <!-- Specify entity. -->
- * <mapping class="com.example.Entity"/>
- *
- * <!-- Enable L2 cache with nonstrict-read-write access strategy for entity. -->
- * <class-cache class="com.example.Entity" usage="nonstrict-read-write"/>
- * </hibernate-configuration>
- * </pre>
- * Also cache for entity can be enabled using annotations:
- * <pre name="code" class="java">
- * @javax.persistence.Entity
- * @javax.persistence.Cacheable
- * @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
- * public class Entity { ... }
- * </pre>
- */
-public class HibernateEntityRegion extends HibernateTransactionalDataRegion implements EntityRegion {
- /**
- * @param factory Region factory.
- * @param name Region name.
- * @param ignite Grid.
- * @param cache Region cache,
- * @param dataDesc Region data description.
- */
- HibernateEntityRegion(HibernateRegionFactory factory, String name, Ignite ignite,
- HibernateCacheProxy cache, CacheDataDescription dataDesc) {
- super(factory, name, ignite, cache, dataDesc);
- }
-
- /** {@inheritDoc} */
- @Override public EntityRegionAccessStrategy buildAccessStrategy(AccessType accessType) throws CacheException {
- return new AccessStrategy(createAccessStrategy(accessType));
- }
-
- /**
- * Entity region access strategy.
- */
- private class AccessStrategy extends HibernateAbstractRegionAccessStrategy
- implements EntityRegionAccessStrategy {
- /**
- * @param stgy Access strategy implementation.
- */
- private AccessStrategy(HibernateAccessStrategyAdapter stgy) {
- super(stgy);
- }
-
- /** {@inheritDoc} */
- @Override public EntityRegion getRegion() {
- return HibernateEntityRegion.this;
- }
-
- /** {@inheritDoc} */
- @Override public boolean insert(Object key, Object val, Object ver) throws CacheException {
- return stgy.insert(key, val);
- }
-
- /** {@inheritDoc} */
- @Override public boolean afterInsert(Object key, Object val, Object ver) throws CacheException {
- return stgy.afterInsert(key, val);
- }
-
- /** {@inheritDoc} */
- @Override public boolean update(Object key, Object val, Object currVer, Object previousVer)
- throws CacheException {
- return stgy.update(key, val);
- }
-
- /** {@inheritDoc} */
- @Override public boolean afterUpdate(Object key, Object val, Object currVer, Object previousVer, SoftLock lock)
- throws CacheException {
- return stgy.afterUpdate(key, val);
- }
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateGeneralDataRegion.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateGeneralDataRegion.java
deleted file mode 100644
index d223b5909e8..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateGeneralDataRegion.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.GeneralDataRegion;
-import org.hibernate.cache.spi.QueryResultsRegion;
-import org.hibernate.cache.spi.TimestampsRegion;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Implementation of {@link GeneralDataRegion}. This interface defines common contract for {@link QueryResultsRegion}
- * and {@link TimestampsRegion}.
- */
-public class HibernateGeneralDataRegion extends HibernateRegion implements GeneralDataRegion {
- /**
- * @param factory Region factory.
- * @param name Region name.
- * @param ignite Grid.
- * @param cache Region cache.
- */
- HibernateGeneralDataRegion(HibernateRegionFactory factory, String name,
- Ignite ignite, HibernateCacheProxy cache) {
- super(factory, name, ignite, cache);
- }
-
- /** {@inheritDoc} */
- @Nullable @Override public Object get(Object key) throws CacheException {
- try {
- return cache.get(key);
- } catch (IgniteCheckedException e) {
- throw new CacheException(e);
- }
- }
-
- /** {@inheritDoc} */
- @Override public void put(Object key, Object val) throws CacheException {
- try {
- cache.put(key, val);
- } catch (IgniteCheckedException e) {
- throw new CacheException(e);
- }
- }
-
- /** {@inheritDoc} */
- @Override public void evict(Object key) throws CacheException {
- HibernateAccessStrategyAdapter.evict(ignite, cache, key);
- }
-
- /** {@inheritDoc} */
- @Override public void evictAll() throws CacheException {
- try {
- HibernateAccessStrategyAdapter.evictAll(cache);
- }
- catch (IgniteCheckedException e) {
- throw HibernateRegionFactory.EXCEPTION_CONVERTER.convert(e);
- }
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateKeyWrapper.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateKeyWrapper.java
deleted file mode 100644
index b4b75af7426..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateKeyWrapper.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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 implements Serializable {
- /** Key. */
- private final Object key;
-
- /** Entry. */
- private final String entry;
-
- /** */
- private final String tenantId;
-
- /**
- * @param key Key.
- * @param entry Entry.
- * @param tenantId Tenant ID.
- */
- HibernateKeyWrapper(Object key, String entry, String tenantId) {
- this.key = key;
- this.entry = entry;
- this.tenantId = tenantId;
- }
-
- /**
- * @return Key.
- */
- Object id() {
- return key;
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object o) {
- if (this == o) return true;
-
- if (o == null || getClass() != o.getClass())
- return false;
-
- HibernateKeyWrapper that = (HibernateKeyWrapper)o;
-
- return (key != null ? key.equals(that.key) : that.key == null) &&
- (entry != null ? entry.equals(that.entry) : that.entry == null) &&
- (tenantId != null ? tenantId.equals(that.tenantId) : that.tenantId == null);
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- int res = key != null ? key.hashCode() : 0;
- res = 31 * res + (entry != null ? entry.hashCode() : 0);
- res = 31 * res + (tenantId != null ? tenantId.hashCode() : 0);
- return res;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(HibernateKeyWrapper.class, this);
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateNaturalIdRegion.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateNaturalIdRegion.java
deleted file mode 100644
index f51e0c7058a..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateNaturalIdRegion.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import org.apache.ignite.Ignite;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.CacheDataDescription;
-import org.hibernate.cache.spi.NaturalIdRegion;
-import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cache.spi.access.NaturalIdRegionAccessStrategy;
-import org.hibernate.cache.spi.access.SoftLock;
-
-/**
- * Implementation of {@link NaturalIdRegion}. This region is used to store naturalId data.
- * <p>
- * L2 cache for entity naturalId and target cache region can be set using annotations:
- * <pre name="code" class="java">
- * @javax.persistence.Entity
- * @javax.persistence.Cacheable
- * @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
- * @org.hibernate.annotations.NaturalIdCache
- * public class Entity {
- * @org.hibernate.annotations.NaturalId
- * private String entityCode;
- *
- * ...
- * }
- * </pre>
- */
-public class HibernateNaturalIdRegion extends HibernateTransactionalDataRegion implements NaturalIdRegion {
- /**
- * @param factory Region factory.
- * @param name Region name.
- * @param ignite Grid.
- * @param cache Region cache,
- * @param dataDesc Region data description.
- */
- HibernateNaturalIdRegion(HibernateRegionFactory factory,
- String name,
- Ignite ignite,
- HibernateCacheProxy cache,
- CacheDataDescription dataDesc) {
- super(factory, name, ignite, cache, dataDesc);
- }
-
- /** {@inheritDoc} */
- @Override public NaturalIdRegionAccessStrategy buildAccessStrategy(AccessType accessType) throws CacheException {
- return new AccessStrategy(createAccessStrategy(accessType));
- }
-
- /**
- * NaturalId region access strategy.
- */
- private class AccessStrategy extends HibernateAbstractRegionAccessStrategy implements
- NaturalIdRegionAccessStrategy {
- /**
- * @param stgy Access strategy implementation.
- */
- private AccessStrategy(HibernateAccessStrategyAdapter stgy) {
- super(stgy);
- }
-
- /** {@inheritDoc} */
- @Override public NaturalIdRegion getRegion() {
- return HibernateNaturalIdRegion.this;
- }
-
- /** {@inheritDoc} */
- @Override public boolean insert(Object key, Object val) throws CacheException {
- return stgy.insert(key, val);
- }
-
- /** {@inheritDoc} */
- @Override public boolean afterInsert(Object key, Object val) throws CacheException {
- return stgy.afterInsert(key, val);
- }
-
- /** {@inheritDoc} */
- @Override public boolean update(Object key, Object val) throws CacheException {
- return stgy.update(key, val);
- }
-
- /** {@inheritDoc} */
- @Override public boolean afterUpdate(Object key, Object val, SoftLock lock) throws CacheException {
- return stgy.afterUpdate(key, val);
- }
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateQueryResultsRegion.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateQueryResultsRegion.java
deleted file mode 100644
index c00b821d93a..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateQueryResultsRegion.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import org.apache.ignite.Ignite;
-import org.hibernate.Query;
-import org.hibernate.cache.spi.QueryResultsRegion;
-
-/**
- * Implementation of {@link QueryResultsRegion}. This region is used to store query results.
- * <p>
- * Query results caching can be enabled in the Hibernate configuration file:
- * <pre name="code" class="xml">
- * <hibernate-configuration>
- * <!-- Enable L2 cache. -->
- * <property name="cache.use_second_level_cache">true</property>
- *
- * <!-- Enable query cache. -->
- * <property name="cache.use_second_level_cache">true</property>
-
- * <!-- Use Ignite as L2 cache provider. -->
- * <property name="cache.region.factory_class">org.apache.ignite.cache.hibernate.HibernateRegionFactory</property>
- *
- * <!-- Specify entity. -->
- * <mapping class="com.example.Entity"/>
- *
- * <!-- Enable L2 cache with nonstrict-read-write access strategy for entity. -->
- * <class-cache class="com.example.Entity" usage="nonstrict-read-write"/>
- * </hibernate-configuration>
- * </pre>
- * By default queries are not cached even after enabling query caching, to enable results caching for a particular
- * query, call {@link Query#setCacheable(boolean)}:
- * <pre name="code" class="java">
- * Session ses = getSession();
- *
- * Query qry = ses.createQuery("...");
- *
- * qry.setCacheable(true); // Enable L2 cache for query.
- * </pre>
- * Note: the query cache does not cache the state of the actual entities in the cache, it caches only identifier
- * 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
- */
-class HibernateQueryResultsRegion extends HibernateGeneralDataRegion implements QueryResultsRegion {
- /**
- * @param factory Region factory.
- * @param name Region name.
- * @param ignite Grid.
- * @param cache Region cache.
- */
- HibernateQueryResultsRegion(HibernateRegionFactory factory, String name,
- Ignite ignite, HibernateCacheProxy cache) {
- super(factory, name, ignite, cache);
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegion.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegion.java
deleted file mode 100644
index 1f8a613d622..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegion.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import java.util.Collections;
-import java.util.Map;
-import org.apache.ignite.Ignite;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.Region;
-
-/**
- * Implementation of {@link Region}. This interface defines base contract for all L2 cache regions.
- */
-public class HibernateRegion implements Region {
- /** */
- protected final HibernateRegionFactory factory;
-
- /** */
- private final String name;
-
- /** Cache instance. */
- protected final HibernateCacheProxy cache;
-
- /** Grid instance. */
- protected Ignite ignite;
-
- /**
- * @param factory Region factory.
- * @param name Region name.
- * @param ignite Grid.
- * @param cache Region cache.
- */
- HibernateRegion(HibernateRegionFactory factory, String name, Ignite ignite, HibernateCacheProxy cache) {
- this.factory = factory;
- this.name = name;
- this.ignite = ignite;
- this.cache = cache;
- }
-
- /** {@inheritDoc} */
- @Override public String getName() {
- return name;
- }
-
- /** {@inheritDoc} */
- @Override public void destroy() throws CacheException {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public boolean contains(Object key) {
- return cache.containsKey(key);
- }
-
- /** {@inheritDoc} */
- @Override public long getSizeInMemory() {
- return -1;
- }
-
- /** {@inheritDoc} */
- @Override public long getElementCountInMemory() {
- return cache.size();
- }
-
- /** {@inheritDoc} */
- @Override public long getElementCountOnDisk() {
- return -1;
- }
-
- /** {@inheritDoc} */
- @Override public Map toMap() {
- return Collections.emptyMap();
- }
-
- /** {@inheritDoc} */
- @Override public long nextTimestamp() {
- return System.currentTimeMillis();
- }
-
- /** {@inheritDoc} */
- @Override public int getTimeout() {
- return 0;
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java
deleted file mode 100644
index 89e576c976f..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateRegionFactory.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import java.util.Properties;
-import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.CacheDataDescription;
-import org.hibernate.cache.spi.CacheKey;
-import org.hibernate.cache.spi.CollectionRegion;
-import org.hibernate.cache.spi.EntityRegion;
-import org.hibernate.cache.spi.NaturalIdRegion;
-import org.hibernate.cache.spi.QueryResultsRegion;
-import org.hibernate.cache.spi.RegionFactory;
-import org.hibernate.cache.spi.TimestampsRegion;
-import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cfg.Settings;
-
-import static org.apache.ignite.cache.hibernate.HibernateAccessStrategyFactory.DFLT_ACCESS_TYPE_PROPERTY;
-import static org.hibernate.cache.spi.access.AccessType.NONSTRICT_READ_WRITE;
-
-/**
- * Hibernate L2 cache region factory.
- * <p>
- * Following Hibernate settings should be specified to enable second level cache and to use this
- * region factory for caching:
- * <pre name="code" class="brush: xml; gutter: false;">
- * hibernate.cache.use_second_level_cache=true
- * hibernate.cache.region.factory_class=org.apache.ignite.cache.hibernate.HibernateRegionFactory
- * </pre>
- * Note that before region factory is started you need to start properly configured Ignite node in the same JVM.
- * For example to start Ignite node one of loader provided in {@code org.apache.ignite.grid.startup} package can be used.
- * <p>
- * Name of Ignite instance to be used for region factory must be specified as following Hibernate property:
- * <pre name="code" class="brush: xml; gutter: false;">
- * org.apache.ignite.hibernate.ignite_instance_name=<Ignite instance name>
- * </pre>
- * Each Hibernate cache region must be associated with some {@link IgniteInternalCache}, by default it is assumed that
- * for each cache region there is a {@link IgniteInternalCache} with the same name. Also it is possible to define
- * region to cache mapping using properties with prefix {@code org.apache.ignite.hibernate.region_cache}.
- * For example if for region with name "region1" cache with name "cache1" should be used then following
- * Hibernate property should be specified:
- * <pre name="code" class="brush: xml; gutter: false;">
- * org.apache.ignite.hibernate.region_cache.region1=cache1
- * </pre>
- */
-public class HibernateRegionFactory implements RegionFactory {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** */
- static final HibernateExceptionConverter EXCEPTION_CONVERTER = new HibernateExceptionConverter() {
- @Override public RuntimeException convert(Exception e) {
- return new CacheException(e);
- }
- };
-
- /** Default region access type. */
- private AccessType dfltAccessType;
-
- /** Key transformer. */
- private final HibernateKeyTransformer hibernate4transformer = new HibernateKeyTransformer() {
- @Override public Object transform(Object key) {
- if (key instanceof CacheKey) {
- CacheKey cacheKey = (CacheKey)key;
-
- return new HibernateKeyWrapper(
- cacheKey.getKey(),
- cacheKey.getEntityOrRoleName(),
- cacheKey.getTenantId()
- );
- }
-
- return key;
- }
- };
-
- /** */
- private final HibernateAccessStrategyFactory accessStgyFactory =
- new HibernateAccessStrategyFactory(hibernate4transformer, EXCEPTION_CONVERTER);
-
- /** {@inheritDoc} */
- @Override public void start(Settings settings, Properties props) throws CacheException {
- String accessType = props.getProperty(DFLT_ACCESS_TYPE_PROPERTY, NONSTRICT_READ_WRITE.name());
-
- dfltAccessType = AccessType.valueOf(accessType);
-
- accessStgyFactory.start(props);
- }
-
- /**
- * @return Access strategy factory.
- */
- HibernateAccessStrategyFactory accessStrategyFactory() {
- return accessStgyFactory;
- }
-
- /** {@inheritDoc} */
- @Override public void stop() {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public boolean isMinimalPutsEnabledByDefault() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public AccessType getDefaultAccessType() {
- return dfltAccessType;
- }
-
- /** {@inheritDoc} */
- @Override public long nextTimestamp() {
- return System.currentTimeMillis();
- }
-
- /** {@inheritDoc} */
- @Override public EntityRegion buildEntityRegion(String regionName, Properties props, CacheDataDescription metadata)
- throws CacheException {
- return new HibernateEntityRegion(this,
- regionName,
- accessStgyFactory.node(),
- accessStgyFactory.regionCache(regionName),
- metadata);
- }
-
- /** {@inheritDoc} */
- @Override public NaturalIdRegion buildNaturalIdRegion(String regionName, Properties props,
- CacheDataDescription metadata) throws CacheException {
- return new HibernateNaturalIdRegion(this,
- regionName,
- accessStgyFactory.node(),
- accessStgyFactory.regionCache(regionName),
- metadata);
- }
-
- /** {@inheritDoc} */
- @Override public CollectionRegion buildCollectionRegion(String regionName, Properties props,
- CacheDataDescription metadata) throws CacheException {
- return new HibernateCollectionRegion(this,
- regionName,
- accessStgyFactory.node(),
- accessStgyFactory.regionCache(regionName),
- metadata);
- }
-
- /** {@inheritDoc} */
- @Override public QueryResultsRegion buildQueryResultsRegion(String regionName, Properties props)
- throws CacheException {
- return new HibernateQueryResultsRegion(this,
- regionName,
- accessStgyFactory.node(),
- accessStgyFactory.regionCache(regionName));
- }
-
- /** {@inheritDoc} */
- @Override public TimestampsRegion buildTimestampsRegion(String regionName, Properties props) throws CacheException {
- return new HibernateTimestampsRegion(this,
- regionName,
- accessStgyFactory.node(),
- accessStgyFactory.regionCache(regionName));
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateTimestampsRegion.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateTimestampsRegion.java
deleted file mode 100644
index 7479bc4dbc6..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateTimestampsRegion.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import org.apache.ignite.Ignite;
-import org.hibernate.cache.spi.TimestampsRegion;
-
-/**
- * Implementation of {@link TimestampsRegion}. This region is automatically created when query
- * caching is enabled and it holds most recent updates timestamps to queryable tables.
- * Name of timestamps region is {@code "org.hibernate.cache.spi.UpdateTimestampsCache"}.
- */
-public class HibernateTimestampsRegion extends HibernateGeneralDataRegion implements TimestampsRegion {
- /**
- * @param factory Region factory.
- * @param name Region name.
- * @param ignite Grid.
- * @param cache Region cache.
- */
- public HibernateTimestampsRegion(HibernateRegionFactory factory, String name,
- Ignite ignite, HibernateCacheProxy cache) {
- super(factory, name, ignite, cache);
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java
deleted file mode 100644
index 275ea9ed697..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalDataRegion.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import org.apache.ignite.Ignite;
-import org.hibernate.cache.spi.CacheDataDescription;
-import org.hibernate.cache.spi.CollectionRegion;
-import org.hibernate.cache.spi.EntityRegion;
-import org.hibernate.cache.spi.NaturalIdRegion;
-import org.hibernate.cache.spi.TransactionalDataRegion;
-import org.hibernate.cache.spi.access.AccessType;
-
-/**
- * Implementation of {@link TransactionalDataRegion} (transactional means that
- * data in the region is updated in connection with database transaction).
- * This interface defines base contract for {@link EntityRegion}, {@link CollectionRegion}
- * and {@link NaturalIdRegion}.
- */
-public class HibernateTransactionalDataRegion extends HibernateRegion implements TransactionalDataRegion {
- /** */
- private final CacheDataDescription dataDesc;
-
- /**
- * @param factory Region factory.
- * @param name Region name.
- * @param ignite Grid.
- * @param cache Region cache.
- * @param dataDesc Region data description.
- */
- HibernateTransactionalDataRegion(HibernateRegionFactory factory, String name,
- Ignite ignite, HibernateCacheProxy cache, CacheDataDescription dataDesc) {
- super(factory, name, ignite, cache);
-
- this.dataDesc = dataDesc;
- }
-
- /** {@inheritDoc} */
- @Override public boolean isTransactionAware() {
- return false; // This method is not used by Hibernate.
- }
-
- /** {@inheritDoc} */
- @Override public CacheDataDescription getCacheDataDescription() {
- return dataDesc;
- }
-
- /**
- * @param accessType Hibernate L2 cache access type.
- * @return Access strategy for given access type.
- */
- HibernateAccessStrategyAdapter createAccessStrategy(AccessType accessType) {
- switch (accessType) {
- case READ_ONLY:
- return factory.accessStrategyFactory().createReadOnlyStrategy(cache);
-
- case NONSTRICT_READ_WRITE:
- return factory.accessStrategyFactory().createNonStrictReadWriteStrategy(cache);
-
- case READ_WRITE:
- return factory.accessStrategyFactory().createReadWriteStrategy(cache);
-
- case TRANSACTIONAL:
- return factory.accessStrategyFactory().createTransactionalStrategy(cache);
-
- default:
- throw new IllegalArgumentException("Unknown Hibernate access type: " + accessType);
- }
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/package-info.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/package-info.java
deleted file mode 100644
index 48e8ffcce1d..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/hibernate/package-info.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * <!-- Package description. -->
- * Contains implementation of Hibernate L2 cache. Refer to
- * <i>org.apache.ignite.examples.datagrid.hibernate.HibernateL2CacheExample</i> for more information on how to
- * configure and use Ignite with Hibernate.
- */
-
-package org.apache.ignite.cache.hibernate;
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java
deleted file mode 100644
index 66581008237..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java
+++ /dev/null
@@ -1,546 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.store.hibernate;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicBoolean;
-import javax.cache.integration.CacheLoaderException;
-import javax.cache.integration.CacheWriterException;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.cache.store.CacheStore;
-import org.apache.ignite.cache.store.CacheStoreAdapter;
-import org.apache.ignite.cache.store.CacheStoreSession;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
-import org.apache.ignite.internal.util.tostring.GridToStringExclude;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.marshaller.Marshaller;
-import org.apache.ignite.marshaller.jdk.JdkMarshaller;
-import org.apache.ignite.resources.CacheStoreSessionResource;
-import org.apache.ignite.resources.IgniteInstanceResource;
-import org.apache.ignite.resources.LoggerResource;
-import org.apache.ignite.transactions.Transaction;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.SharedSessionContract;
-import org.hibernate.cfg.Configuration;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * {@link CacheStore} implementation backed by Hibernate. This implementation
- * stores objects in underlying database in {@code BLOB} format.
- * <h2 class="header">Configuration</h2>
- * Either {@link #setSessionFactory(SessionFactory)} or
- * {@link #setHibernateConfigurationPath(String)} or
- * {@link #setHibernateProperties(Properties)} should be set.
- * <p>
- * If session factory is provided it should contain
- * {@link CacheHibernateBlobStoreEntry} persistent class (via provided
- * mapping file {@code GridCacheHibernateStoreEntry.hbm.xml} or by
- * adding {@link CacheHibernateBlobStoreEntry} to annotated classes
- * of session factory.
- * <p>
- * Path to hibernate configuration may be either an URL or a file path or
- * a classpath resource. This configuration file should include provided
- * mapping {@code GridCacheHibernateStoreEntry.hbm.xml} or include annotated
- * class {@link CacheHibernateBlobStoreEntry}.
- * <p>
- * If hibernate properties are provided, mapping
- * {@code GridCacheHibernateStoreEntry.hbm.xml} is included automatically.
- * <p>
- * Use {@link CacheHibernateBlobStoreFactory} factory to pass {@link CacheHibernateBlobStore} to {@link CacheConfiguration}.
- */
-public class CacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> {
- /**
- * Default connection URL
- * (value is <tt>jdbc:h2:mem:hibernateCacheStore;DB_CLOSE_DELAY=-1;DEFAULT_LOCK_TIMEOUT=5000</tt>).
- */
- public static final String DFLT_CONN_URL = "jdbc:h2:mem:hibernateCacheStore;DB_CLOSE_DELAY=-1;" +
- "DEFAULT_LOCK_TIMEOUT=5000";
-
- /** Default show SQL property value (value is <tt>true</tt>). */
- public static final String DFLT_SHOW_SQL = "true";
-
- /** Default <tt>hibernate.hbm2ddl.auto</tt> property value (value is <tt>true</tt>). */
- public static final String DFLT_HBM2DDL_AUTO = "update";
-
- /** Default <tt>hibernate.connection.pool_size</tt> property value (value is <tt>64</tt>). */
- public static final String DFLT_CONN_POOL_SIZE = "64";
-
- /** Session attribute name. */
- private static final String ATTR_SES = "HIBERNATE_STORE_SESSION";
-
- /** Name of Hibarname mapping resource. */
- private static final String MAPPING_RESOURCE =
- "org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml";
-
- /** Marshaller. */
- private static final Marshaller marsh = new JdkMarshaller();
-
- /** Init guard. */
- @GridToStringExclude
- private final AtomicBoolean initGuard = new AtomicBoolean();
-
- /** Init latch. */
- @GridToStringExclude
- private final CountDownLatch initLatch = new CountDownLatch(1);
-
- /** Hibernate properties. */
- @GridToStringExclude
- private Properties hibernateProps;
-
- /** Session factory. */
- @GridToStringExclude
- private SessionFactory sesFactory;
-
- /** Path to hibernate configuration file. */
- private String hibernateCfgPath;
-
- /** Log. */
- @LoggerResource
- private IgniteLogger log;
-
- /** Auto-injected store session. */
- @CacheStoreSessionResource
- private CacheStoreSession ses;
-
- /** Ignite instance. */
- @IgniteInstanceResource
- private Ignite ignite;
-
- /** {@inheritDoc} */
- @SuppressWarnings({"unchecked", "RedundantTypeArguments"})
- @Override public V load(K key) {
- init();
-
- Transaction tx = transaction();
-
- if (log.isDebugEnabled())
- log.debug("Store load [key=" + key + ", tx=" + tx + ']');
-
- Session ses = session(tx);
-
- try {
- CacheHibernateBlobStoreEntry entry = (CacheHibernateBlobStoreEntry)
- ses.get(CacheHibernateBlobStoreEntry.class, toBytes(key));
-
- if (entry == null)
- return null;
-
- return fromBytes(entry.getValue());
- }
- catch (IgniteCheckedException | HibernateException e) {
- rollback(ses, tx);
-
- throw new CacheLoaderException("Failed to load value from cache store with key: " + key, e);
- }
- finally {
- end(ses, tx);
- }
- }
-
- /** {@inheritDoc} */
- @Override public void write(javax.cache.Cache.Entry<? extends K, ? extends V> entry) {
- init();
-
- Transaction tx = transaction();
-
- K key = entry.getKey();
- V val = entry.getValue();
-
- if (log.isDebugEnabled())
- log.debug("Store put [key=" + key + ", val=" + val + ", tx=" + tx + ']');
-
- if (val == null) {
- delete(key);
-
- return;
- }
-
- Session ses = session(tx);
-
- try {
- CacheHibernateBlobStoreEntry entry0 = new CacheHibernateBlobStoreEntry(toBytes(key), toBytes(val));
-
- ses.saveOrUpdate(entry0);
- }
- catch (IgniteCheckedException | HibernateException e) {
- rollback(ses, tx);
-
- throw new CacheWriterException("Failed to put value to cache store [key=" + key + ", val" + val + "]", e);
- }
- finally {
- end(ses, tx);
- }
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings({"JpaQueryApiInspection", "JpaQlInspection"})
- @Override public void delete(Object key) {
- init();
-
- Transaction tx = transaction();
-
- if (log.isDebugEnabled())
- log.debug("Store remove [key=" + key + ", tx=" + tx + ']');
-
- Session ses = session(tx);
-
- try {
- Object obj = ses.get(CacheHibernateBlobStoreEntry.class, toBytes(key));
-
- if (obj != null)
- ses.delete(obj);
- }
- catch (IgniteCheckedException | HibernateException e) {
- rollback(ses, tx);
-
- throw new CacheWriterException("Failed to remove value from cache store with key: " + key, e);
- }
- finally {
- end(ses, tx);
- }
- }
-
- /**
- * Rolls back hibernate session.
- *
- * @param ses Hibernate session.
- * @param tx Cache ongoing transaction.
- */
- private void rollback(SharedSessionContract ses, Transaction tx) {
- // Rollback only if there is no cache transaction,
- // otherwise sessionEnd() will do all required work.
- if (tx == null) {
- org.hibernate.Transaction hTx = ses.getTransaction();
-
- if (hTx != null && hTx.isActive())
- hTx.rollback();
- }
- }
-
- /**
- * Ends hibernate session.
- *
- * @param ses Hibernate session.
- * @param tx Cache ongoing transaction.
- */
- private void end(Session ses, Transaction tx) {
- // Commit only if there is no cache transaction,
- // otherwise sessionEnd() will do all required work.
- if (tx == null) {
- org.hibernate.Transaction hTx = ses.getTransaction();
-
- if (hTx != null && hTx.isActive())
- hTx.commit();
-
- ses.close();
- }
- }
-
- /** {@inheritDoc} */
- @Override public void sessionEnd(boolean commit) {
- init();
-
- Transaction tx = transaction();
-
- Map<String, Session> props = session().properties();
-
- Session ses = props.remove(ATTR_SES);
-
- if (ses != null) {
- org.hibernate.Transaction hTx = ses.getTransaction();
-
- if (hTx != null) {
- try {
- if (commit) {
- ses.flush();
-
- hTx.commit();
- }
- else
- hTx.rollback();
-
- if (log.isDebugEnabled())
- log.debug("Transaction ended [xid=" + tx.xid() + ", commit=" + commit + ']');
- }
- catch (HibernateException e) {
- throw new CacheWriterException("Failed to end transaction [xid=" + tx.xid() +
- ", commit=" + commit + ']', e);
- }
- finally {
- ses.close();
- }
- }
- }
- }
-
- /**
- * Gets Hibernate session.
- *
- * @param tx Cache transaction.
- * @return Session.
- */
- Session session(@Nullable Transaction tx) {
- Session ses;
-
- if (tx != null) {
- Map<String, Session> props = session().properties();
-
- ses = props.get(ATTR_SES);
-
- if (ses == null) {
- ses = sesFactory.openSession();
-
- ses.beginTransaction();
-
- // Store session in transaction metadata, so it can be accessed
- // for other operations on the same transaction.
- props.put(ATTR_SES, ses);
-
- if (log.isDebugEnabled())
- log.debug("Hibernate session open [ses=" + ses + ", tx=" + tx.xid() + "]");
- }
- }
- else {
- ses = sesFactory.openSession();
-
- ses.beginTransaction();
- }
-
- return ses;
- }
-
- /**
- * Sets session factory.
- *
- * @param sesFactory Session factory.
- */
- public void setSessionFactory(SessionFactory sesFactory) {
- this.sesFactory = sesFactory;
- }
-
- /**
- * Sets hibernate configuration path.
- * <p>
- * This may be either URL or file path or classpath resource.
- *
- * @param hibernateCfgPath URL or file path or classpath resource
- * pointing to hibernate configuration XML file.
- */
- public void setHibernateConfigurationPath(String hibernateCfgPath) {
- this.hibernateCfgPath = hibernateCfgPath;
- }
-
- /**
- * Sets Hibernate properties.
- *
- * @param hibernateProps Hibernate properties.
- */
- public void setHibernateProperties(Properties hibernateProps) {
- this.hibernateProps = hibernateProps;
- }
-
- /**
- * Initializes store.
- *
- * @throws IgniteException If failed to initialize.
- */
- private void init() throws IgniteException {
- if (initGuard.compareAndSet(false, true)) {
- if (log.isDebugEnabled())
- log.debug("Initializing cache store.");
-
- try {
- if (sesFactory != null)
- // Session factory has been provided - nothing to do.
- return;
-
- if (!F.isEmpty(hibernateCfgPath)) {
- try {
- URL url = new URL(hibernateCfgPath);
-
- sesFactory = new Configuration().configure(url).buildSessionFactory();
-
- if (log.isDebugEnabled())
- log.debug("Configured session factory using URL: " + url);
-
- // Session factory has been successfully initialized.
- return;
- }
- catch (MalformedURLException e) {
- if (log.isDebugEnabled())
- log.debug("Caught malformed URL exception: " + e.getMessage());
- }
-
- // Provided path is not a valid URL. File?
- File cfgFile = new File(hibernateCfgPath);
-
- if (cfgFile.exists()) {
- sesFactory = new Configuration().configure(cfgFile).buildSessionFactory();
-
- if (log.isDebugEnabled())
- log.debug("Configured session factory using file: " + hibernateCfgPath);
-
- // Session factory has been successfully initialized.
- return;
- }
-
- // Provided path is not a file. Classpath resource?
- sesFactory = new Configuration().configure(hibernateCfgPath).buildSessionFactory();
-
- if (log.isDebugEnabled())
- log.debug("Configured session factory using classpath resource: " + hibernateCfgPath);
- }
- else {
- if (hibernateProps == null) {
- U.warn(log, "No Hibernate configuration has been provided for store (will use default).");
-
- hibernateProps = new Properties();
-
- hibernateProps.setProperty("hibernate.connection.url", DFLT_CONN_URL);
- hibernateProps.setProperty("hibernate.show_sql", DFLT_SHOW_SQL);
- hibernateProps.setProperty("hibernate.hbm2ddl.auto", DFLT_HBM2DDL_AUTO);
- hibernateProps.setProperty("hibernate.connection.pool_size", DFLT_CONN_POOL_SIZE);
- }
-
- Configuration cfg = new Configuration();
-
- cfg.setProperties(hibernateProps);
-
- assert resourceAvailable(MAPPING_RESOURCE) : MAPPING_RESOURCE;
-
- cfg.addResource(MAPPING_RESOURCE);
-
- sesFactory = cfg.buildSessionFactory();
-
- if (log.isDebugEnabled())
- log.debug("Configured session factory using properties: " + hibernateProps);
- }
- }
- catch (HibernateException e) {
- throw new IgniteException("Failed to initialize store.", e);
- }
- finally {
- initLatch.countDown();
- }
- }
- else if (initLatch.getCount() > 0) {
- try {
- U.await(initLatch);
- }
- catch (IgniteInterruptedCheckedException e) {
- throw new IgniteException(e);
- }
- }
-
- if (sesFactory == null)
- throw new IgniteException("Cache store was not properly initialized.");
- }
-
- /**
- * Checks availability of a classpath resource.
- *
- * @param name Resource name.
- * @return {@code true} if resource is available and ready for read, {@code false} otherwise.
- */
- private boolean resourceAvailable(String name) {
- InputStream cfgStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(name);
-
- if (cfgStream == null) {
- log.error("Classpath resource not found: " + name);
-
- return false;
- }
-
- try {
- // Read a single byte to force actual content access by JVM.
- cfgStream.read();
-
- return true;
- }
- catch (IOException e) {
- log.error("Failed to read classpath resource: " + name, e);
-
- return false;
- }
- finally {
- U.close(cfgStream, log);
- }
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(CacheHibernateBlobStore.class, this);
- }
-
- /**
- * Serialize object to byte array using marshaller.
- *
- * @param obj Object to convert to byte array.
- * @return Byte array.
- * @throws IgniteCheckedException If failed to convert.
- */
- protected byte[] toBytes(Object obj) throws IgniteCheckedException {
- return U.marshal(marsh, obj);
- }
-
- /**
- * Deserialize object from byte array using marshaller.
- *
- * @param bytes Bytes to deserialize.
- * @param <X> Result object type.
- * @return Deserialized object.
- * @throws IgniteCheckedException If failed.
- */
- protected <X> X fromBytes(byte[] bytes) throws IgniteCheckedException {
- if (bytes == null || bytes.length == 0)
- return null;
-
- return U.unmarshal(marsh, bytes, getClass().getClassLoader());
- }
-
- /**
- * @return Current transaction.
- */
- @Nullable private Transaction transaction() {
- CacheStoreSession ses = session();
-
- return ses != null ? ses.transaction() : null;
- }
-
- /**
- * @return Store session.
- */
- private CacheStoreSession session() {
- return ses;
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml
deleted file mode 100644
index 5b0be4375a1..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.apache.ignite.examples.datagrid.store" default-access="field">
- <class name="org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreEntry" table="ENTRIES">
- <id name="key"/>
-
- <property name="val"/>
- </class>
-</hibernate-mapping>
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.java
deleted file mode 100644
index 6cc4786324a..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.store.hibernate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * Entry that is used by {@link CacheHibernateBlobStore} implementation.
- * <p>
- * Note that this is a reference implementation for tests only.
- * When running on production systems use concrete key-value types to
- * get better performance.
- */
-@Entity
-@Table(name = "ENTRIES")
-public class CacheHibernateBlobStoreEntry {
- /** Key (use concrete key type in production). */
- @Id
- @Column(length = 65535)
- private byte[] key;
-
- /** Value (use concrete value type in production). */
- @Column(length = 65535)
- private byte[] val;
-
- /**
- * Constructor.
- */
- CacheHibernateBlobStoreEntry() {
- // No-op.
- }
-
- /**
- * Constructor.
- *
- * @param key Key.
- * @param val Value.
- */
- CacheHibernateBlobStoreEntry(byte[] key, byte[] val) {
- this.key = key;
- this.val = val;
- }
-
- /**
- * @return Key.
- */
- public byte[] getKey() {
- return key;
- }
-
- /**
- * @param key Key.
- */
- public void setKey(byte[] key) {
- this.key = key;
- }
-
- /**
- * @return Value.
- */
- public byte[] getValue() {
- return val;
- }
-
- /**
- * @param val Value.
- */
- public void setValue(byte[] val) {
- this.val = val;
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreFactory.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreFactory.java
deleted file mode 100644
index fba9edbddb0..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreFactory.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.store.hibernate;
-
-import java.util.Properties;
-import javax.cache.configuration.Factory;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.internal.IgniteComponentType;
-import org.apache.ignite.internal.util.spring.IgniteSpringHelper;
-import org.apache.ignite.internal.util.tostring.GridToStringExclude;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.resources.SpringApplicationContextResource;
-import org.hibernate.SessionFactory;
-
-/**
- * {@link Factory} implementation for {@link CacheHibernateBlobStore}.
- *
- * Use this factory to pass {@link CacheHibernateBlobStore} to {@link CacheConfiguration}.
- *
- * <h2 class="header">Java Example</h2>
- * In this example existing session factory is provided.
- * <pre name="code" class="java">
- * ...
- * CacheHibernateBlobStoreFactory<String, String> factory = new CacheHibernateBlobStoreFactory<String, String>();
- *
- * factory.setSessionFactory(sesFactory);
- * ...
- * </pre>
- *
- * <h2 class="header">Spring Example (using Spring ORM)</h2>
- * <pre name="code" class="xml">
- * ...
- * <bean id="cache.hibernate.store.factory"
- * class="org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreFactory">
- * <property name="sessionFactory">
- * <bean class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
- * <property name="hibernateProperties">
- * <value>
- * connection.url=jdbc:h2:mem:
- * show_sql=true
- * hbm2ddl.auto=true
- * hibernate.dialect=org.hibernate.dialect.H2Dialect
- * </value>
- * </property>
- * <property name="mappingResources">
- * <list>
- * <value>
- * org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml
- * </value>
- * </list>
- * </property>
- * </bean>
- * </property>
- * </bean>
- * ...
- * </pre>
- *
- * <h2 class="header">Spring Example (using Spring ORM and persistent annotations)</h2>
- * <pre name="code" class="xml">
- * ...
- * <bean id="cache.hibernate.store.factory1"
- * class="org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreFactory">
- * <property name="sessionFactory">
- * <bean class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">
- * <property name="hibernateProperties">
- * <value>
- * connection.url=jdbc:h2:mem:
- * show_sql=true
- * hbm2ddl.auto=true
- * hibernate.dialect=org.hibernate.dialect.H2Dialect
- * </value>
- * </property>
- * <property name="annotatedClasses">
- * <list>
- * <value>
- * org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreEntry
- * </value>
- * </list>
- * </property>
- * </bean>
- * </property>
- * </bean>
- * ...
- * </pre>
- *
- * <h2 class="header">Spring Example</h2>
- * <pre name="code" class="xml">
- * ...
- * <bean id="cache.hibernate.store.factory2"
- * class="org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreFactory">
- * <property name="hibernateProperties">
- * <props>
- * <prop key="connection.url">jdbc:h2:mem:</prop>
- * <prop key="hbm2ddl.auto">update</prop>
- * <prop key="show_sql">true</prop>
- * </props>
- * </property>
- * </bean>
- * ...
- * </pre>
- * <p>
- * <img src="http://ignite.apache.org/images/spring-small.png">
- * <br>
- * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
- */
-public class CacheHibernateBlobStoreFactory<K, V> implements Factory<CacheHibernateBlobStore<K, V>> {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Session factory. */
- @GridToStringExclude
- private transient SessionFactory sesFactory;
-
- /** Session factory bean name. */
- private String sesFactoryBean;
-
- /** Path to hibernate configuration file. */
- private String hibernateCfgPath;
-
- /** Hibernate properties. */
- @GridToStringExclude
- private Properties hibernateProps;
-
- /** Application context. */
- @SpringApplicationContextResource
- private Object appContext;
-
- /** {@inheritDoc} */
- @Override public CacheHibernateBlobStore<K, V> create() {
- CacheHibernateBlobStore<K, V> store = new CacheHibernateBlobStore<>();
-
- store.setHibernateConfigurationPath(hibernateCfgPath);
- store.setHibernateProperties(hibernateProps);
-
- if (sesFactory != null)
- store.setSessionFactory(sesFactory);
- else if (sesFactoryBean != null) {
- if (appContext == null)
- throw new IgniteException("Spring application context resource is not injected.");
-
- IgniteSpringHelper spring;
-
- try {
- spring = IgniteComponentType.SPRING.create(false);
-
- SessionFactory sesFac = spring.loadBeanFromAppContext(appContext, sesFactoryBean);
-
- store.setSessionFactory(sesFac);
- }
- catch (IgniteCheckedException e) {
- throw new IgniteException("Failed to load bean in application context [beanName=" + sesFactoryBean +
- ", igniteConfig=" + appContext + ']');
- }
- }
-
- return store;
- }
-
- /**
- * Sets session factory.
- *
- * @param sesFactory Session factory.
- * @return {@code This} for chaining.
- * @see CacheHibernateBlobStore#setSessionFactory(SessionFactory)
- */
- public CacheHibernateBlobStoreFactory<K, V> setSessionFactory(SessionFactory sesFactory) {
- this.sesFactory = sesFactory;
-
- return this;
- }
-
- /**
- * Sets name of the data source bean.
- *
- * @param sesFactory Session factory bean name.
- * @return {@code This} for chaining.
- * @see CacheHibernateBlobStore#setSessionFactory(SessionFactory)
- */
- public CacheHibernateBlobStoreFactory<K, V> setSessionFactoryBean(String sesFactory) {
- this.sesFactoryBean = sesFactory;
-
- return this;
- }
-
- /**
- * Sets hibernate configuration path.
- * <p>
- * This may be either URL or file path or classpath resource.
- *
- * @param hibernateCfgPath URL or file path or classpath resource
- * pointing to hibernate configuration XML file.
- * @return {@code This} for chaining.
- * @see CacheHibernateBlobStore#setHibernateConfigurationPath(String)
- */
- public CacheHibernateBlobStoreFactory<K, V> setHibernateConfigurationPath(String hibernateCfgPath) {
- this.hibernateCfgPath = hibernateCfgPath;
-
- return this;
- }
-
- /**
- * Sets Hibernate properties.
- *
- * @param hibernateProps Hibernate properties.
- * @return {@code This} for chaining.
- * @see CacheHibernateBlobStore#setHibernateProperties(Properties)
- */
- public CacheHibernateBlobStoreFactory<K, V> setHibernateProperties(Properties hibernateProps) {
- this.hibernateProps = hibernateProps;
-
- return this;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(CacheHibernateBlobStoreFactory.class, this);
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListener.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListener.java
deleted file mode 100644
index 21787aa8e47..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListener.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.store.hibernate;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.cache.integration.CacheWriterException;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.cache.store.CacheStore;
-import org.apache.ignite.cache.store.CacheStoreSession;
-import org.apache.ignite.cache.store.CacheStoreSessionListener;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lifecycle.LifecycleAware;
-import org.apache.ignite.resources.LoggerResource;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.cfg.Configuration;
-
-/**
- * Hibernate-based cache store session listener.
- * <p>
- * This listener creates a new Hibernate session for each store
- * session. If there is an ongoing cache transaction, a corresponding
- * Hibernate transaction is created as well.
- * <p>
- * The Hibernate session is saved as a store session
- * {@link CacheStoreSession#attachment() attachment}.
- * The listener guarantees that the session will be
- * available for any store operation. If there is an
- * ongoing cache transaction, all operations within this
- * transaction will share a DB transaction.
- * <p>
- * As an example, here is how the {@link CacheStore#write(javax.cache.Cache.Entry)}
- * method can be implemented if {@link CacheHibernateStoreSessionListener}
- * is configured:
- * <pre name="code" class="java">
- * private static class Store extends CacheStoreAdapter<Integer, Integer> {
- * @CacheStoreSessionResource
- * private CacheStoreSession ses;
- *
- * @Override public void write(Cache.Entry<? extends Integer, ? extends Integer> entry) throws CacheWriterException {
- * // Get Hibernate session from the current store session.
- * Session hibSes = ses.attachment();
- *
- * // Persist the value.
- * hibSes.persist(entry.getValue());
- * }
- * }
- * </pre>
- * Hibernate session will be automatically created by the listener
- * at the start of the session and closed when it ends.
- * <p>
- * {@link CacheHibernateStoreSessionListener} requires that either
- * {@link #setSessionFactory(SessionFactory)} session factory}
- * or {@link #setHibernateConfigurationPath(String) Hibernate configuration file}
- * is provided. If non of them is set, exception is thrown. Is both are provided,
- * session factory will be used.
- */
-public class CacheHibernateStoreSessionListener implements CacheStoreSessionListener, LifecycleAware {
- /** Hibernate session factory. */
- private SessionFactory sesFactory;
-
- /** Hibernate configuration file path. */
- private String hibernateCfgPath;
-
- /** Logger. */
- @LoggerResource
- private IgniteLogger log;
-
- /** Whether to close session on stop. */
- private boolean closeSesOnStop;
-
- /**
- * Sets Hibernate session factory.
- * <p>
- * Either session factory or configuration file is required.
- * If none is provided, exception will be thrown on startup.
- *
- * @param sesFactory Session factory.
- */
- public void setSessionFactory(SessionFactory sesFactory) {
- this.sesFactory = sesFactory;
- }
-
- /**
- * Gets Hibernate session factory.
- *
- * @return Session factory.
- */
- public SessionFactory getSessionFactory() {
- return sesFactory;
- }
-
- /**
- * Sets hibernate configuration path.
- * <p>
- * Either session factory or configuration file is required.
- * If none is provided, exception will be thrown on startup.
- *
- * @param hibernateCfgPath Hibernate configuration path.
- */
- public void setHibernateConfigurationPath(String hibernateCfgPath) {
- this.hibernateCfgPath = hibernateCfgPath;
- }
-
- /**
- * Gets hibernate configuration path.
- *
- * @return Hibernate configuration path.
- */
- public String getHibernateConfigurationPath() {
- return hibernateCfgPath;
- }
-
- /** {@inheritDoc} */
- @SuppressWarnings("deprecation")
- @Override public void start() throws IgniteException {
- if (sesFactory == null && F.isEmpty(hibernateCfgPath))
- throw new IgniteException("Either session factory or Hibernate configuration file is required by " +
- getClass().getSimpleName() + '.');
-
- if (!F.isEmpty(hibernateCfgPath)) {
- if (sesFactory == null) {
- try {
- URL url = new URL(hibernateCfgPath);
-
- sesFactory = new Configuration().configure(url).buildSessionFactory();
- }
- catch (MalformedURLException ignored) {
- // No-op.
- }
-
- if (sesFactory == null) {
- File cfgFile = new File(hibernateCfgPath);
-
- if (cfgFile.exists())
- sesFactory = new Configuration().configure(cfgFile).buildSessionFactory();
- }
-
- if (sesFactory == null)
- sesFactory = new Configuration().configure(hibernateCfgPath).buildSessionFactory();
-
- if (sesFactory == null)
- throw new IgniteException("Failed to resolve Hibernate configuration file: " + hibernateCfgPath);
-
- closeSesOnStop = true;
- }
- else
- U.warn(log, "Hibernate configuration file configured in " + getClass().getSimpleName() +
- " will be ignored (session factory is already set).");
- }
- }
-
- /** {@inheritDoc} */
- @Override public void stop() throws IgniteException {
- if (closeSesOnStop && sesFactory != null && !sesFactory.isClosed())
- sesFactory.close();
- }
-
- /** {@inheritDoc} */
- @Override public void onSessionStart(CacheStoreSession ses) {
- if (ses.attachment() == null) {
- try {
- Session hibSes = sesFactory.openSession();
-
- ses.attach(hibSes);
-
- if (ses.isWithinTransaction())
- hibSes.beginTransaction();
- }
- catch (HibernateException e) {
- throw new CacheWriterException("Failed to start store session [tx=" + ses.transaction() + ']', e);
- }
- }
- }
-
- /** {@inheritDoc} */
- @Override public void onSessionEnd(CacheStoreSession ses, boolean commit) {
- Session hibSes = ses.attach(null);
-
- if (hibSes != null) {
- try {
- Transaction tx = hibSes.getTransaction();
-
- if (commit) {
- hibSes.flush();
-
- if (tx.isActive())
- tx.commit();
- }
- else if (tx.isActive())
- tx.rollback();
- }
- catch (HibernateException e) {
- throw new CacheWriterException("Failed to end store session [tx=" + ses.transaction() + ']', e);
- }
- finally {
- hibSes.close();
- }
- }
- }
-}
diff --git a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/package-info.java b/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/package-info.java
deleted file mode 100644
index 49af23aac8a..00000000000
--- a/modules/hibernate-4.2/src/main/java/org/apache/ignite/cache/store/hibernate/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * <!-- Package description. -->
- * Contains reference Hibernate-based cache store implementation.
- */
-
-package org.apache.ignite.cache.store.hibernate;
diff --git a/modules/hibernate-4.2/src/test/config/factory-cache.xml b/modules/hibernate-4.2/src/test/config/factory-cache.xml
deleted file mode 100644
index a251846500b..00000000000
--- a/modules/hibernate-4.2/src/test/config/factory-cache.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="simpleSessionFactory"
- class="org.apache.ignite.cache.store.hibernate.CacheHibernateStoreFactorySelfTest$DummySessionFactoryExt"/>
-
- <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
- <property name="cacheConfiguration">
- <list>
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="test"/>
- <property name="atomicityMode" value="ATOMIC"/>
- <property name="backups" value="1"/>
- <property name="cacheStoreFactory">
- <bean class="org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreFactory">
- <property name="sessionFactoryBean" value = "simpleSessionFactory"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
-
- <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
- <property name="discoverySpi">
- <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
- <property name="ipFinder">
- <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
- <property name="addresses">
- <list>
- <value>127.0.0.1:47500..47509</value>
- </list>
- </property>
- </bean>
- </property>
- </bean>
- </property>
- </bean>
-</beans>
diff --git a/modules/hibernate-4.2/src/test/config/factory-cache1.xml b/modules/hibernate-4.2/src/test/config/factory-cache1.xml
deleted file mode 100644
index 7a53b1fa9fd..00000000000
--- a/modules/hibernate-4.2/src/test/config/factory-cache1.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="simpleSessionFactory1"
- class="org.apache.ignite.cache.store.hibernate.CacheHibernateStoreFactorySelfTest$DummySessionFactory"/>
-
- <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
- <property name="igniteInstanceName" value="ignite1"/>
-
- <property name="cacheConfiguration">
- <list>
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="test"/>
- <property name="atomicityMode" value="ATOMIC"/>
- <property name="backups" value="1"/>
- <property name="cacheStoreFactory">
- <bean class="org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreFactory">
- <property name="sessionFactoryBean" value = "simpleSessionFactory1"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
-
- <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
- <property name="discoverySpi">
- <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
- <property name="ipFinder">
- <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
- <property name="addresses">
- <list>
- <value>127.0.0.1:47500..47509</value>
- </list>
- </property>
- </bean>
- </property>
- </bean>
- </property>
- </bean>
-</beans>
diff --git a/modules/hibernate-4.2/src/test/config/factory-incorrect-store-cache.xml b/modules/hibernate-4.2/src/test/config/factory-incorrect-store-cache.xml
deleted file mode 100644
index 4de9fc9aca4..00000000000
--- a/modules/hibernate-4.2/src/test/config/factory-incorrect-store-cache.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
- <property name="failureHandler">
- <bean class="org.apache.ignite.failure.NoOpFailureHandler"/>
- </property>
-
- <property name="cacheConfiguration">
- <list>
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="test"/>
- <property name="atomicityMode" value="ATOMIC"/>
- <property name="backups" value="1"/>
- <property name="cacheStoreFactory">
- <bean class="org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreFactory">
- <property name="sessionFactoryBean" value = "simpleSessionFactory1"/>
- </bean>
- </property>
- </bean>
- </list>
- </property>
-
- <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
- <property name="discoverySpi">
- <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
- <property name="ipFinder">
- <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
- <property name="addresses">
- <list>
- <value>127.0.0.1:47500..47509</value>
- </list>
- </property>
- </bean>
- </property>
- </bean>
- </property>
- </bean>
-</beans>
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
deleted file mode 100644
index fa836680bc1..00000000000
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import javax.cache.Cache;
-import javax.persistence.Cacheable;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.junit.Test;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.hibernate.HibernateAccessStrategyFactory.DFLT_ACCESS_TYPE_PROPERTY;
-import static org.apache.ignite.cache.hibernate.HibernateAccessStrategyFactory.IGNITE_INSTANCE_NAME_PROPERTY;
-import static org.apache.ignite.cache.hibernate.HibernateAccessStrategyFactory.REGION_CACHE_PROPERTY;
-import static org.hibernate.cfg.AvailableSettings.CACHE_REGION_FACTORY;
-import static org.hibernate.cfg.AvailableSettings.GENERATE_STATISTICS;
-import static org.hibernate.cfg.AvailableSettings.HBM2DDL_AUTO;
-import static org.hibernate.cfg.AvailableSettings.RELEASE_CONNECTIONS;
-import static org.hibernate.cfg.AvailableSettings.USE_QUERY_CACHE;
-import static org.hibernate.cfg.AvailableSettings.USE_SECOND_LEVEL_CACHE;
-
-/**
- * Tests Hibernate L2 cache configuration.
- */
-public class HibernateL2CacheConfigurationSelfTest extends GridCommonAbstractTest {
- /** */
- public static final String ENTITY1_NAME = Entity1.class.getName();
-
- /** */
- public static final String ENTITY2_NAME = Entity2.class.getName();
-
- /** */
- public static final String ENTITY3_NAME = Entity3.class.getName();
-
- /** */
- public static final String ENTITY4_NAME = Entity4.class.getName();
-
- /** */
- public static final String TIMESTAMP_CACHE = "org.hibernate.cache.spi.UpdateTimestampsCache";
-
- /** */
- public static final String QUERY_CACHE = "org.hibernate.cache.internal.StandardQueryCache";
-
- /** */
- public static final String CONNECTION_URL = "jdbc:h2:mem:example;DB_CLOSE_DELAY=-1";
-
- /** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- startGrid(0);
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTest() throws Exception {
- for (IgniteCacheProxy<?, ?> cache : ((IgniteKernal)grid(0)).caches())
- cache.clear();
- }
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-
- TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
-
- discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true));
-
- cfg.setDiscoverySpi(discoSpi);
-
- cfg.setCacheConfiguration(cacheConfiguration(ENTITY3_NAME), cacheConfiguration(ENTITY4_NAME),
- cacheConfiguration("cache1"), cacheConfiguration("cache2"), cacheConfiguration("cache3"),
- cacheConfiguration(TIMESTAMP_CACHE), cacheConfiguration(QUERY_CACHE));
-
- return cfg;
- }
-
- /**
- * @param cacheName Cache name.
- * @return Cache configuration.
- */
- private CacheConfiguration cacheConfiguration(String cacheName) {
- CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
-
- cfg.setName(cacheName);
-
- cfg.setCacheMode(PARTITIONED);
-
- cfg.setAtomicityMode(ATOMIC);
-
- return cfg;
- }
-
- /**
- * @param igniteInstanceName Ignite instance name.
- * @return Hibernate configuration.
- */
- protected Configuration hibernateConfiguration(String igniteInstanceName) {
- Configuration cfg = new Configuration();
-
- cfg.addAnnotatedClass(Entity1.class);
- cfg.addAnnotatedClass(Entity2.class);
- cfg.addAnnotatedClass(Entity3.class);
- cfg.addAnnotatedClass(Entity4.class);
-
- cfg.setProperty(DFLT_ACCESS_TYPE_PROPERTY, AccessType.NONSTRICT_READ_WRITE.name());
-
- cfg.setProperty(HBM2DDL_AUTO, "create");
-
- cfg.setProperty(GENERATE_STATISTICS, "true");
-
- cfg.setProperty(USE_SECOND_LEVEL_CACHE, "true");
-
- cfg.setProperty(USE_QUERY_CACHE, "true");
-
- cfg.setProperty(CACHE_REGION_FACTORY, HibernateRegionFactory.class.getName());
-
- cfg.setProperty(RELEASE_CONNECTIONS, "on_close");
-
- cfg.setProperty(IGNITE_INSTANCE_NAME_PROPERTY, igniteInstanceName);
-
- cfg.setProperty(REGION_CACHE_PROPERTY + ENTITY1_NAME, "cache1");
- cfg.setProperty(REGION_CACHE_PROPERTY + ENTITY2_NAME, "cache2");
- cfg.setProperty(REGION_CACHE_PROPERTY + TIMESTAMP_CACHE, TIMESTAMP_CACHE);
- cfg.setProperty(REGION_CACHE_PROPERTY + QUERY_CACHE, QUERY_CACHE);
-
- return cfg;
- }
-
- /**
- * Tests property {@link HibernateAccessStrategyFactory#REGION_CACHE_PROPERTY}.
- */
- @Test
- public void testPerRegionCacheProperty() {
- testCacheUsage(1, 1, 0, 1, 1);
- }
-
- /**
- * @param expCache1 Expected size of cache with name 'cache1'.
- * @param expCache2 Expected size of cache with name 'cache2'.
- * @param expCache3 Expected size of cache with name 'cache3'.
- * @param expCacheE3 Expected size of cache with name {@link #ENTITY3_NAME}.
- * @param expCacheE4 Expected size of cache with name {@link #ENTITY4_NAME}.
- */
- @SuppressWarnings("unchecked")
- private void testCacheUsage(int expCache1, int expCache2, int expCache3, int expCacheE3, int expCacheE4) {
- SessionFactory sesFactory = startHibernate(getTestIgniteInstanceName(0));
-
- try {
- Session ses = sesFactory.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- ses.save(new Entity1());
- ses.save(new Entity2());
- ses.save(new Entity3());
- ses.save(new Entity4());
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- ses = sesFactory.openSession();
-
- try {
- List<Entity1> list1 = ses.createCriteria(ENTITY1_NAME).list();
-
- assertEquals(1, list1.size());
-
- for (Entity1 e : list1) {
- ses.load(ENTITY1_NAME, e.getId());
- assertNotNull(e.getId());
- }
-
- List<Entity2> list2 = ses.createCriteria(ENTITY2_NAME).list();
-
- assertEquals(1, list2.size());
-
- for (Entity2 e : list2)
- assertNotNull(e.getId());
-
- List<Entity3> list3 = ses.createCriteria(ENTITY3_NAME).list();
-
- assertEquals(1, list3.size());
-
- for (Entity3 e : list3)
- assertNotNull(e.getId());
-
- List<Entity4> list4 = ses.createCriteria(ENTITY4_NAME).list();
-
- assertEquals(1, list4.size());
-
- for (Entity4 e : list4)
- assertNotNull(e.getId());
- }
- finally {
- ses.close();
- }
-
- IgniteCache<Object, Object> cache1 = grid(0).cache("cache1");
- IgniteCache<Object, Object> cache2 = grid(0).cache("cache2");
- IgniteCache<Object, Object> cache3 = grid(0).cache("cache3");
- IgniteCache<Object, Object> cacheE3 = grid(0).cache(ENTITY3_NAME);
- IgniteCache<Object, Object> cacheE4 = grid(0).cache(ENTITY4_NAME);
-
- assertEquals("Unexpected entries: " + toSet(cache1.iterator()), expCache1, cache1.size());
- assertEquals("Unexpected entries: " + toSet(cache2.iterator()), expCache2, cache2.size());
- assertEquals("Unexpected entries: " + toSet(cache3.iterator()), expCache3, cache3.size());
- assertEquals("Unexpected entries: " + toSet(cacheE3.iterator()), expCacheE3, cacheE3.size());
- assertEquals("Unexpected entries: " + toSet(cacheE4.iterator()), expCacheE4, cacheE4.size());
- }
- finally {
- sesFactory.close();
- }
- }
-
- /**
- *
- */
- private <K, V> Set<Cache.Entry<K, V>> toSet(Iterator<Cache.Entry<K, V>> iter) {
- Set<Cache.Entry<K, V>> set = new HashSet<>();
-
- while (iter.hasNext())
- set.add(iter.next());
-
- return set;
- }
-
- /**
- * @param igniteInstanceName Name of the grid providing caches.
- * @return Session factory.
- */
- private SessionFactory startHibernate(String igniteInstanceName) {
- Configuration cfg = hibernateConfiguration(igniteInstanceName);
-
- ServiceRegistryBuilder builder = new ServiceRegistryBuilder();
-
- builder.applySetting("hibernate.connection.url", CONNECTION_URL);
- builder.applySetting("hibernate.show_sql", false);
-
- return cfg.buildSessionFactory(builder.buildServiceRegistry());
- }
-
- /**
- * Test Hibernate entity1.
- */
- @javax.persistence.Entity
- @SuppressWarnings({"PublicInnerClass", "UnnecessaryFullyQualifiedName"})
- @Cacheable
- @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
- public static class Entity1 {
- /** */
- private int id;
-
- /**
- * @return ID.
- */
- @Id
- @GeneratedValue
- public int getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(int id) {
- this.id = id;
- }
- }
-
- /**
- * Test Hibernate entity2.
- */
- @javax.persistence.Entity
- @SuppressWarnings({"PublicInnerClass", "UnnecessaryFullyQualifiedName"})
- @Cacheable
- @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
- public static class Entity2 {
- /** */
- private int id;
-
- /**
- * @return ID.
- */
- @Id
- @GeneratedValue
- public int getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(int id) {
- this.id = id;
- }
- }
-
- /**
- * Test Hibernate entity3.
- */
- @javax.persistence.Entity
- @SuppressWarnings({"PublicInnerClass", "UnnecessaryFullyQualifiedName"})
- @Cacheable
- @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
- public static class Entity3 {
- /** */
- private int id;
-
- /**
- * @return ID.
- */
- @Id
- @GeneratedValue
- public int getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(int id) {
- this.id = id;
- }
- }
-
- /**
- * Test Hibernate entity4.
- */
- @javax.persistence.Entity
- @SuppressWarnings({"PublicInnerClass", "UnnecessaryFullyQualifiedName"})
- @Cacheable
- @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
- public static class Entity4 {
- /** */
- private int id;
-
- /**
- * @return ID.
- */
- @Id
- @GeneratedValue
- public int getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(int id) {
- this.id = id;
- }
- }
-}
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
deleted file mode 100644
index 627dae235b8..00000000000
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import java.util.Map;
-import javax.persistence.Cacheable;
-import javax.persistence.Id;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCompute;
-import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
-import org.apache.ignite.lang.IgniteRunnable;
-import org.apache.ignite.resources.IgniteInstanceResource;
-import org.apache.ignite.resources.LoggerResource;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.junit.Test;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
-import static org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest.CONNECTION_URL;
-import static org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest.hibernateProperties;
-import static org.hibernate.cache.spi.access.AccessType.NONSTRICT_READ_WRITE;
-
-/**
- *
- */
-public class HibernateL2CacheMultiJvmTest extends GridCommonAbstractTest {
- /** */
- private static final String TIMESTAMP_CACHE = "org.hibernate.cache.spi.UpdateTimestampsCache";
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-
- cfg.setCacheConfiguration(
- cacheConfiguration(TIMESTAMP_CACHE),
- cacheConfiguration(Entity1.class.getName()),
- cacheConfiguration(Entity2.class.getName()),
- cacheConfiguration(Entity3.class.getName())
- );
-
- cfg.setMarshaller(new BinaryMarshaller());
-
- cfg.setPeerClassLoadingEnabled(false);
-
- return cfg;
- }
-
- /** */
- private CacheConfiguration cacheConfiguration(String cacheName) {
- CacheConfiguration cfg = new CacheConfiguration();
- cfg.setName(cacheName);
- cfg.setCacheMode(PARTITIONED);
- cfg.setAtomicityMode(ATOMIC);
- cfg.setWriteSynchronizationMode(FULL_SYNC);
- return cfg;
- }
-
- /** {@inheritDoc} */
- @Override protected boolean isMultiJvm() {
- return true;
- }
-
- /** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- super.beforeTestsStarted();
-
- startGrid(0);
-
- startClientGrid(1);
- startClientGrid(2);
- }
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testL2Cache() throws Exception {
- Ignite srv = ignite(0);
-
- {
- IgniteCompute client1Compute =
- srv.compute(srv.cluster().forNodeId(ignite(1).cluster().localNode().id()));
-
- client1Compute.run(new HibernateInsertRunnable());
- }
-
- {
- IgniteCompute client2Compute =
- srv.compute(srv.cluster().forNodeId(ignite(2).cluster().localNode().id()));
-
- client2Compute.run(new HibernateLoadRunnable());
- }
-
- {
- IgniteCompute srvCompute = srv.compute(srv.cluster().forLocal());
-
- srvCompute.run(new HibernateLoadRunnable());
- }
- }
-
- /**
- *
- */
- private static class HibernateInsertRunnable extends HibernateBaseRunnable {
- /** {@inheritDoc} */
- @Override public void run() {
- SessionFactory sesFactory = startHibernate(ignite.name());
-
- Session ses = sesFactory.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- for (int i = 0; i < 1; i++) {
- {
- Entity1 e = new Entity1();
- e.setId(i);
- e.setName("name-" + i);
-
- ses.save(e);
- }
-
- {
- Entity2 e = new Entity2();
- e.setId(String.valueOf(i));
- e.setName("name-" + i);
-
- ses.save(e);
- }
-
- {
- Entity3 e = new Entity3();
- e.setId(i);
- e.setName("name-" + i);
-
- ses.save(e);
- }
- }
-
- tx.commit();
- }
- finally {
- ses.close();
- }
- }
- }
-
- /**
- *
- */
- private static class HibernateLoadRunnable extends HibernateBaseRunnable {
- /** {@inheritDoc} */
- @Override public void run() {
- SessionFactory sesFactory = startHibernate(ignite.name());
-
- Session ses = sesFactory.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- for (int i = 0; i < 1; i++) {
- {
- Entity1 e = (Entity1)ses.load(Entity1.class, i);
-
- log.info("Found: " + e.getName());
- }
- {
- Entity2 e = (Entity2)ses.load(Entity2.class, String.valueOf(i));
-
- log.info("Found: " + e.getName());
- }
- {
- Entity3 e = (Entity3)ses.load(Entity3.class, (double)i);
-
- log.info("Found: " + e.getName());
- }
- }
-
- tx.commit();
- }
- finally {
- ses.close();
- }
- }
- }
-
- /**
- *
- */
- private abstract static class HibernateBaseRunnable implements IgniteRunnable {
- /** */
- @IgniteInstanceResource
- protected Ignite ignite;
-
- /** */
- @LoggerResource
- IgniteLogger log;
-
- /**
- * @param igniteInstanceName Name of the grid providing caches.
- * @return Session factory.
- */
- SessionFactory startHibernate(String igniteInstanceName) {
- log.info("Start hibernate on node: " + igniteInstanceName);
-
- Configuration cfg = hibernateConfiguration(igniteInstanceName);
-
- ServiceRegistryBuilder builder = new ServiceRegistryBuilder();
-
- builder.applySetting("hibernate.connection.url", CONNECTION_URL);
-
- return cfg.buildSessionFactory(builder.buildServiceRegistry());
- }
-
- /**
- * @param nodeName Ignite instance name.
- * @return Hibernate configuration.
- */
- private Configuration hibernateConfiguration(String nodeName) {
- Configuration cfg = new Configuration();
-
- cfg.addAnnotatedClass(Entity1.class);
- cfg.addAnnotatedClass(Entity2.class);
- cfg.addAnnotatedClass(Entity3.class);
-
- for (Map.Entry<String, String> e : hibernateProperties(nodeName, NONSTRICT_READ_WRITE.name()).entrySet())
- cfg.setProperty(e.getKey(), e.getValue());
-
- return cfg;
- }
- }
-
- /**
- * Test Hibernate entity1.
- */
- @javax.persistence.Entity
- @Cacheable
- @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
- public static class Entity1 {
- /** */
- @Id
- private int id;
-
- /** */
- private String name;
-
- /**
- * @return ID.
- */
- public int getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @return Name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name Name.
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object o) {
- if (this == o)
- return true;
-
- if (o == null || getClass() != o.getClass())
- return false;
-
- Entity1 entity1 = (Entity1)o;
-
- return id == entity1.id;
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- return id;
- }
- }
-
- /**
- * Test Hibernate entity1.
- */
- @javax.persistence.Entity
- @Cacheable
- @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
- public static class Entity2 {
- /** */
- @Id
- private String id;
-
- /** */
- private String name;
-
- /**
- * @return ID.
- */
- public String getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(String id) {
- this.id = id;
- }
-
- /**
- * @return Name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name Name.
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object o) {
- if (this == o)
- return true;
-
- if (o == null || getClass() != o.getClass())
- return false;
-
- Entity2 entity2 = (Entity2)o;
-
- return id.equals(entity2.id);
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- return id.hashCode();
- }
- }
-
- /**
- * Test Hibernate entity1.
- */
- @javax.persistence.Entity
- @Cacheable
- @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
- public static class Entity3 {
- /** */
- @Id
- private double id;
-
- /** */
- private String name;
-
- /**
- * @return ID.
- */
- public double getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(double id) {
- this.id = id;
- }
-
- /**
- * @return Name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name Name.
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object o) {
- if (this == o)
- return true;
-
- if (o == null || getClass() != o.getClass())
- return false;
-
- Entity3 entity3 = (Entity3)o;
-
- return Double.compare(entity3.id, id) == 0;
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- long temp = Double.doubleToLongBits(id);
- return (int)(temp ^ (temp >>> 32));
- }
- }
-}
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
deleted file mode 100644
index 05e3eb0b0e7..00000000000
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
+++ /dev/null
@@ -1,1945 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
-import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.hibernate.ObjectNotFoundException;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.StaleObjectStateException;
-import org.hibernate.Transaction;
-import org.hibernate.annotations.NaturalId;
-import org.hibernate.annotations.NaturalIdCache;
-import org.hibernate.cache.spi.GeneralDataRegion;
-import org.hibernate.cache.spi.TransactionalDataRegion;
-import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.exception.ConstraintViolationException;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.stat.NaturalIdCacheStatistics;
-import org.hibernate.stat.SecondLevelCacheStatistics;
-import org.junit.Test;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
-import static org.apache.ignite.cache.hibernate.HibernateAccessStrategyFactory.DFLT_ACCESS_TYPE_PROPERTY;
-import static org.apache.ignite.cache.hibernate.HibernateAccessStrategyFactory.IGNITE_INSTANCE_NAME_PROPERTY;
-import static org.apache.ignite.cache.hibernate.HibernateAccessStrategyFactory.REGION_CACHE_PROPERTY;
-import static org.hibernate.cfg.Environment.CACHE_REGION_FACTORY;
-import static org.hibernate.cfg.Environment.GENERATE_STATISTICS;
-import static org.hibernate.cfg.Environment.HBM2DDL_AUTO;
-import static org.hibernate.cfg.Environment.RELEASE_CONNECTIONS;
-import static org.hibernate.cfg.Environment.USE_QUERY_CACHE;
-import static org.hibernate.cfg.Environment.USE_SECOND_LEVEL_CACHE;
-
-/**
- *
- * Tests Hibernate L2 cache.
- */
-public class HibernateL2CacheSelfTest extends GridCommonAbstractTest {
- /** */
- public static final String CONNECTION_URL = "jdbc:h2:mem:example;DB_CLOSE_DELAY=-1";
-
- /** */
- public static final String ENTITY_NAME = Entity.class.getName();
-
- /** */
- public static final String ENTITY2_NAME = Entity2.class.getName();
-
- /** */
- public static final String VERSIONED_ENTITY_NAME = VersionedEntity.class.getName();
-
- /** */
- public static final String PARENT_ENTITY_NAME = ParentEntity.class.getName();
-
- /** */
- public static final String CHILD_COLLECTION_REGION = ENTITY_NAME + ".children";
-
- /** */
- public static final String NATURAL_ID_REGION =
- "org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest$Entity##NaturalId";
-
- /** */
- public static final String NATURAL_ID_REGION2 =
- "org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest$Entity2##NaturalId";
-
- /** */
- private SessionFactory sesFactory1;
-
- /** */
- private SessionFactory sesFactory2;
-
- /**
- * First Hibernate test entity.
- */
- @javax.persistence.Entity
- @NaturalIdCache
- @SuppressWarnings({"PublicInnerClass", "UnnecessaryFullyQualifiedName"})
- public static class Entity {
- /** */
- private int id;
-
- /** */
- private String name;
-
- /** */
- private Collection<ChildEntity> children;
-
- /**
- * Default constructor required by Hibernate.
- */
- public Entity() {
- // No-op.
- }
-
- /**
- * @param id ID.
- * @param name Name.
- */
- public Entity(int id, String name) {
- this.id = id;
- this.name = name;
- }
-
- /**
- * @return ID.
- */
- @Id
- public int getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @return Name.
- */
- @NaturalId(mutable = true)
- public String getName() {
- return name;
- }
-
- /**
- * @param name Name.
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @return Children.
- */
- @OneToMany(cascade = javax.persistence.CascadeType.ALL, fetch = FetchType.LAZY)
- @JoinColumn(name = "ENTITY_ID")
- public Collection<ChildEntity> getChildren() {
- return children;
- }
-
- /**
- * @param children Children.
- */
- public void setChildren(Collection<ChildEntity> children) {
- this.children = children;
- }
- }
-
- /**
- * Second Hibernate test entity.
- */
- @javax.persistence.Entity
- @NaturalIdCache
- @SuppressWarnings({"PublicInnerClass", "UnnecessaryFullyQualifiedName"})
- public static class Entity2 {
- /** */
- private int id;
-
- /** */
- private String name;
-
- /** */
- private Collection<ChildEntity> children;
-
- /**
- * Default constructor required by Hibernate.
- */
- public Entity2() {
- // No-op.
- }
-
- /**
- * @param id ID.
- * @param name Name.
- */
- public Entity2(int id, String name) {
- this.id = id;
- this.name = name;
- }
-
- /**
- * @return ID.
- */
- @Id
- public int getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @return Name.
- */
- @NaturalId(mutable = true)
- public String getName() {
- return name;
- }
-
- /**
- * @param name Name.
- */
- public void setName(String name) {
- this.name = name;
- }
- }
-
- /**
- * Hibernate child entity referenced by {@link Entity}.
- */
- @javax.persistence.Entity
- @SuppressWarnings("PublicInnerClass")
- public static class ChildEntity {
- /** */
- private int id;
-
- /**
- * Default constructor required by Hibernate.
- */
- public ChildEntity() {
- // No-op.
- }
-
- /**
- * @param id ID.
- */
- public ChildEntity(int id) {
- this.id = id;
- }
-
- /**
- * @return ID.
- */
- @Id
- @GeneratedValue
- public int getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(int id) {
- this.id = id;
- }
- }
-
- /**
- * Hibernate entity referencing {@link Entity}.
- */
- @javax.persistence.Entity
- @SuppressWarnings("PublicInnerClass")
- public static class ParentEntity {
- /** */
- private int id;
-
- /** */
- private Entity entity;
-
- /**
- * Default constructor required by Hibernate.
- */
- public ParentEntity() {
- // No-op.
- }
-
- /**
- * @param id ID.
- * @param entity Referenced entity.
- */
- public ParentEntity(int id, Entity entity) {
- this.id = id;
- this.entity = entity;
- }
-
- /**
- * @return ID.
- */
- @Id
- public int getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @return Referenced entity.
- */
- @OneToOne
- public Entity getEntity() {
- return entity;
- }
-
- /**
- * @param entity Referenced entity.
- */
- public void setEntity(Entity entity) {
- this.entity = entity;
- }
- }
-
- /**
- * Hibernate entity.
- */
- @javax.persistence.Entity
- @SuppressWarnings({"PublicInnerClass", "UnnecessaryFullyQualifiedName"})
- public static class VersionedEntity {
- /** */
- private int id;
-
- /** */
- private long ver;
-
- /**
- * Default constructor required by Hibernate.
- */
- public VersionedEntity() {
- }
-
- /**
- * @param id ID.
- */
- public VersionedEntity(int id) {
- this.id = id;
- }
-
- /**
- * @return ID.
- */
- @Id
- public int getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @return Version.
- */
- @javax.persistence.Version
- public long getVersion() {
- return ver;
- }
-
- /**
- * @param ver Version.
- */
- public void setVersion(long ver) {
- this.ver = ver;
- }
- }
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-
- cfg.setCacheConfiguration(generalRegionConfiguration("org.hibernate.cache.spi.UpdateTimestampsCache"),
- generalRegionConfiguration("org.hibernate.cache.internal.StandardQueryCache"),
- transactionalRegionConfiguration(ENTITY_NAME),
- transactionalRegionConfiguration(ENTITY2_NAME),
- transactionalRegionConfiguration(VERSIONED_ENTITY_NAME),
- transactionalRegionConfiguration(PARENT_ENTITY_NAME),
- transactionalRegionConfiguration(CHILD_COLLECTION_REGION),
- transactionalRegionConfiguration(NATURAL_ID_REGION),
- transactionalRegionConfiguration(NATURAL_ID_REGION2));
-
- return cfg;
- }
-
- /**
- * @param regionName Region name.
- * @return Cache configuration for {@link GeneralDataRegion}.
- */
- private CacheConfiguration generalRegionConfiguration(String regionName) {
- CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
-
- cfg.setName(regionName);
-
- cfg.setCacheMode(PARTITIONED);
-
- cfg.setAtomicityMode(ATOMIC);
-
- cfg.setWriteSynchronizationMode(FULL_SYNC);
-
- cfg.setBackups(1);
-
- cfg.setAffinity(new RendezvousAffinityFunction(false, 10));
-
- return cfg;
- }
-
- /**
- * @param regionName Region name.
- * @return Cache configuration for {@link TransactionalDataRegion}.
- */
- protected CacheConfiguration transactionalRegionConfiguration(String regionName) {
- CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
-
- cfg.setName(regionName);
-
- cfg.setCacheMode(PARTITIONED);
-
- cfg.setAtomicityMode(TRANSACTIONAL);
-
- cfg.setWriteSynchronizationMode(FULL_SYNC);
-
- cfg.setBackups(1);
-
- cfg.setAffinity(new RendezvousAffinityFunction(false, 10));
-
- return cfg;
- }
-
- /**
- * @param accessType Hibernate L2 cache access type.
- * @param igniteInstanceName Ignite instance name.
- * @return Hibernate configuration.
- */
- private Configuration hibernateConfiguration(AccessType accessType,
- String igniteInstanceName) {
- Configuration cfg = new Configuration();
-
- cfg.addAnnotatedClass(Entity.class);
- cfg.addAnnotatedClass(Entity2.class);
- cfg.addAnnotatedClass(VersionedEntity.class);
- cfg.addAnnotatedClass(ChildEntity.class);
- cfg.addAnnotatedClass(ParentEntity.class);
-
- cfg.setCacheConcurrencyStrategy(ENTITY_NAME, accessType.getExternalName());
- cfg.setCacheConcurrencyStrategy(ENTITY2_NAME, accessType.getExternalName());
- cfg.setCacheConcurrencyStrategy(VERSIONED_ENTITY_NAME, accessType.getExternalName());
- cfg.setCacheConcurrencyStrategy(PARENT_ENTITY_NAME, accessType.getExternalName());
- cfg.setCollectionCacheConcurrencyStrategy(CHILD_COLLECTION_REGION, accessType.getExternalName());
-
- for (Map.Entry<String, String> e : hibernateProperties(igniteInstanceName, accessType.name()).entrySet())
- cfg.setProperty(e.getKey(), e.getValue());
-
- // Use the same cache for Entity and Entity2.
- cfg.setProperty(REGION_CACHE_PROPERTY + ENTITY2_NAME, ENTITY_NAME);
-
- return cfg;
- }
-
- /**
- * @return Hibernate registry builder.
- */
- protected ServiceRegistryBuilder registryBuilder() {
- ServiceRegistryBuilder builder = new ServiceRegistryBuilder();
-
- builder.applySetting("hibernate.connection.url", CONNECTION_URL);
-
- return builder;
- }
-
- /** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- startGrids(2);
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTest() throws Exception {
- cleanup();
- }
-
- /**
- * @return Hibernate L2 cache access types to test.
- */
- protected AccessType[] accessTypes() {
- return new AccessType[]{AccessType.READ_ONLY, AccessType.NONSTRICT_READ_WRITE, AccessType.READ_WRITE};
- }
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testCollectionCache() throws Exception {
- for (AccessType accessType : accessTypes())
- testCollectionCache(accessType);
- }
-
- /**
- * @param accessType Cache access type.
- * @throws Exception If failed.
- */
- @SuppressWarnings("unchecked")
- private void testCollectionCache(AccessType accessType) throws Exception {
- createSessionFactories(accessType);
-
- Map<Integer, Integer> idToChildCnt = new HashMap<>();
-
- try {
- Session ses = sesFactory1.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- for (int i = 0; i < 3; i++) {
- Entity e = new Entity(i, "name-" + i);
-
- Collection<ChildEntity> children = new ArrayList<>();
-
- for (int j = 0; j < 3; j++)
- children.add(new ChildEntity());
-
- e.setChildren(children);
-
- idToChildCnt.put(e.getId(), e.getChildren().size());
-
- ses.save(e);
- }
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- // Load children, this should populate cache.
-
- ses = sesFactory1.openSession();
-
- try {
- List<Entity> list = ses.createCriteria(ENTITY_NAME).list();
-
- assertEquals(idToChildCnt.size(), list.size());
-
- for (Entity e : list)
- assertEquals((int)idToChildCnt.get(e.getId()), e.getChildren().size());
- }
- finally {
- ses.close();
- }
-
- assertCollectionCache(sesFactory2, idToChildCnt, 3, 0);
- assertCollectionCache(sesFactory1, idToChildCnt, 3, 0);
-
- if (accessType == AccessType.READ_ONLY)
- return;
-
- // Update children for one entity.
-
- ses = sesFactory1.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- Entity e1 = (Entity)ses.load(Entity.class, 1);
-
- e1.getChildren().remove(e1.getChildren().iterator().next());
-
- ses.update(e1);
-
- idToChildCnt.put(e1.getId(), e1.getChildren().size());
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertCollectionCache(sesFactory2, idToChildCnt, 2, 1); // After update collection cache entry is removed.
- assertCollectionCache(sesFactory1, idToChildCnt, 3, 0); // 'assertCollectionCache' loads children in cache.
-
- // Update children for the same entity using another SessionFactory.
-
- ses = sesFactory2.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- Entity e1 = (Entity)ses.load(Entity.class, 1);
-
- e1.getChildren().remove(e1.getChildren().iterator().next());
-
- ses.update(e1);
-
- idToChildCnt.put(e1.getId(), e1.getChildren().size());
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertCollectionCache(sesFactory2, idToChildCnt, 2, 1); // After update collection cache entry is removed.
- assertCollectionCache(sesFactory1, idToChildCnt, 3, 0); // 'assertCollectionCache' loads children in cache.
- }
- finally {
- cleanup();
- }
- }
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testEntityCache() throws Exception {
- for (AccessType accessType : accessTypes())
- testEntityCache(accessType);
- }
-
- /**
- * @param accessType Cache access type.
- * @throws Exception If failed.
- */
- private void testEntityCache(AccessType accessType) throws Exception {
- createSessionFactories(accessType);
-
- Map<Integer, String> idToName = new HashMap<>();
-
- try {
- Session ses = sesFactory1.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- for (int i = 0; i < 2; i++) {
- String name = "name-" + i;
-
- ses.save(new Entity(i, name));
-
- idToName.put(i, name);
- }
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertEntityCache(ENTITY_NAME, sesFactory2, idToName, 100);
- assertEntityCache(ENTITY_NAME, sesFactory1, idToName, 100);
-
- if (accessType == AccessType.READ_ONLY)
- return;
-
- ses = sesFactory1.openSession();
-
- try {
- // Updates and inserts in single transaction.
-
- Transaction tx = ses.beginTransaction();
-
- Entity e0 = (Entity)ses.load(Entity.class, 0);
-
- e0.setName("name-0-changed1");
-
- ses.update(e0);
-
- idToName.put(0, e0.getName());
-
- ses.save(new Entity(2, "name-2"));
-
- idToName.put(2, "name-2");
-
- Entity e1 = (Entity)ses.load(Entity.class, 1);
-
- e1.setName("name-1-changed1");
-
- ses.update(e1);
-
- idToName.put(1, e1.getName());
-
- ses.save(new Entity(3, "name-3"));
-
- idToName.put(3, "name-3");
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertEntityCache(ENTITY_NAME, sesFactory2, idToName);
- assertEntityCache(ENTITY_NAME, sesFactory1, idToName);
-
- ses = sesFactory1.openSession();
-
- try {
- // Updates, inserts and deletes in single transaction.
-
- Transaction tx = ses.beginTransaction();
-
- ses.save(new Entity(4, "name-4"));
-
- idToName.put(4, "name-4");
-
- Entity e0 = (Entity)ses.load(Entity.class, 0);
-
- e0.setName("name-0-changed2");
-
- ses.update(e0);
-
- idToName.put(e0.getId(), e0.getName());
-
- ses.delete(ses.load(Entity.class, 1));
-
- idToName.remove(1);
-
- Entity e2 = (Entity)ses.load(Entity.class, 2);
-
- e2.setName("name-2-changed1");
-
- ses.update(e2);
-
- idToName.put(e2.getId(), e2.getName());
-
- ses.delete(ses.load(Entity.class, 3));
-
- idToName.remove(3);
-
- ses.save(new Entity(5, "name-5"));
-
- idToName.put(5, "name-5");
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertEntityCache(ENTITY_NAME, sesFactory2, idToName, 1, 3);
- assertEntityCache(ENTITY_NAME, sesFactory1, idToName, 1, 3);
-
- // Try to update the same entity using another SessionFactory.
-
- ses = sesFactory2.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- Entity e0 = (Entity)ses.load(Entity.class, 0);
-
- e0.setName("name-0-changed3");
-
- ses.update(e0);
-
- idToName.put(e0.getId(), e0.getName());
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertEntityCache(ENTITY_NAME, sesFactory2, idToName);
- assertEntityCache(ENTITY_NAME, sesFactory1, idToName);
- }
- finally {
- cleanup();
- }
- }
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testTwoEntitiesSameCache() throws Exception {
- for (AccessType accessType : accessTypes())
- testTwoEntitiesSameCache(accessType);
- }
-
- /**
- * @param accessType Cache access type.
- * @throws Exception If failed.
- */
- private void testTwoEntitiesSameCache(AccessType accessType) throws Exception {
- createSessionFactories(accessType);
-
- try {
- Session ses = sesFactory1.openSession();
-
- Map<Integer, String> idToName1 = new HashMap<>();
- Map<Integer, String> idToName2 = new HashMap<>();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- for (int i = 0; i < 2; i++) {
- String name = "name-" + i;
-
- ses.save(new Entity(i, name));
- ses.save(new Entity2(i, name));
-
- idToName1.put(i, name);
- idToName2.put(i, name);
- }
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertEntityCache(ENTITY_NAME, sesFactory2, idToName1, 100);
- assertEntityCache(ENTITY_NAME, sesFactory1, idToName1, 100);
-
- assertEntityCache(ENTITY2_NAME, sesFactory2, idToName2, 100);
- assertEntityCache(ENTITY2_NAME, sesFactory1, idToName2, 100);
-
- if (accessType == AccessType.READ_ONLY)
- return;
-
- ses = sesFactory1.openSession();
-
- try {
- // Updates both entities in single transaction.
-
- Transaction tx = ses.beginTransaction();
-
- Entity e = (Entity)ses.load(Entity.class, 0);
-
- e.setName("name-0-changed1");
-
- ses.update(e);
-
- Entity2 e2 = (Entity2)ses.load(Entity2.class, 0);
-
- e2.setName("name-e2-0-changed1");
-
- ses.update(e2);
-
- idToName1.put(0, e.getName());
- idToName2.put(0, e2.getName());
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertEntityCache(ENTITY_NAME, sesFactory2, idToName1, 100);
- assertEntityCache(ENTITY_NAME, sesFactory1, idToName1, 100);
-
- assertEntityCache(ENTITY2_NAME, sesFactory2, idToName2, 100);
- assertEntityCache(ENTITY2_NAME, sesFactory1, idToName2, 100);
-
- ses = sesFactory1.openSession();
-
- try {
- // Remove entity1 and insert entity2 in single transaction.
-
- Transaction tx = ses.beginTransaction();
-
- Entity e = (Entity)ses.load(Entity.class, 0);
-
- ses.delete(e);
-
- Entity2 e2 = new Entity2(2, "name-2");
-
- ses.save(e2);
-
- idToName1.remove(0);
- idToName2.put(2, e2.getName());
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertEntityCache(ENTITY_NAME, sesFactory2, idToName1, 0, 100);
- assertEntityCache(ENTITY_NAME, sesFactory1, idToName1, 0, 100);
-
- assertEntityCache(ENTITY2_NAME, sesFactory2, idToName2, 100);
- assertEntityCache(ENTITY2_NAME, sesFactory1, idToName2, 100);
-
- ses = sesFactory1.openSession();
-
- Transaction tx = ses.beginTransaction();
-
- try {
- // Update, remove, insert in single transaction, transaction fails.
-
- Entity e = (Entity)ses.load(Entity.class, 1);
-
- e.setName("name-1-changed1");
-
- ses.update(e); // Valid update.
-
- ses.save(new Entity(2, "name-2")); // Valid insert.
-
- ses.delete(ses.load(Entity2.class, 0)); // Valid delete.
-
- Entity2 e2 = (Entity2)ses.load(Entity2.class, 1);
-
- e2.setName("name-2"); // Invalid update, not-unique name.
-
- ses.update(e2);
-
- tx.commit();
-
- fail("Commit must fail.");
- }
- catch (ConstraintViolationException e) {
- log.info("Expected exception: " + e);
-
- tx.rollback();
- }
- finally {
- ses.close();
- }
-
- assertEntityCache(ENTITY_NAME, sesFactory2, idToName1, 0, 2, 100);
- assertEntityCache(ENTITY_NAME, sesFactory1, idToName1, 0, 2, 100);
-
- assertEntityCache(ENTITY2_NAME, sesFactory2, idToName2, 100);
- assertEntityCache(ENTITY2_NAME, sesFactory1, idToName2, 100);
-
- ses = sesFactory2.openSession();
-
- try {
- // Update, remove, insert in single transaction.
-
- tx = ses.beginTransaction();
-
- Entity e = (Entity)ses.load(Entity.class, 1);
-
- e.setName("name-1-changed1");
-
- ses.update(e);
-
- idToName1.put(1, e.getName());
-
- ses.save(new Entity(2, "name-2"));
-
- idToName1.put(2, "name-2");
-
- ses.delete(ses.load(Entity2.class, 0));
-
- idToName2.remove(0);
-
- Entity2 e2 = (Entity2)ses.load(Entity2.class, 1);
-
- e2.setName("name-e2-2-changed");
-
- ses.update(e2);
-
- idToName2.put(1, e2.getName());
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertEntityCache(ENTITY_NAME, sesFactory2, idToName1, 0, 100);
- assertEntityCache(ENTITY_NAME, sesFactory1, idToName1, 0, 100);
-
- assertEntityCache(ENTITY2_NAME, sesFactory2, idToName2, 0, 100);
- assertEntityCache(ENTITY2_NAME, sesFactory1, idToName2, 0, 100);
- }
- finally {
- cleanup();
- }
- }
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testVersionedEntity() throws Exception {
- for (AccessType accessType : accessTypes())
- testVersionedEntity(accessType);
- }
-
- /**
- * @param accessType Cache access type.
- * @throws Exception If failed.
- */
- private void testVersionedEntity(AccessType accessType) throws Exception {
- createSessionFactories(accessType);
-
- try {
- Session ses = sesFactory1.openSession();
-
- VersionedEntity e0 = new VersionedEntity(0);
-
- try {
- Transaction tx = ses.beginTransaction();
-
- ses.save(e0);
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- ses = sesFactory1.openSession();
-
- long ver;
-
- try {
- ver = ((VersionedEntity)ses.load(VersionedEntity.class, 0)).getVersion();
- }
- finally {
- ses.close();
- }
-
- SecondLevelCacheStatistics stats1 =
- sesFactory1.getStatistics().getSecondLevelCacheStatistics(VERSIONED_ENTITY_NAME);
- SecondLevelCacheStatistics stats2 =
- sesFactory2.getStatistics().getSecondLevelCacheStatistics(VERSIONED_ENTITY_NAME);
-
- assertEquals(1, stats1.getElementCountInMemory());
- assertEquals(1, stats2.getElementCountInMemory());
-
- ses = sesFactory2.openSession();
-
- try {
- assertEquals(ver, ((VersionedEntity)ses.load(VersionedEntity.class, 0)).getVersion());
- }
- finally {
- ses.close();
- }
-
- assertEquals(1, stats2.getElementCountInMemory());
- assertEquals(1, stats2.getHitCount());
-
- if (accessType == AccessType.READ_ONLY)
- return;
-
- e0.setVersion(ver - 1);
-
- ses = sesFactory1.openSession();
-
- Transaction tx = ses.beginTransaction();
-
- try {
- ses.update(e0);
-
- tx.commit();
-
- fail("Commit must fail.");
- }
- catch (StaleObjectStateException e) {
- log.info("Expected exception: " + e);
- }
- finally {
- tx.rollback();
-
- ses.close();
- }
-
- sesFactory1.getStatistics().clear();
-
- stats1 = sesFactory1.getStatistics().getSecondLevelCacheStatistics(VERSIONED_ENTITY_NAME);
-
- ses = sesFactory1.openSession();
-
- try {
- assertEquals(ver, ((VersionedEntity)ses.load(VersionedEntity.class, 0)).getVersion());
- }
- finally {
- ses.close();
- }
-
- assertEquals(1, stats1.getElementCountInMemory());
- assertEquals(1, stats1.getHitCount());
- assertEquals(1, stats2.getElementCountInMemory());
- assertEquals(1, stats2.getHitCount());
- }
- finally {
- cleanup();
- }
- }
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testNaturalIdCache() throws Exception {
- for (AccessType accessType : accessTypes())
- testNaturalIdCache(accessType);
- }
-
- /**
- * @param accessType Cache access type.
- * @throws Exception If failed.
- */
- private void testNaturalIdCache(AccessType accessType) throws Exception {
- createSessionFactories(accessType);
-
- Map<String, Integer> nameToId = new HashMap<>();
-
- try {
- Session ses = sesFactory1.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- for (int i = 0; i < 3; i++) {
- String name = "name-" + i;
-
- ses.save(new Entity(i, name));
-
- nameToId.put(name, i);
- }
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- ses = sesFactory1.openSession();
-
- try {
- for (Map.Entry<String, Integer> e : nameToId.entrySet())
- ((Entity)ses.bySimpleNaturalId(Entity.class).load(e.getKey())).getId();
- }
- finally {
- ses.close();
- }
-
- assertNaturalIdCache(sesFactory2, nameToId, "name-100");
- assertNaturalIdCache(sesFactory1, nameToId, "name-100");
-
- if (accessType == AccessType.READ_ONLY)
- return;
-
- // Update naturalId.
-
- ses = sesFactory1.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- Entity e1 = (Entity)ses.load(Entity.class, 1);
-
- nameToId.remove(e1.getName());
-
- e1.setName("name-1-changed1");
-
- nameToId.put(e1.getName(), e1.getId());
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertNaturalIdCache(sesFactory2, nameToId, "name-1");
- assertNaturalIdCache(sesFactory1, nameToId, "name-1");
-
- // Update entity using another SessionFactory.
-
- ses = sesFactory2.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- Entity e1 = (Entity)ses.load(Entity.class, 1);
-
- nameToId.remove(e1.getName());
-
- e1.setName("name-1-changed2");
-
- nameToId.put(e1.getName(), e1.getId());
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertNaturalIdCache(sesFactory2, nameToId, "name-1-changed1");
- assertNaturalIdCache(sesFactory1, nameToId, "name-1-changed1");
-
- // Try invalid NaturalId update.
-
- ses = sesFactory1.openSession();
-
- Transaction tx = ses.beginTransaction();
-
- try {
- Entity e1 = (Entity)ses.load(Entity.class, 1);
-
- e1.setName("name-0"); // Invalid update (duplicated name).
-
- tx.commit();
-
- fail("Commit must fail.");
- }
- catch (ConstraintViolationException e) {
- log.info("Expected exception: " + e);
-
- tx.rollback();
- }
- finally {
- ses.close();
- }
-
- assertNaturalIdCache(sesFactory2, nameToId);
- assertNaturalIdCache(sesFactory1, nameToId);
-
- // Delete entity.
-
- ses = sesFactory2.openSession();
-
- try {
- tx = ses.beginTransaction();
-
- Entity e2 = (Entity)ses.load(Entity.class, 2);
-
- ses.delete(e2);
-
- nameToId.remove(e2.getName());
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertNaturalIdCache(sesFactory2, nameToId, "name-2");
- }
- finally {
- cleanup();
- }
- }
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testEntityCacheTransactionFails() throws Exception {
- for (AccessType accessType : accessTypes())
- testEntityCacheTransactionFails(accessType);
- }
-
- /**
- * @param accessType Cache access type.
- * @throws Exception If failed.
- */
- private void testEntityCacheTransactionFails(AccessType accessType) throws Exception {
- createSessionFactories(accessType);
-
- Map<Integer, String> idToName = new HashMap<>();
-
- try {
- Session ses = sesFactory1.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- for (int i = 0; i < 3; i++) {
- String name = "name-" + i;
-
- ses.save(new Entity(i, name));
-
- idToName.put(i, name);
- }
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertEntityCache(ENTITY_NAME, sesFactory2, idToName, 100);
- assertEntityCache(ENTITY_NAME, sesFactory1, idToName, 100);
-
- ses = sesFactory1.openSession();
-
- Transaction tx = ses.beginTransaction();
-
- try {
- ses.save(new Entity(3, "name-3")); // Valid insert.
-
- ses.save(new Entity(0, "name-0")); // Invalid insert (duplicated ID).
-
- tx.commit();
-
- fail("Commit must fail.");
- }
- catch (ConstraintViolationException e) {
- log.info("Expected exception: " + e);
-
- tx.rollback();
- }
- finally {
- ses.close();
- }
-
- assertEntityCache(ENTITY_NAME, sesFactory2, idToName, 3);
- assertEntityCache(ENTITY_NAME, sesFactory1, idToName, 3);
-
- if (accessType == AccessType.READ_ONLY)
- return;
-
- ses = sesFactory1.openSession();
-
- tx = ses.beginTransaction();
-
- try {
- Entity e0 = (Entity)ses.load(Entity.class, 0);
- Entity e1 = (Entity)ses.load(Entity.class, 1);
-
- e0.setName("name-10"); // Valid update.
- e1.setName("name-2"); // Invalid update (violates unique constraint).
-
- ses.update(e0);
- ses.update(e1);
-
- tx.commit();
-
- fail("Commit must fail.");
- }
- catch (ConstraintViolationException e) {
- log.info("Expected exception: " + e);
-
- tx.rollback();
- }
- finally {
- ses.close();
- }
-
- assertEntityCache(ENTITY_NAME, sesFactory2, idToName);
- assertEntityCache(ENTITY_NAME, sesFactory1, idToName);
-
- ses = sesFactory1.openSession();
-
- try {
- // Create parent entity referencing Entity with ID = 0.
-
- tx = ses.beginTransaction();
-
- ses.save(new ParentEntity(0, (Entity)ses.load(Entity.class, 0)));
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- ses = sesFactory1.openSession();
-
- tx = ses.beginTransaction();
-
- try {
- ses.save(new Entity(3, "name-3")); // Valid insert.
-
- Entity e1 = (Entity)ses.load(Entity.class, 1);
-
- e1.setName("name-10"); // Valid update.
-
- ses.delete(ses.load(Entity.class, 0)); // Invalid delete (there is a parent entity referencing it).
-
- tx.commit();
-
- fail("Commit must fail.");
- }
- catch (ConstraintViolationException e) {
- log.info("Expected exception: " + e);
-
- tx.rollback();
- }
- finally {
- ses.close();
- }
-
- assertEntityCache(ENTITY_NAME, sesFactory2, idToName, 3);
- assertEntityCache(ENTITY_NAME, sesFactory1, idToName, 3);
-
- ses = sesFactory1.openSession();
-
- tx = ses.beginTransaction();
-
- try {
- ses.delete(ses.load(Entity.class, 1)); // Valid delete.
-
- idToName.remove(1);
-
- ses.delete(ses.load(Entity.class, 0)); // Invalid delete (there is a parent entity referencing it).
-
- tx.commit();
-
- fail("Commit must fail.");
- }
- catch (ConstraintViolationException e) {
- log.info("Expected exception: " + e);
-
- tx.rollback();
- }
- finally {
- ses.close();
- }
-
- assertEntityCache(ENTITY_NAME, sesFactory2, idToName);
- assertEntityCache(ENTITY_NAME, sesFactory1, idToName);
- }
- finally {
- cleanup();
- }
- }
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testQueryCache() throws Exception {
- for (AccessType accessType : accessTypes())
- testQueryCache(accessType);
- }
-
- /**
- * @param accessType Cache access type.
- * @throws Exception If failed.
- */
- private void testQueryCache(AccessType accessType) throws Exception {
- createSessionFactories(accessType);
-
- try {
- Session ses = sesFactory1.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- for (int i = 0; i < 5; i++)
- ses.save(new Entity(i, "name-" + i));
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- // Run some queries.
-
- ses = sesFactory1.openSession();
-
- try {
- Query qry1 = ses.createQuery("from " + ENTITY_NAME + " where id > 2");
-
- qry1.setCacheable(true);
-
- assertEquals(2, qry1.list().size());
-
- Query qry2 = ses.createQuery("from " + ENTITY_NAME + " where name = 'name-0'");
-
- qry2.setCacheable(true);
-
- assertEquals(1, qry2.list().size());
- }
- finally {
- ses.close();
- }
-
- assertEquals(0, sesFactory1.getStatistics().getQueryCacheHitCount());
- assertEquals(2, sesFactory1.getStatistics().getQueryCacheMissCount());
- assertEquals(2, sesFactory1.getStatistics().getQueryCachePutCount());
-
- // Run queries using another SessionFactory.
-
- ses = sesFactory2.openSession();
-
- try {
- Query qry1 = ses.createQuery("from " + ENTITY_NAME + " where id > 2");
-
- qry1.setCacheable(true);
-
- assertEquals(2, qry1.list().size());
-
- Query qry2 = ses.createQuery("from " + ENTITY_NAME + " where name = 'name-0'");
-
- qry2.setCacheable(true);
-
- assertEquals(1, qry2.list().size());
-
- Query qry3 = ses.createQuery("from " + ENTITY_NAME + " where id > 1");
-
- qry3.setCacheable(true);
-
- assertEquals(3, qry3.list().size());
- }
- finally {
- ses.close();
- }
-
- assertEquals(2, sesFactory2.getStatistics().getQueryCacheHitCount());
- assertEquals(1, sesFactory2.getStatistics().getQueryCacheMissCount());
- assertEquals(1, sesFactory2.getStatistics().getQueryCachePutCount());
-
- // Update entity, it should invalidate query cache.
-
- ses = sesFactory1.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- ses.save(new Entity(5, "name-5"));
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- // Run queries.
-
- ses = sesFactory1.openSession();
-
- sesFactory1.getStatistics().clear();
-
- try {
- Query qry1 = ses.createQuery("from " + ENTITY_NAME + " where id > 2");
-
- qry1.setCacheable(true);
-
- assertEquals(3, qry1.list().size());
-
- Query qry2 = ses.createQuery("from " + ENTITY_NAME + " where name = 'name-0'");
-
- qry2.setCacheable(true);
-
- assertEquals(1, qry2.list().size());
- }
- finally {
- ses.close();
- }
-
- assertEquals(0, sesFactory1.getStatistics().getQueryCacheHitCount());
- assertEquals(2, sesFactory1.getStatistics().getQueryCacheMissCount());
- assertEquals(2, sesFactory1.getStatistics().getQueryCachePutCount());
-
- // Clear query cache using another SessionFactory.
-
- sesFactory2.getCache().evictDefaultQueryRegion();
-
- ses = sesFactory1.openSession();
-
- // Run queries again.
-
- sesFactory1.getStatistics().clear();
-
- try {
- Query qry1 = ses.createQuery("from " + ENTITY_NAME + " where id > 2");
-
- qry1.setCacheable(true);
-
- assertEquals(3, qry1.list().size());
-
- Query qry2 = ses.createQuery("from " + ENTITY_NAME + " where name = 'name-0'");
-
- qry2.setCacheable(true);
-
- assertEquals(1, qry2.list().size());
- }
- finally {
- ses.close();
- }
-
- assertEquals(0, sesFactory1.getStatistics().getQueryCacheHitCount());
- assertEquals(2, sesFactory1.getStatistics().getQueryCacheMissCount());
- assertEquals(2, sesFactory1.getStatistics().getQueryCachePutCount());
- }
- finally {
- cleanup();
- }
- }
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testRegionClear() throws Exception {
- for (AccessType accessType : accessTypes())
- testRegionClear(accessType);
- }
-
- /**
- * @param accessType Cache access type.
- * @throws Exception If failed.
- */
- private void testRegionClear(AccessType accessType) throws Exception {
- createSessionFactories(accessType);
-
- try {
- final int ENTITY_CNT = 100;
-
- Session ses = sesFactory1.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- for (int i = 0; i < ENTITY_CNT; i++) {
- Entity e = new Entity(i, "name-" + i);
-
- Collection<ChildEntity> children = new ArrayList<>();
-
- for (int j = 0; j < 3; j++)
- children.add(new ChildEntity());
-
- e.setChildren(children);
-
- ses.save(e);
- }
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- loadEntities(sesFactory2, ENTITY_CNT);
-
- SecondLevelCacheStatistics stats1 = sesFactory1.getStatistics().getSecondLevelCacheStatistics(ENTITY_NAME);
- SecondLevelCacheStatistics stats2 = sesFactory2.getStatistics().getSecondLevelCacheStatistics(ENTITY_NAME);
-
- NaturalIdCacheStatistics idStats1 =
- sesFactory1.getStatistics().getNaturalIdCacheStatistics(NATURAL_ID_REGION);
- NaturalIdCacheStatistics idStats2 =
- sesFactory2.getStatistics().getNaturalIdCacheStatistics(NATURAL_ID_REGION);
-
- SecondLevelCacheStatistics colStats1 =
- sesFactory1.getStatistics().getSecondLevelCacheStatistics(CHILD_COLLECTION_REGION);
- SecondLevelCacheStatistics colStats2 =
- sesFactory2.getStatistics().getSecondLevelCacheStatistics(CHILD_COLLECTION_REGION);
-
- assertEquals(ENTITY_CNT, stats1.getElementCountInMemory());
- assertEquals(ENTITY_CNT, stats2.getElementCountInMemory());
-
- assertEquals(ENTITY_CNT, idStats1.getElementCountInMemory());
- assertEquals(ENTITY_CNT, idStats2.getElementCountInMemory());
-
- assertEquals(ENTITY_CNT, colStats1.getElementCountInMemory());
- assertEquals(ENTITY_CNT, colStats2.getElementCountInMemory());
-
- // Test cache is cleared after update query.
-
- ses = sesFactory1.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- ses.createQuery("delete from " + ENTITY_NAME + " where name='no such name'").executeUpdate();
-
- ses.createQuery("delete from " + ChildEntity.class.getName() + " where id=-1").executeUpdate();
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- assertEquals(0, stats1.getElementCountInMemory());
- assertEquals(0, stats2.getElementCountInMemory());
-
- assertEquals(0, idStats1.getElementCountInMemory());
- assertEquals(0, idStats2.getElementCountInMemory());
-
- assertEquals(0, colStats1.getElementCountInMemory());
- assertEquals(0, colStats2.getElementCountInMemory());
-
- // Load some data in cache.
-
- loadEntities(sesFactory1, 10);
-
- assertEquals(10, stats1.getElementCountInMemory());
- assertEquals(10, stats2.getElementCountInMemory());
- assertEquals(10, idStats1.getElementCountInMemory());
- assertEquals(10, idStats2.getElementCountInMemory());
-
- // Test evictAll method.
-
- sesFactory2.getCache().evictEntityRegion(ENTITY_NAME);
-
- assertEquals(0, stats1.getElementCountInMemory());
- assertEquals(0, stats2.getElementCountInMemory());
-
- sesFactory2.getCache().evictNaturalIdRegion(ENTITY_NAME);
-
- assertEquals(0, idStats1.getElementCountInMemory());
- assertEquals(0, idStats2.getElementCountInMemory());
-
- sesFactory2.getCache().evictCollectionRegion(CHILD_COLLECTION_REGION);
-
- assertEquals(0, colStats1.getElementCountInMemory());
- assertEquals(0, colStats2.getElementCountInMemory());
- }
- finally {
- cleanup();
- }
- }
-
- /**
- * @param sesFactory Session factory.
- * @param nameToId Name-ID mapping.
- * @param absentNames Absent entities' names.
- */
- private void assertNaturalIdCache(SessionFactory sesFactory, Map<String, Integer> nameToId, String... absentNames) {
- sesFactory.getStatistics().clear();
-
- NaturalIdCacheStatistics stats =
- sesFactory.getStatistics().getNaturalIdCacheStatistics(NATURAL_ID_REGION);
-
- long hitBefore = stats.getHitCount();
-
- long missBefore = stats.getMissCount();
-
- final Session ses = sesFactory.openSession();
-
- try {
- for (Map.Entry<String, Integer> e : nameToId.entrySet())
- assertEquals((int)e.getValue(), ((Entity)ses.bySimpleNaturalId(Entity.class).load(e.getKey())).getId());
-
- for (String name : absentNames)
- assertNull((ses.bySimpleNaturalId(Entity.class).load(name)));
-
- assertEquals(nameToId.size() + hitBefore, stats.getHitCount());
-
- assertEquals(absentNames.length + missBefore, stats.getMissCount());
- }
- finally {
- ses.close();
- }
- }
-
- /**
- * @param sesFactory Session factory.
- * @param idToChildCnt Number of children per entity.
- * @param expHit Expected cache hits.
- * @param expMiss Expected cache misses.
- */
- @SuppressWarnings("unchecked")
- private void assertCollectionCache(SessionFactory sesFactory, Map<Integer, Integer> idToChildCnt, int expHit,
- int expMiss) {
- sesFactory.getStatistics().clear();
-
- Session ses = sesFactory.openSession();
-
- try {
- for (Map.Entry<Integer, Integer> e : idToChildCnt.entrySet()) {
- Entity entity = (Entity)ses.load(Entity.class, e.getKey());
-
- assertEquals((int)e.getValue(), entity.getChildren().size());
- }
- }
- finally {
- ses.close();
- }
-
- SecondLevelCacheStatistics stats =
- sesFactory.getStatistics().getSecondLevelCacheStatistics(CHILD_COLLECTION_REGION);
-
- assertEquals(expHit, stats.getHitCount());
-
- assertEquals(expMiss, stats.getMissCount());
- }
-
- /**
- * @param sesFactory Session factory.
- * @param cnt Number of entities to load.
- */
- private void loadEntities(SessionFactory sesFactory, int cnt) {
- Session ses = sesFactory.openSession();
-
- try {
- for (int i = 0; i < cnt; i++) {
- Entity e = (Entity)ses.load(Entity.class, i);
-
- assertEquals("name-" + i, e.getName());
-
- assertFalse(e.getChildren().isEmpty());
-
- ses.bySimpleNaturalId(Entity.class).load(e.getName());
- }
- }
- finally {
- ses.close();
- }
- }
-
- /**
- * @param entityName Entity name.
- * @param sesFactory Session factory.
- * @param idToName ID to name mapping.
- * @param absentIds Absent entities' IDs.
- */
- private void assertEntityCache(String entityName, SessionFactory sesFactory, Map<Integer, String> idToName,
- Integer... absentIds) {
- assert entityName.equals(ENTITY_NAME) || entityName.equals(ENTITY2_NAME) : entityName;
-
- sesFactory.getStatistics().clear();
-
- final Session ses = sesFactory.openSession();
-
- final boolean entity1 = entityName.equals(ENTITY_NAME);
-
- try {
- if (entity1) {
- for (Map.Entry<Integer, String> e : idToName.entrySet())
- assertEquals(e.getValue(), ((Entity)ses.load(Entity.class, e.getKey())).getName());
- }
- else {
- for (Map.Entry<Integer, String> e : idToName.entrySet())
- assertEquals(e.getValue(), ((Entity2)ses.load(Entity2.class, e.getKey())).getName());
- }
-
- for (final int id : absentIds) {
- GridTestUtils.assertThrows(log, new Callable<Void>() {
- @Override public Void call() throws Exception {
- if (entity1)
- ((Entity)ses.load(Entity.class, id)).getName();
- else
- ((Entity2)ses.load(Entity2.class, id)).getName();
-
- return null;
- }
- }, ObjectNotFoundException.class, null);
- }
-
- SecondLevelCacheStatistics stats = sesFactory.getStatistics().getSecondLevelCacheStatistics(entityName);
-
- assertEquals(idToName.size(), stats.getHitCount());
-
- assertEquals(absentIds.length, stats.getMissCount());
- }
- finally {
- ses.close();
- }
- }
-
- /**
- * Creates session factories.
- *
- * @param accessType Cache access type.
- */
- private void createSessionFactories(AccessType accessType) {
- sesFactory1 = startHibernate(accessType, getTestIgniteInstanceName(0));
-
- sesFactory2 = startHibernate(accessType, getTestIgniteInstanceName(1));
- }
-
- /**
- * Starts Hibernate.
- *
- * @param accessType Cache access type.
- * @param igniteInstanceName Ignite instance name.
- * @return Session factory.
- */
- private SessionFactory startHibernate(AccessType accessType, String igniteInstanceName) {
- Configuration cfg = hibernateConfiguration(accessType, igniteInstanceName);
-
- ServiceRegistryBuilder builder = registryBuilder();
-
- builder.applySetting("hibernate.show_sql", false);
-
- return cfg.buildSessionFactory(builder.buildServiceRegistry());
- }
-
- /**
- * Closes session factories and clears data from caches.
- *
- * @throws Exception If failed.
- */
- private void cleanup() throws Exception {
- if (sesFactory1 != null)
- sesFactory1.close();
-
- sesFactory1 = null;
-
- if (sesFactory2 != null)
- sesFactory2.close();
-
- sesFactory2 = null;
-
- for (IgniteCacheProxy<?, ?> cache : ((IgniteKernal)grid(0)).caches())
- cache.clear();
- }
-
- /**
- * @param igniteInstanceName Node name.
- * @param dfltAccessType Default cache access type.
- * @return Properties map.
- */
- static Map<String, String> hibernateProperties(String igniteInstanceName, String dfltAccessType) {
- Map<String, String> map = new HashMap<>();
-
- map.put(HBM2DDL_AUTO, "create");
- map.put(GENERATE_STATISTICS, "true");
- map.put(USE_SECOND_LEVEL_CACHE, "true");
- map.put(USE_QUERY_CACHE, "true");
- map.put(CACHE_REGION_FACTORY, HibernateRegionFactory.class.getName());
- map.put(RELEASE_CONNECTIONS, "on_close");
- map.put(IGNITE_INSTANCE_NAME_PROPERTY, igniteInstanceName);
- map.put(DFLT_ACCESS_TYPE_PROPERTY, dfltAccessType);
-
- return map;
- }
-}
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java
deleted file mode 100644
index 7a23c7571fb..00000000000
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java
+++ /dev/null
@@ -1,594 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import java.util.HashMap;
-import java.util.List;
-import javax.cache.Cache;
-import javax.persistence.Cacheable;
-import javax.persistence.Id;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.hamcrest.core.Is;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.junit.Test;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.hibernate.HibernateAccessStrategyFactory.DFLT_ACCESS_TYPE_PROPERTY;
-import static org.apache.ignite.cache.hibernate.HibernateAccessStrategyFactory.IGNITE_INSTANCE_NAME_PROPERTY;
-import static org.apache.ignite.cache.hibernate.HibernateAccessStrategyFactory.REGION_CACHE_PROPERTY;
-import static org.hibernate.cfg.AvailableSettings.CACHE_REGION_FACTORY;
-import static org.hibernate.cfg.AvailableSettings.GENERATE_STATISTICS;
-import static org.hibernate.cfg.AvailableSettings.HBM2DDL_AUTO;
-import static org.hibernate.cfg.AvailableSettings.RELEASE_CONNECTIONS;
-import static org.hibernate.cfg.AvailableSettings.USE_QUERY_CACHE;
-import static org.hibernate.cfg.AvailableSettings.USE_SECOND_LEVEL_CACHE;
-import static org.hibernate.cfg.AvailableSettings.USE_STRUCTURED_CACHE;
-import static org.junit.Assert.assertThat;
-
-/**
- * Tests Hibernate L2 cache configuration.
- */
-@SuppressWarnings("unchecked")
-public class HibernateL2CacheStrategySelfTest extends GridCommonAbstractTest {
- /** */
- private static final String ENTITY1_NAME = Entity1.class.getName();
-
- /** */
- private static final String ENTITY2_NAME = Entity2.class.getName();
-
- /** */
- private static final String ENTITY3_NAME = Entity3.class.getName();
-
- /** */
- private static final String ENTITY4_NAME = Entity4.class.getName();
-
- /** */
- private static final String TIMESTAMP_CACHE = "org.hibernate.cache.spi.UpdateTimestampsCache";
-
- /** */
- private static final String QUERY_CACHE = "org.hibernate.cache.internal.StandardQueryCache";
-
- /** */
- private static final String CONNECTION_URL = "jdbc:h2:mem:example;DB_CLOSE_DELAY=-1";
-
- /** */
- private SessionFactory sesFactory1;
-
- /** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- startGrid(0);
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTest() throws Exception {
- for (IgniteCacheProxy<?, ?> cache : ((IgniteKernal)grid(0)).caches())
- cache.clear();
- }
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-
- ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(new TcpDiscoveryVmIpFinder(true));
-
- cfg.setCacheConfiguration(cacheConfiguration(ENTITY3_NAME),
- cacheConfiguration(ENTITY4_NAME),
- cacheConfiguration("cache1"),
- cacheConfiguration("cache2"),
- cacheConfiguration(TIMESTAMP_CACHE),
- cacheConfiguration(QUERY_CACHE));
-
- return cfg;
- }
-
- /**
- * @param cacheName Cache name.
- * @return Cache configuration.
- */
- private CacheConfiguration cacheConfiguration(String cacheName) {
- CacheConfiguration cfg = new CacheConfiguration();
-
- cfg.setName(cacheName);
- cfg.setCacheMode(PARTITIONED);
- cfg.setAtomicityMode(TRANSACTIONAL);
-
- return cfg;
- }
-
- /**
- * @param accessType Cache access type.
- * @param igniteInstanceName Ignite instance name.
- * @return Hibernate configuration.
- */
- private Configuration hibernateConfiguration(AccessType accessType, String igniteInstanceName) {
- Configuration cfg = new Configuration();
-
- cfg.addAnnotatedClass(Entity1.class);
- cfg.addAnnotatedClass(Entity2.class);
- cfg.addAnnotatedClass(Entity3.class);
- cfg.addAnnotatedClass(Entity4.class);
-
- cfg.setCacheConcurrencyStrategy(ENTITY1_NAME, accessType.getExternalName());
- cfg.setCacheConcurrencyStrategy(ENTITY2_NAME, accessType.getExternalName());
- cfg.setCacheConcurrencyStrategy(ENTITY3_NAME, accessType.getExternalName());
- cfg.setCacheConcurrencyStrategy(ENTITY4_NAME, accessType.getExternalName());
-
- cfg.setProperty(DFLT_ACCESS_TYPE_PROPERTY, accessType.name());
-
- cfg.setProperty(HBM2DDL_AUTO, "create");
-
- cfg.setProperty(GENERATE_STATISTICS, "true");
-
- cfg.setProperty(USE_SECOND_LEVEL_CACHE, "true");
-
- cfg.setProperty(USE_QUERY_CACHE, "true");
-
- cfg.setProperty(CACHE_REGION_FACTORY, HibernateRegionFactory.class.getName());
-
- cfg.setProperty(RELEASE_CONNECTIONS, "on_close");
-
- cfg.setProperty(USE_STRUCTURED_CACHE, "true");
-
- cfg.setProperty(IGNITE_INSTANCE_NAME_PROPERTY, igniteInstanceName);
-
- cfg.setProperty(REGION_CACHE_PROPERTY + ENTITY1_NAME, "cache1");
- cfg.setProperty(REGION_CACHE_PROPERTY + ENTITY2_NAME, "cache2");
- cfg.setProperty(REGION_CACHE_PROPERTY + TIMESTAMP_CACHE, TIMESTAMP_CACHE);
- cfg.setProperty(REGION_CACHE_PROPERTY + QUERY_CACHE, QUERY_CACHE);
-
- return cfg;
- }
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testEntityCacheReadWrite() throws Exception {
- for (AccessType accessType : new AccessType[]{AccessType.READ_WRITE, AccessType.NONSTRICT_READ_WRITE})
- testEntityCacheReadWrite(accessType);
- }
-
- /**
- * @param accessType Cache access type.
- * @throws Exception If failed.
- */
- private void testEntityCacheReadWrite(AccessType accessType) throws Exception {
- log.info("Test access type: " + accessType);
-
- sesFactory1 = startHibernate(accessType, getTestIgniteInstanceName(0));
-
- try {
- // 1 Adding.
- Session ses = sesFactory1.openSession();
-
- try {
- Transaction tr = ses.beginTransaction();
-
- ses.save(new Entity1(1, "entity-1#name-1"));
- ses.save(new Entity2(1, "entity-2#name-1"));
-
- tr.commit();
- }
- finally {
- ses.close();
- }
-
- loadEntities(sesFactory1);
-
- assertEquals(1, grid(0).cache("cache1").size());
- assertEquals(1, grid(0).cache("cache2").size());
- assertThat(getEntityNameFromRegion(sesFactory1, "cache1", 1), Is.is("entity-1#name-1"));
- assertThat(getEntityNameFromRegion(sesFactory1, "cache2", 1), Is.is("entity-2#name-1"));
-
- // 2. Updating and adding.
- ses = sesFactory1.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- Entity1 e1 = (Entity1)ses.load(Entity1.class, 1);
-
- e1.setName("entity-1#name-1#UPDATED-1");
-
- ses.update(e1);
-
- ses.save(new Entity2(2, "entity-2#name-2#ADDED"));
-
- tx.commit();
- }
- finally {
- ses.close();
- }
-
- loadEntities(sesFactory1);
-
- assertEquals(1, grid(0).cache("cache1").size());
- assertEquals(2, grid(0).cache("cache2").size());
- assertThat(getEntityNameFromRegion(sesFactory1, "cache1", 1), Is.is("entity-1#name-1#UPDATED-1"));
- assertThat(getEntityNameFromRegion(sesFactory1, "cache2", 1), Is.is("entity-2#name-1"));
- assertThat(getEntityNameFromRegion(sesFactory1, "cache2", 2), Is.is("entity-2#name-2#ADDED"));
-
- // 3. Updating, adding, updating.
- ses = sesFactory1.openSession();
-
- try {
- Transaction tx = ses.beginTransaction();
-
- Entity2 e2_1 = (Entity2)ses.load(Entity2.class, 1);
-
- e2_1.setName("entity-2#name-1#UPDATED-1");
-
- ses.update(e2_1);
-
- ses.save(new Entity1(2, "entity-1#name-2#ADDED"));
-
- Entity1 e1_1 = (Entity1)ses.load(Entity1.class, 1);
-
- e1_1.setName("entity-1#name-1#UPDATED-2");
-
- ses.update(e1_1);
-
- tx.commit();
-
- }
- finally {
- ses.close();
- }
-
- loadEntities(sesFactory1);
-
- assertEquals(2, grid(0).cache("cache1").size());
- assertEquals(2, grid(0).cache("cache2").size());
- assertThat(getEntityNameFromRegion(sesFactory1, "cache2", 1), Is.is("entity-2#name-1#UPDATED-1"));
- assertThat(getEntityNameFromRegion(sesFactory1, "cache1", 2), Is.is("entity-1#name-2#ADDED"));
- assertThat(getEntityNameFromRegion(sesFactory1, "cache1", 1), Is.is("entity-1#name-1#UPDATED-2"));
-
- ses = sesFactory1.openSession();
-
- sesFactory1.getStatistics().logSummary();
-
- ses.close();
- }
- finally {
- cleanup();
- }
- }
-
- /**
- * @param sesFactory Session factory.
- */
- private void loadEntities(SessionFactory sesFactory) {
- Session ses = sesFactory.openSession();
-
- try {
- List<Entity1> list1 = ses.createCriteria(ENTITY1_NAME).list();
-
- for (Entity1 e1 : list1)
- assertNotNull(e1.getName());
-
- List<Entity2> list2 = ses.createCriteria(ENTITY2_NAME).list();
-
- for (Entity2 e2 : list2)
- assertNotNull(e2.getName());
- }
- finally {
- ses.close();
- }
- }
-
- /**
- * @param sesFactory Session Factory.
- * @param regionName Region Name.
- * @param id Id.
- * @return Entity Name.
- */
- private String getEntityNameFromRegion(SessionFactory sesFactory, String regionName, int id) {
- Session ses = sesFactory.openSession();
-
- try {
- for (Cache.Entry<Object, Object> entry : grid(0).cache(regionName)) {
- if (((HibernateKeyWrapper)entry.getKey()).id().equals(id))
- return (String)((HashMap)entry.getValue()).get("name");
- }
-
- return null;
- }
- finally {
- ses.close();
- }
- }
-
- /**
- * @param accessType Cache access typr.
- * @param igniteInstanceName Name of the grid providing caches.
- * @return Session factory.
- */
- private SessionFactory startHibernate(AccessType accessType, String igniteInstanceName) {
- Configuration cfg = hibernateConfiguration(accessType, igniteInstanceName);
-
- ServiceRegistryBuilder builder = new ServiceRegistryBuilder();
-
- builder.applySetting("hibernate.connection.url", CONNECTION_URL);
- builder.applySetting("hibernate.show_sql", false);
-
- return cfg.buildSessionFactory(builder.buildServiceRegistry());
- }
-
- /**
- * Test Hibernate entity1.
- */
- @javax.persistence.Entity
- @SuppressWarnings({"PublicInnerClass", "UnnecessaryFullyQualifiedName"})
- @Cacheable
- public static class Entity1 {
- /** */
- private int id;
-
- /** */
- private String name;
-
- /**
- *
- */
- public Entity1() {
- // No-op.
- }
-
- /**
- * @param id ID.
- * @param name Name.
- */
- Entity1(int id, String name) {
- this.id = id;
- this.name = name;
- }
-
- /**
- * @return ID.
- */
- @Id
- public int getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @return Name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name Name.
- */
- public void setName(String name) {
- this.name = name;
- }
- }
-
- /**
- * Test Hibernate entity2.
- */
- @javax.persistence.Entity
- @SuppressWarnings({"PublicInnerClass", "UnnecessaryFullyQualifiedName"})
- @Cacheable
- public static class Entity2 {
- /** */
- private int id;
-
- /** */
- private String name;
-
- /**
- *
- */
- public Entity2() {
- // No-op.
- }
-
- /**
- * @param id ID.
- * @param name Name.
- */
- Entity2(int id, String name) {
- this.id = id;
- this.name = name;
- }
-
- /**
- * @return ID.
- */
- @Id
- public int getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @return Name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name Name.
- */
- public void setName(String name) {
- this.name = name;
- }
- }
-
- /**
- * Test Hibernate entity3.
- */
- @javax.persistence.Entity
- @SuppressWarnings({"PublicInnerClass", "UnnecessaryFullyQualifiedName"})
- @Cacheable
- public static class Entity3 {
- /** */
- private int id;
-
- /** */
- private String name;
-
- /**
- *
- */
- public Entity3() {
- // No-op.
- }
-
- /**
- * @param id ID.
- * @param name Name.
- */
- public Entity3(int id, String name) {
- this.id = id;
- this.name = name;
- }
-
- /**
- * @return ID.
- */
- @Id
- public int getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @return Name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name Name.
- */
- public void setName(String name) {
- this.name = name;
- }
- }
-
- /**
- * Test Hibernate entity4.
- */
- @javax.persistence.Entity
- @SuppressWarnings({"PublicInnerClass", "UnnecessaryFullyQualifiedName"})
- @Cacheable
- public static class Entity4 {
- /** */
- private int id;
-
- /** */
- private String name;
-
- /**
- *
- */
- public Entity4() {
- // No-op.
- }
-
- /**
- * @param id ID.
- * @param name Name.
- */
- public Entity4(int id, String name) {
- this.id = id;
- this.name = name;
- }
-
- /**
- * @return ID.
- */
- @Id
- public int getId() {
- return id;
- }
-
- /**
- * @param id ID.
- */
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @return Name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name Name.
- */
- public void setName(String name) {
- this.name = name;
- }
- }
-
- /**
- * Closes session factories and clears data from caches.
- *
- * @throws Exception If failed.
- */
- private void cleanup() throws Exception {
- if (sesFactory1 != null)
- sesFactory1.close();
-
- sesFactory1 = null;
-
- for (IgniteCacheProxy<?, ?> cache : ((IgniteKernal)grid(0)).caches())
- cache.clear();
- }
-}
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
deleted file mode 100644
index 232a7f1ef50..00000000000
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import java.util.Collections;
-import javax.cache.configuration.Factory;
-import javax.transaction.Synchronization;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-import org.apache.commons.dbcp.managed.BasicManagedDataSource;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.h2.jdbcx.JdbcDataSource;
-import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.engine.transaction.internal.jta.JtaTransactionFactory;
-import org.hibernate.engine.transaction.spi.TransactionFactory;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.service.jta.platform.internal.AbstractJtaPlatform;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
-import org.jetbrains.annotations.Nullable;
-import org.objectweb.jotm.Jotm;
-import org.objectweb.jotm.rmi.RmiLocalConfiguration;
-
-/**
- *
- * Tests Hibernate L2 cache with TRANSACTIONAL access mode (Hibernate and Cache are configured
- * to used the same TransactionManager).
- */
-public class HibernateL2CacheTransactionalSelfTest extends HibernateL2CacheSelfTest {
- /** */
- private static Jotm jotm;
-
- /**
- */
- private static class TestJtaPlatform extends AbstractJtaPlatform {
- /** {@inheritDoc} */
- @Override protected TransactionManager locateTransactionManager() {
- return jotm.getTransactionManager();
- }
-
- /** {@inheritDoc} */
- @Override protected UserTransaction locateUserTransaction() {
- return jotm.getUserTransaction();
- }
- }
-
- /**
- */
- @SuppressWarnings("PublicInnerClass")
- public static class TestTmFactory implements Factory<TransactionManager> {
- /** */
- private static final long serialVersionUID = 0;
-
- /** {@inheritDoc} */
- @Override public TransactionManager create() {
- return jotm.getTransactionManager();
- }
- }
-
- /** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- jotm = new Jotm(true, false, new RmiLocalConfiguration());
-
- super.beforeTestsStarted();
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- if (jotm != null)
- jotm.stop();
-
- jotm = null;
- }
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-
- cfg.getTransactionConfiguration().setTxManagerFactory(new TestTmFactory());
- cfg.getTransactionConfiguration().setUseJtaSynchronization(useJtaSynchronization());
-
- return cfg;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheConfiguration transactionalRegionConfiguration(String regionName) {
- CacheConfiguration cfg = super.transactionalRegionConfiguration(regionName);
-
- cfg.setNearConfiguration(null);
-
- return cfg;
- }
-
- /** {@inheritDoc} */
- @Nullable @Override protected ServiceRegistryBuilder registryBuilder() {
- ServiceRegistryBuilder builder = new ServiceRegistryBuilder();
-
- DatasourceConnectionProviderImpl connProvider = new DatasourceConnectionProviderImpl();
-
- BasicManagedDataSource dataSrc = new BasicManagedDataSource(); // JTA-aware data source.
-
- dataSrc.setTransactionManager(jotm.getTransactionManager());
-
- dataSrc.setDefaultAutoCommit(false);
-
- JdbcDataSource h2DataSrc = new JdbcDataSource();
-
- h2DataSrc.setURL(CONNECTION_URL);
-
- dataSrc.setXaDataSourceInstance(h2DataSrc);
-
- connProvider.setDataSource(dataSrc);
-
- connProvider.configure(Collections.emptyMap());
-
- builder.addService(ConnectionProvider.class, connProvider);
-
- builder.addService(JtaPlatform.class, new TestJtaPlatform());
-
- builder.addService(TransactionFactory.class, new JtaTransactionFactory());
-
- return builder;
- }
-
- /** {@inheritDoc} */
- @Override protected AccessType[] accessTypes() {
- return new AccessType[]{AccessType.TRANSACTIONAL};
- }
-
- /**
- * @return Whether to use {@link Synchronization}.
- */
- protected boolean useJtaSynchronization() {
- return false;
- }
-}
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalUseSyncSelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalUseSyncSelfTest.java
deleted file mode 100644
index 44899f95557..00000000000
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalUseSyncSelfTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import javax.transaction.Synchronization;
-
-/**
- * Tests Hibernate L2 cache with TRANSACTIONAL access mode and {@link Synchronization}
- * instead of XA resource.
- */
-public class HibernateL2CacheTransactionalUseSyncSelfTest extends HibernateL2CacheTransactionalSelfTest {
- /** {@inheritDoc} */
- @Override protected boolean useJtaSynchronization() {
- return true;
- }
-}
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
deleted file mode 100644
index fa2b96f24de..00000000000
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreNodeRestartTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.store.hibernate;
-
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.cache.store.CacheStore;
-import org.apache.ignite.configuration.NearCacheConfiguration;
-import org.apache.ignite.internal.processors.cache.integration.IgniteCacheStoreNodeRestartAbstractTest;
-
-/** */
-public class CacheHibernateBlobStoreNodeRestartTest extends IgniteCacheStoreNodeRestartAbstractTest {
- /** {@inheritDoc} */
- @Override protected CacheStore getStore() {
- return new CacheHibernateBlobStore();
- }
-
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return CacheMode.PARTITIONED;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicityMode atomicityMode() {
- return CacheAtomicityMode.ATOMIC;
- }
-
- /** {@inheritDoc} */
- @Override protected NearCacheConfiguration nearConfiguration() {
- return null;
- }
-}
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreSelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreSelfTest.java
deleted file mode 100644
index f1b88d49c1f..00000000000
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreSelfTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.store.hibernate;
-
-import java.io.File;
-import java.net.URL;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.testframework.junits.cache.GridAbstractCacheStoreSelfTest;
-import org.hibernate.FlushMode;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-
-/**
- * Cache store test.
- */
-public class CacheHibernateBlobStoreSelfTest extends
- GridAbstractCacheStoreSelfTest<CacheHibernateBlobStore<Object, Object>> {
- /**
- * @throws Exception If failed.
- */
- public CacheHibernateBlobStoreSelfTest() throws Exception {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTest() throws Exception {
- super.afterTest();
-
- Session s = store.session(null);
-
- if (s == null)
- return;
-
- try {
- s.createQuery("delete from " + CacheHibernateBlobStoreEntry.class.getSimpleName())
- .setFlushMode(FlushMode.ALWAYS).executeUpdate();
-
- Transaction hTx = s.getTransaction();
-
- if (hTx != null && hTx.isActive())
- hTx.commit();
- }
- finally {
- s.close();
- }
- }
-
- /** {@inheritDoc} */
- @Override protected CacheHibernateBlobStore<Object, Object> store() {
- return new CacheHibernateBlobStore<>();
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testConfigurationByUrl() throws Exception {
- URL url = U.resolveIgniteUrl(CacheHibernateStoreFactorySelfTest.MODULE_PATH +
- "/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml");
-
- assert url != null;
-
- store.setHibernateConfigurationPath(url.toString());
-
- // Store will be implicitly initialized.
- store.load("key");
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testConfigurationByFile() throws Exception {
- URL url = U.resolveIgniteUrl(CacheHibernateStoreFactorySelfTest.MODULE_PATH +
- "/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml");
-
- assert url != null;
-
- File file = new File(url.toURI());
-
- store.setHibernateConfigurationPath(file.getAbsolutePath());
-
- // Store will be implicitly initialized.
- store.load("key");
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testConfigurationByResource() throws Exception {
- store.setHibernateConfigurationPath("/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml");
-
- // Store will be implicitly initialized.
- store.load("key");
- }
-}
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java
deleted file mode 100644
index f4cbdab6b18..00000000000
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.store.hibernate;
-
-import java.io.Serializable;
-import java.sql.Connection;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.Ignition;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.hibernate.Cache;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.hibernate.SessionBuilder;
-import org.hibernate.SessionFactory;
-import org.hibernate.StatelessSession;
-import org.hibernate.StatelessSessionBuilder;
-import org.hibernate.TypeHelper;
-import org.hibernate.engine.spi.FilterDefinition;
-import org.hibernate.metadata.ClassMetadata;
-import org.hibernate.metadata.CollectionMetadata;
-import org.hibernate.stat.Statistics;
-import org.junit.Test;
-
-/**
- * Test for Cache jdbc blob store factory.
- */
-public class CacheHibernateStoreFactorySelfTest extends GridCommonAbstractTest {
- /** Cache name. */
- private static final String CACHE_NAME = "test";
-
- /** */
- static final String MODULE_PATH = "modules/hibernate-4.2/";
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testCacheConfiguration() throws Exception {
- try (Ignite ignite1 = startGrid(0)) {
- IgniteCache<Integer, String> cache1 = ignite1.getOrCreateCache(cacheConfiguration());
-
- checkStore(cache1);
- }
- }
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testXmlConfiguration() throws Exception {
- try (Ignite ignite = Ignition.start(MODULE_PATH + "/src/test/config/factory-cache.xml")) {
- try (Ignite ignite1 = Ignition.start(MODULE_PATH + "/src/test/config/factory-cache1.xml")) {
- checkStore(ignite.<Integer, String>cache(CACHE_NAME), DummySessionFactoryExt.class);
-
- checkStore(ignite1.<Integer, String>cache(CACHE_NAME), DummySessionFactory.class);
- }
- }
- }
-
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testIncorrectBeanConfiguration() throws Exception {
- GridTestUtils.assertThrows(log, new Callable<Object>() {
- @Override public Object call() throws Exception {
- try (Ignite ignite =
- Ignition.start(MODULE_PATH + "/src/test/config/factory-incorrect-store-cache.xml")) {
- ignite.cache(CACHE_NAME).getConfiguration(CacheConfiguration.class).
- getCacheStoreFactory().create();
- }
- return null;
- }
- }, IgniteException.class, "Failed to load bean in application context");
- }
-
- /**
- * @return Cache configuration with store.
- */
- private CacheConfiguration<Integer, String> cacheConfiguration() {
- CacheConfiguration<Integer, String> cfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
-
- CacheHibernateBlobStoreFactory<Integer, String> factory = new CacheHibernateBlobStoreFactory();
-
- factory.setHibernateConfigurationPath("/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml");
-
- cfg.setCacheStoreFactory(factory);
-
- return cfg;
- }
-
- /**
- * @param cache Ignite cache.
- * @param dataSrcClass Data source class.
- * @throws Exception If store parameters is not the same as in configuration xml.
- */
- private void checkStore(IgniteCache<Integer, String> cache, Class<?> dataSrcClass) throws Exception {
- CacheHibernateBlobStore store = (CacheHibernateBlobStore)cache
- .getConfiguration(CacheConfiguration.class).getCacheStoreFactory().create();
-
- assertEquals(dataSrcClass,
- GridTestUtils.getFieldValue(store, CacheHibernateBlobStore.class, "sesFactory").getClass());
- }
-
- /**
- * @param cache Ignite cache.
- * @throws Exception If store parameters is not the same as in configuration xml.
- */
- private void checkStore(IgniteCache<Integer, String> cache) throws Exception {
- CacheHibernateBlobStore store = (CacheHibernateBlobStore)cache.getConfiguration(CacheConfiguration.class)
- .getCacheStoreFactory().create();
-
- assertEquals("/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml",
- GridTestUtils.getFieldValue(store, CacheHibernateBlobStore.class, "hibernateCfgPath"));
- }
-
- /**
- *
- */
- public static class DummySessionFactoryExt extends DummySessionFactory {
- /** */
- public DummySessionFactoryExt() {
- // No-op.
- }
- }
-
- /**
- *
- */
- public static class DummySessionFactory implements SessionFactory {
- /** {@inheritDoc} */
- @Override public SessionFactoryOptions getSessionFactoryOptions() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public SessionBuilder withOptions() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public Session openSession() throws HibernateException {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public Session getCurrentSession() throws HibernateException {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public StatelessSessionBuilder withStatelessOptions() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public StatelessSession openStatelessSession() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public StatelessSession openStatelessSession(Connection conn) {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public ClassMetadata getClassMetadata(Class entityCls) {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public ClassMetadata getClassMetadata(String entityName) {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public CollectionMetadata getCollectionMetadata(String roleName) {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public Map<String, ClassMetadata> getAllClassMetadata() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public Map getAllCollectionMetadata() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public Statistics getStatistics() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public void close() throws HibernateException {
- }
-
- /** {@inheritDoc} */
- @Override public boolean isClosed() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public Cache getCache() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public void evict(Class persistentCls) throws HibernateException {
- }
-
- /** {@inheritDoc} */
- @Override public void evict(Class persistentCls, Serializable id) throws HibernateException {
- }
-
- /** {@inheritDoc} */
- @Override public void evictEntity(String entityName) throws HibernateException {
- }
-
- /** {@inheritDoc} */
- @Override public void evictEntity(String entityName, Serializable id) throws HibernateException {
- }
-
- /** {@inheritDoc} */
- @Override public void evictCollection(String roleName) throws HibernateException {
- }
-
- /** {@inheritDoc} */
- @Override public void evictCollection(String roleName, Serializable id) throws HibernateException {
- }
-
- /** {@inheritDoc} */
- @Override public void evictQueries(String cacheRegion) throws HibernateException {
- }
-
- /** {@inheritDoc} */
- @Override public void evictQueries() throws HibernateException {
- }
-
- /** {@inheritDoc} */
- @Override public Set getDefinedFilterNames() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public FilterDefinition getFilterDefinition(String filterName) throws HibernateException {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public boolean containsFetchProfileDefinition(String name) {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public TypeHelper getTypeHelper() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public Reference getReference() throws NamingException {
- return null;
- }
- }
-}
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListenerSelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListenerSelfTest.java
deleted file mode 100644
index 621ce348356..00000000000
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListenerSelfTest.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.store.hibernate;
-
-import java.io.Serializable;
-import java.util.Map;
-import javax.cache.Cache;
-import javax.cache.configuration.Factory;
-import javax.cache.integration.CacheLoaderException;
-import javax.cache.integration.CacheWriterException;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import org.apache.ignite.cache.store.CacheStore;
-import org.apache.ignite.cache.store.CacheStoreAdapter;
-import org.apache.ignite.cache.store.CacheStoreSession;
-import org.apache.ignite.cache.store.CacheStoreSessionListener;
-import org.apache.ignite.cache.store.CacheStoreSessionListenerAbstractSelfTest;
-import org.apache.ignite.cache.store.jdbc.CacheJdbcStoreSessionListener;
-import org.apache.ignite.lang.IgniteBiInClosure;
-import org.apache.ignite.resources.CacheStoreSessionResource;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.cfg.Configuration;
-
-/**
- * Tests for {@link CacheJdbcStoreSessionListener}.
- */
-public class CacheHibernateStoreSessionListenerSelfTest extends CacheStoreSessionListenerAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected Factory<? extends CacheStore<Integer, Integer>> storeFactory() {
- return new Factory<CacheStore<Integer, Integer>>() {
- @Override public CacheStore<Integer, Integer> create() {
- return new Store();
- }
- };
- }
-
- /** {@inheritDoc} */
- @Override protected Factory<CacheStoreSessionListener> sessionListenerFactory() {
- return new Factory<CacheStoreSessionListener>() {
- @Override public CacheStoreSessionListener create() {
- CacheHibernateStoreSessionListener lsnr = new CacheHibernateStoreSessionListener();
-
- SessionFactory sesFactory = new Configuration().
- setProperty("hibernate.connection.url", URL).
- addAnnotatedClass(Table1.class).
- addAnnotatedClass(Table2.class).
- buildSessionFactory();
-
- lsnr.setSessionFactory(sesFactory);
-
- return lsnr;
- }
- };
- }
-
- /**
- */
- private static class Store extends CacheStoreAdapter<Integer, Integer> {
- /** */
- private static String SES_CONN_KEY = "ses_conn";
-
- /** */
- @CacheStoreSessionResource
- private CacheStoreSession ses;
-
- /** {@inheritDoc} */
- @Override public void loadCache(IgniteBiInClosure<Integer, Integer> clo, Object... args) {
- loadCacheCnt.incrementAndGet();
-
- checkSession();
- }
-
- /** {@inheritDoc} */
- @Override public Integer load(Integer key) throws CacheLoaderException {
- loadCnt.incrementAndGet();
-
- checkSession();
-
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public void write(Cache.Entry<? extends Integer, ? extends Integer> entry)
- throws CacheWriterException {
- writeCnt.incrementAndGet();
-
- checkSession();
-
- if (write.get()) {
- Session hibSes = ses.attachment();
-
- switch (ses.cacheName()) {
- case "cache1":
- hibSes.save(new Table1(entry.getKey(), entry.getValue()));
-
- break;
-
- case "cache2":
- if (fail.get())
- throw new CacheWriterException("Expected failure.");
-
- hibSes.save(new Table2(entry.getKey(), entry.getValue()));
-
- break;
-
- default:
- throw new CacheWriterException("Wring cache: " + ses.cacheName());
- }
- }
- }
-
- /** {@inheritDoc} */
- @Override public void delete(Object key) throws CacheWriterException {
- deleteCnt.incrementAndGet();
-
- checkSession();
- }
-
- /** {@inheritDoc} */
- @Override public void sessionEnd(boolean commit) {
- assertNull(ses.attachment());
- }
-
- /**
- */
- private void checkSession() {
- Session hibSes = ses.attachment();
-
- assertNotNull(hibSes);
-
- assertTrue(hibSes.isOpen());
-
- Transaction tx = hibSes.getTransaction();
-
- assertNotNull(tx);
-
- if (ses.isWithinTransaction())
- assertTrue(tx.isActive());
- else
- assertFalse(tx.isActive());
-
- verifySameInstance(hibSes);
- }
-
- /**
- * @param hibSes Session.
- */
- private void verifySameInstance(Session hibSes) {
- Map<String, Session> props = ses.properties();
-
- Session sesConn = props.get(SES_CONN_KEY);
-
- if (sesConn == null)
- props.put(SES_CONN_KEY, hibSes);
- else {
- assertSame(hibSes, sesConn);
-
- reuseCnt.incrementAndGet();
- }
- }
- }
-
- /**
- */
- @Entity
- @Table(name = "Table1")
- private static class Table1 implements Serializable {
- /** */
- @Id @GeneratedValue
- @Column(name = "id")
- private Integer id;
-
- /** */
- @Column(name = "key")
- private int key;
-
- /** */
- @Column(name = "value")
- private int value;
-
- /**
- * @param key Key.
- * @param value Value.
- */
- private Table1(int key, int value) {
- this.key = key;
- this.value = value;
- }
- }
-
- /**
- */
- @Entity
- @Table(name = "Table2")
- private static class Table2 implements Serializable {
- /** */
- @Id @GeneratedValue
- @Column(name = "id")
- private Integer id;
-
- /** */
- @Column(name = "key")
- private int key;
-
- /** */
- @Column(name = "value")
- private int value;
-
- /**
- * @param key Key.
- * @param value Value.
- */
- private Table2(int key, int value) {
- this.key = key;
- this.value = value;
- }
- }
-}
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml
deleted file mode 100644
index 3822b311595..00000000000
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-
-<!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
- <session-factory>
- <!-- Show SQL. -->
- <property name="show_sql">true</property>
-
- <!-- Database connection settings (private in-memory database). -->
- <property name="connection.url">jdbc:h2:mem:example;DB_CLOSE_DELAY=-1</property>
-
- <!-- Only validate the database schema on startup in production mode. -->
- <property name="hbm2ddl.auto">update</property>
-
- <!-- H2 dialect. -->
- <property name="hibernate.dialect">org.hibernate.dialect.H2Dialect</property>
-
- <!-- Mappings. -->
- <mapping resource="org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml"/>
- </session-factory>
-</hibernate-configuration>
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/package-info.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/package-info.java
deleted file mode 100644
index 25aceb08994..00000000000
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/store/hibernate/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * <!-- Package description. -->
- * Contains internal tests or test related classes and interfaces.
- */
-
-package org.apache.ignite.cache.store.hibernate;
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java
deleted file mode 100644
index 9f83514f2ef..00000000000
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites;
-
-import org.apache.ignite.cache.hibernate.HibernateL2CacheConfigurationSelfTest;
-import org.apache.ignite.cache.hibernate.HibernateL2CacheMultiJvmTest;
-import org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest;
-import org.apache.ignite.cache.hibernate.HibernateL2CacheStrategySelfTest;
-import org.apache.ignite.cache.hibernate.HibernateL2CacheTransactionalSelfTest;
-import org.apache.ignite.cache.hibernate.HibernateL2CacheTransactionalUseSyncSelfTest;
-import org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreNodeRestartTest;
-import org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreSelfTest;
-import org.apache.ignite.cache.store.hibernate.CacheHibernateStoreFactorySelfTest;
-import org.apache.ignite.cache.store.hibernate.CacheHibernateStoreSessionListenerSelfTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * Hibernate integration tests.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
- HibernateL2CacheSelfTest.class,
- HibernateL2CacheTransactionalSelfTest.class,
- HibernateL2CacheTransactionalUseSyncSelfTest.class,
- HibernateL2CacheConfigurationSelfTest.class,
- HibernateL2CacheStrategySelfTest.class,
- HibernateL2CacheMultiJvmTest.class,
-
- CacheHibernateBlobStoreSelfTest.class,
-
- CacheHibernateBlobStoreNodeRestartTest.class,
-
- CacheHibernateStoreSessionListenerSelfTest.class,
-
- CacheHibernateStoreFactorySelfTest.class
-})
-public class IgniteHibernateTestSuite {
-}
diff --git a/modules/hibernate-5.1/README.txt b/modules/hibernate-5.1/README.txt
deleted file mode 100644
index 7631d38ba03..00000000000
--- a/modules/hibernate-5.1/README.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-Apache Ignite Hibernate Module
-------------------------------
-
-Apache Ignite Hibernate module provides Hibernate second-level cache (L2 cache) implementation based
-on Apache Ignite In-Memory Data Grid.
-
-To enable Hibernate module when starting a standalone node, move 'optional/ignite-hibernate5' folder to
-'libs' folder before running 'ignite.{sh|bat}' script. The content of the module folder will
-be added to classpath in this case.
-
-Importing Hibernate Module In Maven Project
--------------------------------------------
-
-If you are using Maven to manage dependencies of your project, you can add Hibernate module
-dependency like this (replace '${ignite.version}' with actual Ignite version you are
-interested in):
-
-<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
- http://maven.apache.org/xsd/maven-4.0.0.xsd">
- ...
- <dependencies>
- ...
- <dependency>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-hibernate_5.1</artifactId>
- <version>${ignite.version}</version>
- </dependency>
- ...
- </dependencies>
- ...
-</project>
-
-
-LGPL dependencies
------------------
-
-Ignite includes the following optional LGPL dependencies:
- - Hibernate L2 Cache Integration, http://hibernate.org/orm/
- - JTS Topology Suite for Geospatial indexing, http://tsusiatsoftware.net/jts/main.html
- - cron4j for cron-based task scheduling, http://www.sauronsoftware.it/projects/cron4j
-
-Apache binary releases cannot include LGPL dependencies. If you would like include
-optional LGPL dependencies into your release, you should download the source release
-from Ignite website and do the build with the following maven command:
-
-./mvnw clean package -DskipTests -Prelease,lgpl
diff --git a/modules/hibernate-5.1/licenses/apache-2.0.txt b/modules/hibernate-5.1/licenses/apache-2.0.txt
deleted file mode 100644
index d6456956733..00000000000
--- a/modules/hibernate-5.1/licenses/apache-2.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/modules/hibernate-5.1/pom.xml b/modules/hibernate-5.1/pom.xml
deleted file mode 100644
index 845e8a00f93..00000000000
--- a/modules/hibernate-5.1/pom.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
- POM file.
--->
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-parent-internal</artifactId>
- <version>${revision}</version>
- <relativePath>../../parent-internal/pom.xml</relativePath>
- </parent>
-
- <artifactId>ignite-hibernate_5.1</artifactId>
-
- <url>http://ignite.apache.org</url>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-hibernate-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>5.1.5.Final</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-jta</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ow2.jotm</groupId>
- <artifactId>jotm-core</artifactId>
- <version>${jotm.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>${commons.dbcp.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${h2.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <version>1.5</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-tools</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-spring</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ignite-log4j</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <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>
-
- <!-- JDK9+ -->
-
- <dependency>
- <groupId>org.jboss.spec.javax.rmi</groupId>
- <artifactId>jboss-rmi-api_1.0_spec</artifactId>
- <version>${jboss.rmi.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb.api.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb.impl.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb.impl.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>lgpl</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/main/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- <testResource>
- <directory>src/test/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
-
- <plugins>
- <!-- Generate the OSGi MANIFEST.MF for this bundle. -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/modules/hibernate-5.1/src/main/java/org/apache/ignite/cache/hibernate/HibernateAbstractRegionAccessStrategy.java b/modules/hibernate-5.1/src/main/java/org/apache/ignite/cache/hibernate/HibernateAbstractRegionAccessStrategy.java
deleted file mode 100644
index 7eb3e94bfa3..00000000000
--- a/modules/hibernate-5.1/src/main/java/org/apache/ignite/cache/hibernate/HibernateAbstractRegionAccessStrategy.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.access.RegionAccessStrategy;
-import org.hibernate.cache.spi.access.SoftLock;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Implementation of L2 cache access strategy delegating to {@link HibernateAccessStrategyAdapter}.
- */
-public abstract class HibernateAbstractRegionAccessStrategy implements RegionAccessStrategy {
- /** */
- protected final HibernateAccessStrategyAdapter stgy;
-
- /**
- * @param stgy Access strategy implementation.
- */
- protected HibernateAbstractRegionAccessStrategy(HibernateAccessStrategyAdapter stgy) {
- this.stgy = stgy;
- }
-
- /** {@inheritDoc} */
- @Nullable @Override public Object get(SessionImplementor ses, Object key, long txTs) throws CacheException {
- return stgy.get(key);
- }
-
- /** {@inheritDoc} */
- @Override public boolean putFromLoad(SessionImplementor ses, Object key, Object val, long txTs, Object ver) throws CacheException {
- stgy.putFromLoad(key, val);
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean putFromLoad(SessionImplementor ses, Object key, Object val, long txTs, Object ver, boolean minimalPutOverride)
- throws CacheException {
- stgy.putFromLoad(key, val, minimalPutOverride);
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Nullable @Override public SoftLock lockItem(SessionImplementor ses, Object key, Object ver) throws CacheException {
- stgy.lock(key);
-
- return null;
- }
-
- /** {@inheritDoc} */
- @Nullable @Override public SoftLock lockRegion() throws CacheException {
- stgy.lockRegion();
-
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public void unlockRegion(SoftLock lock) throws CacheException {
- stgy.unlockRegion();
- }
-
- /** {@inheritDoc} */
- @Override public void unlockItem(SessionImplementor ses, Object key, SoftLock lock) throws CacheException {
- stgy.unlock(key);
- }
-
- /** {@inheritDoc} */
- @Override public void remove(SessionImplementor ses, Object key) throws CacheException {
- stgy.remove(key);
- }
-
- /** {@inheritDoc} */
- @Override public void removeAll() throws CacheException {
- stgy.removeAll();
- }
-
- /** {@inheritDoc} */
- @Override public void evict(Object key) throws CacheException {
- stgy.evict(key);
- }
-
- /** {@inheritDoc} */
- @Override public void evictAll() throws CacheException {
- stgy.evictAll();
- }
-}
diff --git a/modules/hibernate-5.1/src/main/java/org/apache/ignite/cache/hibernate/HibernateCollectionRegion.java b/modules/hibernate-5.1/src/main/java/org/apache/ignite/cache/hibernate/HibernateCollectionRegion.java
deleted file mode 100644
index afb9c357001..00000000000
--- a/modules/hibernate-5.1/src/main/java/org/apache/ignite/cache/hibernate/HibernateCollectionRegion.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import org.apache.ignite.Ignite;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.CacheDataDescription;
-import org.hibernate.cache.spi.CollectionRegion;
-import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.persister.collection.CollectionPersister;
-
-/**
- * Implementation of {@link CollectionRegion}. This region is used to store collection data.
- * <p>
- * L2 cache for collection can be enabled in the Hibernate configuration file:
- * <pre name="code" class="xml">
- * <hibernate-configuration>
- * <!-- Enable L2 cache. -->
- * <property name="cache.use_second_level_cache">true</property>
- *
- * <!-- Use Ignite as L2 cache provider. -->
- * <property name="cache.region.factory_class">org.apache.ignite.cache.hibernate.HibernateRegionFactory</property>
- *
- * <!-- Specify entities. -->
- * <mapping class="com.example.Entity"/>
- * <mapping class="com.example.ChildEntity"/>
- *
- * <!-- Enable L2 cache with nonstrict-read-write access strategy for entities and collection. -->
- * <collection-cache collection="com.example.Entity" usage="nonstrict-read-write"/>
- * <collection-cache collection="com.example.ChildEntity" usage="nonstrict-read-write"/>
- * <collection-cache collection="com.example.Entity.children" usage="nonstrict-read-write"/>
- * </hibernate-configuration>
- * </pre>
- * Also cache for collection can be enabled using annotations:
- * <pre name="code" class="java">
- * @javax.persistence.Entity
- * public class Entity {
- * ...
- *
- * @javax.persistence.OneToMany(cascade=CascadeType.ALL, fetch=FetchType.EAGER)
- * @javax.persistence.JoinColumn(name="PARENT_ID")
- * @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
- * public List<ChildEntity> getChildren() {...}
- * }
- * </pre>
- * Note: the collection cache does not cache the state of the actual entities in the cache, it caches only identifier
- * values. For this reason, the collection cache should always be used in conjunction with
- * the second-level cache for those entities expected to be cached as part of a collection cache.
- */
-public class HibernateCollectionRegion extends HibernateTransactionalDataRegion implements CollectionRegion {
- /**
- * @param factory Region factory.
- * @param name Region name.
- * @param ignite Grid.
- * @param cache Region cache.
- * @param dataDesc Region data description.
- */
- public HibernateCollectionRegion(HibernateRegionFactory factory, String name,
- Ignite ignite, HibernateCacheProxy cache, CacheDataDescription dataDesc) {
- super(factory, name, ignite, cache, dataDesc);
- }
-
- /** {@inheritDoc} */
- @Override public CollectionRegionAccessStrategy buildAccessStrategy(AccessType accessType) throws CacheException {
- return new AccessStrategy(createAccessStrategy(accessType));
- }
-
- /**
- * Collection region access strategy.
- */
- private class AccessStrategy extends HibernateAbstractRegionAccessStrategy
- implements CollectionRegionAccessStrategy {
- /**
- * @param stgy Access strategy implementation.
- */
- private AccessStrategy(HibernateAccessStrategyAdapter stgy) {
- super(stgy);
- }
-
- /** {@inheritDoc} */
- @Override public Object generateCacheKey(Object id,
- CollectionPersister persister,
- SessionFactoryImplementor factory, String tenantIdentifier) {
- return HibernateKeyWrapper.staticCreateCollectionKey(id, persister, tenantIdentifier);
- }
-
- /** {@inheritDoc} */
- @Override public Object getCacheKeyId(Object cacheKey) {
- return ((HibernateKeyWrapper)cacheKey).id();
- }
-
- /** {@inheritDoc} */
- @Override public CollectionRegion getRegion() {
- return HibernateCollectionRegion.this;
- }
- }
-}
diff --git a/modules/hibernate-5.1/src/main/java/org/apache/ignite/cache/hibernate/HibernateEntityRegion.java b/modules/hibernate-5.1/src/main/java/org/apache/ignite/cache/hibernate/HibernateEntityRegion.java
deleted file mode 100644
index 5e00177750b..00000000000
--- a/modules/hibernate-5.1/src/main/java/org/apache/ignite/cache/hibernate/HibernateEntityRegion.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import org.apache.ignite.Ignite;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.CacheDataDescription;
-import org.hibernate.cache.spi.EntityRegion;
-import org.hibernate.cache.spi.access.AccessType;
-import org.hibernate.cache.spi.access.EntityRegionAccessStrategy;
-import org.hibernate.cache.spi.access.SoftLock;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.persister.entity.EntityPersister;
-
-/**
- * Implementation of {@link EntityRegion}. This region is used to store entity data.
- * <p>
- * L2 cache for entity can be enabled in the Hibernate configuration file:
- * <pre name="code" class="xml">
- * <hibernate-configuration>
- * <!-- Enable L2 cache. -->
- * <property name="cache.use_second_level_cache">true</property>
- *
- * <!-- Use Ignite as L2 cache provider. -->
- * <property name="cache.region.factory_class">org.apache.ignite.cache.hibernate.HibernateRegionFactory</property>
- *
- * <!-- Specify entity. -->
- * <mapping class="com.example.Entity"/>
- *
- * <!-- Enable L2 cache with nonstrict-read-write access strategy for entity. -->
- * <class-cache class="com.example.Entity" usage="nonstrict-read-write"/>
- * </hibernate-configuration>
- * </pre>
- * Also cache for entity can be enabled using annotations:
- * <pre name="code" class="java">
- * @javax.persistence.Entity
- * @javax.persistence.Cacheable
- * @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
- * public class Entity { ... }
- * </pre>
- */
-public class HibernateEntityRegion extends HibernateTransactionalDataRegion implements EntityRegion {
- /**
- * @param factory Region factory.
- * @param name Region name.
- * @param ignite Grid.
- * @param cache Region cache,
- * @param dataDesc Region data description.
- */
- public HibernateEntityRegion(HibernateRegionFactory factory, String name, Ignite ignite,
- HibernateCacheProxy cache, CacheDataDescription dataDesc) {
- super(factory, name, ignite, cache, dataDesc);
- }
-
- /** {@inheritDoc} */
- @Override public EntityRegionAccessStrategy buildAccessStrategy(AccessType accessType) throws CacheException {
- return new AccessStrategy(createAccessStrategy(accessType));
- }
-
- /**
- * Entity region access strategy.
- */
- private class AccessStrategy extends HibernateAbstractRegionAccessStrategy
- implements EntityRegionAccessStrategy {
- /**
- * @param stgy Access strategy implementation.
- */
- private AccessStrategy(HibernateAccessStrategyAdapter stgy) {
- super(stgy);
- }
-
- /** {@inheritDoc} */
- @Override public Object generateCacheKey(Object id,
- EntityPersister persister,
- SessionFactoryImplementor factory,
- String tenantIdentifier) {
- return HibernateKeyWrapper.staticCreateEntityKey(id, persister, tenantIdentifier);
- }
-
- /** {@inheritDoc} */
- @Override public Object getCacheKeyId(Object cacheKey) {
- return ((HibernateKeyWrapper)cacheKey).id();
- }
-
- /** {@inheritDoc} */
- @Override public EntityRegion getRegion() {
- return HibernateEntityRegion.this;
- }
-
- /** {@inheritDoc} */
- @Override public boolean insert(SessionImplementor ses, Object key, Object val, Object ver) throws CacheException {
- return stgy.insert(key, val);
- }
-
- /** {@inheritDoc} */
- @Override public boolean afterInsert(SessionImplementor ses, Object key, Object val, Object ver) throws CacheException {
- return stgy.afterInsert(key, val);
- }
-
- /** {@inheritDoc} */
- @Override public boolean update(SessionImplementor ses, Object key, Object val, Object currVer, Object previousVer)
- throws CacheException {
- return stgy.update(key, val);
- }
-
- /** {@inheritDoc} */
- @Override public boolean afterUpdate(
- SessionImplementor ses,
- Object key,
- Object val,
- Object currVer,
- Object previousVer,
- SoftLock lock
- )
- throws CacheException {
- return stgy.afterUpdate(key, val);
- }
- }
-}
diff --git a/modules/hibernate-5.1/src/main/java/org/apache/ignite/cache/hibernate/HibernateGeneralDataRegion.java b/modules/hibernate-5.1/src/main/java/org/apache/ignite/cache/hibernate/HibernateGeneralDataRegion.java
deleted file mode 100644
index df3ec877c33..00000000000
--- a/modules/hibernate-5.1/src/main/java/org/apache/ignite/cache/hibernate/HibernateGeneralDataRegion.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache.hibernate;
-
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.GeneralDataRegion;
-import org.hibernate.cache.spi.QueryResultsRegion;
-import org.hibernate.cache.spi.TimestampsRegion;
-import org.hibernate.engine.spi.SessionImplementor;
... 16757 lines suppressed ...