- Eugene-commits - mailman.cloud.codelutin.com

r1125 - in trunk: . ant-eugene-task eugene maven-eugene-plugin maven-eugene-plugin/src/it/smart-generate/generators
by tchemit＠users.nuiton.org Dec. 19, 2011

Dec. 19, 2011

Author: tchemit Date: 2011-12-19 23:26:46 +0100 (Mon, 19 Dec 2011) New Revision: 1125 Url: http://nuiton.org/repositories/revision/eugene/1125 Log: remove svn id property from pom Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2011-12-19 22:23:28 UTC (rev 1124) +++ trunk/ant-eugene-task/pom.xml 2011-12-19 22:26:46 UTC (rev 1125) @@ -3,7 +3,6 @@ #%L EUGene :: Ant task - $Id$ $HeadURL$ %% Copyright (C) 2006 - 2010 CodeLutin Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2011-12-19 22:23:28 UTC (rev 1124) +++ trunk/eugene/pom.xml 2011-12-19 22:26:46 UTC (rev 1125) @@ -3,7 +3,6 @@ #%L EUGene :: EUGene - $Id$ $HeadURL$ %% Copyright (C) 2004 - 2010 CodeLutin Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2011-12-19 22:23:28 UTC (rev 1124) +++ trunk/maven-eugene-plugin/pom.xml 2011-12-19 22:26:46 UTC (rev 1125) @@ -3,7 +3,6 @@ #%L EUGene :: Maven plugin - $Id$ $HeadURL$ %% Copyright (C) 2006 - 2010 CodeLutin Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml 2011-12-19 22:23:28 UTC (rev 1124) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml 2011-12-19 22:26:46 UTC (rev 1125) @@ -3,7 +3,6 @@ #%L EUGene :: Maven plugin - $Id$ $HeadURL$ %% Copyright (C) 2006 - 2010 CodeLutin Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-19 22:23:28 UTC (rev 1124) +++ trunk/pom.xml 2011-12-19 22:26:46 UTC (rev 1125) @@ -3,7 +3,6 @@ #%L EUGene - $Id$ $HeadURL$ %% Copyright (C) 2004 - 2010 CodeLutin

1 0

Dec. 19, 2011

