- Topia-commits - mailman.cloud.codelutin.com

r2401 - in trunk: . topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence/src/test/java/org/nuiton/topia/test topia-persistence/src/test/java/org/nuiton/topia/test/evo1912 topia-persistence/src/test/xmi
by ymartel＠users.nuiton.org 18 Jan '12

18 Jan '12

Author: ymartel Date: 2012-01-18 16:45:09 +0100 (Wed, 18 Jan 2012) New Revision: 2401 Url: http://nuiton.org/repositories/revision/topia/2401 Log: evo#1912 Add TagValue to generate an "id" property with EntityDTOTransformer Added: trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/ trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java Modified: trunk/ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java trunk/topia-persistence/src/test/xmi/topiatest.properties Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - *.ipr *.iws .classpath *.iml .project target .settings + *.ipr *.iws .classpath *.iml .project target .settings .idea Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2012-01-12 15:56:52 UTC (rev 2400) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2012-01-18 15:45:09 UTC (rev 2401) @@ -41,6 +41,7 @@ import java.io.Serializable; import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.shouldGenerateDTOIdTagValue; /*{generator option: parentheses = false}*/ @@ -100,6 +101,11 @@ addAttribute(result, "serialVersionUID", "long", svUID, ObjectModelModifier.FINAL, ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); } + boolean generateDTOId = shouldGenerateDTOIdTagValue(clazz, model); + if (generateDTOId) { + addAttribute(result, "id", "String"); + } + ObjectModelAttribute attr2; for (ObjectModelAttribute attr : clazz.getAttributes()) { ObjectModelAttribute reverse = attr.getReverseAttribute(); @@ -169,7 +175,25 @@ protected void addOperations(ObjectModelClass result,ObjectModelClass clazz) { + boolean generateDTOId = shouldGenerateDTOIdTagValue(clazz, model); ObjectModelOperation op; + if (generateDTOId) { + op = addOperation(result, "setId", "void", ObjectModelModifier.PUBLIC); + addParameter(op, "String", "id"); + setOperationBody(op, "" +/*{ + this.id = id; + }*/ + ); + + op = addOperation(result, "getId", "String", ObjectModelModifier.PUBLIC); + setOperationBody(op, "" +/*{ + return id; + }*/ + ); + } + op = addOperation(result, "addPropertyChangeListener", "void"); addParameter(op,PropertyChangeListener.class,"listener"); setOperationBody(op,"" Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2012-01-12 15:56:52 UTC (rev 2400) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2012-01-18 15:45:09 UTC (rev 2401) @@ -1801,5 +1801,21 @@ return Boolean.parseBoolean(value); } + /** + * Search if the TagValue {@link TopiaTagValues#TAG_GENERATE_ID_IN_DTO} has been + * activated in the model. + * + * @param classifier classifier to seek + * @param model model to seek + * @return the none empty value of the found tag value or {@code null} if not found nor empty. + * @see TopiaTagValues#TAG_GENERATE_ID_IN_DTO + * @since 2.6.7 + */ + public static boolean shouldGenerateDTOIdTagValue(ObjectModelClassifier classifier, ObjectModel model) { + String tagValue = findTagValue(TopiaTagValues.TAG_GENERATE_ID_IN_DTO, classifier, model); + boolean generate = StringUtils.isNotEmpty(tagValue) && Boolean.valueOf(tagValue); + return generate; + } + } // TopiaGeneratorUtil Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2012-01-12 15:56:52 UTC (rev 2400) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2012-01-18 15:45:09 UTC (rev 2401) @@ -25,7 +25,6 @@ package org.nuiton.topia.generator; import org.nuiton.eugene.EugeneTagValues; -import org.nuiton.eugene.ModelPropertiesUtil; import org.nuiton.eugene.models.Model; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; @@ -456,4 +455,17 @@ @TagValueDefinition(target = {ObjectModel.class,ObjectModelAttribute.class}, documentation = "Specifies if an nm-multiplicity attribute (or all nm-multiplicity attributes of a given model) needs an index in db (Hibernate mapping)") String TAG_INDEX_FOREIGN_KEYS = "indexForeignKeys"; + + /** + * Tag to specify if we want to add an "id" property in DTO generated by + * {@link EntityDTOTransformer}. + * <p/> + * + * @see EntityDTOTransformer + * @see TopiaGeneratorUtil#shouldGenerateDTOIdTagValue(ObjectModelClassifier, ObjectModel) + * @since 2.6.7 + */ + @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, + documentation = "Add a \"id\" property with its getter/setter on a DTO.") + String TAG_GENERATE_ID_IN_DTO = "generateDTOId"; } Added: trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java 2012-01-18 15:45:09 UTC (rev 2401) @@ -0,0 +1,24 @@ +package org.nuiton.topia.test.evo1912; + +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.topiatest.CompanyDTO; + +/** + * @author ymartel <martel(a)codelutin.com> + */ +public class EntityDTOTransformerTest { + + @Test + public void testEvo1912() throws Exception { + // simply test the getter/setter on id property : with the tagValue, they should be generated + CompanyDTO companyDTO = new CompanyDTO(); + String originalId = companyDTO.getId(); + Assert.assertNull(originalId); + String wantedId = "mycompany"; + companyDTO.setId(wantedId); + String updatedId = companyDTO.getId(); + Assert.assertEquals(wantedId, updatedId); + } + +} Modified: trunk/topia-persistence/src/test/xmi/topiatest.properties =================================================================== --- trunk/topia-persistence/src/test/xmi/topiatest.properties 2012-01-12 15:56:52 UTC (rev 2400) +++ trunk/topia-persistence/src/test/xmi/topiatest.properties 2012-01-18 15:45:09 UTC (rev 2401) @@ -25,6 +25,7 @@ model.tagvalue.i18n=topia.test.common. model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.constantPrefix=PROPERTY_ +model.tagvalue.generateDTOId=true # Do not use this tag value (deprecated since 2.5) #model.tagvalue.useLegacyDAO=true

1 0

r2400 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org 12 Jan '12

12 Jan '12

Author: maven-release Date: 2012-01-12 16:56:52 +0100 (Thu, 12 Jan 2012) New Revision: 2400 Url: http://nuiton.org/repositories/revision/topia/2400 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-12 15:56:51 UTC (rev 2399) +++ trunk/pom.xml 2012-01-12 15:56:52 UTC (rev 2400) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.6</version> + <version>2.6.7-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -443,9 +443,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.6</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.6</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.6</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2012-01-12 15:56:51 UTC (rev 2399) +++ trunk/topia-persistence/pom.xml 2012-01-12 15:56:52 UTC (rev 2400) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.6</version> + <version>2.6.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2012-01-12 15:56:51 UTC (rev 2399) +++ trunk/topia-service-migration/pom.xml 2012-01-12 15:56:52 UTC (rev 2400) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.6</version> + <version>2.6.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2012-01-12 15:56:51 UTC (rev 2399) +++ trunk/topia-service-replication/pom.xml 2012-01-12 15:56:52 UTC (rev 2400) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.6</version> + <version>2.6.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2012-01-12 15:56:51 UTC (rev 2399) +++ trunk/topia-service-security/pom.xml 2012-01-12 15:56:52 UTC (rev 2400) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.6</version> + <version>2.6.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2399 - in tags: . topia-2.6.6
by maven-release＠users.nuiton.org 12 Jan '12

12 Jan '12

Author: maven-release Date: 2012-01-12 16:56:51 +0100 (Thu, 12 Jan 2012) New Revision: 2399 Url: http://nuiton.org/repositories/revision/topia/2399 Log: [maven-release-plugin] copy for tag topia-2.6.6 Added: tags/topia-2.6.6/ Property changes on: tags/topia-2.6.6 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2398 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org 12 Jan '12

12 Jan '12

Author: maven-release Date: 2012-01-12 16:56:50 +0100 (Thu, 12 Jan 2012) New Revision: 2398 Url: http://nuiton.org/repositories/revision/topia/2398 Log: [maven-release-plugin] prepare release topia-2.6.6 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-09 10:24:36 UTC (rev 2397) +++ trunk/pom.xml 2012-01-12 15:56:50 UTC (rev 2398) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.6-SNAPSHOT</version> + <version>2.6.6</version> <modules> <module>topia-persistence</module> @@ -443,9 +443,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.6</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.6</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.6</url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2012-01-09 10:24:36 UTC (rev 2397) +++ trunk/topia-persistence/pom.xml 2012-01-12 15:56:50 UTC (rev 2398) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.6-SNAPSHOT</version> + <version>2.6.6</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2012-01-09 10:24:36 UTC (rev 2397) +++ trunk/topia-service-migration/pom.xml 2012-01-12 15:56:50 UTC (rev 2398) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.6-SNAPSHOT</version> + <version>2.6.6</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2012-01-09 10:24:36 UTC (rev 2397) +++ trunk/topia-service-replication/pom.xml 2012-01-12 15:56:50 UTC (rev 2398) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.6-SNAPSHOT</version> + <version>2.6.6</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2012-01-09 10:24:36 UTC (rev 2397) +++ trunk/topia-service-security/pom.xml 2012-01-12 15:56:50 UTC (rev 2398) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.6-SNAPSHOT</version> + <version>2.6.6</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2397 - trunk
by echatellier＠users.nuiton.org 09 Jan '12

09 Jan '12

Author: echatellier Date: 2012-01-09 11:24:36 +0100 (Mon, 09 Jan 2012) New Revision: 2397 Url: http://nuiton.org/repositories/revision/topia/2397 Log: Update nuiton-utils, slf4j, h2. Add contributors. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-09 10:17:56 UTC (rev 2396) +++ trunk/pom.xml 2012-01-09 10:24:36 UTC (rev 2397) @@ -68,14 +68,14 @@  <eugeneVersion>2.4.2</eugeneVersion> - <nuitonUtilsVersion>2.3.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.1</nuitonUtilsVersion> <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> <hibernateVersion>3.6.9.Final</hibernateVersion>  - <sl4jVersion>1.6.1</sl4jVersion> - <h2Version>1.3.160</h2Version> + <sl4jVersion>1.6.4</sl4jVersion> + <h2Version>1.3.163</h2Version>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -278,12 +278,46 @@ <role>Documentation writer</role> </roles> </developer> - </developers> -  + <contributors> + <contributor> + <name>Nicolas Dupont</name> + <email>ndupont(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + </contributor> + <contributor> + <name>Eduardo Ore</name> + <email>eore(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + </contributor> + <contributor> + <name>Gabriel Landais</name> + <email>glandais(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + </contributor> + <contributor> + <name>Stéphane Chorlet</name> + <email>schorlet(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + </contributor> + <contributor> + <name>Jonathan pepin</name> + <email>jpepin(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + </contributor> + <contributor> + <name>Nolwenn Ranou</name> + <email>nrannou(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + </contributor> + </contributors>

1 0

r2396 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator test/java/org/nuiton/topia test/java/org/nuiton/topia/test test/java/org/nuiton/topia/test/ano1882 test/xmi
by bleny＠users.nuiton.org 09 Jan '12

09 Jan '12

Author: bleny Date: 2012-01-09 11:17:56 +0100 (Mon, 09 Jan 2012) New Revision: 2396 Url: http://nuiton.org/repositories/revision/topia/2396 Log: #1882: Generated code doesn't compile since #1855 Added: trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/ trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java trunk/topia-persistence/src/test/xmi/topiatest.zargo Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2012-01-09 10:15:16 UTC (rev 2395) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2012-01-09 10:17:56 UTC (rev 2396) @@ -617,7 +617,7 @@ // System.out.println("Query : " + query); // List<<%=attrType%>> list = dao.findAllByQuery(query); - + String removeName = getJavaBeanMethodName("remove", reverseAttrName); body.append("" /*{ { @@ -629,7 +629,7 @@ .addEntity("main", <%=providerFQN%>(<%=attrType%>.class)).list(); for (<%=attrType%> item : list) { - item.remove<%=StringUtils.capitalize(reverseAttrName)%>(entity); + item.<%=removeName%>(entity); } } }*/ @@ -641,6 +641,8 @@ // THIMEL: J'ai remplacé reverse.getName() par reverseAttrName sans certitude addImport(result, attrType); String attrSimpleType = TopiaGeneratorUtil.getClassNameFromQualifiedName(attrType); + String getName = getJavaBeanMethodName("get", reverseAttrName); + String setName = getJavaBeanMethodName("set", reverseAttrName); body.append("" /*{ @@ -651,8 +653,8 @@ for (<%=attrSimpleType%> item : list) { // sletellier : Set null only if target is concerned by deletion - if (entity.equals(item.get<%=StringUtils.capitalize(reverseAttrName)%>())) { - item.set<%=StringUtils.capitalize(reverseAttrName)%>(null); + if (entity.equals(item.<%=getName%>())) { + item.<%=setName%>(null); } }*/ ); @@ -803,12 +805,11 @@ } // found something to seek - String methodNameSuffix = StringUtils.capitalize(attrName); String methodName; if (TopiaGeneratorUtil.isNMultiplicity(attr)) { - methodName = "findAllContains" + methodNameSuffix; + methodName = getJavaBeanMethodName("findAllContains", attrName); } else { - methodName = "findAllBy" + methodNameSuffix; + methodName = getJavaBeanMethodName("findAllBy", attrName); } String daoName = StringUtils.capitalize(usageSimpleType) + "DAO"; @@ -970,7 +971,7 @@ } ObjectModelOperation op; op = addOperation(result, - "findBy" + StringUtils.capitalize(attrName), + getJavaBeanMethodName("findBy", attrName), "E", ObjectModelModifier.PUBLIC); addException(op, TopiaException.class); @@ -983,7 +984,7 @@ ); op = addOperation(result, - "findAllBy" + StringUtils.capitalize(attrName), + getJavaBeanMethodName("findAllBy", attrName), "List<E>", ObjectModelModifier.PUBLIC); addException(op, TopiaException.class); @@ -999,7 +1000,7 @@ String assocClassName = attr.getAssociationClass().getName(); String assocClassFQN = attr.getAssociationClass().getQualifiedName(); op = addOperation(result, - "findBy" + StringUtils.capitalize(assocClassName), + getJavaBeanMethodName("findBy", assocClassName), "E", ObjectModelModifier.PUBLIC); addException(op, TopiaException.class); @@ -1012,7 +1013,7 @@ ); op = addOperation(result, - "findAllBy" + StringUtils.capitalize(assocClassName), + getJavaBeanMethodName("findAllBy", assocClassName), "List<E>", ObjectModelModifier.PUBLIC); addException(op, TopiaException.class); @@ -1038,7 +1039,7 @@ ObjectModelOperation op; // Since 2.4 do nothing, findContains and findAllContains are not generated anymore op = addOperation(result, - "findContains" + StringUtils.capitalize(attrName), + getJavaBeanMethodName("findContains", attrName), "E", ObjectModelModifier.PUBLIC); addException(op, TopiaException.class); @@ -1051,7 +1052,7 @@ ); op = addOperation(result, - "findAllContains" + StringUtils.capitalize(attrName), + getJavaBeanMethodName("findAllContains", attrName), "List<E>", ObjectModelModifier.PUBLIC); addException(op, TopiaException.class); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2012-01-09 10:15:16 UTC (rev 2395) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2012-01-09 10:17:56 UTC (rev 2396) @@ -29,14 +29,20 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.*; -import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.Serializable; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; + /*{generator option: parentheses = false}*/ /*{generator option: writeString = +}*/ @@ -213,9 +219,10 @@ if (isEntity(attrType)) { attrType += "DTO"; } - String capitalizedAttrName = StringUtils.capitalize(attrName); + String setterName = getJavaBeanMethodName("set", attrName); + String getterName = getJavaBeanMethodName("get", attrName); if (!GeneratorUtil.isNMultiplicity(attr)) { - op = addOperation(result, "set" + capitalizedAttrName, "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, setterName, "void", ObjectModelModifier.PUBLIC); addParameter(op, attrType, "value"); setOperationBody(op, "" /*{ @@ -225,7 +232,7 @@ }*/ ); - op = addOperation(result, "get" + capitalizedAttrName, attrType, ObjectModelModifier.PUBLIC); + op = addOperation(result, getterName, attrType, ObjectModelModifier.PUBLIC); setOperationBody(op, "" /*{ return <%=attrName%>; @@ -234,7 +241,7 @@ } else { - op = addOperation(result, "set" + capitalizedAttrName, "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, setterName, "void", ObjectModelModifier.PUBLIC); addParameter(op, attrType+"[]", "values"); setOperationBody(op, "" /*{ @@ -244,7 +251,7 @@ }*/ ); - op = addOperation(result, "get" + capitalizedAttrName, attrType+"[]", ObjectModelModifier.PUBLIC); + op = addOperation(result, getterName, attrType+"[]", ObjectModelModifier.PUBLIC); setOperationBody(op, "" /*{ return <%=attrName%>; @@ -255,9 +262,10 @@ String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); String propertyName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); String assocClassFQN = attr.getAssociationClass().getQualifiedName(); - String capitaliedAttrName = StringUtils.capitalize(assocAttrName); + String setterName = getJavaBeanMethodName("set", assocAttrName); + String getterName = getJavaBeanMethodName("get", assocAttrName); if (!GeneratorUtil.isNMultiplicity(attr)) { - op = addOperation(result, "set" + capitaliedAttrName, "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, setterName, "void", ObjectModelModifier.PUBLIC); addParameter(op, assocClassFQN + "DTO", "association"); setOperationBody(op, "" /*{ @@ -267,7 +275,7 @@ }*/ ); - op = addOperation(result, "get" + capitaliedAttrName, assocClassFQN + "DTO", ObjectModelModifier.PUBLIC); + op = addOperation(result, getterName, assocClassFQN + "DTO", ObjectModelModifier.PUBLIC); setOperationBody(op, "" /*{ return <%=propertyName%>; @@ -275,7 +283,7 @@ ); } else { - op = addOperation(result, "set" + capitaliedAttrName, "void", ObjectModelModifier.PUBLIC); + op = addOperation(result, setterName, "void", ObjectModelModifier.PUBLIC); addParameter(op, assocClassFQN + "DTO[]", "values"); setOperationBody(op, "" /*{ @@ -285,7 +293,7 @@ }*/ ); - op = addOperation(result, "get" + capitaliedAttrName, assocClassFQN + "DTO[]", ObjectModelModifier.PUBLIC); + op = addOperation(result, getterName, assocClassFQN + "DTO[]", ObjectModelModifier.PUBLIC); setOperationBody(op, "" /*{ return this.<%=propertyName%>; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2012-01-09 10:15:16 UTC (rev 2395) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2012-01-09 10:17:56 UTC (rev 2396) @@ -34,10 +34,6 @@ * @author Arnaud Thimel <thimel(a)codelutin.com> * @version $Revision$ * -* Mise a jour: $Date$ -* par : $Author$ -* Mise a jour: $Date$ -* par : $Author$ */ package org.nuiton.topia.generator; @@ -51,6 +47,7 @@ import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelGenerator; +import java.beans.Introspector; import java.io.File; import java.io.IOException; import java.io.Writer; @@ -336,7 +333,7 @@ } protected String getName(ObjectModelAttribute attr, boolean isAssoc) { - String result = TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getName()); + String result = Introspector.decapitalize(attr.getName()); if (attr.hasAssociationClass() && !isAssoc) { result = TopiaGeneratorUtil.getAssocAttrName(attr); } @@ -564,7 +561,7 @@ boolean isInverse = attr.getReverseAttribute().isNavigable(); isInverse |= hasUnidirectionalRelationOnAbstractType(attr, model); - String attrName = getName(attr); + String attrName = getName(attr); // ??? String attrType = getType(attr); String reverseAttrDBName = TopiaGeneratorUtil.getReverseDbName(attr); String orderBy = generateFromTagValue(HIBERNATE_ATTRIBUTE_ORDER_BY, TopiaGeneratorUtil.getOrderByTagValue(attr)); Added: trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java 2012-01-09 10:17:56 UTC (rev 2396) @@ -0,0 +1,57 @@ +package org.nuiton.topia.test.ano1882; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.topia.TestHelper; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topia.persistence.NaturalIdTest; + +import java.io.File; +import java.io.IOException; +import java.util.Arrays; + +public class DAOAbstractTransformerTest { + + private static final Log log = LogFactory.getLog(NaturalIdTest.class); + + protected static File testBasedir; + + @BeforeClass + public static void setUpClass() throws Exception { + + testBasedir = TestHelper.getTestBasedir(NaturalIdTest.class); + } + + protected TopiaContext initTopiaContext(String testName) throws IOException, TopiaNotFoundException { + TopiaContext root = TestHelper.initTopiaContext(testBasedir, + "/TopiaContextImpl.properties", + testName); + return root; + } + + @Test + public void testAno1882() throws Exception { + TopiaContext rootContext = initTopiaContext("testAno1882"); + TopiaContext transaction = rootContext.beginTransaction(); + try { + FrenchCompanyDAO dao = TopiaTestDAOHelper.getFrenchCompanyDAO(transaction); + SIRETDAO siretDAO = TopiaTestDAOHelper.getSIRETDAO(transaction); + SIRET siret = siretDAO.create(); + FrenchCompany entity = + dao.create( + FrenchCompany.PROPERTY_S_IREN, null, + FrenchCompany.PROPERTY_SIREN2, null, + FrenchCompany.PROPERTY_S_IRET, Arrays.asList(siret), + FrenchCompany.PROPERTY_SIRET2, null); + transaction.commitTransaction(); + dao.delete(entity); + transaction.commitTransaction(); + } finally { + rootContext.closeContext(); + } + } +} Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r2395 - trunk
by echatellier＠users.nuiton.org 09 Jan '12

09 Jan '12

Author: echatellier Date: 2012-01-09 11:15:16 +0100 (Mon, 09 Jan 2012) New Revision: 2395 Url: http://nuiton.org/repositories/revision/topia/2395 Log: #1886 : Update to hibernate 3.6.9.Final Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-09 10:14:16 UTC (rev 2394) +++ trunk/pom.xml 2012-01-09 10:15:16 UTC (rev 2395) @@ -72,7 +72,7 @@ <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> - <hibernateVersion>3.6.8.Final</hibernateVersion> + <hibernateVersion>3.6.9.Final</hibernateVersion>  <sl4jVersion>1.6.1</sl4jVersion> <h2Version>1.3.160</h2Version>

1 0

r2394 - trunk/topia-tutorial
by echatellier＠users.nuiton.org 09 Jan '12

09 Jan '12

Author: echatellier Date: 2012-01-09 11:14:16 +0100 (Mon, 09 Jan 2012) New Revision: 2394 Url: http://nuiton.org/repositories/revision/topia/2394 Log: svn:imports Modified: trunk/topia-tutorial/ Property changes on: trunk/topia-tutorial ___________________________________________________________________ Modified: svn:ignore - target + target .settings .project

1 0

r2393 - trunk
by maven-release＠users.nuiton.org 04 Jan '12

