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

Jenkins build is back to normal : topia-2.9.x-nightly » ToPIA :: Service Replication #6
by admin+ci-nuiton.org＠codelutin.com 17 Apr '14

17 Apr '14

See <http://ci.nuiton.org/jenkins/job/topia-2.9.x-nightly/org.nuiton.topia$topia…>

1 0

Jenkins build is back to normal : topia-2.9.x-nightly » ToPIA #6
by admin+ci-nuiton.org＠codelutin.com 17 Apr '14

17 Apr '14

See <http://ci.nuiton.org/jenkins/job/topia-2.9.x-nightly/org.nuiton$topia/6/>

1 0

Jenkins build is back to normal : topia-2.9.x-nightly » ToPIA :: Service Security #6
by admin+ci-nuiton.org＠codelutin.com 17 Apr '14

17 Apr '14

See <http://ci.nuiton.org/jenkins/job/topia-2.9.x-nightly/org.nuiton.topia$topia…>

1 0

r3071 - branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator
by echatellier＠users.nuiton.org 16 Apr '14

16 Apr '14

Author: echatellier Date: 2014-04-16 12:41:21 +0200 (Wed, 16 Apr 2014) New Revision: 3071 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3071 Log: Fix javadoc Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java =================================================================== --- branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2014-04-16 10:40:53 UTC (rev 3070) +++ branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2014-04-16 10:41:21 UTC (rev 3071) @@ -471,7 +471,7 @@ /** * Tag to specify if we want to generate fireOnPreRead and fireOnPostRead method into entity getters. * - * @see TopiaGeneratorUtil#isDoNotGenerateReadListeners(ObjectModelClassifier, ObjectModel) + * @see TopiaGeneratorUtil#isDoNotGenerateReadListeners(ObjectModelAttribute, ObjectModel) * @since 2.9 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class},

1 0

r3070 - branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator
by echatellier＠users.nuiton.org 16 Apr '14

16 Apr '14

Author: echatellier Date: 2014-04-16 12:40:53 +0200 (Wed, 16 Apr 2014) New Revision: 3070 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3070 Log: Fix since version Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java =================================================================== --- branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2014-04-16 10:14:56 UTC (rev 3069) +++ branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2014-04-16 10:40:53 UTC (rev 3070) @@ -472,7 +472,7 @@ * Tag to specify if we want to generate fireOnPreRead and fireOnPostRead method into entity getters. * * @see TopiaGeneratorUtil#isDoNotGenerateReadListeners(ObjectModelClassifier, ObjectModel) - * @since 2.6.7 + * @since 2.9 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, documentation = "Add a \"id\" property with its getter/setter on a DTO.")

1 0

r3069 - branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator
by echatellier＠users.nuiton.org 16 Apr '14

16 Apr '14

Author: echatellier Date: 2014-04-16 12:14:56 +0200 (Wed, 16 Apr 2014) New Revision: 3069 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3069 Log: fixes #3154: Add tag value to not generate fireOnPreRead and fireOnPostRead listeners Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2014-04-16 08:22:06 UTC (rev 3068) +++ branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2014-04-16 10:14:56 UTC (rev 3069) @@ -732,20 +732,39 @@ addOperation(outputInterface, getJavaBeanMethodName(operationPrefix, attrName), attrType, ObjectModelJavaModifier.PACKAGE); + boolean generateReadListeners = !TopiaGeneratorUtil.isDoNotGenerateReadListeners(attribute, model); + // Implementation ObjectModelOperation implOperation = createImplOperation(interfaceOperation); attrType = TopiaGeneratorUtil.getSimpleName(attrType); - setOperationBody(implOperation, "" + StringBuilder body = new StringBuilder(); + if (generateReadListeners) { + body.append("" /*{ fireOnPreRead(<%=constantName%>, <%=attrName%>); +}*/); + } + + body.append("" +/*{ <%=attrType%> result = this.<%=attrName%>; +}*/); + + if (generateReadListeners) { + body.append("" +/*{ fireOnPostRead(<%=constantName%>, <%=attrName%>); +}*/); + } + + body.append("" +/*{ return result; - }*/ - ); + }*/); + setOperationBody(implOperation, body.toString()); } protected void addMultipleAddOperation(ObjectModelAttribute attribute, Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2014-04-16 08:22:06 UTC (rev 3068) +++ branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2014-04-16 10:14:56 UTC (rev 3069) @@ -25,11 +25,13 @@ package org.nuiton.topia.generator; import java.util.LinkedHashSet; + import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.AbstractGenerator; +import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.ModelPropertiesUtil; import org.nuiton.eugene.java.JavaGeneratorUtil; @@ -1876,6 +1878,23 @@ boolean generate = StringUtils.isNotEmpty(tagValue) && Boolean.valueOf(tagValue); return generate; } + + /** + * Obtain the value of the {@link TopiaTagValues#TAG_DO_NOT_GENERATE_READ_LISTENERS} + * tag value on the given model or classifier. + * + * It will first look on the model, and then in the given classifier. + * + * @param model model to seek + * @param attribute attribute to seek + * @return the none empty value of the found tag value or {@code null} if not found nor empty. + * @see TopiaTagValues#TAG_DO_NOT_GENERATE_READ_LISTENERS + * @since 2.9 + */ + public static boolean isDoNotGenerateReadListeners(ObjectModelAttribute attribute, ObjectModel model) { + String value = findTagValue(TopiaTagValues.TAG_DO_NOT_GENERATE_READ_LISTENERS, attribute, model); + return value != null && "true".equals(value); + } } // TopiaGeneratorUtil Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java =================================================================== --- branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2014-04-16 08:22:06 UTC (rev 3068) +++ branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2014-04-16 10:14:56 UTC (rev 3069) @@ -467,4 +467,14 @@ @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, documentation = "Add a \"id\" property with its getter/setter on a DTO.") String TAG_GENERATE_TOPIA_ID_IN_DTO = "generateDTOTopiaId"; + + /** + * Tag to specify if we want to generate fireOnPreRead and fireOnPostRead method into entity getters. + * + * @see TopiaGeneratorUtil#isDoNotGenerateReadListeners(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_DO_NOT_GENERATE_READ_LISTENERS = "notGenerateReadListeners"; }

1 0

r3068 - in trunk: topia-it/src/test/java/org/nuiton/topia/persistence/internal topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support
by athimel＠users.nuiton.org 16 Apr '14

16 Apr '14

Author: athimel Date: 2014-04-16 10:22:06 +0200 (Wed, 16 Apr 2014) New Revision: 3068 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3068 Log: fixes #3153 Fix possible NPE Modified: trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaHibernateEventListener.java Modified: trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java 2014-04-15 15:54:37 UTC (rev 3067) +++ trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java 2014-04-16 08:22:06 UTC (rev 3068) @@ -37,6 +37,7 @@ import org.nuiton.topia.it.legacy.test.entities.Person; import org.nuiton.topia.it.legacy.test.entities.PersonTopiaDao; +import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.nuiton.topia.persistence.TopiaDao; @@ -209,4 +210,19 @@ protected Person createPerson(String name) throws TopiaException { return dao.create(Person.PROPERTY_NAME, name); } + + @Test // Test to avoid NPE during update(...) on non persisted entity (see http://nuiton.org/issues/3153) + public void findUpdateNonPersistedEntity() throws TopiaException { + + Person person = dao.newInstance(); + person.setName("whatever"); + + Assert.assertFalse(person.isPersisted()); + + dao.update(person); + + Assert.assertTrue(person.isPersisted()); + Assert.assertTrue(!Strings.isNullOrEmpty(person.getTopiaId())); + } + } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaHibernateEventListener.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaHibernateEventListener.java 2014-04-15 15:54:37 UTC (rev 3067) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaHibernateEventListener.java 2014-04-16 08:22:06 UTC (rev 3068) @@ -57,6 +57,7 @@ import org.nuiton.topia.persistence.TopiaEntityContextable; import com.google.common.base.Preconditions; +import com.google.common.base.Strings; /** * @author Arnaud Thimel : thimel(a)codelutin.com @@ -235,9 +236,19 @@ if (log.isDebugEnabled()) { log.debug("Adding topiaId into entity " + entity.getClass()); } + + // TopiaIdFactory#newTopiaId only requires interface. First get the entity class name. + String entityClassName = event.getEntityName(); + // event.getEntityName() may be null in case .update(...) method is called on a new (not yet persisted) entity (see http://nuiton.org/issues/3153) + if (Strings.isNullOrEmpty(entityClassName)) { + entityClassName = entity.getClass().getName(); + } + + // Then extract interface name // FIXME echatellier 20130713 : hack to find interface for current entity class - // #newTopiaId only accept interface - Class entityInterface = Class.forName(event.getEntityName().replace("Impl", "")); + Class entityInterface = Class.forName(entityClassName.replace("Impl", "")); + + // Generate topiaId String topiaId = context.getTopiaIdFactory().newTopiaId(entityInterface, entity); entity.setTopiaId(topiaId); }

1 0

r3067 - branches/topia-2.9.x
by echatellier＠users.nuiton.org 15 Apr '14

15 Apr '14

Author: echatellier Date: 2014-04-15 17:54:37 +0200 (Tue, 15 Apr 2014) New Revision: 3067 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3067 Log: Fix mavenpom Modified: branches/topia-2.9.x/pom.xml Modified: branches/topia-2.9.x/pom.xml =================================================================== --- branches/topia-2.9.x/pom.xml 2014-04-15 15:24:40 UTC (rev 3066) +++ branches/topia-2.9.x/pom.xml 2014-04-15 15:54:37 UTC (rev 3067) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.0.5-SNAPSHOT</version> + <version>5.0.5</version> </parent> <artifactId>topia</artifactId>

1 0

r3066 - trunk
by athimel＠users.nuiton.org 15 Apr '14

15 Apr '14

Author: athimel Date: 2014-04-15 17:24:40 +0200 (Tue, 15 Apr 2014) New Revision: 3066 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3066 Log: Upgrade versions Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-15 15:22:50 UTC (rev 3065) +++ trunk/pom.xml 2014-04-15 15:24:40 UTC (rev 3066) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.0.5</version> + <version>5.0.6-SNAPSHOT</version> </parent> <artifactId>topia</artifactId> @@ -239,14 +239,14 @@  <eugeneVersion>2.8-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> - <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> + <nuitonCsvVersion>3.0-rc-1</nuitonCsvVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonI18nVersion>3.0</nuitonI18nVersion> <processorPluginVersion>1.3</processorPluginVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> - <sl4jVersion>1.7.6</sl4jVersion> - <h2Version>1.3.175</h2Version> + <sl4jVersion>1.7.7</sl4jVersion> + <h2Version>1.3.176</h2Version> <hamcrestVersion>1.3</hamcrestVersion> </properties>

1 0

r3065 - trunk/topia-templates/src/main/java/org/nuiton/topia/templates
by bleny＠users.nuiton.org 15 Apr '14

15 Apr '14

Author: bleny Date: 2014-04-15 17:22:50 +0200 (Tue, 15 Apr 2014) New Revision: 3065 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3065 Log: fixes #3150 change reverse attribute type in generated addAll Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java 2014-04-15 13:21:50 UTC (rev 3064) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java 2014-04-15 15:22:50 UTC (rev 3065) @@ -872,7 +872,8 @@ String getterName = getJavaBeanMethodName("get", reverse.getName()); String setterName = getJavaBeanMethodName("set", reverse.getName()); - String reverseAttrType = TopiaGeneratorUtil.getSimpleName(reverse.getType()); + // TODO brendan 15/04/14 remove FQN + String reverseAttrType = JavaGeneratorUtil.getAttributeImplementationType(reverse, true); if (!TopiaGeneratorUtil.isNMultiplicity(reverse)) { body.append("" @@ -885,7 +886,7 @@ body.append("" /*{ if (<%=attrName%>.<%=getterName%>() == null) { - <%=attrName%>.<%=setterName%>(new <%=collectionImpl%><<%=reverseAttrType%>>()); + <%=attrName%>.<%=setterName%>(new <%=reverseAttrType%>()); } <%=attrName%>.<%=getterName%>().add(this); }*/

1 0