Author: tchemit Date: 2011-12-19 23:23:28 +0100 (Mon, 19 Dec 2011) New Revision: 1124 Url: http://nuiton.org/repositories/revision/eugene/1124 Log: Evolution #1858: Migrates to commons-lang3 Anomalie #1857: Bad property generation Modified: trunk/eugene/pom.xml trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/Template.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaGeneratorUtilTest.java trunk/maven-eugene-plugin/pom.xml trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/pom.xml 2011-12-19 22:23:28 UTC (rev 1124) @@ -64,8 +64,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -26,7 +26,7 @@ package org.nuiton.eugene; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.eugene.models.Model; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Template.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/Template.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/main/java/org/nuiton/eugene/Template.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -25,7 +25,7 @@ package org.nuiton.eugene; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.eugene.models.Model; import org.nuiton.eugene.writer.WriterReport; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -24,7 +24,7 @@ */ package org.nuiton.eugene.java; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.EugeneTagValues; @@ -235,8 +235,6 @@ boolean multiple = JavaGeneratorUtil.isNMultiplicity(attr); - String attrNameCapitalized = StringUtils.capitalize(attrName); - String constantName = getConstantName(attrName); String simpleType = JavaGeneratorUtil.getSimpleName(attrType); @@ -244,14 +242,12 @@ createGetChildMethod(output, attrName, - attrNameCapitalized, attrType, simpleType ); createAddChildMethod(output, attrName, - attrNameCapitalized, attrType, constantName, usePCS @@ -259,7 +255,6 @@ createAddAllChildrenMethod(output, attrName, - attrNameCapitalized, attrType, constantName, usePCS @@ -267,38 +262,30 @@ createRemoveChildMethod(output, attrName, - attrNameCapitalized, attrType, constantName, usePCS - ); createRemoveAllChildrenMethod(output, attrName, - attrNameCapitalized, attrType, constantName, usePCS - ); createContainsChildMethod(output, attrName, - attrNameCapitalized, attrType, constantName, usePCS - ); createContainsAllChildrenMethod(output, attrName, - attrNameCapitalized, attrType, constantName, usePCS - ); // Change type for Multiple attribute @@ -318,7 +305,6 @@ // creates a isXXX method createGetMethod(output, attrName, - attrNameCapitalized, attrType, JavaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX ); @@ -328,7 +314,6 @@ createGetMethod(output, attrName, - attrNameCapitalized, attrType, JavaGeneratorUtil.OPERATION_GETTER_DEFAULT_PREFIX ); @@ -336,7 +321,6 @@ } createSetMethod(output, attrName, - attrNameCapitalized, attrType, simpleType, constantName, @@ -382,13 +366,12 @@ protected void createGetMethod(ObjectModelClass output, String attrName, - String attrNameCapitalized, String attrType, String methodPrefix) { ObjectModelOperation getter = addOperation( output, - methodPrefix + attrNameCapitalized, + getJavaBeanMethodName(methodPrefix , attrName), attrType, ObjectModelModifier.PUBLIC ); @@ -401,12 +384,11 @@ protected void createGetChildMethod(ObjectModelClass output, String attrName, - String attrNameCapitalized, String attrType, String simpleType) { ObjectModelOperation getChild = addOperation( output, - "get" + attrNameCapitalized, + getJavaBeanMethodName("get", attrName), attrType, ObjectModelModifier.PUBLIC ); @@ -421,21 +403,21 @@ protected void createAddChildMethod(ObjectModelClass output, String attrName, - String attrNameCapitalized, String attrType, String constantName, boolean usePCS) { ObjectModelOperation addChild = addOperation( output, - "add" + attrNameCapitalized, + getJavaBeanMethodName("add", attrName), "void", ObjectModelModifier.PUBLIC ); addParameter(addChild, attrType, attrName); + String methodName = getJavaBeanMethodName("get", attrName); StringBuilder buffer = new StringBuilder("" /*{ - get<%=attrNameCapitalized%>().add(<%=attrName%>); + <%=methodName%>().add(<%=attrName%>); }*/ ); if (usePCS) { @@ -450,21 +432,21 @@ protected void createAddAllChildrenMethod(ObjectModelClass output, String attrName, - String attrNameCapitalized, String attrType, String constantName, boolean usePCS) { ObjectModelOperation addAllChild = addOperation( output, - "addAll" + attrNameCapitalized, + getJavaBeanMethodName("addAll", attrName), "void", ObjectModelModifier.PUBLIC ); addParameter(addAllChild, "java.util.Collection<" + attrType + ">", attrName); + String methodName = getJavaBeanMethodName("get", attrName); StringBuilder buffer = new StringBuilder("" /*{ - get<%=attrNameCapitalized%>().addAll(<%=attrName%>); + <%=methodName%>().addAll(<%=attrName%>); }*/ ); if (usePCS) { @@ -479,21 +461,21 @@ protected void createRemoveChildMethod(ObjectModelClass output, String attrName, - String attrNameCapitalized, String attrType, String constantName, boolean usePCS) { ObjectModelOperation operation = addOperation( output, - "remove" + attrNameCapitalized, + getJavaBeanMethodName("remove", attrName), "boolean", ObjectModelModifier.PUBLIC ); addParameter(operation, attrType, attrName); + String methodName = getJavaBeanMethodName("get", attrName); StringBuilder buffer = new StringBuilder(); buffer.append("" /*{ - boolean removed = get<%=attrNameCapitalized%>().remove(<%=attrName%>); + boolean removed = <%=methodName%>().remove(<%=attrName%>); }*/ ); @@ -516,22 +498,22 @@ protected void createRemoveAllChildrenMethod(ObjectModelClass output, String attrName, - String attrNameCapitalized, String attrType, String constantName, boolean usePCS) { ObjectModelOperation operation = addOperation( output, - "removeAll" + attrNameCapitalized, + getJavaBeanMethodName("removeAll", attrName), "boolean", ObjectModelModifier.PUBLIC ); addParameter(operation, "java.util.Collection<" + attrType + ">", attrName); StringBuilder buffer = new StringBuilder(); + String methodName = getJavaBeanMethodName("get", attrName); buffer.append("" /*{ - boolean removed = get<%=attrNameCapitalized%>().removeAll(<%=attrName%>); + boolean removed = <%=methodName%>().removeAll(<%=attrName%>); }*/ ); @@ -554,22 +536,22 @@ protected void createContainsChildMethod(ObjectModelClass output, String attrName, - String attrNameCapitalized, String attrType, String constantName, boolean usePCS) { ObjectModelOperation operation = addOperation( output, - "contains" + attrNameCapitalized, + getJavaBeanMethodName("contains", attrName), "boolean", ObjectModelModifier.PUBLIC ); addParameter(operation, attrType, attrName); StringBuilder buffer = new StringBuilder(); + String methodName = getJavaBeanMethodName("get", attrName); buffer.append("" /*{ - boolean contains = get<%=attrNameCapitalized%>().contains(<%=attrName%>); + boolean contains = <%=methodName%>().contains(<%=attrName%>); }*/ ); @@ -583,22 +565,22 @@ protected void createContainsAllChildrenMethod(ObjectModelClass output, String attrName, - String attrNameCapitalized, String attrType, String constantName, boolean usePCS) { ObjectModelOperation operation = addOperation( output, - "containsAll" + attrNameCapitalized, + getJavaBeanMethodName("containsAll", attrName), "boolean", ObjectModelModifier.PUBLIC ); addParameter(operation, "java.util.Collection<" + attrType + ">", attrName); StringBuilder buffer = new StringBuilder(); + String methodName = getJavaBeanMethodName("get", attrName); buffer.append("" /*{ - boolean contains = get<%=attrNameCapitalized%>().containsAll(<%=attrName%>); + boolean contains = <%=methodName%>().containsAll(<%=attrName%>); }*/ ); @@ -612,22 +594,23 @@ protected void createSetMethod(ObjectModelClass output, String attrName, - String attrNameCapitalized, String attrType, String simpleType, String constantName, boolean usePCS) { ObjectModelOperation operation = addOperation( output, - "set" + attrNameCapitalized, + getJavaBeanMethodName("set", attrName), "void", ObjectModelModifier.PUBLIC ); addParameter(operation, attrType, attrName); + if (usePCS) { + String methodName = getJavaBeanMethodName("get", attrName); setOperationBody(operation, "" /*{ - <%=simpleType%> oldValue = get<%=attrNameCapitalized%>(); + <%=simpleType%> oldValue = <%=methodName%>(); this.<%=attrName%> = <%=attrName%>; firePropertyChange(<%=constantName%>, oldValue, <%=attrName%>); }*/ Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -35,7 +35,7 @@ import java.util.Set; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -24,6 +24,7 @@ */ package org.nuiton.eugene.java; +import org.apache.commons.lang3.StringUtils; import org.nuiton.eugene.EugeneStereoTypes; import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.GeneratorUtil; @@ -210,6 +211,38 @@ } /** + * Convertit une propriété javaBean son suffix utilisé pour écrire les + * getter/setter correspondant. + * + * @param propertyName le nom de propriété a convertir + * @return le nom capitalizé de la propriété JavaBean + * @since 2.4.2 + */ + public static String capitalizeJavaBeanPropertyName(String propertyName) { + + if (StringUtils.isEmpty(propertyName)) { + return propertyName; + } + + if (propertyName.length() == 1) { + + // simple case : + return propertyName.toUpperCase(); + } + + // check if second caracter is up + char c = propertyName.charAt(1); + boolean carIsUp = Character.isUpperCase(c); + if (carIsUp) { + + // this is a special and strange case : must not capitalize first char + return propertyName; + } + + return StringUtils.capitalize(propertyName); + } + + /** * Split the given fqn which contains a generic declaration into his parts. * <p/> * Example : Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -25,7 +25,7 @@ package org.nuiton.eugene.java; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.models.object.ObjectModelAttribute; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -26,7 +26,7 @@ package org.nuiton.eugene.java; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.EugeneTagValues; @@ -796,6 +796,10 @@ this.constantPrefix = constantPrefix; } + protected String getJavaBeanMethodName(String methodPrefix, String propertyName) { + return methodPrefix + JavaGeneratorUtil.capitalizeJavaBeanPropertyName(propertyName); + } + /** * Used to initialize constant prefix depends on model tagvalue {@link * EugeneTagValues#TAG_CONSTANT_PREFIX}. If no tagvalue found, the default Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -25,7 +25,7 @@ package org.nuiton.eugene.java.extension; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.JavaGeneratorUtil; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -25,7 +25,7 @@ package org.nuiton.eugene.models.object.validator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -25,7 +25,7 @@ package org.nuiton.eugene.models.object.xml; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.eugene.EugeneStereoTypes; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.JavaGeneratorUtil; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -25,7 +25,7 @@ package org.nuiton.eugene.models.object.xml; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.models.object.ObjectModel; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -25,7 +25,7 @@ package org.nuiton.eugene.writer; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * Definition of of the chained writer entry. Modified: trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -33,6 +33,7 @@ import org.nuiton.eugene.models.object.xml.ObjectModelOperationImpl; import org.nuiton.eugene.models.object.xml.ObjectModelParameterImpl; +import java.beans.Introspector; import java.util.Set; /** @author fdesbois */ @@ -562,4 +563,16 @@ // assertEquals(results.size(), 1); } + @Test + public void testConvertVariableNameToConstantName() { + + String actual; + + actual = GeneratorUtil.convertVariableNameToConstantName("aProperty"); + Assert.assertEquals("A_PROPERTY", actual); + + actual = GeneratorUtil.convertVariableNameToConstantName("AProperty"); + Assert.assertEquals("APROPERTY", actual); + } + } Modified: trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaGeneratorUtilTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaGeneratorUtilTest.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaGeneratorUtilTest.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -28,6 +28,8 @@ import org.junit.Test; import org.nuiton.util.StringUtil; +import java.beans.Introspector; + /** * Test class {@link JavaGeneratorUtil}. * @@ -150,4 +152,20 @@ actual = JavaGeneratorUtil.splitFqnList("java.util.Map< X<Y<Z>>>| java.util.Map<Integer, Integer, Toto<A, B, C>>| X| Y<X>", '|'); Assert.assertArrayEquals(expected, actual); } + + @Test + public void capitalizeJavaBeanPropertyName() { + + assertCapitalizeJavaBeanPropertyName("a","A"); + assertCapitalizeJavaBeanPropertyName("ab","Ab"); + assertCapitalizeJavaBeanPropertyName("aB","aB"); + assertCapitalizeJavaBeanPropertyName("AB","AB"); + } + + protected void assertCapitalizeJavaBeanPropertyName(String original, String expected) { + + String actual = JavaGeneratorUtil.capitalizeJavaBeanPropertyName(original); + Assert.assertEquals(expected, actual); + Assert.assertEquals(Introspector.decapitalize(actual), original); + } } Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/maven-eugene-plugin/pom.xml 2011-12-19 22:23:28 UTC (rev 1124) @@ -56,8 +56,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -56,7 +56,7 @@ package org.nuiton.eugene.test.generator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.File; import java.io.IOException; Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -44,7 +44,7 @@ */ package org.nuiton.eugene.test.generator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.*; Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -25,7 +25,7 @@ package org.nuiton.eugene.plugin; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -25,7 +25,7 @@ package org.nuiton.eugene.plugin; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.model.Resource; import org.apache.maven.plugin.MojoExecutionException; Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java 2011-11-28 22:21:01 UTC (rev 1123) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java 2011-12-19 22:23:28 UTC (rev 1124) @@ -25,7 +25,7 @@ package org.nuiton.eugene.plugin.writer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.eugene.DefaultTemplateConfiguration; import org.nuiton.eugene.ModelPropertiesUtil; import org.nuiton.eugene.ModelReader;

