remove call of old bean initializer
authorAndreas Müller <a.mueller@bgbm.org>
Sat, 26 Oct 2013 18:12:16 +0000 (18:12 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Sat, 26 Oct 2013 18:12:16 +0000 (18:12 +0000)
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/AdvancedBeanInitializer.java

index 579befc507545b45c04fe3e5e5222ed61e03fc53..2ea8e2f296bcd7628873a80071185bab687469af 100644 (file)
@@ -32,68 +32,50 @@ public class AdvancedBeanInitializer extends HibernateBeanInitializer {
 \r
           public static final Logger logger = Logger.getLogger(AdvancedBeanInitializer.class);\r
        \r
-           /* (non-Javadoc)\r
-            * @see eu.etaxonomy.cdm.persistence.dao.BeanInitializer#load(eu.etaxonomy.cdm.model.common.CdmBase)\r
-            */\r
            @Override\r
            public void load(Object bean) {\r
                initializeBean(bean, true, false);\r
            }\r
 \r
-           /* (non-Javadoc)\r
-            * @see eu.etaxonomy.cdm.persistence.dao.BeanInitializer#loadFully(eu.etaxonomy.cdm.model.common.CdmBase)\r
-            */\r
            @Override\r
            public void loadFully(Object bean) {\r
                initializeBean(bean, true, true);\r
            }\r
 \r
-           /**\r
-            * Initializes all *toOne relations of the given bean and all *toMany\r
-            * relations, depending on the state of the boolean parameters\r
-            * <code>cdmEntities</code> and <code>collections</code>\r
-            *\r
-            * @param bean\r
-            *            the bean to initialize\r
-            * @param cdmEntities\r
-            *            initialize all *toOne relations to cdm entities\r
-            * @param collections\r
-            *            initialize all *toMany relations\r
-            */\r
-           public void initializeBean(Object bean, boolean cdmEntities, boolean collections){\r
 \r
-               if(logger.isDebugEnabled()){\r
-                   logger.debug(">> starting initializeBean() of " + bean + " ;class:" + bean.getClass().getSimpleName());\r
-               }\r
-               Set<Class> restrictions = new HashSet<Class>();\r
-               if(cdmEntities){\r
-                   restrictions.add(CdmBase.class);\r
-               }\r
-               if(collections){\r
-                   restrictions.add(Collections.class);\r
-               }\r
-               Set<PropertyDescriptor> props = getProperties(bean, restrictions);\r
-               for(PropertyDescriptor propertyDescriptor : props){\r
-                   try {\r
-\r
-                       invokeInitialization(bean, propertyDescriptor);\r
-\r
-                   } catch (IllegalAccessException e) {\r
-                       logger.error("Illegal access on property " + propertyDescriptor.getName());\r
-                   } catch (InvocationTargetException e) {\r
-                       logger.info("Cannot invoke property " + propertyDescriptor.getName() + " not found");\r
-                   } catch (NoSuchMethodException e) {\r
-                       logger.info("Property " + propertyDescriptor.getName() + " not found");\r
-                   }\r
-               }\r
-               if(logger.isDebugEnabled()){\r
-                   logger.debug("  completed initializeBean() of " + bean);\r
-               }\r
-           }\r
+//         @Override\r
+//         public void initializeBean(Object bean, boolean cdmEntities, boolean collections){\r
+//\r
+//             if(logger.isDebugEnabled()){\r
+//                 logger.debug(">> starting initializeBean() of " + bean + " ;class:" + bean.getClass().getSimpleName());\r
+//             }\r
+//             Set<Class> restrictions = new HashSet<Class>();\r
+//             if(cdmEntities){\r
+//                 restrictions.add(CdmBase.class);\r
+//             }\r
+//             if(collections){\r
+//                 restrictions.add(Collections.class);\r
+//             }\r
+//             Set<PropertyDescriptor> props = getProperties(bean, restrictions);\r
+//             for(PropertyDescriptor propertyDescriptor : props){\r
+//                 try {\r
+//\r
+//                     invokeInitialization(bean, propertyDescriptor);\r
+//\r
+//                 } catch (IllegalAccessException e) {\r
+//                     logger.error("Illegal access on property " + propertyDescriptor.getName());\r
+//                 } catch (InvocationTargetException e) {\r
+//                     logger.info("Cannot invoke property " + propertyDescriptor.getName() + " not found");\r
+//                 } catch (NoSuchMethodException e) {\r
+//                     logger.info("Property " + propertyDescriptor.getName() + " not found");\r
+//                 }\r
+//             }\r
+//             if(logger.isDebugEnabled()){\r
+//                 logger.debug("  completed initializeBean() of " + bean);\r
+//             }\r
+//         }\r
+\r
 \r
-           /* (non-Javadoc)\r
-            * @see eu.etaxonomy.cdm.persistence.dao.BeanInitializer#initializeProperties(java.lang.Object, java.util.List)\r
-            */\r
            //TODO optimize algorithm ..\r
            @Override\r
            public void initialize(Object bean, List<String> propertyPaths) {\r
@@ -114,11 +96,12 @@ public class AdvancedBeanInitializer extends HibernateBeanInitializer {
                initializeBean(bean, rootInitializer);\r
                \r
                \r
-               //old\r
-               Collections.sort(propertyPaths);\r
-               for(String propPath : propertyPaths){\r
-                   initializePropertyPath(bean, propPath);\r
-               }\r
+//             //old\r
+//             if(logger.isDebugEnabled()){logger.debug("Start old initalizer ... ");};\r
+//             Collections.sort(propertyPaths);\r
+//             for(String propPath : propertyPaths){\r
+//                 initializePropertyPath(bean, propPath);\r
+//             }\r
                if(logger.isDebugEnabled()){\r
                    logger.debug("   Completed initialization of " + bean);\r
                }\r