ignite git commit: ignite-1794

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1794 424ef28dc -> b14dbb2c9


ignite-1794


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b14dbb2c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b14dbb2c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b14dbb2c

Branch: refs/heads/ignite-1794
Commit: b14dbb2c98f27a85235b3f33ef36ab60b89b036a
Parents: 424ef28
Author: sboikov <sboi...@gridgain.com>
Authored: Mon Apr 10 14:26:26 2017 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Mon Apr 10 14:26:26 2017 +0300

----------------------------------------------------------------------
 .../hibernate/HibernateL2CacheSelfTest.java     |  2 +-
 .../hibernate/HibernateL2CacheSelfTest.java     | 29 ++++----------------
 2 files changed, 7 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b14dbb2c/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
 
b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
index a36a823..13956dc 100644
--- 
a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
+++ 
b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
@@ -479,7 +479,7 @@ public class HibernateL2CacheSelfTest extends 
GridCommonAbstractTest {
      * @param igniteInstanceName Ignite instance name.
      * @return Hibernate configuration.
      */
-    protected Configuration hibernateConfiguration(AccessType accessType,
+    private Configuration hibernateConfiguration(AccessType accessType,
         String igniteInstanceName) {
         Configuration cfg = new Configuration();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/b14dbb2c/modules/hibernate5/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/hibernate5/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
 
b/modules/hibernate5/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
index c4b71ad..f847c97 100644
--- 
a/modules/hibernate5/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
+++ 
b/modules/hibernate5/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
@@ -54,7 +54,6 @@ import 
org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 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.cfg.Environment;
 import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.mapping.PersistentClass;
@@ -485,25 +484,6 @@ public class HibernateL2CacheSelfTest extends 
GridCommonAbstractTest {
     }
 
     /**
-     * @param accessType Hibernate L2 cache access type.
-     * @param igniteInstanceName Ignite instance name.
-     * @return Hibernate configuration.
-     */
-    protected Configuration 
hibernateConfiguration(org.hibernate.cache.spi.access.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);
-
-
-        return cfg;
-    }
-
-    /**
      * @return Hibernate registry builder.
      */
     protected StandardServiceRegistryBuilder registryBuilder() {
@@ -1919,12 +1899,12 @@ public class HibernateL2CacheSelfTest extends 
GridCommonAbstractTest {
         builder.applySetting(Environment.DIALECT, 
"org.hibernate.dialect.H2Dialect");
         builder.applySetting("hibernate.show_sql", false);
 
-        StandardServiceRegistry serviceRegistry = builder.build();
+        StandardServiceRegistry srvcRegistry = builder.build();
 
-        MetadataSources metadataSources = new MetadataSources( serviceRegistry 
);
+        MetadataSources metadataSources = new MetadataSources(srvcRegistry);
 
         for (Class entityClass : getAnnotatedClasses())
-            metadataSources.addAnnotatedClass( entityClass );
+            metadataSources.addAnnotatedClass(entityClass);
 
         Metadata metadata = metadataSources.buildMetadata();
 
@@ -1939,6 +1919,9 @@ public class HibernateL2CacheSelfTest extends 
GridCommonAbstractTest {
         return metadata.buildSessionFactory();
     }
 
+    /**
+     * @return Entities classes.
+     */
     private Class[] getAnnotatedClasses() {
         return new Class[]{Entity.class, Entity2.class, VersionedEntity.class, 
ChildEntity.class, ParentEntity.class};
     }