1 0

r1123 - trunk
by maven-release＠users.nuiton.org Nov. 28, 2011

Nov. 28, 2011

Author: maven-release Date: 2011-11-28 23:21:01 +0100 (Mon, 28 Nov 2011) New Revision: 1123 Url: http://nuiton.org/repositories/revision/eugene/1123 Log: Update mavenpom4redmineAndCentral to 3.0.6. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 21:25:07 UTC (rev 1122) +++ trunk/pom.xml 2011-11-28 22:21:01 UTC (rev 1123) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.5</version> + <version>3.0.6</version> </parent> <artifactId>eugene</artifactId>

1 0

r1122 - trunk
by maven-release＠users.nuiton.org Oct. 28, 2011

Oct. 28, 2011

Author: maven-release Date: 2011-10-28 23:25:07 +0200 (Fri, 28 Oct 2011) New Revision: 1122 Url: http://nuiton.org/repositories/revision/eugene/1122 Log: Update mavenpom4redmineAndCentral to 3.0.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-20 08:39:55 UTC (rev 1121) +++ trunk/pom.xml 2011-10-28 21:25:07 UTC (rev 1122) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.4</version> + <version>3.0.5</version> </parent> <artifactId>eugene</artifactId> @@ -469,12 +469,12 @@ <tasks> <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/xsd"> - <include name="**/*.xsd" /> + <include name="**/*.xsd"/> </fileset> </copy> <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/dtd"> - <include name="**/*.dtd" /> + <include name="**/*.dtd"/> </fileset> </copy> </tasks>

1 0

r1121 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by maven-release＠users.nuiton.org Oct. 20, 2011

Oct. 20, 2011

Author: maven-release Date: 2011-10-20 10:39:55 +0200 (Thu, 20 Oct 2011) New Revision: 1121 Url: http://nuiton.org/repositories/revision/eugene/1121 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2011-10-20 08:39:54 UTC (rev 1120) +++ trunk/ant-eugene-task/pom.xml 2011-10-20 08:39:55 UTC (rev 1121) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2011-10-20 08:39:54 UTC (rev 1120) +++ trunk/eugene/pom.xml 2011-10-20 08:39:55 UTC (rev 1121) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2011-10-20 08:39:54 UTC (rev 1120) +++ trunk/maven-eugene-plugin/pom.xml 2011-10-20 08:39:55 UTC (rev 1121) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-20 08:39:54 UTC (rev 1120) +++ trunk/pom.xml 2011-10-20 08:39:55 UTC (rev 1121) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> <modules> <module>eugene</module> @@ -431,11 +431,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.4.1</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.4.1 + scm:svn:http://svn.nuiton.org/svn/eugene/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.4.1</url> + <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> </scm> <distributionManagement>

1 0

r1120 - in tags: . eugene-2.4.1
by maven-release＠users.nuiton.org Oct. 20, 2011

