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

r2607 - trunk/doc
by athimel＠users.nuiton.org 09 Jul '12

09 Jul '12

Author: athimel Date: 2012-07-09 18:44:29 +0200 (Mon, 09 Jul 2012) New Revision: 2607 Url: http://nuiton.org/repositories/revision/topia/2607 Log: Add a small HOWTO about migration to ToPIA 3 Added: trunk/doc/migration-to-topia-3.rst Added: trunk/doc/migration-to-topia-3.rst =================================================================== --- trunk/doc/migration-to-topia-3.rst (rev 0) +++ trunk/doc/migration-to-topia-3.rst 2012-07-09 16:44:29 UTC (rev 2607) @@ -0,0 +1,91 @@ +Migration vers ToPIA 3 +====================== + + +Dépéndances +----------- + +L'ancien topia-pesistence est maintenant séparé en 2 modules. +Pour la génération, vous n'avez besoin que du module topia-persistence. + +En runtime par contre, vous aurez besoin du module Hibernate de ToPIA : topia-persistence-hibernate. + +Dans votre dependency-management, ajoutez donc : + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence-hibernate</artifactId> + <version>${topiaVersion}</version> + <scope>runtime</scope> + </dependency> + +avec la propriété : + <topiaVersion>3.0-SNAPSHOT</topiaVersion> + +Il est aussi nécessaire d'utiliser au moins la version 2.4.3-SNAPSHOT d'Eugene : + <eugeneVersion>2.4.3-SNAPSHOT</eugeneVersion> +Et de renommer si besoin le plugin maven : "maven-eugene-plugin" devient "eugene-maven-plugin" + +Le plugin eugene a besoin d'une dépendance supplémentaire, qui est : + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_2.0_spec</artifactId> + <version>1.1</version> + </dependency> + +Dans un module qui n'a pas de runtime, supprimez la dépendance vers Hibernate et ajoutez cette même dépendance en provided : + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_2.0_spec</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + +Il faut aussi maintenant utiliser la version 4 d'Hibernate : + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>4.1.3.Final</version> + </dependency> + + +Configuration +------------- + +Les propriétés de ToPIA lui sont maintenant spécifiques. + +Par exemple, + hibernate.connection.url +devient + topia.connection.url + +Les propriétés utilisés sont disponibles sur la classe org.nuiton.topia.TopiaContextFactory. +Par exemple : org.nuiton.topia.TopiaContextFactory#CONFIG_URL = "topia.connection.url" + + +API +--- + +Peu de changements dans l'immédiat. Si vous accédiez à la session Hibernate (getHibernate()), vous devriez maintenant +retrouver vos petits avec (getEntityManager()). + +La javadoc de l'API ToPIA a été améliorée, n'hésitez pas à la consulter. + + +FAQ +--- + +Q : "No Persistence provider for EntityManager named topia" +A : C'est probablement parce que vous n'avez pas inclus "topia-persistence-hibernate" en dépendance "runtime" de votre projet + +Q : "java.lang.NoClassDefFoundError: org/hibernate/event/spi/EventType" +A : C'est probablement parce que vous n'utilisez pas la version 4 d'Hibernate +

1 0

r2606 - trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14
by athimel＠users.nuiton.org 09 Jul '12

09 Jul '12

