Issues #50, #40, #33.

highsource · Sep 12, 2015 · 2c979f4 · 2c979f4
1 parent 5e4641b
commit 2c979f4
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 3 deletions.
diff --git a/compiler/src/main/java/org/hisrc/jsonix/compilation/mapping/PropertyInfoVisitor.java b/compiler/src/main/java/org/hisrc/jsonix/compilation/mapping/PropertyInfoVisitor.java
@@ -1,5 +1,7 @@
 package org.hisrc.jsonix.compilation.mapping;
 
+import java.math.BigInteger;
+
 import javax.xml.namespace.QName;
 
 import org.apache.commons.lang3.Validate;
@@ -9,6 +11,8 @@
 import org.hisrc.jscm.codemodel.expression.JSMemberExpression;
 import org.hisrc.jscm.codemodel.expression.JSObjectLiteral;
 import org.hisrc.jsonix.naming.Naming;
+import org.hisrc.jsonix.xml.xsom.ParticleMultiplicityCounter;
+import org.hisrc.xml.xsom.XSFunctionApplier;
 import org.jvnet.jaxb2_commons.xml.bind.model.MAnyAttributePropertyInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MAnyElementPropertyInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MAttributePropertyInfo;
@@ -29,12 +33,16 @@
 import org.jvnet.jaxb2_commons.xml.bind.model.MWrappable;
 import org.jvnet.jaxb2_commons.xml.bind.model.util.DefaultTypeInfoVisitor;
 
+import com.sun.tools.xjc.model.Multiplicity;
+
 final class PropertyInfoVisitor<T, C extends T> implements
 		MPropertyInfoVisitor<T, C, JSObjectLiteral> {
 
 	private final JSCodeModel codeModel;
 	private final MappingCompiler<T, C> mappingCompiler;
 	private final Naming naming;
+	private final XSFunctionApplier<Multiplicity> multiplicityCounter = new XSFunctionApplier<Multiplicity>(
+			ParticleMultiplicityCounter.INSTANCE);
 
 	public PropertyInfoVisitor(MappingCompiler<T, C> mappingCompiler) {
 		Validate.notNull(mappingCompiler);
@@ -47,6 +55,28 @@ private void createPropertyInfoOptions(MPropertyInfo<T, C> propertyInfo,
 			JSObjectLiteral options) {
 		options.append(naming.name(),
 				this.codeModel.string(propertyInfo.getPrivateName()));
+
+		final Multiplicity multiplicity = multiplicityCounter
+				.apply(propertyInfo.getOrigin());
+		if (multiplicity != null) {
+			if (multiplicity.min != null
+					&& !BigInteger.ZERO.equals(multiplicity.min)) {
+				options.append(naming.required(), this.codeModel._boolean(true));
+			}
+			if (propertyInfo.isCollection()) {
+				if (multiplicity.min != null) {
+					if (!BigInteger.ONE.equals(multiplicity.min)) {
+						options.append(naming.minOccurs(), this.codeModel
+								.integer(multiplicity.min.longValue()));
+					}
+				}
+				if (multiplicity.max != null) {
+					options.append(naming.maxOccurs(), this.codeModel
+							.integer(multiplicity.max.longValue()));
+				}
+			}
+		}
+
 		if (propertyInfo.isCollection()) {
 			options.append(naming.collection(), this.codeModel._boolean(true));
 		}

diff --git a/compiler/src/main/java/org/hisrc/jsonix/naming/CompactNaming.java b/compiler/src/main/java/org/hisrc/jsonix/naming/CompactNaming.java
@@ -48,6 +48,10 @@ public class CompactNaming implements Naming {
 	public static final String ELEMENT_REF = "er";
 	public static final String ELEMENT_REFS = "ers";
 
+	public static final String REQUIRED = "rq";
+	public static final String MINOCCURS = "mno";
+	public static final String MAXOCCURS = "mxo";
+
 	public static final String NAMING_NAME = "compact";
 
 	public CompactNaming() {
@@ -245,4 +249,19 @@ public String elementInfos() {
 	public String typeInfos() {
 		return TYPE_INFOS;
 	}
+
+	@Override
+	public String required() {
+		return REQUIRED;
+	}
+
+	@Override
+	public String minOccurs() {
+		return MINOCCURS;
+	}
+
+	@Override
+	public String maxOccurs() {
+		return MAXOCCURS;
+	}
 }
diff --git a/compiler/src/main/java/org/hisrc/jsonix/naming/Naming.java b/compiler/src/main/java/org/hisrc/jsonix/naming/Naming.java
@@ -86,4 +86,9 @@ public interface Naming {
 
 	String localPart();
 
+	String required();
+
+	String minOccurs();
+
+	String maxOccurs();
 }
diff --git a/compiler/src/main/java/org/hisrc/jsonix/naming/StandardNaming.java b/compiler/src/main/java/org/hisrc/jsonix/naming/StandardNaming.java
@@ -9,7 +9,7 @@ public class StandardNaming implements Naming {
 	public static final String LIST = "list"; // li
 	public static final String CLASS_INFO = "classInfo"; // ci
 	public static final String LOCAL_NAME = "localName"; // ln
-	public static final String TYPE_NAME = "typeName";	// tn
+	public static final String TYPE_NAME = "typeName"; // tn
 	public static final String BASE_TYPE_INFO = "baseTypeInfo"; // base
 	public static final String PROPERTY_INFOS = "propertyInfos"; // ps
 	public static final String ENUM_INFO = "enumInfo"; // ei
@@ -43,6 +43,10 @@ public class StandardNaming implements Naming {
 	public static final String ELEMENT_REFS = "elementRefs";// rfs
 	public static final String COLLECTION = "collection";// col
 
+	public static final String REQUIRED = "required";
+	public static final String MINOCCURS = "minOccurs";
+	public static final String MAXOCCURS = "maxOccurs";
+
 	public static final String NAMING_NAME = "standard";
 
 	public StandardNaming() {
@@ -68,7 +72,7 @@ public String list() {
 	public String localName() {
 		return LOCAL_NAME;
 	}
-	
+
 	@Override
 	public String typeName() {
 		return TYPE_NAME;
@@ -216,7 +220,7 @@ public String localPart() {
 	public String dependencies() {
 		return DEPENDENCIES;
 	}
-	
+
 	@Override
 	public String targetNamespaceURI() {
 		return TARGET_NAMESPACE_URI;
@@ -242,4 +246,19 @@ public String typeInfos() {
 		return TYPE_INFOS;
 	}
 
+	@Override
+	public String required() {
+		return REQUIRED;
+	}
+
+	@Override
+	public String minOccurs() {
+		return MINOCCURS;
+	}
+
+	@Override
+	public String maxOccurs() {
+		return MAXOCCURS;
+	}
+
 }