Oct. 20, 2011

Author: maven-release Date: 2011-10-20 10:39:54 +0200 (Thu, 20 Oct 2011) New Revision: 1120 Url: http://nuiton.org/repositories/revision/eugene/1120 Log: [maven-release-plugin] copy for tag eugene-2.4.1 Added: tags/eugene-2.4.1/ Property changes on: tags/eugene-2.4.1 ___________________________________________________________________ Added: svn:ignore + target .settings bin .classpath .project *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/1.0.1-Javabuilder:641-651 /branches/1.1.0-Javabuilder:652-681 /branches/eugene-2.0:682-754

1 0

r1119 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by maven-release＠users.nuiton.org Oct. 20, 2011

Oct. 20, 2011

Author: maven-release Date: 2011-10-20 10:39:53 +0200 (Thu, 20 Oct 2011) New Revision: 1119 Url: http://nuiton.org/repositories/revision/eugene/1119 Log: [maven-release-plugin] prepare release eugene-2.4.1 Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2011-10-20 08:32:48 UTC (rev 1118) +++ trunk/ant-eugene-task/pom.xml 2011-10-20 08:39:53 UTC (rev 1119) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2011-10-20 08:32:48 UTC (rev 1118) +++ trunk/eugene/pom.xml 2011-10-20 08:39:53 UTC (rev 1119) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2011-10-20 08:32:48 UTC (rev 1118) +++ trunk/maven-eugene-plugin/pom.xml 2011-10-20 08:39:53 UTC (rev 1119) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-20 08:32:48 UTC (rev 1118) +++ trunk/pom.xml 2011-10-20 08:39:53 UTC (rev 1119) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> <modules> <module>eugene</module> @@ -431,11 +431,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.4.1</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/trunk + scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.4.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> + <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.4.1</url> </scm> <distributionManagement> @@ -469,12 +469,12 @@ <tasks> <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/xsd"> - <include name="**/*.xsd"/> + <include name="**/*.xsd" /> </fileset> </copy> <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/dtd"> - <include name="**/*.dtd"/> + <include name="**/*.dtd" /> </fileset> </copy> </tasks>