Author: athimel Date: 2012-07-09 17:28:22 +0200 (Mon, 09 Jul 2012) New Revision: 2606 Url: http://nuiton.org/repositories/revision/topia/2606 Log: refs #2177 Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/BidiAssociationClassTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/ManyToManyAssociationClassTest.java Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/BidiAssociationClassTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/BidiAssociationClassTest.java 2012-07-09 14:52:49 UTC (rev 2605) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/BidiAssociationClassTest.java 2012-07-09 15:28:22 UTC (rev 2606) @@ -99,7 +99,7 @@ } @Test - @Ignore //FIXME AThimel 09/07/2012 Test is ignored as cascade-delete does not work as expected + @Ignore //FIXME AThimel 09/07/2012 #2177: Test is ignored as cascade-delete does not work as expected public void testDeleteCascade() throws TopiaException { A14A a1 = aDAO.create(); Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/ManyToManyAssociationClassTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/ManyToManyAssociationClassTest.java 2012-07-09 14:52:49 UTC (rev 2605) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/ManyToManyAssociationClassTest.java 2012-07-09 15:28:22 UTC (rev 2606) @@ -95,7 +95,7 @@ @Test @Ignore - //FIXME AThimel 09/07/2012 Test is ignored as cascade-delete does not work as expected + //FIXME AThimel 09/07/2012 #2177: Test is ignored as cascade-delete does not work as expected public void testDeleteCascade() throws TopiaException { A14D a1 = aDAO.create();

1 0

r2605 - in trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping: . test14
by athimel＠users.nuiton.org 09 Jul '12

09 Jul '12

