Eugene-commits

Download

eugene-commits@list.nuiton.org

December 2011

1 participants
2 discussions

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

19 Dec '11

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

19 Dec '11

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