Author: tchemit Date: 2012-05-23 17:42:02 +0200 (Wed, 23 May 2012) New Revision: 2518 Url: http://nuiton.org/repositories/revision/topia/2518 Log: - add logger in test - move some methods to TopiaUtil - fix mapping test Added: trunk/topia-persistence-tck/src/test/resources/log4j.properties Modified: trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-mapping.properties trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderByTest.java 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/TopiaPersistenceUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.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 14:23:29 UTC (rev 2517) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2012-05-23 15:42:02 UTC (rev 2518) @@ -26,6 +26,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -36,6 +37,7 @@ import java.net.URL; import java.util.Collection; +import java.util.List; import java.util.Properties; import java.util.StringTokenizer; import java.util.regex.Pattern; @@ -162,6 +164,33 @@ return result; } + /** + * Construit la liste des topiaId d'une liste donnée d'entités. + * + * @param entities la liste des entités + * @return la liste des topiaId + */ + public static List<String> getTopiaIdList( + List<? extends TopiaEntity> entities) { + List<String> ids = Lists.transform(entities, + TopiaFunctions.GET_TOPIA_ID); + return ids; + } + + /** + * Construit un tableau des topiaId d'une liste donnée d'entités. + * + * @param entities la liste des entités + * @return le tableau des topiaId + * @since 2.5.2 + */ + public static String[] getTopiaIdArray( + List<? extends TopiaEntity> entities) { + List<String> list = getTopiaIdList(entities); + String[] ids = list.toArray(new String[list.size()]); + return ids; + } + // /** // * 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 14:23:29 UTC (rev 2517) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2012-05-23 15:42:02 UTC (rev 2518) @@ -45,7 +45,6 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityAbstract; import org.nuiton.topia.persistence.TopiaEntityContextable; -import org.nuiton.topia.persistence.util.TopiaEntityHelper; import java.util.ArrayList; import java.util.Collection; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceUtil.java 2012-05-23 14:23:29 UTC (rev 2517) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceUtil.java 2012-05-23 15:42:02 UTC (rev 2518) @@ -12,7 +12,6 @@ // no constructor for a util class } - /** * Obtain the *entity* contract from a given class. * <p/> 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 14:23:29 UTC (rev 2517) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2012-05-23 15:42:02 UTC (rev 2518) @@ -930,14 +930,12 @@ * * @param entities la liste des entités * @return la liste des topiaId + * @deprecated since 3.0, use instead {@link TopiaUtil#getTopiaIdList(List)} */ + @Deprecated public static List<String> getTopiaIdList( List<? extends TopiaEntity> entities) { - List<String> ids = new ArrayList<String>(entities.size()); - for (TopiaEntity entity : entities) { - ids.add(entity.getTopiaId()); - } - return ids; + return TopiaUtil.getTopiaIdList(entities); } /** @@ -946,7 +944,9 @@ * @param entities la liste des entités * @return le tableau des topiaId * @since 2.5.2 + * @deprecated since 3.0, use instead {@link TopiaUtil#getTopiaIdArray(List)} */ + @Deprecated public static String[] getTopiaIdArray( List<? extends TopiaEntity> entities) { String[] ids = new String[entities.size()]; @@ -996,8 +996,8 @@ DiffState.DiffStateMap result = DiffState.newMap(); // construction des deux listes d'id - List<String> referentielIdList = getTopiaIdList(referentiel); - List<String> localeIdList = getTopiaIdList(locale); + List<String> referentielIdList = TopiaUtil.getTopiaIdList(referentiel); + List<String> localeIdList = TopiaUtil.getTopiaIdList(locale); for (E aReferentiel : referentiel) { TopiaEntity referentielEntity = aReferentiel; Modified: trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-mapping.properties =================================================================== --- trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-mapping.properties 2012-05-23 14:23:29 UTC (rev 2517) +++ trunk/topia-persistence-hibernate/src/test/resources/TopiaContext-mapping.properties 2012-05-23 15:42:02 UTC (rev 2518) @@ -1,7 +1,7 @@ # Proprietes par defaut pour une base de donnees de type H2 et le model mapping hibernate.hbm2ddl.auto=update -hibernate.show_sql=false - +hibernate.show_sql=true +hibernate.format_sql=true hibernate.dialect=org.hibernate.dialect.H2Dialect topia.use.hibernate.mapping.files=false Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderByTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderByTest.java 2012-05-23 14:23:29 UTC (rev 2517) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test7/SimpleOneToManyOrderByTest.java 2012-05-23 15:42:02 UTC (rev 2518) @@ -6,6 +6,7 @@ import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.tck.mapping.AbstractMappingTest; import java.util.Collection; @@ -72,9 +73,11 @@ bsBis = Lists.newArrayList(); bsBis.add(b2); bsBis.add(b); - a.setB71(bsBis); + aBis.setB71(bsBis); tx.commitTransaction(); + ((TopiaContextImplementor)tx).getEntityManager().clear(); + aBis = aDAO.findByTopiaId(a.getTopiaId()); Assert.assertEquals(a, aBis); Assert.assertEquals(2, aBis.sizeB71()); @@ -89,9 +92,11 @@ bsBis.add(b3); bsBis.add(b2); bsBis.add(b); - a.setB71(bsBis); + aBis.setB71(bsBis); tx.commitTransaction(); + ((TopiaContextImplementor)tx).getEntityManager().clear(); + aBis = aDAO.findByTopiaId(a.getTopiaId()); Assert.assertEquals(a, aBis); Assert.assertEquals(3, aBis.sizeB71()); Copied: trunk/topia-persistence-tck/src/test/resources/log4j.properties (from rev 2513, trunk/topia-persistence-hibernate/src/test/resources/log4j.properties) =================================================================== --- trunk/topia-persistence-tck/src/test/resources/log4j.properties (rev 0) +++ trunk/topia-persistence-tck/src/test/resources/log4j.properties 2012-05-23 15:42:02 UTC (rev 2518) @@ -0,0 +1,34 @@ +### +# #%L +# ToPIA :: Persistence +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +#This log is used to display trace in generation + +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.nuiton.topia=INFO Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2012-05-23 14:23:29 UTC (rev 2517) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2012-05-23 15:42:02 UTC (rev 2518) @@ -29,16 +29,15 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaUtil; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.EntityOperator; import org.nuiton.topia.persistence.util.TopiaEntityHelper; import org.nuiton.topia.replication.TopiaReplicationContext; import org.nuiton.topia.replication.TopiaReplicationOperation; import org.nuiton.topia.replication.model.ReplicationLink; -import org.nuiton.topia.replication.model.ReplicationModel; import org.nuiton.topia.replication.model.ReplicationNode; import org.nuiton.topia.replication.model.ReplicationOperationDef; -import org.nuiton.topia.replication.model.ReplicationOperationPhase; import java.util.Collection; import java.util.Collections; @@ -62,9 +61,6 @@ * l'assocation et on retrouve les entities a partir d'un troisieme parametre * qui donne le node source des entities sources. * <p/> - * Note : cette operation est interne, et n'est pas creable par l'utilisateur - * via la methode {@link #register(ReplicationModel, ReplicationNode, - * ReplicationOperationPhase, Object...)}. * * @author tchemit <chemit@codelutin.com> * @since 2.2.0 @@ -105,11 +101,11 @@ List<String> ownerIds = null; if (ownerNode.equals(operationDef.getNode())) { - ownerIds = TopiaEntityHelper.getTopiaIdList(nodeEntities); + ownerIds = TopiaUtil.getTopiaIdList(nodeEntities); } if (cibleNode.equals(operationDef.getNode())) { - associationIds = TopiaEntityHelper.getTopiaIdList(nodeEntities); + associationIds = TopiaUtil.getTopiaIdList(nodeEntities); } if (ownerIds == null) { @@ -182,7 +178,7 @@ List<String> dstTargetAssociationsId = dstTargetEntities == null ? Collections.<String>emptyList() : - TopiaEntityHelper.getTopiaIdList( + TopiaUtil.getTopiaIdList( (List<? extends TopiaEntity>) dstTargetEntities); boolean shouldUpdate = false; for (Object a : targetEntities) { Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2012-05-23 14:23:29 UTC (rev 2517) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2012-05-23 15:42:02 UTC (rev 2518) @@ -31,6 +31,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; @@ -409,7 +410,7 @@ TopiaContext rootCtxt = createReplicateDb("doReplicate_" + contract); - List<String> ids = TopiaEntityHelper.getTopiaIdList(Arrays.asList(entity)); + List<String> ids = TopiaUtil.getTopiaIdList(Arrays.asList(entity)); getLog().info("entity " + ids); prepareModel(ids.toArray(new String[ids.size()])); @@ -461,7 +462,7 @@ TopiaContext rootCtxt = createReplicateDb("doReplicateWithComputedOrder"); - List<String> ids = TopiaEntityHelper.getTopiaIdList(Arrays.asList(entity)); + List<String> ids = TopiaUtil.getTopiaIdList(Arrays.asList(entity)); prepareModelWithComputedOrder(ids.toArray(new String[ids.size()]));