Author: athimel Date: 2012-07-09 16:52:49 +0200 (Mon, 09 Jul 2012) New Revision: 2605 Url: http://nuiton.org/repositories/revision/topia/2605 Log: Add tests about association classes Added: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/BidiAssociationClassTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/ManyToManyAssociationClassTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/OneToManyAssociationClassTest.java Added: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/BidiAssociationClassTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/BidiAssociationClassTest.java (rev 0) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/BidiAssociationClassTest.java 2012-07-09 14:52:49 UTC (rev 2605) @@ -0,0 +1,140 @@ +package org.nuiton.topia.tck.mapping.test14; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaPersistenceException; +import org.nuiton.topia.tck.mapping.AbstractMappingTest; + +import java.util.List; + +/** + * @author Arnaud Thimel <thimel(a)codelutin.com> + */ +public class BidiAssociationClassTest extends AbstractMappingTest { + + protected TopiaContext tx; + + protected A14ADAO aDAO; + + protected B14ADAO bDAO; + + protected Assoc14ADAO assocDAO; + + @Before + public void before() throws TopiaException { + tx = db.beginTransaction(); + aDAO = getDAO(tx, A14A.class); + bDAO = getDAO(tx, B14A.class); + assocDAO = getDAO(tx, Assoc14A.class); + } + + @Test + public void testCreate() throws TopiaException { + + A14A a = aDAO.create(); + B14A b = bDAO.create(); + + Assoc14A assoc = assocDAO.create(Assoc14A.PROPERTY_A14_A, a, Assoc14A.PROPERTY_ROLE_B, b); + tx.commitTransaction(); + Assert.assertNotNull(assoc.getTopiaId()); + + Assoc14A assocFound = assocDAO.findByTopiaId(assoc.getTopiaId()); + A14A aFound = assocFound.getA14A(); + B14A bFound = assocFound.getRoleB(); + + Assert.assertNotNull(aFound); + Assert.assertEquals(a, aFound); + Assert.assertNotNull(bFound); + Assert.assertEquals(b, bFound); + } + + @Test(expected = TopiaPersistenceException.class) + public void testCreateWithNull() throws TopiaException { + + A14A a = aDAO.create(); + + Assert.assertNotNull(a.getTopiaId()); + + Assoc14A assoc = assocDAO.create(Assoc14A.PROPERTY_A14_A, a); + Assert.assertNotNull(assoc.getTopiaId()); + + // Will throw an exception because 'b' is mandatory + tx.commitTransaction(); + } + + @Test + public void testFindAll() throws TopiaException { + + A14A a1 = aDAO.create(); + A14A a2 = aDAO.create(); + B14A b = bDAO.create(); + + Assoc14A assoc = assocDAO.create(Assoc14A.PROPERTY_A14_A, a1, Assoc14A.PROPERTY_ROLE_B, b); + a1.setRoleB(assoc); + aDAO.update(a1); + b.setA14AAssoc14A(assoc); + bDAO.update(b); + + tx.commitTransaction(); + + A14A aFound = aDAO.findByAssoc14A(assoc); + Assert.assertEquals(a1, aFound); + + aFound = aDAO.findByRoleB(b); + Assert.assertEquals(a1, aFound); + + B14A bFound = bDAO.findByA14A(a1); + Assert.assertEquals(b, bFound); + + bFound = bDAO.findByA14A(a2); + Assert.assertNull(bFound); + + bFound = bDAO.findByAssoc14A(assoc); + Assert.assertEquals(b, bFound); + + } + + @Test + @Ignore //FIXME AThimel 09/07/2012 Test is ignored as cascade-delete does not work as expected + public void testDeleteCascade() throws TopiaException { + + A14A a1 = aDAO.create(); + A14A a2 = aDAO.create(); + B14A b1 = bDAO.create(); + B14A b2 = bDAO.create(); + + Assoc14A assoc11 = assocDAO.create(Assoc14A.PROPERTY_A14_A, a1, Assoc14A.PROPERTY_ROLE_B, b1); + Assoc14A assoc22 = assocDAO.create(Assoc14A.PROPERTY_A14_A, a2, Assoc14A.PROPERTY_ROLE_B, b2); + + a1.setRoleB(assoc11); + a2.setRoleB(assoc22); + b1.setA14AAssoc14A(assoc11); + b2.setA14AAssoc14A(assoc22); + + aDAO.update(a1); + aDAO.update(a2); + bDAO.update(b1); + bDAO.update(b2); + + tx.commitTransaction(); + + Assert.assertEquals(2, assocDAO.count()); + + aDAO.delete(a1); + + tx.commitTransaction(); + + Assert.assertEquals(1, assocDAO.count()); + + List<Assoc14A> all = assocDAO.findAll(); + Assert.assertEquals(1, all.size()); + Assoc14A first = all.iterator().next(); + Assert.assertEquals(a2, first.getA14A()); + Assert.assertEquals(b2, first.getRoleB()); + } + +} Added: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/ManyToManyAssociationClassTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/ManyToManyAssociationClassTest.java (rev 0) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/ManyToManyAssociationClassTest.java 2012-07-09 14:52:49 UTC (rev 2605) @@ -0,0 +1,139 @@ +package org.nuiton.topia.tck.mapping.test14; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.tck.mapping.AbstractMappingTest; + +import java.util.List; + +/** + * @author Arnaud Thimel <thimel(a)codelutin.com> + */ +public class ManyToManyAssociationClassTest extends AbstractMappingTest { + + protected TopiaContext tx; + + protected A14DDAO aDAO; + + protected B14DDAO bDAO; + + protected Assoc14DDAO assocDAO; + + @Before + public void before() throws TopiaException { + tx = db.beginTransaction(); + aDAO = getDAO(tx, A14D.class); + bDAO = getDAO(tx, B14D.class); + assocDAO = getDAO(tx, Assoc14D.class); + } + + @Test + public void testCreate() throws TopiaException { + + A14D a = aDAO.create(); + B14D b = bDAO.create(); + + Assoc14D assoc = assocDAO.create(Assoc14D.PROPERTY_ROLE_A, a, Assoc14D.PROPERTY_B14_D, b); + a.addB14DAssoc14D(assoc); + b.addRoleA(assoc); + aDAO.update(a); + bDAO.update(b); + tx.commitTransaction(); + + + Assoc14D assocFound = assocDAO.findByTopiaId(assoc.getTopiaId()); + A14D aFound = assocFound.getRoleA(); + Assert.assertEquals(a, aFound); + B14D bFound = assocFound.getB14D(); + Assert.assertEquals(b, bFound); + + Assert.assertEquals(1, aFound.sizeB14DAssoc14D()); + Assert.assertEquals(1, bFound.sizeRoleA()); + + } + + + @Test + public void testFindAll() throws TopiaException { + + A14D a1 = aDAO.create(); + A14D a2 = aDAO.create(); + B14D b1 = bDAO.create(); + B14D b2 = bDAO.create(); + + Assoc14D assoc11 = assocDAO.create(Assoc14D.PROPERTY_ROLE_A, a1, Assoc14D.PROPERTY_B14_D, b1); + Assoc14D assoc12 = assocDAO.create(Assoc14D.PROPERTY_ROLE_A, a1, Assoc14D.PROPERTY_B14_D, b2); + Assoc14D assoc21 = assocDAO.create(Assoc14D.PROPERTY_ROLE_A, a2, Assoc14D.PROPERTY_B14_D, b1); + + a1.addB14DAssoc14D(assoc11); + a1.addB14DAssoc14D(assoc12); + a2.addB14DAssoc14D(assoc21); + b1.addRoleA(assoc11); + b1.addRoleA(assoc21); + b2.addRoleA(assoc12); + + aDAO.update(a1); + aDAO.update(a2); + bDAO.update(b1); + bDAO.update(b2); + + tx.commitTransaction(); + + Assert.assertEquals(3, assocDAO.count()); + + List<Assoc14D> allByB14D = assocDAO.findAllByB14D(b1); + Assert.assertEquals(2, allByB14D.size()); + + List<Assoc14D> allByRoleA = assocDAO.findAllByRoleA(a2); + Assert.assertEquals(1, allByRoleA.size()); + + } + + @Test + @Ignore + //FIXME AThimel 09/07/2012 Test is ignored as cascade-delete does not work as expected + public void testDeleteCascade() throws TopiaException { + + A14D a1 = aDAO.create(); + A14D a2 = aDAO.create(); + B14D b1 = bDAO.create(); + B14D b2 = bDAO.create(); + + Assoc14D assoc11 = assocDAO.create(Assoc14D.PROPERTY_ROLE_A, a1, Assoc14D.PROPERTY_B14_D, b1); + Assoc14D assoc12 = assocDAO.create(Assoc14D.PROPERTY_ROLE_A, a1, Assoc14D.PROPERTY_B14_D, b2); + Assoc14D assoc21 = assocDAO.create(Assoc14D.PROPERTY_ROLE_A, a2, Assoc14D.PROPERTY_B14_D, b1); + + a1.addB14DAssoc14D(assoc11); + a1.addB14DAssoc14D(assoc12); + a2.addB14DAssoc14D(assoc21); + b1.addRoleA(assoc11); + b1.addRoleA(assoc21); + b2.addRoleA(assoc12); + + aDAO.update(a1); + aDAO.update(a2); + bDAO.update(b1); + bDAO.update(b2); + + tx.commitTransaction(); + + Assert.assertEquals(3, assocDAO.count()); + + aDAO.delete(a1); + + tx.commitTransaction(); + + Assert.assertEquals(1, assocDAO.count()); + + List<Assoc14D> all = assocDAO.findAll(); + Assert.assertEquals(1, all.size()); + Assoc14D first = all.iterator().next(); + Assert.assertEquals(a2, first.getRoleA()); + Assert.assertEquals(b1, first.getB14D()); + } + +} Added: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/OneToManyAssociationClassTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/OneToManyAssociationClassTest.java (rev 0) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/OneToManyAssociationClassTest.java 2012-07-09 14:52:49 UTC (rev 2605) @@ -0,0 +1,101 @@ +package org.nuiton.topia.tck.mapping.test14; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.tck.mapping.AbstractMappingTest; + +import java.util.List; + +/** + * @author Arnaud Thimel <thimel(a)codelutin.com> + */ +public class OneToManyAssociationClassTest extends AbstractMappingTest { + + protected TopiaContext tx; + + protected A14CDAO aDAO; + + protected B14CDAO bDAO; + + protected Assoc14CDAO assocDAO; + + @Before + public void before() throws TopiaException { + tx = db.beginTransaction(); + aDAO = getDAO(tx, A14C.class); + bDAO = getDAO(tx, B14C.class); + assocDAO = getDAO(tx, Assoc14C.class); + } + + @Test + public void testCreate() throws TopiaException { + + A14C a = aDAO.create(); + B14C b = bDAO.create(); + + Assoc14C assoc = assocDAO.create(Assoc14C.PROPERTY_A14_C, a, Assoc14C.PROPERTY_B14_C, b); + a.addB14CAssoc14C(assoc); + b.setA14CAssoc14C(assoc); + aDAO.update(a); + bDAO.update(b); + tx.commitTransaction(); + + + Assoc14C assocFound = assocDAO.findByTopiaId(assoc.getTopiaId()); + A14C aFound = assocFound.getA14C(); + Assert.assertEquals(a, aFound); + Assert.assertEquals(b, assocFound.getB14C()); + + Assert.assertEquals(1, aFound.sizeB14CAssoc14C()); + Assert.assertEquals(b, aFound.getB14CAssoc14C().iterator().next().getB14C()); + + } + + + @Test + public void testFindAll() throws TopiaException { + + A14C a = aDAO.create(); + B14C b1 = bDAO.create(); + B14C b2 = bDAO.create(); + + Assoc14C assoc1 = assocDAO.create(Assoc14C.PROPERTY_A14_C, a, Assoc14C.PROPERTY_B14_C, b1); + a.addB14CAssoc14C(assoc1); + b1.setA14CAssoc14C(assoc1); + aDAO.update(a); + bDAO.update(b1); + + tx.commitTransaction(); + + List<B14C> allByA14C = bDAO.findAllByA14C(a); + Assert.assertEquals(1, allByA14C.size()); + Assert.assertEquals(b1, allByA14C.iterator().next()); + + B14C bFound = bDAO.findByAssoc14C(assoc1); + Assert.assertEquals(b1, bFound); + + Assoc14C assoc2 = assocDAO.create(Assoc14C.PROPERTY_A14_C, a, Assoc14C.PROPERTY_B14_C, b2); + a.addB14CAssoc14C(assoc2); + b2.setA14CAssoc14C(assoc2); + + aDAO.update(a); + bDAO.update(b2); + + tx.commitTransaction(); + + bFound = bDAO.findByAssoc14C(assoc1); + Assert.assertEquals(b1, bFound); + bFound = bDAO.findByAssoc14C(assoc2); + Assert.assertEquals(b2, bFound); + + allByA14C = bDAO.findAllByA14C(a); + Assert.assertEquals(2, allByA14C.size()); + A14C aFound = allByA14C.iterator().next().getA14CAssoc14C().getA14C(); + Assert.assertEquals(2, aFound.sizeB14CAssoc14C()); + + } + +}

1 0

r2604 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence-tck/src/main/xmi
by athimel＠users.nuiton.org 09 Jul '12

09 Jul '12

Author: athimel Date: 2012-07-09 16:52:23 +0200 (Mon, 09 Jul 2012) New Revision: 2604 Url: http://nuiton.org/repositories/revision/topia/2604 Log: Fix JPA mapping generation about association classes Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-07-07 19:45:34 UTC (rev 2603) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-07-09 14:52:23 UTC (rev 2604) @@ -37,6 +37,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +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.ObjectModelGenerator; @@ -370,6 +371,14 @@ for (ObjectModelAttribute attribute : manyToOneAttributes) { generateManyToOneAttribute(output, input, attribute, false); } + + if (input instanceof ObjectModelAssociationClass) { + ObjectModelAssociationClass inputAssoc = (ObjectModelAssociationClass)input; + for (ObjectModelAttribute attributeAssoc : inputAssoc.getParticipantsAttributes()) { + generateManyToOneAttribute(output, input, attributeAssoc, false); + } + } + // generate one-to-one attributes Collection<ObjectModelAttribute> oneToOneAttributes = attributesByType.get(PROPERTY_TYPE.ONE_TO_ONE); @@ -535,12 +544,15 @@ Map<String, String> xmlAttributes = Maps.newTreeMap(); Map<String, String> columnAttributes = Maps.newTreeMap(); - String attrName = getName(attr); + boolean isAssociationClass = input instanceof ObjectModelAssociationClass; + + String attrName = getName(attr, isAssociationClass); addAttribute(xmlAttributes, ATTRIBUTE_NAME, attrName); String attrColumn = TopiaGeneratorUtil.getDbName(attr); - if ("true".equals(TopiaGeneratorUtil.getNotNullTagValue(attr))) { + if ("true".equals(TopiaGeneratorUtil.getNotNullTagValue(attr)) + || (attr.hasAssociationClass() && isAssociationClass)) { // not-null property addAttribute(xmlAttributes, ATTRIBUTE_OPTIONAL, false); @@ -560,10 +572,11 @@ addAttribute(columnAttributes, ATTRIBUTE_NAME, attrColumn); //NOTUSED addAttribute(columnAttributes, ATTRIBUTE_REFERENCE_COLUMN_NAME, TopiaEntity.TOPIA_ID); - addAttribute(xmlAttributes, ATTRIBUTE_TARGET_ENTITY, getType(attr)); + String type = getType(attr, isAssociationClass); + addAttribute(xmlAttributes, ATTRIBUTE_TARGET_ENTITY, type); boolean withDeleteCascade = false; - if (attr.isComposite() || attr.hasAssociationClass()) { + if (attr.isComposite() || (attr.hasAssociationClass() && !isAssociationClass)) { withDeleteCascade = true; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2012-07-07 19:45:34 UTC (rev 2603) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2012-07-09 14:52:23 UTC (rev 2604) @@ -688,7 +688,7 @@ String collectionType = getCollectionType(attribute); if (collectionType != null) { - attrType = collectionType + "<" + attrType + ">"; + attrType = String.format("%s<%s>", collectionType, attrType); } //String attrVisibility = attr.getVisibility(); Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo =================================================================== (Binary files differ)

