Merge pull request #1 from terancet/master

Removed fully qualified class names from Hibernate queries

Author: xpinjection

src/test/java/com/jeeconf/hibernate/performancetuning/batchfetching/BatchFetchingTest.java

@@ -17,9 +17,7 @@ public class BatchFetchingTest extends BaseTest {
     @SuppressWarnings("unchecked")
     @Test
     public void batchFetching() {
-        List<Client> clients = session.createQuery("select c from " +
-                "com.jeeconf.hibernate.performancetuning.batchfetching.entity.Client c " +
-                "where c.age >= :age")
+        List<Client> clients = session.createQuery("select c from BatchableFetchedClientEntity c where c.age >= :age")
                 .setParameter("age", 18)
                 .list();
         clients.forEach(c -> c.getAccounts().size());

src/test/java/com/jeeconf/hibernate/performancetuning/batchfetching/entity/Client.java

@@ -11,10 +11,11 @@
 /**
  * Created by Igor Dmitriev / Mikalai Alimenkou on 4/29/16
  */
-@Entity
+@Entity(name = "BatchableFetchedClientEntity")
 @Getter
 @Setter
 @BatchSize(size = 5)
+@Table(name = "Client")
 public class Client {
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE)

src/test/java/com/jeeconf/hibernate/performancetuning/batchprocessing/BatchingProcessingTest.java

@@ -45,8 +45,7 @@ public void batchInsert() {
     @Commit
     @Test
     public void batchUpdate() {
-        Query query = session.createQuery("select c from " +
-                "com.jeeconf.hibernate.performancetuning.batchprocessing.entity.Client c");
+        Query query = session.createQuery("select c from BatchableClientEntity c");
         ScrollableResults scroll = query.setFetchSize(50)
                 .setCacheMode(CacheMode.IGNORE)
                 .scroll(ScrollMode.FORWARD_ONLY);
@@ -70,8 +69,7 @@ public void batchUpdate() {
     @Commit
     @Test
     public void batchCascadeDelete() {
-        List<Client> clients = session.createQuery("select c from " +
-                "com.jeeconf.hibernate.performancetuning.batchprocessing.entity.Client c")
+        List<Client> clients = session.createQuery("select c from BatchableClientEntity c")
                 .list();
         clients.forEach(session::delete);
         flushAndClear();

src/test/java/com/jeeconf/hibernate/performancetuning/batchprocessing/entity/Client.java

@@ -10,9 +10,10 @@
 /**
  * Created by Igor Dmitriev / Mikalai Alimenkou on 4/29/16
  */
-@Entity
+@Entity(name = "BatchableClientEntity")
 @Getter
 @Setter
+@Table(name = "Client")
 public class Client {
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE)

src/test/java/com/jeeconf/hibernate/performancetuning/cache/EntityCacheTest.java

@@ -38,7 +38,7 @@ public void queryCache() {
 
     @Test
     public void queryCacheInConjunctionWithSecondLevel() {
-        String query = "select c from com.jeeconf.hibernate.performancetuning.cache.entity.Client c";
+        String query = "select c from CachableFromSecondLevelCacheClient c";
         executeCacheableQuery(query);
         session.clear();
         executeCacheableQuery(query);

src/test/java/com/jeeconf/hibernate/performancetuning/cache/entity/Client.java

@@ -11,9 +11,10 @@
 /**
  * Created by Igor Dmitriev / Mikalai Alimenkou on 4/29/16
  */
-@Entity
+@Entity(name = "CachableFromSecondLevelCacheClient")
 @Getter
 @Setter
+@Table(name = "Client")
 public class Client {
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE)

src/test/java/com/jeeconf/hibernate/performancetuning/dirtychecking/DirtyCheckingTest.java

@@ -40,7 +40,7 @@ public void dirtyCheckingDisableForQuery() {
         //session.setReadOnly(Client.class, true);
         // for queries it is also possible
         /*session.createQuery("select c " +
-                "from com.jeeconf.hibernate.performancetuning.dirtychecking.entity.Client c")
+                "from DirtyCheckableClient c")
                 .setReadOnly(true).list();*/
 
         AssertSqlCount.assertSelectCount(1);
@@ -50,8 +50,7 @@ public void dirtyCheckingDisableForQuery() {
     @Commit
     public void statelessSession() {
         StatelessSession statelessSession = getSessionFactory().openStatelessSession();
-        ScrollableResults scroll = statelessSession.createQuery("select c from " +
-                "com.jeeconf.hibernate.performancetuning.dirtychecking.entity.Client c")
+        ScrollableResults scroll = statelessSession.createQuery("select c from DirtyCheckableClient c")
                 .scroll(ScrollMode.FORWARD_ONLY);
         int count = 0;
         while (scroll.next()) {

src/test/java/com/jeeconf/hibernate/performancetuning/dirtychecking/entity/Client.java

@@ -10,9 +10,10 @@
 /**
  * Created by Igor Dmitriev / Mikalai Alimenkou on 4/29/16
  */
-@Entity
+@Entity(name = "DirtyCheckableClient")
 @Getter
 @Setter
+@Table(name = "Client")
 public class Client {
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE)

src/test/java/com/jeeconf/hibernate/performancetuning/entitygraph/EntityGraphTest.java

@@ -26,8 +26,7 @@ public void clientFetchAccounts() {
     }
 
     private TypedQuery<Client> findAdultClientsQuery() {
-        return em.createQuery("select c from com.jeeconf.hibernate.performancetuning.entitygraph.entity.Client c " +
-                "where c.age >= :age", Client.class)
+        return em.createQuery("select c from EntityGraphClient c where c.age >= :age", Client.class)
                 .setParameter("age", 18);
     }
 }

src/test/java/com/jeeconf/hibernate/performancetuning/entitygraph/entity/Client.java

@@ -10,15 +10,16 @@
 /**
  * Created by Igor Dmitriev / Mikalai Alimenkou on 4/29/16
  */
-@Entity
+@Entity(name = "EntityGraphClient")
 @Getter
 @Setter
 @NamedEntityGraphs({
         @NamedEntityGraph(name = Client.ACCOUNTS_GRAPH,
                 attributeNodes = @NamedAttributeNode("accounts"))
 })
+@Table(name = "Client")
 public class Client {
-    public static final String ACCOUNTS_GRAPH = "Client[accounts]";
+    public static final String ACCOUNTS_GRAPH = "EntityGraphClient[accounts]";
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE)