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

r2510 - trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck
by athimel＠users.nuiton.org 23 May '12

23 May '12

Author: athimel Date: 2012-05-23 15:25:13 +0200 (Wed, 23 May 2012) New Revision: 2510 Url: http://nuiton.org/repositories/revision/topia/2510 Log: Remove obsolete test suites Removed: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/TopiaTckItTestSuite.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/TopiaTckLegacyTestSuite.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/TopiaTckMappingTestSuite.java Deleted: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/TopiaTckItTestSuite.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/TopiaTckItTestSuite.java 2012-05-23 13:22:05 UTC (rev 2509) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/TopiaTckItTestSuite.java 2012-05-23 13:25:13 UTC (rev 2510) @@ -1,35 +0,0 @@ -package org.nuiton.topia.tck; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.nuiton.topia.TopiaContextFactoryTest; -import org.nuiton.topia.tck.it.EnumTest; -import org.nuiton.topia.tck.it.deletetest.DeleteEntityTest; -import org.nuiton.topia.tck.it.events.VetoableEventTest; -import org.nuiton.topia.tck.it.generator.CompositeAssociationTest; -import org.nuiton.topia.tck.it.persistence.EntityVisitorExportXmlTest; -import org.nuiton.topia.tck.it.persistence.NaturalIdTest; -import org.nuiton.topia.tck.legacy.ano1882.DAOAbstractTransformerTest; -import org.nuiton.topia.tck.legacy.evo1912.EntityDTOTransformerTest; -import org.nuiton.topia.tck.legacy.framework.TopiaContextReplicateTest; -import org.nuiton.topia.tck.legacy.framework.TopiaUtilTest; - -/** - * @author Arnaud Thimel <thimel(a)codelutin.com> - */ -(a)RunWith(Suite.class) -(a)Suite.SuiteClasses({ - DAOAbstractTransformerTest.class, - EntityDTOTransformerTest.class, - TopiaContextReplicateTest.class, - TopiaUtilTest.class, - CompositeAssociationTest.class, - DeleteEntityTest.class, - EntityVisitorExportXmlTest.class, - NaturalIdTest.class, - TopiaContextFactoryTest.class, - EnumTest.class, - VetoableEventTest.class}) -public abstract class TopiaTckItTestSuite { - -} Deleted: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/TopiaTckLegacyTestSuite.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/TopiaTckLegacyTestSuite.java 2012-05-23 13:22:05 UTC (rev 2509) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/TopiaTckLegacyTestSuite.java 2012-05-23 13:25:13 UTC (rev 2510) @@ -1,29 +0,0 @@ -package org.nuiton.topia.tck; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.nuiton.topia.tck.legacy.ano1882.DAOAbstractTransformerTest; -import org.nuiton.topia.tck.legacy.ano1991.TopiaQueryAnno1991Test; -import org.nuiton.topia.tck.legacy.evo1912.EntityDTOTransformerTest; -import org.nuiton.topia.tck.legacy.framework.TopiaContextReplicateTest; -import org.nuiton.topia.tck.legacy.framework.TopiaUtilTest; - -/** - * Test suite for {@code mapping} model. - * <p/> - * Just implements this in dedicated module to have all this tests runned. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 3.0 - */ -(a)RunWith(Suite.class) -(a)Suite.SuiteClasses( - {DAOAbstractTransformerTest.class, - TopiaQueryAnno1991Test.class, - EntityDTOTransformerTest.class, - TopiaContextReplicateTest.class, - TopiaUtilTest.class - } -) -public abstract class TopiaTckLegacyTestSuite { -} Deleted: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/TopiaTckMappingTestSuite.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/TopiaTckMappingTestSuite.java 2012-05-23 13:22:05 UTC (rev 2509) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/TopiaTckMappingTestSuite.java 2012-05-23 13:25:13 UTC (rev 2510) @@ -1,65 +0,0 @@ -package org.nuiton.topia.tck; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.nuiton.topia.tck.mapping.test1.BiDirectionalOneToManyRelationTest; -import org.nuiton.topia.tck.mapping.test1.BiDirectionalOneToManyRelationWithRoleNamedTest; -import org.nuiton.topia.tck.mapping.test1.SimpleOneToManyRelationTest; -import org.nuiton.topia.tck.mapping.test1.SimpleOneToManyRelationWithRoleNamedTest; -import org.nuiton.topia.tck.mapping.test2.BiDirectionalManyToOneRelationTest; -import org.nuiton.topia.tck.mapping.test2.BiDirectionalManyToOneRelationWithRoleNamedTest; -import org.nuiton.topia.tck.mapping.test2.SimpleManyToOneRelationTest; -import org.nuiton.topia.tck.mapping.test2.SimpleManyToOneRelationWithRoleNamedTest; -import org.nuiton.topia.tck.mapping.test3.BiDirectionalManyToManyRelationTest; -import org.nuiton.topia.tck.mapping.test3.BiDirectionalManyToManyRelationWithRoleNamedTest; -import org.nuiton.topia.tck.mapping.test3.SimpleManyToManyRelationTest; -import org.nuiton.topia.tck.mapping.test3.SimpleManyToManyRelationWithRoleNamedTest; -import org.nuiton.topia.tck.mapping.test4.ElementCollectionTest; -import org.nuiton.topia.tck.mapping.test5.BiDirectionalOneToManyCompositionTest; -import org.nuiton.topia.tck.mapping.test5.OneToManyCompositionTest; -import org.nuiton.topia.tck.mapping.test6.SimpleOneToManyIndexedTest; -import org.nuiton.topia.tck.mapping.test6.SimpleOneToManyWithRoleNamedIndexedTest; - -/** - * Test suite for {@code mapping} model. - * <p/> - * To use this test suite in your jpa implementation of topia-persistence, - * just implements this class with nothing more, like this: - * <pre> - * public class TopiaTckMappingHibernateTest extends TopiaTckMappingTestSuite { - * } - * </pre> - * - * @author tchemit <chemit(a)codelutin.com> - * @since 3.0 - */ -(a)RunWith(Suite.class) -(a)Suite.SuiteClasses( - { - // test1 - SimpleOneToManyRelationTest.class, - SimpleOneToManyRelationWithRoleNamedTest.class, - BiDirectionalOneToManyRelationTest.class, - BiDirectionalOneToManyRelationWithRoleNamedTest.class, - // test2 - SimpleManyToOneRelationTest.class, - SimpleManyToOneRelationWithRoleNamedTest.class, - BiDirectionalManyToOneRelationTest.class, - BiDirectionalManyToOneRelationWithRoleNamedTest.class, - // test3 - SimpleManyToManyRelationTest.class, - SimpleManyToManyRelationWithRoleNamedTest.class, - BiDirectionalManyToManyRelationTest.class, - BiDirectionalManyToManyRelationWithRoleNamedTest.class, - //test 4 - ElementCollectionTest.class, - // test 5 - OneToManyCompositionTest.class, - BiDirectionalOneToManyCompositionTest.class, - // test 6 - SimpleOneToManyIndexedTest.class, - SimpleOneToManyWithRoleNamedIndexedTest.class - } -) -public abstract class TopiaTckMappingTestSuite { -}