1 0

r2603 - branches/topia-2.6.x
by tchemit＠users.nuiton.org 07 Jul '12

07 Jul '12

Author: tchemit Date: 2012-07-07 21:45:34 +0200 (Sat, 07 Jul 2012) New Revision: 2603 Url: http://nuiton.org/repositories/revision/topia/2603 Log: updates to mavenpom 3.3.4 Modified: branches/topia-2.6.x/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-07-07 19:45:19 UTC (rev 2602) +++ branches/topia-2.6.x/pom.xml 2012-07-07 19:45:34 UTC (rev 2603) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </parent> <artifactId>topia</artifactId>

1 0

r2602 - trunk
by tchemit＠users.nuiton.org 07 Jul '12

07 Jul '12

Author: tchemit Date: 2012-07-07 21:45:19 +0200 (Sat, 07 Jul 2012) New Revision: 2602 Url: http://nuiton.org/repositories/revision/topia/2602 Log: updates to mavenpom 3.3.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-06 07:48:16 UTC (rev 2601) +++ trunk/pom.xml 2012-07-07 19:45:19 UTC (rev 2602) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </parent> <artifactId>topia</artifactId>

1 0

r2601 - trunk
by athimel＠users.nuiton.org 06 Jul '12

06 Jul '12

Author: athimel Date: 2012-07-06 09:48:16 +0200 (Fri, 06 Jul 2012) New Revision: 2601 Url: http://nuiton.org/repositories/revision/topia/2601 Log: Use mavenpom-3.3.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-04 08:03:07 UTC (rev 2600) +++ trunk/pom.xml 2012-07-06 07:48:16 UTC (rev 2601) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.2</version> + <version>3.3.3</version> </parent> <artifactId>topia</artifactId>

1 0

r2600 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence-tck/src/main/xmi
by athimel＠users.nuiton.org 04 Jul '12

04 Jul '12

Author: athimel Date: 2012-07-04 10:03:07 +0200 (Wed, 04 Jul 2012) New Revision: 2600 Url: http://nuiton.org/repositories/revision/topia/2600 Log: Fix getComposite() generation about non-navigable attributes Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 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-07-03 15:40:43 UTC (rev 2599) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2012-07-04 08:03:07 UTC (rev 2600) @@ -1215,7 +1215,7 @@ StringBuilder body = new StringBuilder("" /*{ Multimap<Class<? extends TopiaEntity>, TopiaEntity> tmp = - ArrayListMultimap.create(); + ArrayListMultimap.create(); // pour tous les attributs rechecher les composites et les class d'asso // on les ajoute dans tmp @@ -1236,10 +1236,10 @@ addImport(result, type); type = TopiaGeneratorUtil.getSimpleName(type); String attrName = attr.getName(); - String getterName = getJavaBeanMethodName("get", attrName); - if (TopiaGeneratorUtil.isNMultiplicity(attr)) { - addImport(result, Collection.class); - body.append("" + String getterName = getJavaBeanMethodName("get", attrName); + if (TopiaGeneratorUtil.isNMultiplicity(attr)) { + addImport(result, Collection.class); + body.append("" /*{ { Collection<<%=type%>> ee = entity.<%=getterName%>(); if (ee != null) { @@ -1247,9 +1247,9 @@ } } }*/ - ); - } else { - body.append("" + ); + } else { + body.append("" /*{ { <%=type%> ee = entity.<%=getterName%>(); if (ee != null) { @@ -1257,8 +1257,8 @@ } } }*/ - ); - } + ); + } } // add association attributes @@ -1267,14 +1267,14 @@ TopiaGeneratorUtil.getEntityAttributes( input, model, TopiaGeneratorUtil.IS_ATTRIBUTE_REFERENCE_CLASSIFIER, - TopiaGeneratorUtil.IS_ATTRIBUTE_HAS_ASSOCIATION_CLASS); - for (ObjectModelAttribute attr : associationAttributes ) { + TopiaGeneratorUtil.IS_ATTRIBUTE_HAS_ASSOCIATION_CLASS, + TopiaGeneratorUtil.IS_ATTRIBUTE_NAVIGABLE); + for (ObjectModelAttribute attr : associationAttributes) { String assocClassFQN = attr.getAssociationClass().getQualifiedName(); addImport(result, assocClassFQN); assocClassFQN = TopiaGeneratorUtil.getSimpleName(assocClassFQN); - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName( - attr); + String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); String getterName = getJavaBeanMethodName("get", TopiaGeneratorUtil.toLowerCaseFirstLetter( assocAttrName)); if (!TopiaGeneratorUtil.isNMultiplicity(attr)) { @@ -1289,8 +1289,6 @@ ); } else { - - ObjectModelAttribute reverse = attr.getReverseAttribute(); String reverseAttrName = reverse.getName(); // On utilise pas l'attribut car il est potentiellement @@ -1316,7 +1314,7 @@ }*/ ); } - } + } // merge all results @@ -1350,7 +1348,7 @@ StringBuilder body = new StringBuilder("" /*{ Multimap<Class<? extends TopiaEntity>, TopiaEntity> tmp = - ArrayListMultimap.create(); + ArrayListMultimap.create(); // pour tous les attributs rechecher les aggregates // on les ajoute dans tmp 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-07-03 15:40:43 UTC (rev 2599) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2012-07-04 08:03:07 UTC (rev 2600) @@ -1840,6 +1840,13 @@ } }; + public static final Predicate<ObjectModelAttribute> IS_ATTRIBUTE_NAVIGABLE = new Predicate<ObjectModelAttribute>() { + @Override + public boolean apply(ObjectModelAttribute input) { + return input.isNavigable(); + } + }; + public static class AttributeIsEntity implements Predicate<ObjectModelAttribute> { private final ObjectModel model; Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo =================================================================== (Binary files differ)

