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

r1851 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by echatellier＠users.nuiton.org March 22, 2010

March 22, 2010

Author: echatellier Date: 2010-03-22 18:34:41 +0100 (Mon, 22 Mar 2010) New Revision: 1851 Log: Ajout d'une methode create(TopiaEntity) sur le DAO. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-03-22 10:43:24 UTC (rev 1850) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-03-22 17:34:41 UTC (rev 1851) @@ -110,6 +110,18 @@ Entity create(Map<String, Object> properties) throws TopiaException; /** + * Permet de sauver un object instancié sans le DAO. + * + * @param e l'entité instanciée à sauver + * @return l'entité avec son topiaID valorisé + * @throws TopiaException + * + * @since 2.3.1 + * @throw TopiaException if any pb while creating datas + */ + Entity create(Entity e) throws TopiaException; + + /** * Permet d'ajouter ou de mettre a jour un objet. Cela permet d'ajouter * par exemple un objet provenant d'un autre context mais du meme type * de DAO @@ -119,6 +131,11 @@ */ Entity update(Entity e) throws TopiaException; + /** + * Permet de supprimer + * @param e + * @throws TopiaException + */ void delete(Entity e) throws TopiaException; Entity findByTopiaId(String k) throws TopiaException; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-03-22 10:43:24 UTC (rev 1850) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-03-22 17:34:41 UTC (rev 1851) @@ -675,6 +675,26 @@ getContext().removeTopiaEntityVetoable(entityClass, vetoable); } + @Override + public E create(E entity) throws TopiaException { + + // TODO EC-20100322 this code may be merged with other create() methods + try { + // first set topiaId + String topiaId = TopiaId.create(entityClass); + TopiaEntityAbstract entityAbstract = (TopiaEntityAbstract) entity; + entityAbstract.setTopiaId(topiaId); + entityAbstract.setTopiaContext(getContext()); + + // save entity + getSession().save(entity); + getContext().getFiresSupport().warnOnUpdateEntity(entity); + return entity; + } catch (HibernateException eee) { + throw new TopiaException(eee); + } + } + /** * Cette methode appelle fireVetoableCreate et fireOnCreated * Si vous la surchargé, faites attention a appeler le super

1 0

r1850 - trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication
by tchemit＠users.nuiton.org March 22, 2010

March 22, 2010

Author: tchemit Date: 2010-03-22 11:43:24 +0100 (Mon, 22 Mar 2010) New Revision: 1850 Log: reformat contract + fix javadoc Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java 2010-03-20 17:28:21 UTC (rev 1849) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java 2010-03-22 10:43:24 UTC (rev 1850) @@ -30,54 +30,55 @@ */ package org.nuiton.topia.replication; -import org.nuiton.topia.replication.model.ReplicationModel; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaService; import org.nuiton.topia.persistence.TopiaEntityEnum; +import org.nuiton.topia.replication.model.ReplicationModel; /** * User visible interface for replication engin - * + * * To use replicator you must have properties defined in config file: - * <li>topia.replication.engin=[class used to indexation] - * <li>possible specific property for index engin used - * + * <li>topia.replication.engin=[class used to indexation] <li>possible specific + * property for index engin used + * * The replication is always done in two phases : + * + * <li> - prepare the replication model - ({@link #prepare(TopiaEntityEnum[], + * String...)} - ({@link #prepareForAll(TopiaEntityEnum[])} + * + * <li> - lanch replication {@link #doReplicate(ReplicationModel, + * TopiaContext)} * - * <li> - prepare the replication model - * - ({@link #prepare(TopiaEntityEnum[], String[])} - * - ({@link #prepareForAll(TopiaEntityEnum[])} - * - * <li> - lanch replication {@link #doReplicate(ReplicationModel, TopiaContext)} - * * @author chemit * @since 2.2.0 */ public interface TopiaReplicationService extends TopiaService { - public static final String SERVICE_NAME = "replication"; + String SERVICE_NAME = "replication"; /** * Prepare le modele de replication pour les entites dans les topiaIds sont * donnes. * * @param contracts les contrats a repliquer - * @param topiaIds la liste des ids d'entites a repliquer + * @param topiaIds la liste des ids d'entites a repliquer * @return le model de replication initialise - * * @throws TopiaException pour toute erreur recontree */ - ReplicationModel prepare(TopiaEntityEnum[] contracts, String... topiaIds) throws TopiaException; + ReplicationModel prepare(TopiaEntityEnum[] contracts, + String... topiaIds) throws TopiaException; /** - * Prepare le modele de replication pour toutes les entites des types donnes. - * + * Prepare le modele de replication pour toutes les entites des types + * donnes. + * * La méthode calcule l'ordre de replication des données. - * + * * Actuellement, on n'est pas capable de calculer l'ordre si le graphe des * entités contient des cycles. - * + * * TODO : faire en sorte de pouvoir gérer les cycles. * * @param contracts les contrats des types a repliquer @@ -87,47 +88,53 @@ ReplicationModel prepareForAll(TopiaEntityEnum[] contracts) throws TopiaException; /** - * Prepare le modele de replication pour les entites données en ne faisant + * Prepare le modele de replication pour les entites données en ne faisant * pas de calcul sur l'ordre des entités à répliquer. - * + * * L'ordre des types donnees sera celui utilisé. * * @param contracts les contrats a repliquer (dans l'ordre donnée) - * @param topiaIds les ids des entites a repliquer + * @param topiaIds les ids des entites a repliquer * @return le model de replication initialise - * * @throws TopiaException pour toute erreur recontree */ - ReplicationModel prepareWithComputedOrder(TopiaEntityEnum[] contracts, String... topiaIds) throws TopiaException; + ReplicationModel prepareWithComputedOrder(TopiaEntityEnum[] contracts, + String... topiaIds) throws TopiaException; /** * Ajouter une nouvelle operation pre-replication, sur un type de donnee. * - * @param model le modele de replication - * @param type le type du noeud de replication + * @param model le modele de replication + * @param type le type du noeud de replication * @param operationClass l'implantation de l'operation - * @param parameters les parametres supplementaires pour l'operation + * @param parameters les parametres supplementaires pour l'operation */ - void addBeforeOperation(ReplicationModel model, TopiaEntityEnum type, Class<? extends TopiaReplicationOperation> operationClass, Object... parameters); + void addBeforeOperation(ReplicationModel model, + TopiaEntityEnum type, + Class<? extends TopiaReplicationOperation> operationClass, + Object... parameters); /** * Ajouter une nouvelle operation post-replication, sur un type de donnee. * - * @param model le modele de replication - * @param type le type du noeud de replication + * @param model le modele de replication + * @param type le type du noeud de replication * @param operationClass l'implantation de l'operation - * @param parameters les parametres supplementaires pour l'operation + * @param parameters les parametres supplementaires pour l'operation */ - void addAfterOperation(ReplicationModel model, TopiaEntityEnum type, Class<? extends TopiaReplicationOperation> operationClass, Object... parameters); + void addAfterOperation(ReplicationModel model, + TopiaEntityEnum type, + Class<? extends TopiaReplicationOperation> operationClass, + Object... parameters); /** * Lance l'operation de replication a partir du context source vers le * context de destination sur les entites donnees et en utilisant le model - * de replication precedemment construit via la methode - * {@link #prepare(TopiaEntityEnum[], String[])} ou - * {@link #prepareForAll(TopiaEntityEnum[])}. + * de replication precedemment construit via la methode {@link + * #prepare(TopiaEntityEnum[], String...)} ou {@link + * #prepareForAll(TopiaEntityEnum[])}. * - * @param model le modele de replication + * @param model le modele de replication * @param dstCtxt le context sur la source de donnees ou repliquer * @throws Exception pour toute erreur pendant la replication */

1 0

r1849 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org March 20, 2010

March 20, 2010

Author: tchemit Date: 2010-03-20 18:28:21 +0100 (Sat, 20 Mar 2010) New Revision: 1849 Log: Evolution #408: Add a template to generate BinderHelper Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java 2010-03-20 17:28:21 UTC (rev 1849) @@ -0,0 +1,233 @@ +/* + * *##% + * ToPIA :: Persistence + * 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>. + * ##%* + */ +package org.nuiton.topia.generator; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.Template; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.*; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.util.TopiaEntityBinder; +import org.nuiton.topia.persistence.util.TopiaEntityHelper; +import org.nuiton.util.beans.BinderBuilder; +import org.nuiton.util.beans.BinderProvider; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + + +/*{generator option: parentheses = false}*/ + +/*{generator option: writeString = +}*/ + +/** + * A template to generate a helper for {@link TopiaEntityBinder}. + * + * @author tchemit <chemit(a)codelutin.com> + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.BinderHelperTransformer" + * @since 2.3.1 + */ +public class BinderHelperTransformer extends ObjectModelTransformerToJava { + + private static final Log log = + LogFactory.getLog(BinderHelperTransformer.class); + + @Override + public void transformFromModel(ObjectModel model) { + ObjectModelClass resultClass; + String packageName = getOutputProperties().getProperty(Template.PROP_DEFAULT_PACKAGE); + String modelName = model.getName(); + String binderHelperClazzName = modelName + "BinderHelper"; + String daoHelperClazzName = modelName + "DAOHelper"; + + resultClass = createClass(binderHelperClazzName, packageName); + + setSuperClass(resultClass, BinderProvider.class); + + List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model, true); + + addImport(resultClass, TopiaEntityBinder.class); + addImport(resultClass, TopiaEntityHelper.class); + addImport(resultClass, TopiaEntity.class); + addImport(resultClass, BinderBuilder.class); + + ObjectModelOperation op; + + op = addOperation(resultClass, + "getTopiaBinder", + "<E extends TopiaEntity> TopiaEntityBinder<E>", + ObjectModelModifier.PUBLIC, + ObjectModelModifier.STATIC); + addParameter(op, "Class<E>", "entityClass"); + addParameter(op, "String", "contextName"); + setOperationBody(op, "" +/*{ + return (TopiaEntityBinder<E>) getBinder(entityClass, contextName); + }*/ + ); + + op = addOperation(resultClass, + "getSimpleTopiaBinder", + "<E extends TopiaEntity> TopiaEntityBinder<E>", + ObjectModelModifier.PUBLIC, + ObjectModelModifier.STATIC); + addParameter(op, "Class<E>", "entityClass"); + setOperationBody(op, "" +/*{ + return getTopiaBinder(entityClass, "<%=modelName%>"); + }*/ + ); + + op = addOperation(resultClass, + "registerTopiaBinder", + "void", + ObjectModelModifier.PUBLIC, + ObjectModelModifier.STATIC); + addParameter(op, "BinderBuilder", "builder"); + addParameter(op, "String", "contextName"); + setOperationBody(op, "" +/*{ + BinderProvider.registerBinder(builder, TopiaEntityBinder.class, contextName); + }*/ + ); + + op = addOperation(resultClass, + "copy", + "<E extends TopiaEntity> void", + ObjectModelModifier.PUBLIC, + ObjectModelModifier.STATIC); + addParameter(op, "String", "contextName"); + addParameter(op, "E", "source"); + addParameter(op, "E", "target"); + addParameter(op, "boolean", "tech"); + setOperationBody(op, "" +/*{ + Class<E> entityClass = (Class<E>) TopiaEntityHelper.getContractClass(<%=daoHelperClazzName%>.getContracts(), target.getClass()); + TopiaEntityBinder<E> binder = getTopiaBinder(entityClass, contextName); + if (binder == null) { + throw new NullPointerException("could not find a simple topia binder of type : " + target.getClass()); + } + binder.load(source, target, tech); + }*/ + ); + + op = addOperation(resultClass, + "simpleCopy", + "<E extends TopiaEntity> void", + ObjectModelModifier.PUBLIC, + ObjectModelModifier.STATIC); + addParameter(op, "E", "source"); + addParameter(op, "E", "target"); + addParameter(op, "boolean", "tech"); + setOperationBody(op, "" +/*{ + Class<E> entityClass = (Class<E>) TopiaEntityHelper.getContractClass(<%=daoHelperClazzName%>.getContracts(), target.getClass()); + TopiaEntityBinder<E> binder = getSimpleTopiaBinder(entityClass); + if (binder == null) { + throw new NullPointerException("could not find a simple topia binder of type : " + target.getClass()); + } + binder.load(source, target, tech); + }*/ + ); + + StringBuilder initCode = new StringBuilder(); + + initCode.append("" +/*{ + BinderBuilder builder = new BinderBuilder(); +}*/ + ); + for (ObjectModelClass clazz : classes) { + + generateBinder(modelName, clazz, resultClass, initCode); + + } + + op = addOperation(resultClass, "initBinders", "void", ObjectModelModifier.PROTECTED, ObjectModelModifier.STATIC); + setOperationBody(op, initCode.toString()); + + op = addOperation(resultClass, null, (String) null, ObjectModelModifier.STATIC); + setOperationBody(op, "" + /*{ + initBinders(); +}*/ + ); + } + + protected void generateBinder(String modelName, ObjectModelClass clazz, ObjectModelClass resultClass, StringBuilder initCode) { + + List<ObjectModelAttribute> list = new ArrayList<ObjectModelAttribute>(); + for (ObjectModelAttribute attr : clazz.getAttributes()) { + if (!attr.isNavigable()) { + continue; + } + + if (GeneratorUtil.isNMultiplicity(attr)) { + // not dealing with association + continue; + } + + list.add(attr); + } + + String clazzName = clazz.getName(); + + if (list.isEmpty()) { + // no attribute, do nothing + if (log.isDebugEnabled()) { + log.debug("no attribute to add in a binder for " + clazzName + + ", will not generate it."); + } + return; + } + + + if (log.isDebugEnabled()) { + log.debug("generate simple binder for " + clazzName); + } + addImport(resultClass, clazz); + initCode.append("" +/*{ + builder.createBinderModel(<%=clazzName%>.class); + builder.addSimpleProperties( +}*/ + ); + Iterator<ObjectModelAttribute> itr = list.iterator(); + while (itr.hasNext()) { + ObjectModelAttribute attr = itr.next(); + String attrName = attr.getName(); + boolean hasNext = itr.hasNext(); + initCode.append("" +/*{ <%=clazzName%>.<%=getConstantName(attrName)%><%=(hasNext?",\n":"")%>}*/ + ); + } + initCode.append("" +/*{ + ); + registerTopiaBinder(builder, "<%=modelName%>"); + }*/ + ); + } +} + Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL

1 0

r1848 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org March 20, 2010

March 20, 2010

Author: tchemit Date: 2010-03-20 18:26:44 +0100 (Sat, 20 Mar 2010) New Revision: 1848 Log: optimize imports Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java 2010-03-20 17:26:12 UTC (rev 1847) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java 2010-03-20 17:26:44 UTC (rev 1848) @@ -20,12 +20,9 @@ */ package org.nuiton.topia.persistence.util; -import org.apache.commons.lang.NotImplementedException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; -import java.util.Map; - /** * A {@link Binder} dedicated to {@link TopiaEntity} dealing with technical * values. @@ -60,4 +57,4 @@ } copy(source, target, propertyNames); } -} \ No newline at end of file +}

1 0

r1847 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org March 20, 2010

March 20, 2010

Author: tchemit Date: 2010-03-20 18:26:12 +0100 (Sat, 20 Mar 2010) New Revision: 1847 Log: remove deprecated classes Removed: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/BeanPropertyLoador.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityLoador.java Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/BeanPropertyLoador.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/BeanPropertyLoador.java 2010-03-20 17:25:40 UTC (rev 1846) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/BeanPropertyLoador.java 2010-03-20 17:26:12 UTC (rev 1847) @@ -1,184 +0,0 @@ -/* - * *##% - * ToPIA :: Persistence - * 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>. - * ##%* - */ -package org.nuiton.topia.persistence.util; - - -import org.nuiton.util.ObjectUtil; - -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; -import java.lang.reflect.InvocationTargetException; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * A implementation fo the {@link org.nuiton.topia.persistence.util.Loador} contract using - * {@link PropertyDescriptor}. - * - * Some factory methods are defined to simplify the generic cast, prefer used them - * instead of the (protected) constructor. - * - * @author tchemit < chemit(a)codelutin.com > - * @param <E> type of bean to bind - * @deprecated since 2.3.0, prefer use the {@link TopiaEntityBinder} - */ -@Deprecated -public class BeanPropertyLoador<E> implements Loador<E> { - - public static <E> BeanPropertyLoador<E> newLoador(Class<E> klass, String... properties) { - return new BeanPropertyLoador<E>(klass, properties); - } - - private static final long serialVersionUID = 1L; -// protected static final Integer ZERO = 0; -// protected static final Float ZEROF = 0f; -// protected static final Long ZEROL = 0l; -// protected static final Double ZEROD = 0.; -// protected static final Byte ZEROB = 0; - protected List<String> properties; - protected transient PropertyDescriptor[] descriptors; - protected Class<E> klass; - - protected BeanPropertyLoador(Class<E> klass, String... properties) { - this.properties = java.util.Collections.unmodifiableList(Arrays.asList(properties)); - this.klass = klass; - } - - public List<String> getProperties() { - return properties; - } - - public PropertyDescriptor[] getDescriptors() { - if (descriptors == null) { - try { - descriptors = new PropertyDescriptor[properties.size()]; - for (PropertyDescriptor propertydescriptor : Introspector.getBeanInfo(klass).getPropertyDescriptors()) { - int index = properties.indexOf(propertydescriptor.getName()); - if (index != -1) { - descriptors[index] = propertydescriptor; - } - } - } catch (IntrospectionException e) { - throw new RuntimeException(e); - } - } - return descriptors; - } - - @Override - public Map<String, Object> obtainProperties(E from, String... propertyNames) { - if (from == null) { - return java.util.Collections.emptyMap(); - } - if (propertyNames.length > 0) { - throw new IllegalArgumentException("The BeanPropertyLoader does " + - "not accept subset of properties, prefer use the " + - "org.nuiton.util.beans.Binder api instead now."); - } - Map<String, Object> result = new HashMap<String, Object>(); - for (PropertyDescriptor descriptor : getDescriptors()) { - Object read; - try { - read = descriptor.getReadMethod().invoke(from); - if (read != null) { - result.put(descriptor.getName(), read); - } - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } - - } - return result; - } - - @Override - public void load(E from, E dst, boolean tech, String... propertyNames) { - if (from == null) { - // reset all fields - for (PropertyDescriptor descriptor : getDescriptors()) { - Object read = - ObjectUtil.getNullValue(descriptor.getPropertyType()); - setProperty(dst, descriptor, read); - } - } else { - // set all fields from - for (PropertyDescriptor descriptor : getDescriptors()) { - try { - Object value = descriptor.getReadMethod().invoke(from); - setProperty(dst, descriptor, value); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } - } - } - } - - protected void setProperty(E dst, PropertyDescriptor descriptor, Object value) { - try { - descriptor.getWriteMethod().invoke(dst, value); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - /** - * @param type type to test - * @return the null value for the given type - * @deprecated use {@link TopiaEntityHelper#getNullValue(Class)} - */ - @Deprecated - protected static Object getNullValue(Class<?> type) { - return ObjectUtil.getNullValue(type); - } - - /** - * @param value the value to test - * @return <code>true</code> if value is null - * @deprecated use {@link TopiaEntityHelper#isNullValue(Object)} - */ - @Deprecated - public static boolean isNullValue(Object value) { - return ObjectUtil.isNullValue(value); - } - - protected void checkProperties() { - PropertyDescriptor[] d = getDescriptors(); - for (int i = 0; i < d.length; i++) { - PropertyDescriptor descriptor = d[i]; - if (descriptor == null) { - throw new IllegalStateException("could not find descriptor for property " + properties.get(i) + " on " + klass); - } - if (descriptor.getReadMethod() == null) { - throw new IllegalStateException("property " + properties.get(i) + " is not readable on " + klass); - } - if (descriptor.getWriteMethod() == null) { - throw new IllegalStateException("property " + properties.get(i) + " is not writable on " + klass); - } - } - } -} Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityLoador.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityLoador.java 2010-03-20 17:25:40 UTC (rev 1846) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityLoador.java 2010-03-20 17:26:12 UTC (rev 1847) @@ -1,68 +0,0 @@ -/* - * *##% - * ToPIA :: Persistence - * 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>. - * ##%* - */ -package org.nuiton.topia.persistence.util; - -import org.nuiton.topia.persistence.TopiaEntity; - -/** - * A implementation of {@link BeanPropertyLoador} for {@link TopiaEntity} - * - * Some factory methods are defined to simplify the generic cast, prefer used them - * instead of the (protected) constructor). - * - * @param <E> type of entity - * @author tchemit < chemit(a)codelutin.com > - * @deprecated since 2.3.0, prefer use the {@link TopiaEntityBinder} - */ -@Deprecated -public class EntityLoador<E extends TopiaEntity> extends BeanPropertyLoador<E> { - - private static final long serialVersionUID = 1L; - protected E empty; - - public static <E extends TopiaEntity> EntityLoador<E> newEntityLoador( - Class<E> klass, E empty, String... properties) { - return new EntityLoador<E>(klass, empty, properties); - } - - public static <E extends TopiaEntity> EntityLoador<E> newEntityLoador( - Class<E> klass, String... properties) { - return newEntityLoador(klass, null, properties); - } - - @Override - public void load(E from, E dst, boolean tech,String... propertyNames) { - if (from == null) { - from = empty; - } - if (tech) { - TopiaEntityHelper.bindTechnical(from, dst); - } - super.load(from, dst, tech,propertyNames); - } - - protected EntityLoador(Class<E> klass, E empty, String... properties) { - super(klass, properties); - this.empty = empty; - // check properties - checkProperties(); - } -}

1 0

r1846 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org March 20, 2010

March 20, 2010

Author: tchemit Date: 2010-03-20 18:25:40 +0100 (Sat, 20 Mar 2010) New Revision: 1846 Log: fix javadoc + remove deprecated methods 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 2010-03-17 13:06:52 UTC (rev 1845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2010-03-20 17:25:40 UTC (rev 1846) @@ -49,9 +49,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.beanutils.MethodUtils; import org.nuiton.topia.persistence.TopiaEntityEnum; -import org.nuiton.util.ObjectUtil; /** * Une classe avec des méthodes utiles sur les entités. @@ -63,16 +61,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(TopiaEntityHelper.class); - protected static final Integer ZERO = 0; - - protected static final Float ZEROF = 0f; - - protected static final Long ZEROL = 0l; - - protected static final Double ZEROD = 0.; - - protected static final Byte ZEROB = 0; - /** * Le pattern d'une reference sur une association */ @@ -80,73 +68,6 @@ "%1$s[@" + TopiaEntity.TOPIA_ID + "=\"%2$s\"]"; /** - * - * @param type the type to test - * @return null object (default value for primitive types) - * @deprecated since 2.3.0, prefer use the - * {@link ObjectUtil#getNullValue(Class)} method - */ - @Deprecated - protected static Object getNullValue(Class<?> type) { - if (type.isPrimitive()) { - type = MethodUtils.getPrimitiveWrapper(type); - if (Boolean.class.isAssignableFrom(type)) { - return Boolean.FALSE; - } - if (Integer.class.isAssignableFrom(type)) { - return ZERO; - } - if (Float.class.isAssignableFrom(type)) { - return ZEROF; - } - if (Long.class.isAssignableFrom(type)) { - return ZEROL; - } - if (Double.class.isAssignableFrom(type)) { - return ZEROD; - } - if (Byte.class.isAssignableFrom(type)) { - return ZEROB; - } - } - return null; - } - - /** - * @param value the value to test - * @return {@code true} if value is null or default value for primitive - * types) - * @deprecated since 2.3.0, prefer use the - * {@link ObjectUtil#isNullValue(Object)} method - */ - @Deprecated - public static boolean isNullValue(Object value) { - if (value == null) { - return true; - } - Class<?> type = value.getClass(); - if (type.isPrimitive()) { - type = MethodUtils.getPrimitiveWrapper(type); - } - if (Boolean.class.isAssignableFrom(type)) { - return Boolean.FALSE.equals(value); - } - if (Integer.class.isAssignableFrom(type)) { - return ZERO.equals(value); - } - if (Float.class.isAssignableFrom(type)) { - return ZEROF.equals(value); - } - if (Long.class.isAssignableFrom(type)) { - return ZEROL.equals(value); - } - if (Double.class.isAssignableFrom(type)) { - return ZEROD.equals(value); - } - return Byte.class.isAssignableFrom(type) && ZEROB.equals(value); - } - - /** * Bind les valeurs techniques depuis une entitée vers une autre. * * @param from l'entité source @@ -302,11 +223,13 @@ if (!dbDirectory.exists()) { if (!dbDirectory.mkdirs()) { - throw new IOException("could not create directory " + dbDirectory); + throw new IOException( + "could not create directory " + dbDirectory); } } - log.info("create database from [" + databaseDump + "] at [" + dbDirectory + "]"); + log.info("create database from [" + databaseDump + "] at [" + + dbDirectory + "]"); TopiaContext ctxt = topiaContext.beginTransaction(); @@ -328,7 +251,8 @@ * @param topiaContext the topiaContext of the db to store * @throws TopiaException if any pb while saving db * @throws NullPointerException if parameters are null - * @throws IOException if could not create gzipFile container directory + * @throws IOException if could not create gzipFile container + * directory */ public static void saveDB( File gzipFile, TopiaContext topiaContext) @@ -385,7 +309,8 @@ * * @param entities the list of entities to filter * @param filterClass the type of entities to keep - * @return the list of filtered entities for the given entity type in the list + * @return the list of filtered entities for the given entity type in the + * list * @since 2.1.4 */ public static List<TopiaEntity> filter( @@ -454,7 +379,8 @@ TopiaEntityEnum[] contracts, Set<Class<? extends TopiaEntity>> classes) { Map<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>> dico; - dico = new HashMap<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>>(); + dico = new HashMap<Class<? extends TopiaEntity>, + Class<? extends TopiaEntity>>(); try { Set<Class<? extends TopiaEntity>> result = new HashSet<Class<? extends TopiaEntity>>(); @@ -511,7 +437,7 @@ * @return l'ensemble des types d'entites decouverts (uniquement les * contrats des entites). * - * @throws TopiaException + * @throws TopiaException if a problem while visiting entities */ public static Set<Class<? extends TopiaEntity>> detectTypes( final TopiaEntityEnum[] contracts, @@ -564,7 +490,7 @@ * @return l'ensemble des entites decouverts (on converse uniquement les * entites dont le contract est dans l'ensemble voulu). * - * @throws TopiaException + * @throws TopiaException if a pb while visiting entities */ public static Map<Class<? extends TopiaEntity>, List<TopiaEntity>> detectEntities(final TopiaEntityEnum[] contracts, @@ -626,7 +552,7 @@ * @return l'ensemble des ids d'entites decouverts (on converse uniquement les * entites dont le contract est dans l'ensemble voulu). * - * @throws TopiaException + * @throws TopiaException if a pb while visiting entities */ public static Map<Class<? extends TopiaEntity>, List<String>> detectEntityIds(final TopiaEntityEnum[] contracts, @@ -685,7 +611,7 @@ * @param entities les entites a parcourir * @return l'ensemble des references decouvertes. * - * @throws TopiaException + * @throws TopiaException if a pb while visiting entities * * @see TopiaEntityRef */ @@ -706,7 +632,7 @@ * @param entities les entites a parcourir * @return l'ensemble des references decouvertes. * - * @throws TopiaException + * @throws TopiaException if a pb while visiting entities * * @see TopiaEntityRef */

1 0

r1845 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: generator persistence
by tchemit＠users.nuiton.org March 17, 2010

March 17, 2010

Author: tchemit Date: 2010-03-17 14:06:52 +0100 (Wed, 17 Mar 2010) New Revision: 1845 Log: fix signature of findAllUsages in DAO api Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-03-17 00:18:04 UTC (rev 1844) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-03-17 13:06:52 UTC (rev 1845) @@ -396,7 +396,7 @@ operation = addOperation(result, "findAllUsages", - "Map<Class<?>, List<? extends TopiaEntity>>", + "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", ObjectModelModifier.PUBLIC); addParameter(operation, "E", "entity"); @@ -404,7 +404,7 @@ addAnnotation(result, operation,"Override"); setOperationBody(operation, "" /*{ - return new HashMap<Class<?>, List<? extends TopiaEntity>>(); + return new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(); }*/ ); @@ -507,7 +507,7 @@ operation = addOperation(result, "findAllUsages", - "Map<Class<?>, List<? extends TopiaEntity>>", + "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", ObjectModelModifier.PUBLIC); addParameter(operation, "E", "entity"); @@ -517,8 +517,8 @@ buffer = new StringBuilder(300); buffer.append("" /*{ - Map<Class<?>,List<? extends TopiaEntity>> result; - result = new HashMap<Class<?>, List<? extends TopiaEntity>>(<%=usagesForclass.size()%>); + Map<Class<? extends TopiaEntity>,List<? extends TopiaEntity>> result; + result = new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(<%=usagesForclass.size()%>); List<? extends TopiaEntity> list; }*/ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-03-17 00:18:04 UTC (rev 1844) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-03-17 13:06:52 UTC (rev 1845) @@ -348,7 +348,7 @@ * @since 2.3.0 */ - Map<Class<?>, List<? extends TopiaEntity>> findAllUsages(Entity entity) + Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> findAllUsages(Entity entity) throws TopiaException; /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-03-17 00:18:04 UTC (rev 1844) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-03-17 13:06:52 UTC (rev 1845) @@ -564,7 +564,7 @@ } @Override - public Map<Class<?>, List<? extends TopiaEntity>> findAllUsages(E e) + public Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> findAllUsages(E e) throws TopiaException { // must be implemented by specialized dao throw new UnsupportedOperationException();

1 0

r1844 - in trunk/topia-service-replication/src: main/java/org/nuiton/topia/replication/model test/java/org/nuiton/topia/replication
by tchemit＠users.nuiton.org March 17, 2010

March 17, 2010

Author: tchemit Date: 2010-03-17 01:18:04 +0100 (Wed, 17 Mar 2010) New Revision: 1844 Log: improve code and tester Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java 2010-03-15 10:57:51 UTC (rev 1843) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java 2010-03-17 00:18:04 UTC (rev 1844) @@ -72,34 +72,34 @@ public ReplicationModel(TopiaEntityEnum[] contracts, Set<Class<? extends TopiaEntity>> types, String... topiaIds) { this.contracts = contracts; this.topiaIds = topiaIds; - this.replicateAll = false; - this.nodes = new LinkedHashMap<Class<? extends TopiaEntity>, ReplicationNode>(); - this.order = new ArrayList<ReplicationNode>(); + replicateAll = false; + nodes = new LinkedHashMap<Class<? extends TopiaEntity>, ReplicationNode>(); + order = new ArrayList<ReplicationNode>(); Map<Class<? extends TopiaEntity>, ReplicationNode> tmpNodes = new HashMap<Class<? extends TopiaEntity>, ReplicationNode>(); for (Class<? extends TopiaEntity> k : types) { TopiaEntityEnum e = TopiaEntityHelper.getEntityEnum(k, contracts); ReplicationNode replicationNode = new ReplicationNode(e); tmpNodes.put(k, replicationNode); } - this.nodes = Collections.unmodifiableMap(tmpNodes); + nodes = Collections.unmodifiableMap(tmpNodes); } public ReplicationModel(TopiaEntityEnum[] contracts, boolean replicateAll, String... topiaIds) { this.contracts = contracts; this.topiaIds = topiaIds; this.replicateAll = replicateAll; - this.nodes = new LinkedHashMap<Class<? extends TopiaEntity>, ReplicationNode>(); - this.order = new ArrayList<ReplicationNode>(); + nodes = new LinkedHashMap<Class<? extends TopiaEntity>, ReplicationNode>(); + order = new ArrayList<ReplicationNode>(); Map<Class<? extends TopiaEntity>, ReplicationNode> tmpNodes = new HashMap<Class<? extends TopiaEntity>, ReplicationNode>(); for (TopiaEntityEnum e : contracts) { ReplicationNode replicationNode = new ReplicationNode(e); tmpNodes.put(e.getContract(), replicationNode); if (!replicateAll) { // mode restreint : l'ordre est induit par l'ordre sur les contrats passes - this.order.add(replicationNode); + order.add(replicationNode); } } - this.nodes = Collections.unmodifiableMap(tmpNodes); + nodes = Collections.unmodifiableMap(tmpNodes); } Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java 2010-03-15 10:57:51 UTC (rev 1843) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java 2010-03-17 00:18:04 UTC (rev 1844) @@ -75,13 +75,13 @@ public ReplicationNode(TopiaEntityEnum contract) { this.contract = contract; - this.operator = EntityOperatorStore.getOperator(contract); - this.associations = new HashMap<String, ReplicationNode>(); - this.dependencies = new HashMap<String, ReplicationNode>(); - this.shell = new HashSet<ReplicationNode>(); - this.associationsToDettach = new HashSet<String>(); - this.dependenciesToDettach = new HashSet<String>(); - this.operations = new ArrayList<ReplicationOperationDef>(); + operator = EntityOperatorStore.getOperator(contract); + associations = new HashMap<String, ReplicationNode>(); + dependencies = new HashMap<String, ReplicationNode>(); + shell = new HashSet<ReplicationNode>(); + associationsToDettach = new HashSet<String>(); + dependenciesToDettach = new HashSet<String>(); + operations = new ArrayList<ReplicationOperationDef>(); if (log.isTraceEnabled()) { log.trace("new node : " + this); } @@ -209,14 +209,14 @@ if (getClass() != obj.getClass()) { return false; } - final ReplicationNode other = (ReplicationNode) obj; - return this.contract == other.contract; + ReplicationNode other = (ReplicationNode) obj; + return contract == other.contract; } @Override public int hashCode() { int hash = 7; - hash = 37 * hash + (this.contract.hashCode()); + hash = 37 * hash + contract.hashCode(); return hash; } Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java 2010-03-15 10:57:51 UTC (rev 1843) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java 2010-03-17 00:18:04 UTC (rev 1844) @@ -57,7 +57,7 @@ protected TopiaContextImplementor dstCtxt; protected TopiaReplicationImplementor service; protected ReplicationModel model; - static private boolean init ; + static protected boolean init ; static private Long testsTimeStamp; static private File testsBasedir; static private final String TEST_BASEDIR = "target%1$ssurefire-tests%1$s%2$td_%2$tm_%2$tY%1$s%2$tH_%2$tM_%2$tS"; @@ -79,8 +79,13 @@ if (!init) { I18n.init(Locale.FRANCE); - - context = createDb("source"); + + try { + context = createDb("source"); + } catch (Exception e) { + getLog().error("could not create db source.", e); + throw e; + } init = true; } @@ -185,7 +190,10 @@ Set<?> detectTypes; detectTypes = service.detectTypes(getContracts(), entity.getTopiaId()); - assertEquals(expectedCouple.length, detectTypes.size()); + assertEquals("expected types : "+ + Arrays.toString(expectedCouple) + + " but was "+detectTypes, + expectedCouple.length, detectTypes.size()); for (Object o : expectedCouple) { assertTrue(detectTypes.contains(o)); } @@ -247,7 +255,10 @@ entity.getClass(), getContracts()); assertNotNull(c); shell = model.getNode(c.getContract()).getShell(); - assertEquals(expected.length, shell.size()); + assertEquals( + "expected shell : "+ Arrays.toString(expected) + ", but was " + + shell, expected.length, shell.size()); + for (int i = 0, j = expected.length; i < j; i++) { TopiaEntityEnum type = expected[i]; ReplicationNode node = model.getNode(type.getContract()); @@ -256,9 +267,9 @@ } } - protected void detectDependencies(TopiaEntity entity, - TopiaEntityEnum[]... expected) throws - TopiaException { + protected void detectDependencies( + TopiaEntity entity, + TopiaEntityEnum[]... expected) throws TopiaException { createModel(entity); model.detectAssociations(); @@ -440,7 +451,13 @@ protected void assertDbEquals(TopiaEntityEnum[] contracts, TopiaContextImplementor ctxt, TopiaContextImplementor ctxt2) throws TopiaException { Set<String> ids = new HashSet<String>(); + if (getLog().isInfoEnabled()) { + getLog().info("will verify db for contracts "+ Arrays.toString(contracts)); + } for (TopiaEntityEnum c : contracts) { + if (getLog().isDebugEnabled()) { + getLog().debug("verify for contract " + c); + } TopiaDAO<? extends TopiaEntity> daoSrc = ctxt.getDAO(c.getContract()); TopiaDAO<? extends TopiaEntity> daoDst = ctxt2.getDAO(c.getContract()); long nbSrc = daoSrc.size(); @@ -452,6 +469,9 @@ Collections.sort(idsDst); assertEquals(idsSrc, idsDst); for (String id : idsSrc) { + if (getLog().isDebugEnabled()) { + getLog().debug("verify for entity " + id); + } TopiaEntity eSrc = daoSrc.findByTopiaId(id); TopiaEntity eDst = daoDst.findByTopiaId(id); assertEquals(eSrc, eDst); @@ -476,6 +496,14 @@ getLog().debug("expected : " + expected + " / actual " + actual); } TopiaEntityEnum contract = TopiaEntityHelper.getEntityEnum(expected.getClass(), getContracts()); + if (contract==null) { + // this type of entity in not dealed here... + getLog().debug("untested property type " + expected.getClass()); + return; + } + Assert.assertNotNull( + "contract not found for "+ expected.getClass() + " in " + + Arrays.toString(getContracts()), contract); EntityOperator<TopiaEntity> operator = EntityOperatorStore.getOperator(contract); List<String> associationProperties = operator.getAssociationProperties(); for (String name : associationProperties) {

1 0

r1843 - trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication
by tchemit＠users.nuiton.org March 15, 2010

March 15, 2010

Author: tchemit Date: 2010-03-15 11:57:51 +0100 (Mon, 15 Mar 2010) New Revision: 1843 Log: reformat code (80 car max per line) + remove redundant initializer Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java 2010-03-15 10:55:07 UTC (rev 1842) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractReplicationEngineTest.java 2010-03-15 10:57:51 UTC (rev 1843) @@ -21,7 +21,6 @@ import java.io.File; import java.util.*; -import org.junit.BeforeClass; import org.nuiton.i18n.I18n; import org.nuiton.topia.persistence.util.EntityOperator; import org.nuiton.topia.replication.model.ReplicationModel; @@ -104,7 +103,7 @@ protected abstract TopiaContext createDb(String name) throws Exception; protected TopiaContext createReplicateDb(Object contract) throws Exception { - TopiaContext rootCtxt = (TopiaContextImplementor) createDb2(contract.toString() + dbCounter++); + TopiaContext rootCtxt = createDb2(contract.toString() + dbCounter++); return rootCtxt; } @@ -185,7 +184,7 @@ Set<?> detectTypes; - detectTypes = ((ReplicationEngine) service).detectTypes(getContracts(), entity.getTopiaId()); + detectTypes = service.detectTypes(getContracts(), entity.getTopiaId()); assertEquals(expectedCouple.length, detectTypes.size()); for (Object o : expectedCouple) { assertTrue(detectTypes.contains(o)); @@ -197,7 +196,9 @@ assertEquals(shouldExist, operation != null); } - protected void detectAssociations(TopiaEntity entity, Object... expectedCouple) throws TopiaException { + protected void detectAssociations(TopiaEntity entity, + Object... expectedCouple) + throws TopiaException { createModel(entity); model.detectAssociations(); @@ -208,12 +209,15 @@ TopiaEntityEnum src = (TopiaEntityEnum) expectedCouple[2 * i]; String name = (String) expectedCouple[2 * i + 1]; ReplicationNode nodeSrc = model.getNode(src); + assertNotNull("association "+name+" not found", nodeSrc); assertTrue(nodeSrc.hasAssociation()); assertTrue(nodeSrc.getAssociations().containsKey(name)); } } - protected void detectDirectDependencies(TopiaEntity entity, Object... expectedCouple) throws TopiaException { + protected void detectDirectDependencies(TopiaEntity entity, + Object... expectedCouple) + throws TopiaException { createModel(entity); model.detectDirectDependencies(); @@ -229,7 +233,9 @@ } } - protected void detectShell(TopiaEntity entity, TopiaEntityEnum... expected) throws TopiaException { + protected void detectShell(TopiaEntity entity, + TopiaEntityEnum... expected) throws + TopiaException { Set<ReplicationNode> shell; createModel(entity); @@ -237,7 +243,9 @@ model.detectDirectDependencies(); model.detectShell(); - TopiaEntityEnum c = TopiaEntityHelper.getEntityEnum(entity.getClass(), getContracts()); + TopiaEntityEnum c = TopiaEntityHelper.getEntityEnum( + entity.getClass(), getContracts()); + assertNotNull(c); shell = model.getNode(c.getContract()).getShell(); assertEquals(expected.length, shell.size()); for (int i = 0, j = expected.length; i < j; i++) { @@ -248,7 +256,9 @@ } } - protected void detectDependencies(TopiaEntity entity, TopiaEntityEnum[]... expected) throws TopiaException { + protected void detectDependencies(TopiaEntity entity, + TopiaEntityEnum[]... expected) throws + TopiaException { createModel(entity); model.detectAssociations(); @@ -349,7 +359,7 @@ getLog().info("=========================================================================="); } } - private static int dbCounter = 0; + private static int dbCounter; protected void doReplicate(TopiaEntityEnum contract, TopiaEntity... entity) throws Exception {

1 0

r1842 - trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org March 15, 2010

March 15, 2010

Author: tchemit Date: 2010-03-15 11:55:07 +0100 (Mon, 15 Mar 2010) New Revision: 1842 Log: improve TopiaEntityRefTester + add javadoc Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTester.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTester.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTester.java 2010-03-15 10:54:46 UTC (rev 1841) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTester.java 2010-03-15 10:55:07 UTC (rev 1842) @@ -6,15 +6,15 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.SortedMap; +import java.util.*; import static java.util.Map.Entry; /** - * A abstract class to help testing {@link TopiaEntityRef} + * A abstract class to help testing {@link TopiaEntityRef} as detectes types, or + * detects or references. + * + * An example of use if given in the test {@link TopiaEntityRefTesterTest}. * * @author tchemit <chemit(a)codelutin.com> * @since 2.3.1 @@ -31,6 +31,8 @@ protected T[] contracts; + protected int index; + protected T[] getContracts() { if (contracts == null) { contracts = getContracts0(); @@ -38,6 +40,7 @@ return contracts; } + /** @return all the {@link TopiaEntityEnum} to be used */ protected abstract T[] getContracts0(); @After @@ -46,9 +49,92 @@ entry = null; refs = null; detected = null; + index = 0; } + /** + * Creates a new entity with the given {@code topiaId} (will use the {@link + * TopiaEntityEnum#getImplementation()} class). + * + * @param constant the constant defining the entity + * @param topiaId the topia to assign + * @param <T> the type of entity + * @return the new entity + * @throws IllegalAccessException if can no access entity constructor + * @throws InstantiationException if can no instanciate the entity + */ + protected <T extends TopiaEntity> T newEntity( + TopiaEntityEnum constant, String topiaId) throws + IllegalAccessException, + InstantiationException { + Class<? extends TopiaEntity> impl = constant.getImplementation(); + TopiaEntity topiaEntity = impl.newInstance(); + topiaEntity.setTopiaId(topiaId); + return (T) topiaEntity; + } + /** + * Obtain the reference of an association for a given entity. + * + * Example, to obtain the Pet 'pudding' on a Person : + * <pre>pet[@topiaId='pudding']</pre> + * invoke + * <pre>getAssociationRef('pet',pet);</pre> + * + * @param associationName the name of the association + * @param e the required entity + * @return the reference of the association + */ + protected String getAssociationRef(String associationName, TopiaEntity e) { + return getAssociationRef(associationName, e.getTopiaId()); + } + + /** + * Obtain the reference of an association for a given id. + * + * Example to obtain the Pet 'pudding' on a Person : + * <pre>pet[@topiaId='pudding']</pre> + * invoke + * <pre>getAssociationRef('pet','pudding');</pre> + * + * @param associationName the name of the association + * @param e the id + * @return the reference of the association + */ + protected String getAssociationRef(String associationName, String e) { + String s = String.format( + TopiaEntityHelper.ASSOCIATION_PATTERN, + associationName, + e + ); + return s; + } + + /** + * Obtain the next entry from the iterator. + * + * As a side-effect, it will increment the state {@link #index}. + */ + protected void nextEntry() { + if (!itr.hasNext()) { + throw new IllegalStateException("no more entry to get..."); + } + entry = itr.next(); + index = 0; + } + + /** + * Detects the references from the given {@code entity} which have their + * topiaId in the given list of {@code ids}. + * + * As a side-effect, it will update the states {@code detected} and set the + * iterator {@code itr} to the first position on detected entries. + * + * @param entity the entity to seek + * @param nb the required number of entries + * @param ids the ids to seek + * @throws TopiaException if any pb while visiting entities + */ protected void detectReferences( TopiaEntity entity, int nb, String... ids) throws TopiaException { detected = TopiaEntityHelper.detectReferences( @@ -57,6 +143,18 @@ } + /** + * Detects the references from the given {@code entity} which have their + * topiaId in the given list of {@code ids}. + * + * As a side-effect, it will update the states {@code detected} and set the + * iterator {@code itr} to the first position on detected entries. + * + * @param entity the entity to seek + * @param nb the required number of entries + * @param ids the ids to seek + * @throws TopiaException if any pb while visiting entities + */ protected void detectReferences( Collection<? extends TopiaEntity> entity, int nb, String... ids) throws TopiaException { @@ -65,10 +163,87 @@ assertDetected(nb); } + /** + * Detects the type of entities fro the given {@code data}. + * + * @param expected the array of expected types + * @param data the data to seek + * @throws TopiaException if any pb while visiting data + */ + protected void detectTypes(Class<?>[] expected, + TopiaEntity... data) throws TopiaException { + Set<String> fqns = new HashSet<String>(expected.length); + Set<Class<? extends TopiaEntity>> actual = null; + for (Class<?> c : expected) { + fqns.add(c.getName()); + } + try { + actual = TopiaEntityHelper.detectTypes(getContracts(), data); + Assert.assertEquals(expected.length, actual.size()); + for (Class<? extends TopiaEntity> c : actual) { + Assert.assertTrue(fqns.contains(c.getName())); + } + } finally { + fqns.clear(); + if (actual != null) { + actual.clear(); + } + } + } + + /** + * Asserts if the given entry definition is equals to the next entry + * references on internal state state {@code entry}. + * + * @param invoker the invoker of the reference + * @param invokerProperty the access path of the reference + * @param expected the expected topia entities path to access + * reference target + */ + protected void assertNextEntityRef(TopiaEntity invoker, + String invokerProperty, + TopiaEntity... expected) { + assertEntityRef(index, invoker, invokerProperty, expected); + index++; + } + + /** + * Asserts if the given entry definition (of an association) is equals to + * the next entry reference on internal state {@code entry}. + * + * @param invoker the invoker of the reference + * @param association the association name + * @param id the id of the association ( see {@link + * #getAssociationRef(String, TopiaEntity)} + * @param expected the expected topia entities path to access reference + * target + */ + protected void assertNextAssociationEntityRef(TopiaEntity invoker, + String association, + String id, + TopiaEntity... expected) { + String invokerProperty = getAssociationRef(association, id); + assertNextEntityRef(invoker, invokerProperty, expected); + } + + /** + * Asserts if the given entry definition is equals to the reference entry at + * position {@code index} on internal state {@code entry}. + * + * @param index the index of the reference to test in {@code + * entry} + * @param invoker the invoker of the reference + * @param invokerProperty the path of the reference + * @param expected th expected topia entities path to access + * reference target + */ protected void assertEntityRef(int index, TopiaEntity invoker, String invokerProperty, TopiaEntity... expected) { + Assert.assertNotNull(refs); + Assert.assertTrue("no index [" + index + "] in refs of size " + + refs.size(), index < refs.size()); TopiaEntityRef actual = refs.get(index); Assert.assertEquals(actual.getInvoker(), invoker); Assert.assertEquals(actual.getInvokerProperty(), invokerProperty); @@ -80,14 +255,44 @@ } } - protected void assertEntry(TopiaEntity expected, - int nbPath, - Entry<TopiaEntity, List<TopiaEntityRef>> entry) { + /** + * Asserts if the given {@code expected} entity is equals to the source of + * the internal state {@code entry}. + * + * @param expected the required source of the entry + * @param nbPath the expected number of references of the given entry + */ + protected void assertCurrentEntry(TopiaEntity expected, + int nbPath) { + assertEntry(expected, nbPath, entry); + } + + /** + * Asserts if the given {@code entry} has a good source and a good number of + * references. + * + * @param expected the expected entry source + * @param nbPath the expected number of reference of the entry + * @param entry the entry to test + */ + private void assertEntry(TopiaEntity expected, + int nbPath, + Entry<TopiaEntity, List<TopiaEntityRef>> entry) { + Assert.assertNotNull(entry); Assert.assertEquals(expected, entry.getKey()); refs = entry.getValue(); Assert.assertEquals(nbPath, refs.size()); } + /** + * Asserts that the number of detected entries (store in internal state + * {@code detected}) is ok. + * + * As a side-effect, it will reset the internal state {@code itr} on the + * first entry of the {@code detected} list. + * + * @param size the expected number of detected entries + */ protected void assertDetected(int size) { Assert.assertNotNull(detected); Assert.assertEquals(size, detected.size()); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java 2010-03-15 10:54:46 UTC (rev 1841) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java 2010-03-15 10:55:07 UTC (rev 1842) @@ -1,10 +1,12 @@ package org.nuiton.topia.persistence.util; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Test; -import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTestDAOHelper.TopiaTestEntityEnum; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.test.entities.*; +import org.nuiton.topia.test.entities.Person; +import org.nuiton.topia.test.entities.Pet; +import org.nuiton.topia.test.entities.Race; /** * Test the {@link TopiaEntityRefTester} on @@ -17,16 +19,18 @@ */ public class TopiaEntityRefTesterTest extends TopiaEntityRefTester<TopiaTestEntityEnum> { + /** Logger */ + private static final Log log = + LogFactory.getLog(TopiaEntityRefTesterTest.class); + private static final String PET1 = "pet1"; + private static final String PET2 = "pet2"; + private static final String RACE1 = "race1"; private static final String PERSON1 = "person1"; - private static final String PET2 = "pet2"; - - protected String PET_REF = "pet[@" + TopiaEntity.TOPIA_ID + "=\"%1$s\"]"; - @Override protected TopiaTestEntityEnum[] getContracts0() { return new TopiaTestEntityEnum[]{ @@ -37,88 +41,90 @@ } @Test - public void testPet() throws TopiaException { + public void testNoReferences() throws Exception { - Pet pet = new PetImpl(); - pet.setTopiaId(PET1); + Pet pet = newEntity(TopiaTestEntityEnum.Pet, PET1); detectReferences(pet, 0); - Race race = new RaceImpl(); - race.setTopiaId(RACE1); + Race race = newEntity(TopiaTestEntityEnum.Race, RACE1); detectReferences(race, 0); - Person person = new PersonImpl(); - person.setTopiaId(PERSON1); + Person person = newEntity(TopiaTestEntityEnum.Person, PERSON1); - detectReferences(race, 0); + detectReferences(person, 0); + } + + @Test + public void testReferences() throws Exception { + + Pet pet = newEntity(TopiaTestEntityEnum.Pet, PET1); + Race race = newEntity(TopiaTestEntityEnum.Race, RACE1); pet.setRace(race); + Person person = newEntity(TopiaTestEntityEnum.Person, PERSON1); detectReferences(pet, 1, RACE1); - entry = itr.next(); - assertEntry(race, 1, entry); - assertEntityRef(0, pet, Pet.RACE, pet, race); + nextEntry(); + assertCurrentEntry(race, 1); + assertNextEntityRef(pet, Pet.RACE, pet, race); pet.setPerson(person); detectReferences(pet, 2, RACE1, PERSON1); - entry = itr.next(); - assertEntry(person, 1, entry); - assertEntityRef(0, pet, Pet.PERSON, pet, person); + nextEntry(); + assertCurrentEntry(person, 1); + assertNextEntityRef(pet, Pet.PERSON, pet, person); - entry = itr.next(); - assertEntry(race, 1, entry); - assertEntityRef(0, pet, Pet.RACE, pet, race); + nextEntry(); + assertCurrentEntry(race, 1); + assertNextEntityRef(pet, Pet.RACE, pet, race); person.addPet(pet); detectReferences(person, 1, PET1); - entry = itr.next(); - assertEntry(pet, 1, entry); - assertEntityRef(0, person, String.format(PET_REF, PET1), person, pet); + nextEntry(); + assertCurrentEntry(pet, 1); + assertNextAssociationEntityRef(person, Person.PET, PET1, person, pet); - Pet pet2 = new PetImpl(); - pet2.setTopiaId(PET2); + Pet pet2 = newEntity(TopiaTestEntityEnum.Pet, PET2); person.addPet(pet2); detectReferences(person, 3, PET1, PET2, RACE1); - entry = itr.next(); - assertEntry(pet, 1, entry); - assertEntityRef(0, person, String.format(PET_REF, PET1), person, pet); + nextEntry(); + assertCurrentEntry(pet, 1); + assertNextAssociationEntityRef(person, Person.PET, PET1, person, pet); + nextEntry(); + assertCurrentEntry(pet2, 1); + assertNextAssociationEntityRef(person, Person.PET, PET2, person, pet2); - entry = itr.next(); - assertEntry(pet2, 1, entry); - assertEntityRef(0, person, String.format(PET_REF, PET2), person, pet2); + nextEntry(); + assertCurrentEntry(race, 1); + assertNextEntityRef(pet, Pet.RACE, person, pet, race); - entry = itr.next(); - assertEntry(race, 1, entry); - assertEntityRef(0, pet, Pet.RACE, person, pet, race); - pet2.setRace(race); detectReferences(person, 3, PET1, PET2, RACE1); - entry = itr.next(); - assertEntry(pet, 1, entry); - assertEntityRef(0, person, String.format(PET_REF, PET1), person, pet); + nextEntry(); + assertCurrentEntry(pet, 1); + assertNextAssociationEntityRef(person, Person.PET, PET1, person, pet); + nextEntry(); + assertCurrentEntry(pet2, 1); + assertNextAssociationEntityRef(person, Person.PET, PET2, person, pet2); - entry = itr.next(); - assertEntry(pet2, 1, entry); - assertEntityRef(0, person, String.format(PET_REF, PET2), person, pet2); + nextEntry(); + assertCurrentEntry(race, 2); + assertNextEntityRef(pet, Pet.RACE, person, pet, race); + assertNextEntityRef(pet2, Pet.RACE, person, pet2, race); - entry = itr.next(); - assertEntry(race, 2, entry); - assertEntityRef(0, pet, Pet.RACE, person, pet, race); - assertEntityRef(1, pet2, Pet.RACE, person, pet2, race); - } }

1 0