Issue #18.

Author: highsource

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java

@@ -15,6 +15,7 @@
 import org.jvnet.jaxb2_commons.util.CustomizationUtils;
 import org.xml.sax.ErrorHandler;
 
+import com.sun.codemodel.JJavaName;
 import com.sun.tools.xjc.model.CAdapter;
 import com.sun.tools.xjc.model.CAttributePropertyInfo;
 import com.sun.tools.xjc.model.CClassInfo;
@@ -33,6 +34,16 @@
 
 public class SimplifyPlugin extends AbstractParameterizablePlugin {
 
+	private boolean usePluralForm = true;
+
+	public boolean isUsePluralForm() {
+		return usePluralForm;
+	}
+
+	public void setUsePluralForm(boolean usePluralForm) {
+		this.usePluralForm = usePluralForm;
+	}
+
 	@Override
 	public String getOptionName() {
 		return "Xsimplify";
@@ -240,8 +251,7 @@ private CElementPropertyInfo createElementPropertyInfo(final Model model,
 			CReferencePropertyInfo property, CElement element,
 			final CElementInfo elementInfo) {
 		final CElementPropertyInfo elementPropertyInfo;
-		final String propertyName = createPropertyName(model, element);
-
+		final String propertyName = createPropertyName(model, property, element);
 		final CElementPropertyInfo originalPropertyInfo = elementInfo
 				.getProperty();
 		elementPropertyInfo = new CElementPropertyInfo(propertyName,
@@ -266,7 +276,7 @@ private CElementPropertyInfo createElementPropertyInfo(final Model model,
 			CReferencePropertyInfo property, CElement element,
 			final CClassInfo classInfo) {
 		final CElementPropertyInfo elementPropertyInfo;
-		final String propertyName = createPropertyName(model, element);
+		final String propertyName = createPropertyName(model, property, element);
 		elementPropertyInfo = new CElementPropertyInfo(propertyName,
 				property.isCollection() ? CollectionMode.REPEATED_ELEMENT
 						: CollectionMode.NOT_REPEATED, ID.NONE, null,
@@ -296,7 +306,7 @@ private CElementPropertyInfo createElementPropertyInfo(final Model model,
 	//
 	private CReferencePropertyInfo createReferencePropertyInfo(
 			final Model model, CReferencePropertyInfo property, CElement element) {
-		final String propertyName = createPropertyName(model, element);
+		final String propertyName = createPropertyName(model, property, element);
 		final CReferencePropertyInfo referencePropertyInfo = new CReferencePropertyInfo(
 				propertyName, property.isCollection(), /* required */false,/* mixed */
 				false, element.getSchemaComponent(),
@@ -320,7 +330,7 @@ private CReferencePropertyInfo createContentReferencePropertyInfo(
 
 	private CElementPropertyInfo createElementPropertyInfo(final Model model,
 			CElementPropertyInfo property, CTypeRef typeRef) {
-		final String propertyName = createPropertyName(model, typeRef);
+		final String propertyName = createPropertyName(model, property, typeRef);
 		boolean required = false;
 		final CElementPropertyInfo elementPropertyInfo = new CElementPropertyInfo(
 				propertyName,
@@ -337,7 +347,8 @@ private CElementPropertyInfo createElementPropertyInfo(final Model model,
 		return elementPropertyInfo;
 	}
 
-	private String createPropertyName(final Model model, CElement element) {
+	private String createPropertyName(final Model model,
+			CPropertyInfo propertyInfo, CElement element) {
 		final String localPart;
 		if (element instanceof CClassRef) {
 			final CClassRef classRef = (CClassRef) element;
@@ -348,13 +359,20 @@ private String createPropertyName(final Model model, CElement element) {
 		}
 		final String propertyName = model.getNameConverter().toPropertyName(
 				localPart);
-		return propertyName;
+		return pluralizeIfNecessary(propertyInfo, propertyName);
 	}
 
-	private String createPropertyName(final Model model, CTypeRef element) {
+	private String createPropertyName(final Model model,
+			CPropertyInfo propertyInfo, CTypeRef element) {
 		final String propertyName = model.getNameConverter().toPropertyName(
 				element.getTagName().getLocalPart());
-		return propertyName;
+		return pluralizeIfNecessary(propertyInfo, propertyName);
+	}
+
+	private String pluralizeIfNecessary(CPropertyInfo propertyInfo,
+			final String propertyName) {
+		return (propertyInfo.isCollection() && isUsePluralForm())? JJavaName
+				.getPluralForm(propertyName) : propertyName;
 	}
 
 }

tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh1Test.java

@@ -16,8 +16,8 @@ public class Gh1Test {
 	public void compiles()
 	{
 		final Gh1 item = new Gh1();
-		item.getA();
-		item.getB();
+		item.getAS();
+		item.getBS();
 		item.getMixedContent();
 
 	}
@@ -26,8 +26,8 @@ public void compiles()
 	public void contextIsSuccessfullyCreated() throws JAXBException {
 		final JAXBContext context = JAXBContext.newInstance(Gh1.class);
 		final Gh1 value = new Gh1();
-		value.getA().add("a");
-		value.getB().add(2);
+		value.getAS().add("a");
+		value.getBS().add(2);
 		value.getMixedContent().add("Test");
 
 		final StringWriter sw = new StringWriter();

tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh4Test.java

@@ -19,8 +19,8 @@ public void setUp() throws Exception {
 	@Test
 	public void compiles() {
 		final SimplifyReferencesPropertyAsElementPropertyType item = new SimplifyReferencesPropertyAsElementPropertyType();
-		item.getBase();
-		item.getBaseElement();
+		item.getBases();
+		item.getBaseElements();
 
 	}
 
@@ -36,7 +36,7 @@ public void unmarshalls() throws Exception {
 										"simplifyReferencesPropertyAsElementProperty.xml")))
 				.getValue();
 
-		Assert.assertEquals(3, value.getBase().size());
-		Assert.assertEquals(3, value.getBaseElement().size());
+		Assert.assertEquals(3, value.getBases().size());
+		Assert.assertEquals(3, value.getBaseElements().size());
 	}
 }

tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh5Test.java

@@ -19,8 +19,8 @@ public void setUp() throws Exception {
 	@Test
 	public void compiles() {
 		final SimplifyReferencesPropertyAsReferencePropertyType item = new SimplifyReferencesPropertyAsReferencePropertyType();
-		item.getBase();
-		item.getBaseElement();
+		item.getBases();
+		item.getBaseElements();
 	}
 
 	@Test
@@ -35,7 +35,7 @@ public void unmarshalls() throws Exception {
 										"simplifyReferencesPropertyAsReferenceProperty.xml")))
 				.getValue();
 
-		Assert.assertEquals(3, value.getBase().size());
-		Assert.assertEquals(3, value.getBaseElement().size());
+		Assert.assertEquals(3, value.getBases().size());
+		Assert.assertEquals(3, value.getBaseElements().size());
 	}
 }

tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh6Test.java

@@ -19,8 +19,8 @@ public void setUp() throws Exception {
 	@Test
 	public void compiles() {
 		final SimplifyElementsPropertyAsElementPropertyType item = new SimplifyElementsPropertyAsElementPropertyType();
-		item.getInt();
-		item.getString();
+		item.getInts();
+		item.getStrings();
 	}
 
 	public void testElementsPropertyAsElementPropertyType() throws Exception {
@@ -31,7 +31,7 @@ public void testElementsPropertyAsElementPropertyType() throws Exception {
 						getClass().getResourceAsStream("simplifyElementsPropertyAsElementProperty.xml")))
 				.getValue();
 
-		Assert.assertEquals(3, value.getString().size());
-		Assert.assertEquals(3, value.getInt().size());
+		Assert.assertEquals(3, value.getStrings().size());
+		Assert.assertEquals(3, value.getInts().size());
 	}
 }

tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/RunSimplifyPlugin.java

@@ -28,7 +28,7 @@ public void compilesSchema() throws Exception {
 		URL binding = getClass().getResource("/binding.xjb");
 		final String[] arguments = new String[] { "-xmlschema",
 				schema.toExternalForm(), "-b", binding.toExternalForm(), "-d",
-				"target/generated-sources/xjc", "-extension", "-Xsimplify" };
+				"target/generated-sources/xjc", "-extension", "-Xsimplify"};
 
 		Options options = new Options();
 		options.parseArguments(arguments);