1 0

r1118 - trunk/eugene
by athimel＠users.nuiton.org Oct. 20, 2011

Oct. 20, 2011

Author: athimel Date: 2011-10-20 10:32:48 +0200 (Thu, 20 Oct 2011) New Revision: 1118 Url: http://nuiton.org/repositories/revision/eugene/1118 Log: Ignore IDEA files Modified: trunk/eugene/ Property changes on: trunk/eugene ___________________________________________________________________ Modified: svn:ignore - eugene (1) (org.nuiton.eugene).iml velocity.log .classpath .project .eclipse target lutingenerator.ipr maven.log eugene (1).iml .settings + eugene (1) (org.nuiton.eugene).iml velocity.log .classpath .project .eclipse target lutingenerator.ipr maven.log eugene (1).iml .settings eugene.i*

1 0

r1117 - in trunk/eugene/src/main/java/org/nuiton/eugene: . java
by tchemit＠users.nuiton.org Oct. 20, 2011

Oct. 20, 2011

Author: tchemit Date: 2011-10-20 10:20:33 +0200 (Thu, 20 Oct 2011) New Revision: 1117 Url: http://nuiton.org/repositories/revision/eugene/1117 Log: Anomalie #1783: Do not generate isXXX method for Boolean property Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2011-10-20 04:20:56 UTC (rev 1116) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2011-10-20 08:20:33 UTC (rev 1117) @@ -339,6 +339,18 @@ return composition; } + /** + * Tests if an attribute is a boolean primitive. + * + * @param attribute the attribute to test + * @return {@code true} if attribute is a primitivie boolean + * @since 2.4.1 + */ + public static boolean isBooleanPrimitive(ObjectModelAttribute attribute) { + String type = attribute.getType(); + return "boolean".equals(type); + } + public static String getParsingExpression(String type, String attributeStringName) { if ("byte".equals(type)) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2011-10-20 04:20:56 UTC (rev 1116) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2011-10-20 08:20:33 UTC (rev 1117) @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.EugeneTagValues; -import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.models.object.*; import java.beans.PropertyChangeListener; @@ -312,9 +311,9 @@ simpleType = JavaGeneratorUtil.getSimpleName(attrType); } - boolean booleanProperty = attrType.toLowerCase().contains("boolean"); + boolean booleanProperty = JavaGeneratorUtil.isBooleanPrimitive(attr); - if (booleanProperty && ! multiple) { + if (booleanProperty && !multiple) { // creates a isXXX method createGetMethod(output, @@ -674,10 +673,10 @@ } // Generate the serialVersionUID - long serialVersionUID = GeneratorUtil.generateSerialVersionUID(input); + long serialVersionUID = JavaGeneratorUtil.generateSerialVersionUID(input); addConstant(output, - GeneratorUtil.SERIAL_VERSION_UID, + JavaGeneratorUtil.SERIAL_VERSION_UID, "long", serialVersionUID + "L", ObjectModelModifier.PRIVATE @@ -731,7 +730,7 @@ // add a fix serialVersionUID, since the class has no field nor method addConstant(resultClassImpl, - GeneratorUtil.SERIAL_VERSION_UID, + JavaGeneratorUtil.SERIAL_VERSION_UID, "long", "1L", ObjectModelModifier.PRIVATE

1 0

r1116 - in trunk/eugene/src/main/java/org/nuiton/eugene: . java
by tchemit＠users.nuiton.org Oct. 20, 2011

Oct. 20, 2011

