You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/04/10 10:37:44 UTC
ignite git commit: ignite-1794
Repository: ignite
Updated Branches:
refs/heads/ignite-1794 0ac4d0447 -> 11afee16e
ignite-1794
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11afee16
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11afee16
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11afee16
Branch: refs/heads/ignite-1794
Commit: 11afee16e2cf6def21ef37cd02e7a7626f1ed043
Parents: 0ac4d04
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 10 13:31:25 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 10 13:37:17 2017 +0300
----------------------------------------------------------------------
modules/hibernate5/pom.xml | 2 +-
.../CacheHibernateStoreSessionListener.java | 3 +-
.../CacheHibernateStoreFactorySelfTest.java | 30 ++++++++++++++------
...heHibernateStoreSessionListenerSelfTest.java | 7 +++--
4 files changed, 29 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/11afee16/modules/hibernate5/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate5/pom.xml b/modules/hibernate5/pom.xml
index 7dd069b..13a0c40 100644
--- a/modules/hibernate5/pom.xml
+++ b/modules/hibernate5/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>5.2.7.Final</version>
+ <version>5.2.9.Final</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/11afee16/modules/hibernate5/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListener.java
----------------------------------------------------------------------
diff --git a/modules/hibernate5/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListener.java b/modules/hibernate5/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListener.java
index 917641c..0f5a33c 100644
--- a/modules/hibernate5/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListener.java
+++ b/modules/hibernate5/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListener.java
@@ -203,7 +203,8 @@ public class CacheHibernateStoreSessionListener implements CacheStoreSessionList
Transaction tx = hibSes.getTransaction();
if (commit) {
- hibSes.flush();
+ if (hibSes.isDirty())
+ hibSes.flush();
if (tx.isActive())
tx.commit();
http://git-wip-us.apache.org/repos/asf/ignite/blob/11afee16/modules/hibernate5/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate5/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java b/modules/hibernate5/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java
index 0d09978..d158f81 100644
--- a/modules/hibernate5/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java
+++ b/modules/hibernate5/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreFactorySelfTest.java
@@ -185,12 +185,12 @@ public class CacheHibernateStoreFactorySelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public StatelessSession openStatelessSession(Connection connection) {
+ @Override public StatelessSession openStatelessSession(Connection conn) {
return null;
}
/** {@inheritDoc} */
- @Override public ClassMetadata getClassMetadata(Class entityClass) {
+ @Override public ClassMetadata getClassMetadata(Class entityCls) {
return null;
}
@@ -258,56 +258,68 @@ public class CacheHibernateStoreFactorySelfTest extends GridCommonAbstractTest {
return null;
}
+ /** {@inheritDoc} */
@Override public EntityManager createEntityManager() {
return null;
}
+ /** {@inheritDoc} */
@Override public EntityManager createEntityManager(Map map) {
return null;
}
+ /** {@inheritDoc} */
@Override public EntityManager createEntityManager(SynchronizationType synchronizationType) {
return null;
}
+ /** {@inheritDoc} */
@Override public EntityManager createEntityManager(SynchronizationType synchronizationType, Map map) {
return null;
}
+ /** {@inheritDoc} */
@Override public CriteriaBuilder getCriteriaBuilder() {
return null;
}
+ /** {@inheritDoc} */
@Override public boolean isOpen() {
return false;
}
+ /** {@inheritDoc} */
@Override public Map<String, Object> getProperties() {
return null;
}
+ /** {@inheritDoc} */
@Override public PersistenceUnitUtil getPersistenceUnitUtil() {
return null;
}
- @Override public void addNamedQuery(String s, Query query) {
-
+ /** {@inheritDoc} */
+ @Override public void addNamedQuery(String s, Query qry) {
+ // No-op.
}
- @Override public <T> T unwrap(Class<T> aClass) {
+ /** {@inheritDoc} */
+ @Override public <T> T unwrap(Class<T> aCls) {
return null;
}
+ /** {@inheritDoc} */
@Override public <T> void addNamedEntityGraph(String s, EntityGraph<T> entityGraph) {
-
+ // No-op.
}
- @Override public <T> List<EntityGraph<? super T>> findEntityGraphsByType(Class<T> entityClass) {
+ /** {@inheritDoc} */
+ @Override public <T> List<EntityGraph<? super T>> findEntityGraphsByType(Class<T> entityCls) {
return null;
}
- @Override
- public Metamodel getMetamodel() {
+ /** {@inheritDoc} */
+ @Override public Metamodel getMetamodel() {
return null;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/11afee16/modules/hibernate5/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate5/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListenerSelfTest.java b/modules/hibernate5/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListenerSelfTest.java
index 880d12a..c4d6120 100644
--- a/modules/hibernate5/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListenerSelfTest.java
+++ b/modules/hibernate5/src/test/java/org/apache/ignite/cache/store/hibernate/CacheHibernateStoreSessionListenerSelfTest.java
@@ -26,6 +26,7 @@ import javax.cache.integration.CacheWriterException;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.ignite.cache.store.CacheStore;
@@ -186,7 +187,8 @@ public class CacheHibernateStoreSessionListenerSelfTest extends CacheStoreSessio
@Table(name = "Table1")
private static class Table1 implements Serializable {
/** */
- @Id @GeneratedValue
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
private Integer id;
@@ -214,7 +216,8 @@ public class CacheHibernateStoreSessionListenerSelfTest extends CacheStoreSessio
@Table(name = "Table2")
private static class Table2 implements Serializable {
/** */
- @Id @GeneratedValue
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
private Integer id;