1 0

r2509 - trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia
by athimel＠users.nuiton.org 23 May '12

23 May '12

Author: athimel Date: 2012-05-23 15:22:05 +0200 (Wed, 23 May 2012) New Revision: 2509 Url: http://nuiton.org/repositories/revision/topia/2509 Log: Remove TCK folder Removed: trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/tck/

1 0

r2508 - trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/tck
by athimel＠users.nuiton.org 23 May '12

23 May '12

Author: athimel Date: 2012-05-23 15:20:16 +0200 (Wed, 23 May 2012) New Revision: 2508 Url: http://nuiton.org/repositories/revision/topia/2508 Log: Remove tck suites Removed: trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/tck/TopiaTckItHibernateTest.java trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/tck/TopiaTckLegacyHibernateTest.java trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/tck/TopiaTckMappingHibernateTest.java Deleted: trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/tck/TopiaTckItHibernateTest.java =================================================================== --- trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/tck/TopiaTckItHibernateTest.java 2012-05-23 13:19:33 UTC (rev 2507) +++ trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/tck/TopiaTckItHibernateTest.java 2012-05-23 13:20:16 UTC (rev 2508) @@ -1,12 +0,0 @@ -package org.nuiton.topia.tck; - -/** - * Launch {@link TopiaTckItTestSuite}. - * - * Do not remove even if empty : this class represents the TCK IT tests - * for topia-persistence-hibernate module - * - * @author Arnaud Thimel <thimel(a)codelutin.com> - */ -public class TopiaTckItHibernateTest extends TopiaTckItTestSuite { -} Deleted: trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/tck/TopiaTckLegacyHibernateTest.java =================================================================== --- trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/tck/TopiaTckLegacyHibernateTest.java 2012-05-23 13:19:33 UTC (rev 2507) +++ trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/tck/TopiaTckLegacyHibernateTest.java 2012-05-23 13:20:16 UTC (rev 2508) @@ -1,10 +0,0 @@ -package org.nuiton.topia.tck; - -/** - * Launch {@link TopiaTckLegacyTestSuite}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 3.0 - */ -public class TopiaTckLegacyHibernateTest extends TopiaTckLegacyTestSuite { -} Deleted: trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/tck/TopiaTckMappingHibernateTest.java =================================================================== --- trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/tck/TopiaTckMappingHibernateTest.java 2012-05-23 13:19:33 UTC (rev 2507) +++ trunk/topia-persistence-hibernate/src/test/java/org/nuiton/topia/tck/TopiaTckMappingHibernateTest.java 2012-05-23 13:20:16 UTC (rev 2508) @@ -1,40 +0,0 @@ -package org.nuiton.topia.tck; - -import org.junit.runners.Suite; -import org.nuiton.topia.tck.mapping.test1.SimpleOneToManyRelationTest; - -/** - * Launch {@link TopiaTckMappingTestSuite}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 3.0 - */ -//(a)Suite.SuiteClasses( -// { -// // test1 -// SimpleOneToManyRelationTest.class, -// SimpleOneToManyRelationWithRoleNamedTest.class, -// BiDirectionalOneToManyRelationTest.class, -// BiDirectionalOneToManyRelationWithRoleNamedTest.class, -// // test2 -// SimpleManyToOneRelationTest.class, -// SimpleManyToOneRelationWithRoleNamedTest.class, -// BiDirectionalManyToOneRelationTest.class, -// BiDirectionalManyToOneRelationWithRoleNamedTest.class, -// // test3 -// SimpleManyToManyRelationTest.class, -// SimpleManyToManyRelationWithRoleNamedTest.class, -// BiDirectionalManyToManyRelationTest.class, -// BiDirectionalManyToManyRelationWithRoleNamedTest.class, -// //test 4 -// ElementCollectionTest.class, -// // test 5 -// OneToManyCompositionTest.class, -// BiDirectionalOneToManyCompositionTest.class, -// // test 6 -// SimpleOneToManyIndexedTest.class, -// SimpleOneToManyWithRoleNamedIndexedTest.class -// } -//) -public class TopiaTckMappingHibernateTest extends TopiaTckMappingTestSuite { -}