Author: tchemit Date: 2011-10-20 06:20:56 +0200 (Thu, 20 Oct 2011) New Revision: 1116 Url: http://nuiton.org/repositories/revision/eugene/1116 Log: Evolution #1781: Permits not to generate getXXX() methods for boolean properties Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java 2011-10-20 02:59:54 UTC (rev 1115) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java 2011-10-20 04:20:56 UTC (rev 1116) @@ -110,4 +110,15 @@ @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, documentation = "Sets the i18n prefix to use on I18n keys generated") String TAG_I18N_PREFIX = "i18n"; + + /** + * Tag value to specify to not generate only the {@code isXXX} methods for + * a boolean property. + * + * @see JavaGeneratorUtil#getDoNotGenerateBooleanGetMethods(ObjectModel, ObjectModelClassifier) + * @since 2.4.1 + */ + @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, + documentation = "To specify to NOT generate getXXX methods for boolean properties") + String TAG_DO_NOT_GENERATE_BOOLEAN_GET_METHODS = "doNotGenerateBooleanGetMethods"; } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2011-10-20 02:59:54 UTC (rev 1115) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2011-10-20 04:20:56 UTC (rev 1116) @@ -98,7 +98,13 @@ String noPCSTagValue = JavaGeneratorUtil.getNoPCSTagValue(model, input); boolean usePCS = StringUtils.isEmpty(noPCSTagValue) || !"true".equals(noPCSTagValue.trim()); - + + String noGenerateBooleanGetMethods = + JavaGeneratorUtil.getDoNotGenerateBooleanGetMethods(model, input); + boolean generateBooleanGetMethods = + StringUtils.isEmpty(noGenerateBooleanGetMethods) || + !"true".equals(noGenerateBooleanGetMethods.trim()); + String prefix = getConstantPrefix(input, DEFAULT_CONSTANT_PREFIX); setConstantPrefix(prefix); @@ -123,7 +129,7 @@ // Add properties field + javabean methods for (ObjectModelAttribute attr : properties) { - createProperty(output, attr, usePCS); + createProperty(output, attr, usePCS, generateBooleanGetMethods); } // Add operations @@ -222,7 +228,8 @@ protected void createProperty(ObjectModelClass output, ObjectModelAttribute attr, - boolean usePCS) { + boolean usePCS, + boolean generateBooleanGetMethods) { String attrName = getAttributeName(attr); String attrType = getAttributeType(attr); @@ -305,13 +312,29 @@ simpleType = JavaGeneratorUtil.getSimpleName(attrType); } - createGetMethod(output, - attrName, - attrNameCapitalized, - attrType, - null - ); + boolean booleanProperty = attrType.toLowerCase().contains("boolean"); + if (booleanProperty && ! multiple) { + + // creates a isXXX method + createGetMethod(output, + attrName, + attrNameCapitalized, + attrType, + JavaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX + ); + } + + if (multiple || !booleanProperty || generateBooleanGetMethods) { + + createGetMethod(output, + attrName, + attrNameCapitalized, + attrType, + JavaGeneratorUtil.OPERATION_GETTER_DEFAULT_PREFIX + ); + + } createSetMethod(output, attrName, attrNameCapitalized, @@ -364,10 +387,6 @@ String attrType, String methodPrefix) { - if (methodPrefix == null) { - methodPrefix = JavaGeneratorUtil.OPERATION_GETTER_DEFAULT_PREFIX; - } - ObjectModelOperation getter = addOperation( output, methodPrefix + attrNameCapitalized, @@ -379,13 +398,6 @@ return <%=attrName%>; }*/ ); - - // Create also getter for boolean with 'is' prefix - if (attrType.toLowerCase().contains("boolean") && - !methodPrefix.equals(JavaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX)) { - createGetMethod(output, attrName, attrNameCapitalized, attrType, - JavaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX); - } } protected void createGetChildMethod(ObjectModelClass output, Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2011-10-20 02:59:54 UTC (rev 1115) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2011-10-20 04:20:56 UTC (rev 1116) @@ -157,6 +157,24 @@ } /** + * Obtain the value of the {@link EugeneTagValues#TAG_DO_NOT_GENERATE_BOOLEAN_GET_METHODS} + * tag value on the given model or classifier. + * <p/> + * It will first look on the model, and then in the given classifier. + * + * @param model model to seek + * @param classifier classifier to seek + * @return the none empty value of the found tag value or {@code null} if not found nor empty. + * @see EugeneTagValues#TAG_DO_NOT_GENERATE_BOOLEAN_GET_METHODS + * @since 2.4.1 + */ + public static String getDoNotGenerateBooleanGetMethods(ObjectModel model, + ObjectModelClassifier classifier) { + String value = findTagValue(EugeneTagValues.TAG_DO_NOT_GENERATE_BOOLEAN_GET_METHODS, classifier, model); + return value; + } + + /** * Obtain the value of the {@link EugeneTagValues#TAG_NO_PCS} * tag value on the given model or classifier. * <p/>

1 0