openutils-svn

[<fc...@us...>]

Revision: 743
          http://openutils.svn.sourceforge.net/openutils/?rev=743&view=rev
Author:   fcarone
Date:     2008-03-17 02:21:07 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
Maps testing added

Modified Paths:
--------------
    trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java
    trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
    trunk/openutils-spring-rmibernate/src/test/java/it/openutils/spring/rmibernate/testapp/client/SetupApplicationTest.java
    trunk/openutils-spring-rmibernate/src/test/java/it/openutils/spring/rmibernate/testapp/server/DummyDataobjectChildContainer.java
    trunk/openutils-spring-rmibernate/src/test/resources/HibernateLazyTest-load.xml
    trunk/openutils-spring-rmibernate/src/test/resources/spring-remote-rmi.xml

Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java	2008-03-14 13:17:35 UTC (rev 742)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java	2008-03-17 09:21:07 UTC (rev 743)
@@ -71,7 +71,6 @@
     /**
      * {@inheritDoc}
      */
-    @SuppressWarnings("unchecked")
     public Object invoke(final String className, final String methodName, final Serializable id) throws RemoteException
     {
         log.debug("Initializing lazy property.");

Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java	2008-03-14 13:17:35 UTC (rev 742)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java	2008-03-17 09:21:07 UTC (rev 743)
@@ -27,7 +27,10 @@
 import net.sf.cglib.proxy.Callback;
 import net.sf.cglib.proxy.Enhancer;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+
 /**
  * Store lazy reference
  * @author mmolaschi
@@ -48,6 +51,11 @@
     private String className;
 
     private String fieldClassName;
+    
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(LazyReference.class);
 
     /**
      * default constructor
@@ -91,6 +99,12 @@
             interfaces = new Class[]{superclass, Serializable.class, EntitySerializer.class };
         }
 
+        if (log.isDebugEnabled())
+        {
+            log.debug("className: {} - fieldName: {}", className, fieldName);
+        }
+
+        
         HibernateLazyLoaderAspect hlla = new HibernateLazyLoaderAspect(
             className,
             fieldName,

Modified: trunk/openutils-spring-rmibernate/src/test/java/it/openutils/spring/rmibernate/testapp/client/SetupApplicationTest.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/test/java/it/openutils/spring/rmibernate/testapp/client/SetupApplicationTest.java	2008-03-14 13:17:35 UTC (rev 742)
+++ trunk/openutils-spring-rmibernate/src/test/java/it/openutils/spring/rmibernate/testapp/client/SetupApplicationTest.java	2008-03-17 09:21:07 UTC (rev 743)
@@ -56,7 +56,7 @@
     }
 
     /**
-     * First loading
+     * First loading. This test will fail if the object graph cannot be read.
      */
     @Test
     public void loadTest()
@@ -72,7 +72,23 @@
             child.getId();
         }
     }
+    
+    public void saveTest()
+    {
+        List<DummyDataobject> objects = dummyManager.findAll();
+        Assert.assertEquals(3, objects.size());
+        DummyDataobject firstObj = objects.get(0);
 
+        List<DummyDataobjectChildContainer> children = firstObj.getDummyChildrenContainer();
+        for (DummyDataobjectChildContainer container : children)
+        {
+            DummyDataobjectChild child =  container.getChild();
+            child.setSomeText("some new text");
+        }
+        
+        
+    }
+
     /**
      * Sets the dummyManager.
      * @param dummyManager the dummyManager to set

Modified: trunk/openutils-spring-rmibernate/src/test/java/it/openutils/spring/rmibernate/testapp/server/DummyDataobjectChildContainer.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/test/java/it/openutils/spring/rmibernate/testapp/server/DummyDataobjectChildContainer.java	2008-03-14 13:17:35 UTC (rev 742)
+++ trunk/openutils-spring-rmibernate/src/test/java/it/openutils/spring/rmibernate/testapp/server/DummyDataobjectChildContainer.java	2008-03-17 09:21:07 UTC (rev 743)
@@ -17,16 +17,23 @@
 package it.openutils.spring.rmibernate.testapp.server;
 
 import java.io.Serializable;
+import java.util.Calendar;
+import java.util.Map;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import org.hibernate.annotations.CollectionOfElements;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
 
+
 /**
  * @author fcarone
  * @version $Id: $
@@ -49,7 +56,34 @@
     @JoinColumn(name = "DD_CHILD", referencedColumnName = "ID", nullable = true)
     private DummyDataobjectChild child;
 
+    @CollectionOfElements(fetch = FetchType.LAZY)
+    @org.hibernate.annotations.MapKey(columns = @Column(name = "DAY"))
+    @JoinTable(name = "DDC_CALMAP", joinColumns = {@JoinColumn(name = "ID") })
+    @Column(name = "DDC_STRING", length = 1500)
+    @Fetch(FetchMode.SUBSELECT)
+    private Map<Calendar, String> calendarStringMap;
+
+    
     /**
+     * Returns the calendarStringMap.
+     * @return the calendarStringMap
+     */
+    public Map<Calendar, String> getCalendarStringMap()
+    {
+        return calendarStringMap;
+    }
+
+    
+    /**
+     * Sets the calendarStringMap.
+     * @param calendarStringMap the calendarStringMap to set
+     */
+    public void setCalendarStringMap(Map<Calendar, String> calendarStringMap)
+    {
+        this.calendarStringMap = calendarStringMap;
+    }
+
+    /**
      * Returns the id.
      * @return the id
      */

Modified: trunk/openutils-spring-rmibernate/src/test/resources/HibernateLazyTest-load.xml
===================================================================
--- trunk/openutils-spring-rmibernate/src/test/resources/HibernateLazyTest-load.xml	2008-03-14 13:17:35 UTC (rev 742)
+++ trunk/openutils-spring-rmibernate/src/test/resources/HibernateLazyTest-load.xml	2008-03-17 09:21:07 UTC (rev 743)
@@ -70,5 +70,15 @@
       <value>2</value>
       <value>1</value>
     </row>
-  </table>
+  </table>
+  <table name="DDC_CALMAP">
+    <column>ID</column>
+    <column>DAY</column>
+    <column>DDC_STRING</column>
+    <row>
+      <value>0</value>
+      <value>2008-03-01</value>
+      <value>text</value>
+    </row>
+  </table>  
 </dataset>

Modified: trunk/openutils-spring-rmibernate/src/test/resources/spring-remote-rmi.xml
===================================================================
--- trunk/openutils-spring-rmibernate/src/test/resources/spring-remote-rmi.xml	2008-03-14 13:17:35 UTC (rev 742)
+++ trunk/openutils-spring-rmibernate/src/test/resources/spring-remote-rmi.xml	2008-03-17 09:21:07 UTC (rev 743)
@@ -3,14 +3,12 @@
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
      http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
      http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
-  <bean class="org.springframework.remoting.rmi.RmiServiceExporter" lazy-init="false">
+  <bean  name="/hibernateLazyService" class="it.openutils.spring.rmibernate.server.exporter.HibernateRmiServiceExporter" lazy-init="false">
     <property name="serviceName" value="HibernateLazyService" />
     <property name="service" ref="hibernateLazyService" />
     <property name="serviceInterface" value="it.openutils.spring.rmibernate.shared.managers.HibernateLazyService" />
     <property name="registryPort" value="1099" />
-    <!--
     <property name="sessionFactory" ref="sessionFactory" />
-     -->
   </bean>
   <bean name="/dummyManagerRmi" class="it.openutils.spring.rmibernate.server.exporter.HibernateRmiServiceExporter" lazy-init="false">
     <property name="service" ref="dummyObjectManager" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.