1 0

r2507 - trunk/topia-persistence/src/main/resources
by tchemit＠users.nuiton.org 23 May '12

23 May '12

Author: tchemit Date: 2012-05-23 15:19:33 +0200 (Wed, 23 May 2012) New Revision: 2507 Url: http://nuiton.org/repositories/revision/topia/2507 Log: refs #2088: remove i18n from ToPIA Removed: trunk/topia-persistence/src/main/resources/i18n/

1 0

r2506 - in trunk/topia-persistence-tck/src: main/java/org/nuiton/topia test/java/org/nuiton/topia
by athimel＠users.nuiton.org 23 May '12

23 May '12

Author: athimel Date: 2012-05-23 15:19:06 +0200 (Wed, 23 May 2012) New Revision: 2506 Url: http://nuiton.org/repositories/revision/topia/2506 Log: Move tck tests to src/test Added: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/ Removed: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/

1 0

r2505 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org 23 May '12

23 May '12

Author: tchemit Date: 2012-05-23 15:18:06 +0200 (Wed, 23 May 2012) New Revision: 2505 Url: http://nuiton.org/repositories/revision/topia/2505 Log: use new classes Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2012-05-23 13:17:19 UTC (rev 2504) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2012-05-23 13:18:06 UTC (rev 2505) @@ -30,6 +30,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaUtil; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; @@ -126,17 +127,12 @@ * @param <E> le type de l'entité * @return l'entité trouvée, ou <code>null</code> si elle n'est pas * trouvée. + * @deprecated since 3.0, use now {@link TopiaUtil#getEntityByTopiaId(Collection, String)} */ + @Deprecated public static <E extends TopiaEntity> E getEntityByTopiaId( Collection<E> entities, String topiaId) { - if (entities != null) { - for (E e : entities) { - if (topiaId.equals(e.getTopiaId())) { - return e; - } - } - } - return null; + return TopiaUtil.getEntityByTopiaId(entities, topiaId); } /** @@ -960,6 +956,7 @@ } return ids; } + /** * Construit une list d'entite dont les ids sont tous dans la liste d'ids * donnee. @@ -1085,7 +1082,7 @@ Set<Class<? extends TopiaEntity>> interfaces, Class<? extends TopiaEntity> klass) { Iterator<Class<? extends TopiaEntity>> iterator = interfaces.iterator(); - for (; iterator.hasNext();) { + for (; iterator.hasNext(); ) { Class<? extends TopiaEntity> next = iterator.next(); if (next.isAssignableFrom(klass)) { // cette interface herite de klass

