extending the title and name cache auto initializer by relationsFromThisName - #4174...

[cdmlib.git] / cdmlib-persistence / src / main / java / eu / etaxonomy / cdm / persistence / dao / initializer / TitleAndNameCacheAutoInitializer.java

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/TitleAndNameCacheAutoInitializer.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/TitleAndNameCacheAutoInitializer.java
index 5ea360b556987e0c0eaa1b18faf033a2787465e4..8f7d25619b9f4a53c6ee6cc417a95e818aa30758 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/TitleAndNameCacheAutoInitializer.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/TitleAndNameCacheAutoInitializer.java
@@ -37,7 +37,7 @@ public class TitleAndNameCacheAutoInitializer extends AutoPropertyInitializer<Id
     @Override\r
     public void initialize(IdentifiableEntity<?> bean) {\r
 \r
-       bean = HibernateProxyHelper.deproxy(bean, IdentifiableEntity.class);\r
+        bean = HibernateProxyHelper.deproxy(bean, IdentifiableEntity.class);\r
         // we will implement a bit of redundancy here in order\r
         // to avoid too much casting\r
         if(bean instanceof NonViralName){\r
@@ -88,21 +88,22 @@ public class TitleAndNameCacheAutoInitializer extends AutoPropertyInitializer<Id
         }\r
     }\r
 \r
-       @Override\r
-       public String hibernateFetchJoin(Class<?> clazz, String beanAlias){\r
-               String result = "";\r
-               if (TaxonNameBase.class.isAssignableFrom(clazz)){\r
-                       result += String.format(" LEFT JOIN FETCH %s.rank ", beanAlias);\r
-                       result += String.format(" LEFT JOIN FETCH %s.relationsToThisName rel LEFT JOIN FETCH rel.relatedFrom ", beanAlias);\r
-                       if (NonViralName.class.isAssignableFrom(clazz)){\r
-                               result += String.format(" LEFT JOIN FETCH %s.combinationAuthorTeam ", beanAlias);\r
-                               result += String.format(" LEFT JOIN FETCH %s.exCombinationAuthorTeam ", beanAlias);\r
-                               result += String.format(" LEFT JOIN FETCH %s.basionymAuthorTeam ", beanAlias);\r
-                               result += String.format(" LEFT JOIN FETCH %s.exBasionymAuthorTeam ", beanAlias);\r
-                       }\r
-               }\r
-               return result;\r
-       }\r
-    \r
-    \r
+    @Override\r
+    public String hibernateFetchJoin(Class<?> clazz, String beanAlias){\r
+        String result = "";\r
+        if (TaxonNameBase.class.isAssignableFrom(clazz)){\r
+            result += String.format(" LEFT JOIN FETCH %s.rank ", beanAlias);\r
+            result += String.format(" LEFT JOIN FETCH %s.relationsToThisName relTo LEFT JOIN FETCH relTo.relatedFrom ", beanAlias);\r
+            result += String.format(" LEFT JOIN FETCH %s.relationsFromThisName relFrom LEFT JOIN FETCH relFrom.relatedTo ", beanAlias);\r
+            if (NonViralName.class.isAssignableFrom(clazz)){\r
+                result += String.format(" LEFT JOIN FETCH %s.combinationAuthorTeam ", beanAlias);\r
+                result += String.format(" LEFT JOIN FETCH %s.exCombinationAuthorTeam ", beanAlias);\r
+                result += String.format(" LEFT JOIN FETCH %s.basionymAuthorTeam ", beanAlias);\r
+                result += String.format(" LEFT JOIN FETCH %s.exBasionymAuthorTeam ", beanAlias);\r
+            }\r
+        }\r
+        return result;\r
+    }\r
+\r
+\r
 }\r