GenericListCatalogConfig can now read xml kids as bean properties

Author: daneeldeveloper

fj-core/src/main/java/org/fugerit/java/core/cfg/xml/GenericListCatalogConfig.java

@@ -153,6 +153,16 @@ public GenericListCatalogConfig( String attTagDataList, String attTagData ) {
 	 * Type to use for the for the elements (data)
 	 */
 	public static final String ATT_TYPE = "type";
+
+	/**
+	 * Bean population mode
+	 */
+	public static final String ATT_BEAN_MODE = "bean-mode";
+	
+	/**
+	 * Default, bean population mode (by default read only attributes)
+	 */	
+	public static final String ATT_BEAN_MODE_DEFAULT = XmlBeanHelper.MODE_XML_ATTRIBUTES;
 
 	/**
 	 * Type to use for the config containers (data-list)
@@ -253,6 +263,8 @@ public void configure(Element tag) throws ConfigException {
 
 		String listType = this.getGeneralProps().getProperty( ATT_LIST_TYPE );
 
+		String beanMode = this.getGeneralProps().getProperty( ATT_BEAN_MODE, ATT_BEAN_MODE_DEFAULT );
+		
 		String type = this.getGeneralProps().getProperty( ATT_TYPE );
 		if ( StringUtils.isEmpty( type ) ) {
 			throw new ConfigException( "No type defined" );
@@ -319,7 +331,7 @@ public void configure(Element tag) throws ConfigException {
 					}	
 				} else {
 					try {
-						T t = XmlBeanHelper.setFromElement(type, currentSchemaTag );
+						T t = XmlBeanHelper.setFromElement( type, currentSchemaTag, beanMode );
 						t = this.customEntryHandling( t );
 						listCurrent.add( t );
 					} catch (Exception e) {

fj-core/src/main/java/org/fugerit/java/core/cfg/xml/XmlBeanHelper.java

@@ -2,42 +2,88 @@
 
 import org.fugerit.java.core.lang.helpers.ClassHelper;
 import org.fugerit.java.core.lang.helpers.reflect.MethodHelper;
-import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 public class XmlBeanHelper {
 
 	private static final Logger logger = LoggerFactory.getLogger( XmlBeanHelper.class );
 
+	public static final String MODE_XML_ATTRIBUTES = "bean-xml-attributes";
+	
+	public static final String MODE_XML_ELEMENTS = "bean-xml-elements";
+	
+	public static final String MODE_XML_FULL = "bean-xml-full";
+	
+	public static final String MODE_XML_DEFAULT = MODE_XML_ATTRIBUTES;
+	
 	public static <T> T setFromElement( String type, Element config ) throws Exception {
 		@SuppressWarnings("unchecked")
 		T bean = (T) ClassHelper.newInstance( type );
 		setFromElement(bean, config);
 		return bean;
 	}
 
+	public static <T> T setFromElement( String type, Element config, String mode ) throws Exception {
+		@SuppressWarnings("unchecked")
+		T bean = (T) ClassHelper.newInstance( type );
+		setFromElement(bean, config, mode);
+		return bean;
+	}
+	
 	public static <T> void setFromElement( T bean, Element config ) throws Exception {
-		NamedNodeMap atts = config.getAttributes();
-		for ( int ak=0; ak<atts.getLength(); ak++ ) {
-			Attr att = (Attr)atts.item( ak );
-			String key = att.getName();
-			String value = att.getValue();
-			MethodHelper.invokeSetter( bean , key, String.class, value );
+		setFromElement( bean, config, MODE_XML_DEFAULT );
+	}
+	
+	public static <T> void setFromElement( T bean, Element config, String mode ) throws Exception {
+		if ( MODE_XML_ATTRIBUTES.equalsIgnoreCase( mode ) || MODE_XML_FULL.equalsIgnoreCase( mode ) ) {
+			setFromElementAtts(bean, config);
+		}
+		if ( MODE_XML_ELEMENTS.equalsIgnoreCase( mode ) || MODE_XML_FULL.equalsIgnoreCase( mode ) ) {
+			setFromElementKids(bean, config);
 		}
 		if ( bean instanceof TextValueType ) {
 			((TextValueType) bean ).setTextValue( config.getTextContent() );
 		}
 	}
 
-	public static <T> void setFromElementSafe( T bean, Element config ) {
+	public static <T> void setFromElementSafe( T bean, Element config, String mode ) {
 		try {
-			setFromElement( bean , config);
+			setFromElement( bean , config, mode );
 		} catch (Exception e) {
 			logger.warn( "Cannot set all parameters from bean, usually safe to ignore : "+e );
 		}
 	}
 
+	public static <T> void setFromElementSafe( T bean, Element config ) {
+		setFromElementSafe(bean, config, MODE_XML_DEFAULT );
+	}
+
+	public static <T> void setFromElementAtts( T bean, Element config ) throws Exception {
+		NamedNodeMap atts = config.getAttributes();
+		for ( int ak=0; ak<atts.getLength(); ak++ ) {
+			Attr att = (Attr)atts.item( ak );
+			String key = att.getName();
+			String value = att.getValue();
+			MethodHelper.invokeSetter( bean , key, String.class, value );
+		}
+	}
+	
+	public static <T> void setFromElementKids( T bean, Element config ) throws Exception {
+		NodeList kids = config.getChildNodes();
+		for ( int ak=0; ak<kids.getLength(); ak++ ) {
+			Node current = kids.item( ak );
+			if ( current.getNodeType() == Node.ELEMENT_NODE ) {
+				Element tag = (Element)current;
+				String key = tag.getTagName();
+				MethodHelper.invokeSetter( bean , key, String.class, tag.getTextContent() );
+			}			
+		}
+	}
+	
 }