1 0

r2504 - in trunk/topia-persistence-tck/src/main: java/org/nuiton/topia/tck/mapping/test7 xmi
by tchemit＠users.nuiton.org 23 May '12

23 May '12

Author: tchemit Date: 2012-05-23 15:17:19 +0200 (Wed, 23 May 2012) New Revision: 2504 Url: http://nuiton.org/repositories/revision/topia/2504 Log: new mapping tests Added: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderByTest.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderedTest.java Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo Added: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderByTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderByTest.java (rev 0) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderByTest.java 2012-05-23 13:17:19 UTC (rev 2504) @@ -0,0 +1,104 @@ +package org.nuiton.topia.tck.mapping.test7; + +import com.google.common.collect.Lists; +import junit.framework.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.Collection; +import java.util.Iterator; +import java.util.List; + +/** + * Tests the tag-value {@code ordere-by} on a {@code OneToMany} relation. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class SimpleOneToManyOrderByTest extends AbstractMappingTest { + + protected TopiaContext tx; + + protected A71DAO aDAO; + + protected B71DAO bDAO; + + @Before + public void before() throws TopiaException { + tx = db.beginTransaction(); + aDAO = getDAO(tx, A71.class); + bDAO = getDAO(tx, B71.class); + } + + @Test + public void create() throws TopiaException { + + long nbA = aDAO.count(); + long nbB = bDAO.count(); + + Assert.assertEquals(0, nbA); + Assert.assertEquals(0, nbB); + + A71 a = aDAO.create(); + B71 b = bDAO.create(B71.PROPERTY_NAME, "A"); + B71 b2 = bDAO.create(B71.PROPERTY_NAME, "B"); + B71 b3 = bDAO.create(B71.PROPERTY_NAME, "C"); + + a.addB71(b); + a.addB71(b2); + + tx.commitTransaction(); + + nbA = aDAO.count(); + nbB = bDAO.count(); + + Assert.assertEquals(1, nbA); + Assert.assertEquals(3, nbB); + + A71 aBis = aDAO.findByTopiaId(a.getTopiaId()); + Assert.assertEquals(a, aBis); + Assert.assertEquals(2, aBis.sizeB71()); + Collection<B71> bs = aBis.getB71(); + Iterator<B71> iterator = bs.iterator(); + Assert.assertEquals(b, iterator.next()); + Assert.assertEquals(b2, iterator.next()); + + // change order + List<B71> bsBis; + + bsBis = Lists.newArrayList(); + bsBis.add(b2); + bsBis.add(b); + a.setB71(bsBis); + tx.commitTransaction(); + + aBis = aDAO.findByTopiaId(a.getTopiaId()); + Assert.assertEquals(a, aBis); + Assert.assertEquals(2, aBis.sizeB71()); + bs = aBis.getB71(); + iterator = bs.iterator(); + Assert.assertEquals(b, iterator.next()); + Assert.assertEquals(b2, iterator.next()); + + // rechange order + + bsBis = Lists.newArrayList(); + bsBis.add(b3); + bsBis.add(b2); + bsBis.add(b); + a.setB71(bsBis); + tx.commitTransaction(); + + aBis = aDAO.findByTopiaId(a.getTopiaId()); + Assert.assertEquals(a, aBis); + Assert.assertEquals(3, aBis.sizeB71()); + bs = aBis.getB71(); + iterator = bs.iterator(); + Assert.assertEquals(b, iterator.next()); + Assert.assertEquals(b2, iterator.next()); + Assert.assertEquals(b3, iterator.next()); + } +} \ No newline at end of file Added: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderedTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderedTest.java (rev 0) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderedTest.java 2012-05-23 13:17:19 UTC (rev 2504) @@ -0,0 +1,99 @@ +package org.nuiton.topia.tck.mapping.test7; + +import com.google.common.collect.Lists; +import junit.framework.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; + +/** + * Tests the stereotype {@code orderered} on a {@code OneToMany} relation. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class SimpleOneToManyOrderedTest extends AbstractMappingTest { + + protected TopiaContext tx; + + protected A7DAO aDAO; + + protected B7DAO bDAO; + + @Before + public void before() throws TopiaException { + tx = db.beginTransaction(); + aDAO = getDAO(tx, A7.class); + bDAO = getDAO(tx, B7.class); + } + + @Test + public void create() throws TopiaException { + + long nbA = aDAO.count(); + long nbB = bDAO.count(); + + Assert.assertEquals(0, nbA); + Assert.assertEquals(0, nbB); + + A7 a = aDAO.create(); + B7 b = bDAO.create(); + B7 b2 = bDAO.create(); + B7 b3 = bDAO.create(); + + a.addB7(b); + a.addB7(b2); + + tx.commitTransaction(); + + nbA = aDAO.count(); + nbB = bDAO.count(); + + Assert.assertEquals(1, nbA); + Assert.assertEquals(3, nbB); + + A7 aBis = aDAO.findByTopiaId(a.getTopiaId()); + Assert.assertEquals(a, aBis); + Assert.assertEquals(2, aBis.sizeB7()); + List<B7> bs = aBis.getB7(); + Assert.assertEquals(b, bs.get(0)); + Assert.assertEquals(b2, bs.get(1)); + + // change order + List<B7> bsBis; + + bsBis = Lists.newArrayList(); + bsBis.add(b2); + bsBis.add(b); + a.setB7(bsBis); + tx.commitTransaction(); + + aBis = aDAO.findByTopiaId(a.getTopiaId()); + Assert.assertEquals(a, aBis); + Assert.assertEquals(2, aBis.sizeB7()); + bs = aBis.getB7(); + Assert.assertEquals(b2, bs.get(0)); + Assert.assertEquals(b, bs.get(1)); + + // rechange order + + bsBis = Lists.newArrayList(); + bsBis.add(b3); + bsBis.add(b2); + bsBis.add(b); + a.setB7(bsBis); + tx.commitTransaction(); + + aBis = aDAO.findByTopiaId(a.getTopiaId()); + Assert.assertEquals(a, aBis); + Assert.assertEquals(3, aBis.sizeB7()); + bs = aBis.getB7(); + Assert.assertEquals(b3, bs.get(0)); + Assert.assertEquals(b2, bs.get(1)); + Assert.assertEquals(b, bs.get(2)); + } +} \ No newline at end of file Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo =================================================================== (Binary files differ)

1 0

r2503 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 23 May '12

23 May '12

Author: tchemit Date: 2012-05-23 15:16:45 +0200 (Wed, 23 May 2012) New Revision: 2503 Url: http://nuiton.org/repositories/revision/topia/2503 Log: use a List implementation when association is also orderBy since this is a natural behaviour Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 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-05-23 13:14:45 UTC (rev 2502) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2012-05-23 13:16:45 UTC (rev 2503) @@ -637,13 +637,16 @@ * Renvoie le type d'interface à utiliser en fonction de l'attribut * * @param attr l'attribut a traiter - * @return String + * @return le type d'interface à utiliser en fonction de l'attribut */ public static String getNMultiplicityInterfaceType( ObjectModelAttribute attr) { + //FIXME-tchemit 2012-05-23 : need to be rethink : could have unique + ordered if (hasUniqueStereotype(attr)) { return Set.class.getName(); - } else if (JavaGeneratorUtil.hasIndexedStereotype(attr) || attr.isOrdered()) { + } + if (JavaGeneratorUtil.hasIndexedStereotype(attr) || attr.isOrdered() || + StringUtils.isNotBlank(getOrderByTagValue(attr))) { return List.class.getName(); } return Collection.class.getName(); @@ -653,18 +656,20 @@ * Renvoie le type d'objet (instance) à utiliser en fonction de l'attribut * * @param attr l'attribut a traiter - * @return String + * @return le type d'objet (instance) à utiliser en fonction de l'attribut */ public static String getNMultiplicityObjectType(ObjectModelAttribute attr) { + //FIXME-tchemit 2012-05-23 : need to be rethink : could have unique + ordered if (hasUniqueStereotype(attr)) { return HashSet.class.getName(); - } else if (JavaGeneratorUtil.hasIndexedStereotype(attr) || attr.isOrdered()) { + } + if (JavaGeneratorUtil.hasIndexedStereotype(attr) || attr.isOrdered() || + StringUtils.isNotBlank(getOrderByTagValue(attr))) { //On considère qu'on ne sait pas traiter vraiment l'attribut "ordered" // puisqu'on va conserver l'ordre d'insertion, et non un ordre en // fonction d'un élément donné. Donc on renvoi une ArrayList return ArrayList.class.getName(); } - LinkedList.class.getName(); return ArrayList.class.getName(); }

1 0

r2502 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: framework generator persistence
by tchemit＠users.nuiton.org 23 May '12

23 May '12

Author: tchemit Date: 2012-05-23 15:14:45 +0200 (Wed, 23 May 2012) New Revision: 2502 Url: http://nuiton.org/repositories/revision/topia/2502 Log: use new classes Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2012-05-23 13:13:13 UTC (rev 2501) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2012-05-23 13:14:45 UTC (rev 2502) @@ -24,6 +24,9 @@ */ package org.nuiton.topia.framework; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaNotFoundException; @@ -32,6 +35,7 @@ import org.nuiton.util.Resource; import java.net.URL; +import java.util.Collection; import java.util.Properties; import java.util.StringTokenizer; import java.util.regex.Pattern; @@ -138,6 +142,26 @@ return buffer.substring(2); } + /** + * Get Récupère une entité dans une liste d'entités à partir de son {@link + * TopiaEntity#getTopiaId()}. + * + * @param entities la liste des entités à scanner + * @param topiaId l'id de l'entité recherchée + * @param <E> le type de l'entité + * @return l'entité trouvée, ou <code>null</code> si elle n'est pas + * trouvée. + */ + public static <E extends TopiaEntity> E getEntityByTopiaId( + Collection<E> entities, String topiaId) { + E result = null; + if (CollectionUtils.isNotEmpty(entities)) { + Predicate<E> predicate = TopiaPredicates.newTopiaIdEquals(topiaId); + result = Iterables.find(entities, predicate); + } + return result; + } + // /** // * Test si une entite donnee correspondant a une configuration existe en // * base. 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-05-23 13:13:13 UTC (rev 2501) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2012-05-23 13:14:45 UTC (rev 2502) @@ -40,6 +40,7 @@ import org.nuiton.eugene.models.object.ObjectModelParameter; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaUtil; import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityAbstract; @@ -1068,11 +1069,11 @@ ObjectModelOperation implOperation = createImplOperation(interfaceOperation); - addImport(outputAbstract, TopiaEntityHelper.class); + addImport(outputAbstract, TopiaUtil.class); setOperationBody(implOperation, "" /*{ - return TopiaEntityHelper.getEntityByTopiaId(<%=attrName%>, topiaId); + return TopiaUtil.getEntityByTopiaId(<%=attrName%>, topiaId); }*/ ); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java 2012-05-23 13:13:13 UTC (rev 2501) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java 2012-05-23 13:14:45 UTC (rev 2502) @@ -45,16 +45,19 @@ import java.util.logging.Logger; /** - * TODO-fdesbois-20100508 : Need translation of javadoc. - * * Classe representant un Id, utilisable par JDO. Cette classe contient aussi un ensemble de methode - * static utile pour la manipulation des topiaId + * static utile pour la manipulation des topiaId. + * <p/> + * Classe dépréciée depuis la versiob 3.0 car en fait on n'a juste besoin de + * méthodes utilitaires autour du topiaId et rien d'autre. * * @author poussin <poussing(a)codelutin.com> * @author tchemit <tchemit(a)codelutin.com> * @author chatellier <chatellier(a)codelutin.com> * @version $Id$ + * @deprecated since 3.0, use instead {@link TopiaIdUtil}. */ +@Deprecated public class TopiaId implements Serializable { // TopiaId /** */ @@ -95,18 +98,11 @@ * * @param clazz * @return a generated topiaId + * @deprecated since 3.0, use instead {@link TopiaIdUtil#create(Class)} */ + @Deprecated public static String create(Class clazz) { - if (!clazz.isInterface()) { - throw new IllegalArgumentException( - "Only interface is permit to create id: " + clazz); - } - double random = Math.random(); - while (Double.toString(random).contains("E-")) { - random = Math.random(); - } - return clazz.getName() + '#' + System.currentTimeMillis() + '#' - + random; + return TopiaIdUtil.create(clazz); } /** @@ -115,17 +111,12 @@ * @param topiaId * @return class * @throws TopiaNotFoundException + * @deprecated since 3.0, use instead {@link TopiaIdUtil#getClassName(String)} */ + @Deprecated public static Class getClassName(String topiaId) throws TopiaNotFoundException { - String classname = getClassNameAsString(topiaId); - try { - Class result = Class.forName(classname); - return result; - } catch (ClassNotFoundException eee) { - throw new TopiaNotFoundException("Can't find class for " + topiaId, - eee); - } + return TopiaIdUtil.getClassName(topiaId); } /** @@ -134,14 +125,11 @@ * * @param topiaId * @return class name + * @deprecated since 3.0, use instead {@link TopiaIdUtil#getClassNameAsString(String)} */ + @Deprecated public static String getClassNameAsString(String topiaId) { - String result = ""; - int i = topiaId.indexOf('#'); - if (i > 0) { - result = topiaId.substring(0, i); - } - return result; + return TopiaIdUtil.getClassNameAsString(topiaId); } /** @@ -151,20 +139,11 @@ * * @param topiaId * @return is valid topiaId + * @deprecated since 3.0, use instead {@link TopiaIdUtil#isValidId(String)} */ + @Deprecated public static boolean isValidId(String topiaId) { - try { - if (topiaId.matches(".*?#[0-9]+#[0-9.]+")) { - getClassName(topiaId); - return true; - } - return false; - } catch (Exception eee) { - //TODO-TC20100225 : use commons-loggin api instead of jdk one - Logger.getLogger(TopiaId.class.getName() + ".isValidId").log( - Level.WARNING, "Error during verfication of topiaId", eee); - return false; - } + return TopiaIdUtil.isValidId(topiaId); } } // TopiaId