04 Jan '12

Author: maven-release Date: 2012-01-04 18:19:33 +0100 (Wed, 04 Jan 2012) New Revision: 2393 Url: http://nuiton.org/repositories/revision/topia/2393 Log: Update mavenpom4redmineAndCentral to 3.0.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 15:06:22 UTC (rev 2392) +++ trunk/pom.xml 2012-01-04 17:19:33 UTC (rev 2393) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.6</version> + <version>3.0.7</version> </parent> <artifactId>topia</artifactId>

1 0

r2392 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org 04 Jan '12

04 Jan '12

Author: maven-release Date: 2012-01-04 16:06:22 +0100 (Wed, 04 Jan 2012) New Revision: 2392 Url: http://nuiton.org/repositories/revision/topia/2392 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 15:06:21 UTC (rev 2391) +++ trunk/pom.xml 2012-01-04 15:06:22 UTC (rev 2392) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.5</version> + <version>2.6.6-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -409,9 +409,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.5</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.5</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.5</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2012-01-04 15:06:21 UTC (rev 2391) +++ trunk/topia-persistence/pom.xml 2012-01-04 15:06:22 UTC (rev 2392) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.5</version> + <version>2.6.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2012-01-04 15:06:21 UTC (rev 2391) +++ trunk/topia-service-migration/pom.xml 2012-01-04 15:06:22 UTC (rev 2392) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.5</version> + <version>2.6.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2012-01-04 15:06:21 UTC (rev 2391) +++ trunk/topia-service-replication/pom.xml 2012-01-04 15:06:22 UTC (rev 2392) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.5</version> + <version>2.6.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2012-01-04 15:06:21 UTC (rev 2391) +++ trunk/topia-service-security/pom.xml 2012-01-04 15:06:22 UTC (rev 2392) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.5</version> + <version>2.6.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0