1 0

r2599 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by athimel＠users.nuiton.org 03 Jul '12

03 Jul '12

Author: athimel Date: 2012-07-03 17:40:43 +0200 (Tue, 03 Jul 2012) New Revision: 2599 Url: http://nuiton.org/repositories/revision/topia/2599 Log: Whatever 1 or N multiplicity : Association class always has 1-multiplicity attributes Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 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-07-03 12:24:53 UTC (rev 2598) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2012-07-03 15:40:43 UTC (rev 2599) @@ -438,11 +438,8 @@ (ObjectModelAssociationClass) clazz; for (ObjectModelAttribute attr : assocClass.getParticipantsAttributes()) { if (attr != null) { - if (!GeneratorUtil.isNMultiplicity(attr)) { - generateNoNMultiplicity(clazzName, daoAbstractClass, attr, true); - } else { - generateNMultiplicity(clazzName, daoAbstractClass, attr); - } + // Whatever 1 or N multiplicity : Association class always has 1 multiplicity attributes + generateNoNMultiplicity(clazzName, daoAbstractClass, attr, true); } } }

1 0

r2598 - branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator
by athimel＠users.nuiton.org 03 Jul '12

03 Jul '12

Author: athimel Date: 2012-07-03 14:24:53 +0200 (Tue, 03 Jul 2012) New Revision: 2598 Url: http://nuiton.org/repositories/revision/topia/2598 Log: Fix association class DAO generation Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2012-07-03 12:24:04 UTC (rev 2597) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2012-07-03 12:24:53 UTC (rev 2598) @@ -966,11 +966,20 @@ boolean isAssoc) { String attrName = attr.getName(); String attrType = attr.getType(); - String propertyName = attrName; + String propertyName = clazzName + "." + getConstantName(attrName); if (!isAssoc && attr.hasAssociationClass()) { - propertyName = TopiaGeneratorUtil.toLowerCaseFirstLetter( - attr.getAssociationClass().getName()) + '.' + propertyName; + String assocClassName = attr.getAssociationClass().getName(); + String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + // It is about transitivity : use the property to access the + // associationClass + '.' + the property to access the expected + // attribute + // <class>.<attrAssoc> + '.' + <assocClass>.<attr> + propertyName = + clazzName + '.' + getConstantName(assocAttrName) + + " + '.' + " + + assocClassName + '.' + getConstantName(attrName); } + ObjectModelOperation op; op = addOperation(result, getJavaBeanMethodName("findBy", attrName), @@ -980,7 +989,7 @@ addParameter(op, attrType, "v"); setOperationBody(op, "" /*{ - E result = findByProperty(<%=clazzName + "." + getConstantName(propertyName)%>, v); + E result = findByProperty(<%=propertyName%>, v); return result; }*/ ); @@ -993,14 +1002,16 @@ addParameter(op, attrType, "v"); setOperationBody(op, "" /*{ - List<E> result = findAllByProperty(<%=clazzName + "." + getConstantName(propertyName)%>, v); + List<E> result = findAllByProperty(<%=propertyName%>, v); return result; }*/ ); - if (attr.hasAssociationClass()) { + if (!isAssoc && attr.hasAssociationClass()) { String assocClassName = attr.getAssociationClass().getName(); String assocClassFQN = attr.getAssociationClass().getQualifiedName(); + String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + String assocPropertyConstantName = getConstantName(assocAttrName); op = addOperation(result, getJavaBeanMethodName("findBy", assocClassName), "E", @@ -1009,7 +1020,7 @@ addParameter(op, assocClassFQN, "value"); setOperationBody(op, "" /*{ - E result = findByProperty(<%=clazzName + "." + getConstantName(TopiaGeneratorUtil.toLowerCaseFirstLetter(assocClassName))%>, value); + E result = findByProperty(<%=clazzName + "." + assocPropertyConstantName%>, value); return result; }*/ ); @@ -1022,7 +1033,7 @@ addParameter(op, assocClassFQN, "value"); setOperationBody(op, "" /*{ - List<E> result = findAllByProperty(<%=clazzName + "." + getConstantName(TopiaGeneratorUtil.toLowerCaseFirstLetter(assocClassName))%>, value); + List<E> result = findAllByProperty(<%=clazzName + "." + assocPropertyConstantName%>, value); return result; }*/ );

1 0