1 0

r2501 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: framework persistence
by tchemit＠users.nuiton.org 23 May '12

23 May '12

Author: tchemit Date: 2012-05-23 15:13:13 +0200 (Wed, 23 May 2012) New Revision: 2501 Url: http://nuiton.org/repositories/revision/topia/2501 Log: introduces new classes Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFunctions.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPredicates.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdUtil.java Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFunctions.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFunctions.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFunctions.java 2012-05-23 13:13:13 UTC (rev 2501) @@ -0,0 +1,20 @@ +package org.nuiton.topia.framework; + +import com.google.common.base.Function; +import org.nuiton.topia.persistence.TopiaEntity; + +/** + * All {@link Function} used by ToPIA. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class TopiaFunctions { + + public static final Function<TopiaEntity, String> GET_TOPIA_ID = new Function<TopiaEntity, String>() { + @Override + public String apply(TopiaEntity input) { + return input.getTopiaId(); + } + }; +} Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPredicates.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPredicates.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaPredicates.java 2012-05-23 13:13:13 UTC (rev 2501) @@ -0,0 +1,22 @@ +package org.nuiton.topia.framework; + +import com.google.common.base.Predicate; +import org.nuiton.topia.persistence.TopiaEntity; + +/** + * Useful {@link Predicate} used by ToPIA. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class TopiaPredicates { + + public static <E extends TopiaEntity> Predicate<E> newTopiaIdEquals(final String topiaId) { + return new Predicate<E>() { + @Override + public boolean apply(E input) { + return topiaId.equals(TopiaFunctions.GET_TOPIA_ID.apply(input)); + } + }; + } +} Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdUtil.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdUtil.java 2012-05-23 13:13:13 UTC (rev 2501) @@ -0,0 +1,147 @@ +package org.nuiton.topia.persistence; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaNotFoundException; + +import java.util.StringTokenizer; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.Pattern; + +/** + * Useful methods around the {@code topia-id}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class TopiaIdUtil { + + /** Logger. */ + private static final Log log = LogFactory.getLog(TopiaIdUtil.class); + + protected TopiaIdUtil() { + // util class should not be instanciated + } + + /** + * Cree un topiaId pour une certaine classe + * + * @param clazz + * @return a generated topiaId + */ + public static String create(Class clazz) { + if (!clazz.isInterface()) { + throw new IllegalArgumentException( + "Only interface is permit to create id: " + clazz); + } + double random = Math.random(); + while (Double.toString(random).contains("E-")) { + random = Math.random(); + } + return clazz.getName() + '#' + System.currentTimeMillis() + '#' + + random; + } + + /** + * Extrait la classe du topiaId. + * + * @param topiaId + * @return class + * @throws TopiaNotFoundException if could not find + */ + public static Class getClassName(String topiaId) + throws TopiaNotFoundException { + String classname = getClassNameAsString(topiaId); + try { + Class result = Class.forName(classname); + return result; + } catch (ClassNotFoundException eee) { + throw new TopiaNotFoundException("Can't find class for " + topiaId, + eee); + } + } + + /** + * Return class name id topiaId is id, and empty string if topiaId is not an + * id. + * + * @param topiaId + * @return class name + */ + public static String getClassNameAsString(String topiaId) { + String result = ""; + int i = topiaId.indexOf('#'); + if (i > 0) { + result = topiaId.substring(0, i); + } + return result; + } + + /** + * Verifie si l'id passé en paramètre est bien un Id topia, c-a-d si la + * forme est bien classname#timemillis#random et si le classname est celui + * d'une classe valide, c-a-d que le systeme arrive a trouver. + * + * @param topiaId + * @return is valid topiaId + */ + public static boolean isValidId(String topiaId) { + try { + if (topiaId.matches(".*?#[0-9]+#[0-9.]+")) { + getClassName(topiaId); + return true; + } + return false; + } catch (Exception eee) { + if (log.isWarnEnabled()) { + log.warn("Error during verfication of topiaId", eee); + } + return false; + } + } + + /** + * Compute a regex pattern given a format string. + * <p/> + * A {@link String#format(String, Object...)} will be apply to + * <code>format</code>, with for parameters the list of <code>klass</code> + * transformed in topia pattern via method {@link #getTopiaIdPattern(Class)} + * ready to be capture (enclosed by ()). + * + * @param format the format + * @param classes the list of class to use + * @return the pattern computed + */ + public static Pattern getTopiaPattern(String format, + Class<? extends TopiaEntity>... classes) { + String[] entityPatterns = new String[classes.length]; + for (int i = 0; i < classes.length; i++) { + Class<? extends TopiaEntity> aClass = classes[i]; + entityPatterns[i] = "(" + getTopiaIdPattern(aClass) + ")"; + } + String s = String.format(format, (Object[]) entityPatterns); + if (log.isDebugEnabled()) { + log.debug(s); + } + return Pattern.compile(s); + } + + /** + * Compute the pattern to be used to capture a topia id for a given entity + * class. + * + * @param klass the entity class + * @return the pattern to capture a topia id for the given entity class. + */ + public static String getTopiaIdPattern(Class<? extends TopiaEntity> klass) { + StringBuilder buffer = new StringBuilder(); + StringTokenizer stk = new StringTokenizer(klass.getName(), "."); + while (stk.hasMoreTokens()) { + buffer.append("\\.").append(stk.nextToken()); + } + buffer.append("#(?:\\d+?)#(?:\\d+)\\.(?:\\d+)"); + return buffer.substring(2); + } + +}

1 0