X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.hibernate%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fhibernate%2FLightDaoInterceptor.java;h=4d6f7d951f49416c854ff1f8c7603e1f2bcb68a8;hb=635446a8f223568d13a590c294fe08749b7c2e13;hp=9f3ba093d1497af291a970e7d35320b930bb8a28;hpb=a5ecc57e5fdbb6af2064388be16813a2b4d8517d;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.hibernate/src/main/java/org/argeo/server/hibernate/LightDaoInterceptor.java b/server/runtime/org.argeo.server.hibernate/src/main/java/org/argeo/server/hibernate/LightDaoInterceptor.java
index 9f3ba093d..4d6f7d951 100644
--- a/server/runtime/org.argeo.server.hibernate/src/main/java/org/argeo/server/hibernate/LightDaoInterceptor.java
+++ b/server/runtime/org.argeo.server.hibernate/src/main/java/org/argeo/server/hibernate/LightDaoInterceptor.java
@@ -1,5 +1,6 @@
 package org.argeo.server.hibernate;
 
+import java.beans.PropertyDescriptor;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -35,15 +36,24 @@ public class LightDaoInterceptor extends EmptyInterceptor {
 	@Override
 	public Object getEntity(String entityName, Serializable id) {
 		Class<?> clss = findSupportingClass(entityName);
+		Object res = null;
 		if (clss != null) {
-			if (businessIdFields.containsKey(clss))
-				return lightDaoSupport.getByField(clss, businessIdFields
-						.get(clss), bidMappings.get(clss).get(id));
-			else
-				return lightDaoSupport.getByKey(clss, id);
+			if (businessIdFields.containsKey(clss)) {
+				String field = businessIdFields.get(clss);
+				Object value = bidMappings.get(clss).get(id);
+				res = lightDaoSupport.getByField(clss, field, value);
+				if (log.isTraceEnabled())
+					log.debug("Got entity " + clss + " (" + field + "=" + value
+							+ ")");
+			} else {
+				res = lightDaoSupport.getByKey(clss, id);
+				if (log.isTraceEnabled())
+					log.debug("Got entity " + clss + " (id=" + id + ")");
+			}
 		} else {
-			return super.getEntity(entityName, id);
+			res = super.getEntity(entityName, id);
 		}
+		return res;
 	}
 
 	@Override
@@ -66,7 +76,7 @@ public class LightDaoInterceptor extends EmptyInterceptor {
 				BeanWrapper bw = new BeanWrapperImpl(entity);
 				Object bid = bw.getPropertyValue(businessIdFields.get(clss));
 				bidMappings.get(clss).put(id, bid);
-				if (log.isDebugEnabled())
+				if (log.isTraceEnabled())
 					log.debug("Mapped tid " + id + " with bid " + bid + " for "
 							+ clss);
 			}
@@ -74,6 +84,48 @@ public class LightDaoInterceptor extends EmptyInterceptor {
 		return super.onSave(entity, id, state, propertyNames, types);
 	}
 
+	@Override
+	public boolean onLoad(Object entity, Serializable id, Object[] state,
+			String[] propertyNames, Type[] types) {
+		Class<?> clss = entity.getClass();
+		Object source = null;
+		if (lightDaoSupport.getSupportedClasses().contains(clss)) {
+			if (businessIdFields.containsKey(clss)) {
+				String field = businessIdFields.get(clss);
+				Object value = bidMappings.get(clss).get(id);
+				source = lightDaoSupport.getByField(clss, field, value);
+				if (log.isTraceEnabled())
+					log.debug("Loading entity " + clss + " (" + field + "="
+							+ value + ")");
+			} else {
+				source = lightDaoSupport.getByKey(clss, id);
+				if (log.isTraceEnabled())
+					log.debug("Loading entity " + clss + " (id=" + id + ")");
+			}
+		}
+
+		if (source != null) {
+			BeanWrapper bwTarget = new BeanWrapperImpl(entity);
+			BeanWrapper bwSource = new BeanWrapperImpl(source);
+			for (PropertyDescriptor pd : bwTarget.getPropertyDescriptors()) {
+				String propName = pd.getName();
+				if (bwSource.isReadableProperty(propName)
+						&& bwTarget.isWritableProperty(propName)) {
+					bwTarget.setPropertyValue(propName, bwSource
+							.getPropertyValue(propName));
+					if (log.isTraceEnabled())
+						log.debug("Loaded property " + propName + " for class "
+								+ clss + " (id=" + id + ")");
+				}
+			}
+
+			return true;
+		} else {
+			// res = super.getEntity(entityName, id);
+			return super.onLoad(entity, id, state, propertyNames, types);
+		}
+	}
+
 	protected Boolean supports(Object object) {
 		if (classes.contains(object.getClass()))
 			return lightDaoSupport.getSupportedClasses().contains(