X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FBeanNodeMapper.java;h=63406999634b778bba41656317bd4bcda13792ba;hb=832bee8656e427eef8580b6d24bfdcf4526fce95;hp=a526bcf5ec0d06ed838392baa08aabfbccd38bb1;hpb=a668345e948f3f6da7475279bbe330e129fb1841;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/BeanNodeMapper.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/BeanNodeMapper.java
index a526bcf5e..634069996 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/BeanNodeMapper.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/BeanNodeMapper.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.jcr;
 
 import java.beans.PropertyDescriptor;
@@ -22,12 +38,14 @@ import javax.jcr.Session;
 import javax.jcr.Value;
 import javax.jcr.ValueFactory;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 
 public class BeanNodeMapper implements NodeMapper {
-	// private final static Log log = LogFactory.getLog(BeanNodeMapper.class);
+	private final static Log log = LogFactory.getLog(BeanNodeMapper.class);
 
 	private final static String NODE_VALUE = "value";
 
@@ -153,6 +171,8 @@ public class BeanNodeMapper implements NodeMapper {
 	 * Transforms a node into an object of the class defined by classProperty Property
 	 */
 	protected Object nodeToBean(Node node) throws RepositoryException {
+		if (log.isTraceEnabled())
+			log.trace("Load     " + node);
 
 		try {
 			String clssName = node.getProperty(classProperty).getValue()
@@ -169,9 +189,12 @@ public class BeanNodeMapper implements NodeMapper {
 
 				PropertyDescriptor pd = beanWrapper.getPropertyDescriptor(prop
 						.getName());
-				Class propClass = pd.getPropertyType();
+				Class<?> propClass = pd.getPropertyType();
+
+				if (log.isTraceEnabled())
+					log.trace("Load " + prop + ", propClass=" + propClass
+							+ ", property descriptor=" + pd);
 
-				// Process case of List and its derived classes
 				// primitive list
 				if (propClass != null && List.class.isAssignableFrom(propClass)) {
 					List<Object> lst = new ArrayList<Object>();
@@ -199,7 +222,7 @@ public class BeanNodeMapper implements NodeMapper {
 					continue nodes;
 
 				PropertyDescriptor pd = beanWrapper.getPropertyDescriptor(name);
-				Class propClass = pd.getPropertyType();
+				Class<?> propClass = pd.getPropertyType();
 
 				// objects list
 				if (propClass != null && List.class.isAssignableFrom(propClass)) {
@@ -212,13 +235,30 @@ public class BeanNodeMapper implements NodeMapper {
 						lst = new ArrayList<Object>();
 					}
 
-					NodeIterator valuesIt = childNode.getNodes();
-					while (valuesIt.hasNext()) {
-						Node lstValueNode = valuesIt.nextNode();
-						Object lstValue = nodeToBean(lstValueNode);
-						lst.add(lstValue);
+					if (childNode.hasNodes()) {
+						// Look for children nodes
+						NodeIterator valuesIt = childNode.getNodes();
+						while (valuesIt.hasNext()) {
+							Node lstValueNode = valuesIt.nextNode();
+							Object lstValue = nodeToBean(lstValueNode);
+							lst.add(lstValue);
+						}
+					} else {
+						// look for a property with the same name which will
+						// provide
+						// primitives
+						Property childProp = childNode.getProperty(childNode
+								.getName());
+						Class<?> valuesClass = classFromProperty(childProp);
+						if (valuesClass != null)
+							if (childProp.getDefinition().isMultiple())
+								for (Value value : childProp.getValues()) {
+									lst.add(asObject(value, valuesClass));
+								}
+							else
+								lst.add(asObject(childProp.getValue(),
+										valuesClass));
 					}
-
 					beanWrapper.setPropertyValue(name, lst);
 					continue nodes;
 				}
@@ -244,7 +284,7 @@ public class BeanNodeMapper implements NodeMapper {
 						if (classProperty.equals(key))
 							continue keyProps;
 
-						Class keyPropClass = classFromProperty(keyProp);
+						Class<?> keyPropClass = classFromProperty(keyProp);
 						if (keyPropClass != null) {
 							Object mapValue = asObject(keyProp.getValue(),
 									keyPropClass);