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

r2847 - in trunk/topia-persistence/src: main/java/org/nuiton/topia main/java/org/nuiton/topia/framework main/java/org/nuiton/topia/generator main/java/org/nuiton/topia/persistence test/java/org/nuiton/topia test/java/org/nuiton/topia/framework test/java/org/nuiton/topia/generator test/java/org/nuiton/topia/persistence test/java/org/nuiton/topia/test/ano1882 test/java/org/nuiton/topiatest test/java/org/nuiton/topiatest/deletetest
by bleny＠users.nuiton.org Oct. 25, 2013

Oct. 25, 2013

Author: bleny Date: 2013-10-25 14:03:15 +0200 (Fri, 25 Oct 2013) New Revision: 2847 Url: http://nuiton.org/projects/topia/repository/revisions/2847 Log: extract contract TopiaDao, breking the build Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/LegacyTopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaOrRunQueryStep.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java Removed: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.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 trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java trunk/topia-persistence/src/test/java/org/nuiton/topia/GeneratedPersonneTopiaDao.java trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaJpaSupportTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextReplicateTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -35,7 +35,7 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.nuiton.topia.framework.TopiaFiresSupport; -import org.nuiton.topia.persistence.AbstractTopiaDAO; +import org.nuiton.topia.persistence.AbstractTopiaDao; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaIdFactory; @@ -278,9 +278,9 @@ throw new TopiaException("unable to find DAO class " + daoClassName, e); } - if (dao instanceof AbstractTopiaDAO) { - AbstractTopiaDAO abstractTopiaDAO = (AbstractTopiaDAO) dao; - abstractTopiaDAO.init(hibernateSupport, jpaSupport, sqlSupport, listenableSupport, topiaIdFactory, firesSupport, this); + if (dao instanceof AbstractTopiaDao) { + AbstractTopiaDao abstractTopiaDao = (AbstractTopiaDao) dao; + abstractTopiaDao.init(hibernateSupport, jpaSupport, sqlSupport, listenableSupport, topiaIdFactory, firesSupport, this); } daoCache.put(entityClass, dao); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -59,7 +59,7 @@ import org.nuiton.topia.event.TopiaSchemaListener; import org.nuiton.topia.event.TopiaTransactionListener; import org.nuiton.topia.event.TopiaTransactionVetoable; -import org.nuiton.topia.persistence.AbstractTopiaDAO; +import org.nuiton.topia.persistence.AbstractTopiaDao; import org.nuiton.topia.persistence.DefaultTopiaIdFactory; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaDAOImpl; @@ -751,8 +751,8 @@ if (result instanceof TopiaDAOImpl) { // backward compatibility ((TopiaDAOImpl)result).init(this, entityClass, getFiresSupport()); - } else if (result instanceof AbstractTopiaDAO) { - ((AbstractTopiaDAO)result).init(this, this, this, this, getTopiaIdFactory(), getFiresSupport(), this); + } else if (result instanceof AbstractTopiaDao) { + ((AbstractTopiaDao)result).init(this, this, this, this, getTopiaIdFactory(), getFiresSupport(), this); } daoCache.put(entityClass, result); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -54,7 +54,7 @@ import org.nuiton.topia.event.TopiaTransactionEvent; import org.nuiton.topia.event.TopiaTransactionListener; import org.nuiton.topia.event.TopiaTransactionVetoable; -import org.nuiton.topia.persistence.AbstractTopiaDAO; +import org.nuiton.topia.persistence.AbstractTopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.CategorisedListenerSet; import org.nuiton.util.ListenerSet; @@ -282,7 +282,7 @@ } } - public void fireOnPostLoad(AbstractTopiaDAO context, + public void fireOnPostLoad(AbstractTopiaDao context, TopiaEntity entity, Object[] state) { if (log.isDebugEnabled()) { log.debug("fireOnPostLoad"); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -49,7 +49,7 @@ import org.hibernate.event.spi.SaveOrUpdateEventListener; import org.nuiton.topia.TopiaDaoSupplier; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.AbstractTopiaDAO; +import org.nuiton.topia.persistence.AbstractTopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityContextable; @@ -188,7 +188,7 @@ if (daoSupplier != null && event.getEntity() instanceof TopiaEntity) { attachContext(event.getEntity(), daoSupplier); TopiaEntity entity = (TopiaEntity) event.getEntity(); - AbstractTopiaDAO<? extends TopiaEntity> dao = (AbstractTopiaDAO) daoSupplier.getDao(entity.getClass()); + AbstractTopiaDao<? extends TopiaEntity> dao = (AbstractTopiaDao) daoSupplier.getDao(entity.getClass()); dao.getTopiaFiresSupport().fireOnPostLoad(dao, (TopiaEntity) event.getEntity(), new Object[]{}); } } 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 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -44,7 +44,7 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; -import org.nuiton.topia.persistence.AbstractTopiaDAO; +import org.nuiton.topia.persistence.AbstractTopiaDao; import org.nuiton.topia.persistence.TopiaDAOImpl; import java.util.ArrayList; @@ -1042,7 +1042,7 @@ if (StringUtils.isEmpty(daoImpl)) { // use the default dao implementation of topia - result = AbstractTopiaDAO.class; + result = AbstractTopiaDao.class; } else { try { result = Class.forName(daoImpl); Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -1,1307 +0,0 @@ -/* - * #%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% - */ - -/* * - * TopiaDAOAbstract.java - * - * Created: 31 déc. 2005 13:10:34 - * - * @author poussin <poussin(a)codelutin.com> - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - -package org.nuiton.topia.persistence; - -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.collect.Iterators; -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.hibernate.HibernateException; -import org.hibernate.metadata.ClassMetadata; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaDaoSupplier; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaHibernateSupport; -import org.nuiton.topia.TopiaJpaSupport; -import org.nuiton.topia.TopiaListenableSupport; -import org.nuiton.topia.TopiaSqlSupport; -import org.nuiton.topia.event.TopiaEntityListener; -import org.nuiton.topia.event.TopiaEntityVetoable; -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaFiresSupport; -import org.nuiton.topia.framework.TopiaUtil; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; -import org.nuiton.util.PagerBeanUtil; - -import java.lang.reflect.InvocationTargetException; -import java.security.Permission; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Set; - -/** - * Cette classe permet d'avoir un ensemble de méthode implantée de façon - * standard et plus spécifiquement pour Hibernate. - * - * Certains accès à Hibernate sont tout de même fait ici, car on a pris le choix - * de se baser entièrement sur hibernate pour la persistence, et il est ainsi - * possible d'accèder au meta information hibernate sur les classes lorque l'on - * en a besoin. - * - * @param <E> le type de l'entite - * @author bpoussin <poussin(a)codelutin.com> - * @version $Id$ - */ - -public abstract class AbstractTopiaDAO<E extends TopiaEntity> implements TopiaDAO<E> { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(AbstractTopiaDAO.class); - - /** - * Default batch size used to iterate on data. - * - * @since 2.6.14 - */ - protected int batchSize = 1000; - - protected TopiaHibernateSupport topiaHibernateSupport; - - protected TopiaJpaSupport topiaJpaSupport; - - protected TopiaSqlSupport topiaSqlSupport; - - protected TopiaListenableSupport topiaListenableSupport; - - protected TopiaIdFactory topiaIdFactory; - - protected TopiaFiresSupport topiaFiresSupport; - - protected TopiaDaoSupplier topiaDaoSupplier; - - public abstract TopiaEntityEnum getTopiaEntityEnum(); - - public abstract Class<E> getEntityClass(); - - public Iterator<E> iterator() { - - Iterator<E> iterator = new FindAllIterator<E, E>( - this, - getEntityClass(), - batchSize, - "FROM " + getTopiaEntityEnum().getImplementationFQN() + " ORDER BY id", - Collections. <String, Object> emptyMap()); - - return iterator; - - } - -// /** -// * Retourne l'id de l'entity -// * -// * @param e l'entity -// * @return l'id de l'entity ou null si pas trouvé -// * @throws org.nuiton.topia.TopiaException Si une erreur survient durant la recherche -// */ -// protected Serializable getId(E e) { -// ClassMetadata meta = getClassMetadata(); -// String idPropName = meta.getIdentifierPropertyName(); -// -// try { -// Serializable result; -// result = (Serializable) PropertyUtils.getSimpleProperty(e, -// idPropName); -// return result; -// } catch (Exception eee) { -// throw new TopiaException("Impossible de récuperer l'identifiant " -// + idPropName + " de l'entite: " + e); -// } -// } - -// /** -// * Retourne l'id de l'entity representer comme une map -// * -// * @param map l'entity en representation map -// * @return l'id de l'entity ou null si pas trouvé -// * @throws org.nuiton.topia.TopiaException Si une erreur survient durant la recherche -// */ -// protected Serializable getId(Map map) { -// try { -// ClassMetadata meta = getClassMetadata(); -// String idPropName = meta.getIdentifierPropertyName(); -// -// Serializable id = (Serializable) map.get(idPropName); -// return id; -// } catch (HibernateException eee) { -// throw new TopiaException(eee); -// } -// } - - /** - * When AbstractTopiaContext create the TopiaDAOHibernate, it must call this - * method just after. - */ - public void init( - TopiaHibernateSupport topiaHibernateSupport, - TopiaJpaSupport topiaJpaSupport, - TopiaSqlSupport topiaSqlSupport, - TopiaListenableSupport topiaListenableSupport, - TopiaIdFactory topiaIdFactory, - TopiaFiresSupport topiaFiresSupport, - TopiaDaoSupplier topiaDaoSupplier) { - log.debug("init dao for " + getEntityClass()); - this.topiaHibernateSupport = topiaHibernateSupport; - this.topiaJpaSupport = topiaJpaSupport; - this.topiaSqlSupport = topiaSqlSupport; - this.topiaListenableSupport = topiaListenableSupport; - this.topiaIdFactory = topiaIdFactory; - this.topiaFiresSupport = topiaFiresSupport; - this.topiaDaoSupplier = topiaDaoSupplier; - } - - public TopiaFiresSupport getTopiaFiresSupport() { - return topiaFiresSupport; - } - - @Override - public int getBatchSize() { - return batchSize; - } - - @Override - public void setBatchSize(int batchSize) { - this.batchSize = batchSize; - } - - protected String createSimpleQuery() { - return newFromClause(null); - } - - protected String newFromClause(String alias) { - String hql = "from " + getTopiaEntityEnum().getImplementationFQN(); - if (StringUtils.isNotBlank(alias)) { - hql += " " + alias; - } - return hql; - } - - @Deprecated - public String createSimpleQuery(String alias) { - return newFromClause(alias); - } - - public E newInstance() { - if (log.isTraceEnabled()) { - log.trace("entityClass = " + getEntityClass()); - } - Class<E> implementation = (Class<E>) - getTopiaEntityEnum().getImplementation(); - try { - E newInstance = implementation.newInstance(); - return newInstance; - } catch (InstantiationException e) { - throw new TopiaException( - "Impossible de trouver ou d'instancier la classe " - + implementation); - } catch (IllegalAccessException e) { - throw new TopiaException( - "Impossible de trouver ou d'instancier la classe " - + implementation); - } - } - - public void addTopiaEntityListener(TopiaEntityListener listener) { - topiaListenableSupport.addTopiaEntityListener(getEntityClass(), listener); - } - - public void addTopiaEntityVetoable(TopiaEntityVetoable vetoable) { - topiaListenableSupport.addTopiaEntityVetoable(getEntityClass(), vetoable); - } - - public void removeTopiaEntityListener(TopiaEntityListener listener) { - topiaListenableSupport.removeTopiaEntityListener(getEntityClass(), listener); - } - - public void removeTopiaEntityVetoable(TopiaEntityVetoable vetoable) { - topiaListenableSupport.removeTopiaEntityVetoable(getEntityClass(), vetoable); - } - - public E create(E entity) { - try { - // first set topiaId - if (StringUtils.isBlank(entity.getTopiaId())) { - - // only set id if not already on - String topiaId = topiaIdFactory.newTopiaId(getEntityClass(), entity); - entity.setTopiaId(topiaId); - } - - if (entity instanceof TopiaEntityContextable) { - TopiaEntityContextable contextable = (TopiaEntityContextable) entity; - contextable.setTopiaDAOSupplier(this.topiaDaoSupplier); - } - - // save entity - topiaHibernateSupport.getHibernateSession().save(entity); - topiaFiresSupport.warnOnCreateEntity(entity); - return entity; - } catch (HibernateException eee) { - throw new TopiaException(eee); - } - } - - public E create(String propertyName, Object propertyValue, Object... otherPropertyNamesAndValues) { - Map<String, Object> properties = - TopiaUtil.convertPropertiesArrayToMap(propertyName, propertyValue, otherPropertyNamesAndValues); - E result = create(properties); - return result; - } - - @Override - public E create(Object... propertyNamesAndValues) { - Map<String, Object> properties = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); - E result = create(properties); - return result; - } - - public E create(Map<String, Object> properties) { - - E result = newInstance(); - - try { - for (Map.Entry<String, Object> e : properties.entrySet()) { - String propertyName = e.getKey(); - Object value = e.getValue(); - PropertyUtils.setProperty(result, propertyName, value); - } - } catch (IllegalAccessException eee) { - throw new IllegalArgumentException( - "Can't put properties on new Object", eee); - } catch (InvocationTargetException eee) { - throw new IllegalArgumentException( - "Can't put properties on new Object", eee); - } catch (NoSuchMethodException eee) { - throw new IllegalArgumentException( - "Can't put properties on new Object", eee); - } - - create(result); - - return result; - } - - public E create() { - E result = newInstance(); - create(result); - return result; - } - - public E update(E e) { - try { - topiaHibernateSupport.getHibernateSession().saveOrUpdate(e); - topiaFiresSupport.warnOnUpdateEntity(e); - return e; - } catch (HibernateException eee) { - throw new TopiaException(eee); - } - } - - - public void delete(E e) { - try { - topiaHibernateSupport.getHibernateSession().delete(e); - e.notifyDeleted(); - topiaFiresSupport.warnOnDeleteEntity(e); - } catch (HibernateException eee) { - throw new TopiaException(eee); - } - } - - - public void deleteAll(Iterable<E> entities) { - for (E entity : entities) { - delete(entity); - } - } - - protected HqlAndParametersBuilder<E> newHqlAndParametersBuilder() { - return new HqlAndParametersBuilder<E>(getEntityClass()); - } - - protected HqlAndParametersBuilder<E> getHqlForProperties(String propertyName, - Object propertyValue, - Object... otherPropertyNamesAndValues) { - Map<String, Object> properties = - TopiaUtil.convertPropertiesArrayToMap(propertyName, propertyValue, otherPropertyNamesAndValues); - return getHqlForProperties(properties); - } - - protected HqlAndParametersBuilder<E> getHqlForNoConstraint() { - Map<String, Object> properties = Collections.emptyMap(); - return getHqlForProperties(properties); - } - - protected HqlAndParametersBuilder<E> getHqlForProperties(Map<String, Object> properties) { - HqlAndParametersBuilder<E> hqlAndParametersBuilder = newHqlAndParametersBuilder(); - for (Map.Entry<String, Object> property : properties.entrySet()) { - hqlAndParametersBuilder.addEquals(property.getKey(), property.getValue()); - } - return hqlAndParametersBuilder; - } - - protected TopiaQueryBuilderRunQueryStep<E> forHql(String hql) { - Map<String, Object> properties = Collections.emptyMap(); - return forHql(hql, properties); - } - - protected TopiaQueryBuilderRunQueryStep<E> forHql(String hql, Map<String, Object> hqlParameters) { - return new TopiaQueryBuilderRunQueryStep(this, hql, hqlParameters); - } - - protected TopiaQueryBuilderRunQueryStep<E> forHql(String hql, String parameterName, - Object parameterValue, - Object... otherParameterNamesAndValues) { - Map<String, Object> hqlParameters = - TopiaUtil.convertPropertiesArrayToMap(parameterName, parameterValue, otherParameterNamesAndValues); - return forHql(hql, hqlParameters); - } - - public TopiaQueryBuilderCreateQueryStep<E> newQueryBuilder() { - return new TopiaQueryBuilderCreateQueryStep(this); - } - - // shortcuts for first step of builder - - public TopiaQueryBuilderAddCriteriaStep<E> forProperties(Map<String, Object> properties) { - return newQueryBuilder().forProperties(properties); - } - - public TopiaQueryBuilderAddCriteriaStep<E> forProperties(String propertyName, - Object propertyValue, - Object... otherPropertyNamesAndValues) { - return newQueryBuilder().forProperties(propertyName, propertyValue, otherPropertyNamesAndValues); - } - - public TopiaQueryBuilderAddCriteriaStep<E> forAll() { - return newQueryBuilder().forAll(); - } - - public TopiaQueryBuilderRunQueryStep<E> forContains(String propertyName, Object propertyValue) { - return forAll().addContains(propertyName, propertyValue).getNextStep(); - } - - public TopiaQueryBuilderRunQueryStep<E> forEquals(String propertyName, Object propertyValue) { - return forAll().addEquals(propertyName, propertyValue).getNextStep(); - } - - public TopiaQueryBuilderRunQueryStep<E> forIn(String propertyName, Iterable<Object> propertyValues) { - return forAll().addIn(propertyName, propertyValues).getNextStep(); - } - - public static class TopiaQueryBuilderCreateQueryStep<E extends TopiaEntity> { - - protected AbstractTopiaDAO<E> topiaDAO; - - protected TopiaQueryBuilderCreateQueryStep(AbstractTopiaDAO<E> topiaDAO) { - this.topiaDAO = topiaDAO; - } - - public TopiaQueryBuilderAddCriteriaStep<E> forProperties(Map<String, Object> properties) { - HqlAndParametersBuilder<E> hqlAndParametersBuilder = topiaDAO.getHqlForProperties(properties); - return getNextStep(hqlAndParametersBuilder); - } - - public TopiaQueryBuilderAddCriteriaStep<E> forProperties(String propertyName, - Object propertyValue, - Object... otherPropertyNamesAndValues) { - HqlAndParametersBuilder<E> hqlAndParametersBuilder = topiaDAO.getHqlForProperties(propertyName, propertyValue, otherPropertyNamesAndValues); - return getNextStep(hqlAndParametersBuilder); - } - - public TopiaQueryBuilderAddCriteriaStep<E> forAll() { - HqlAndParametersBuilder<E> hqlAndParametersBuilder = topiaDAO.getHqlForNoConstraint(); - return getNextStep(hqlAndParametersBuilder); - } - - protected TopiaQueryBuilderAddCriteriaStep<E> getNextStep(HqlAndParametersBuilder<E> hqlAndParametersBuilder) { - TopiaQueryBuilderAddCriteriaStep nextStep = new TopiaQueryBuilderAddCriteriaStep(topiaDAO, hqlAndParametersBuilder); - return nextStep; - } - - // shortcuts to next step - - public TopiaQueryBuilderAddCriteriaStep<E> addEquals(String property, Object value) { - return forAll().addEquals(property, value); - } - - public TopiaQueryBuilderAddCriteriaStep<E> addIn(String property, Iterable<Object> values) { - return forAll().addIn(property, values); - } - - public TopiaQueryBuilderAddCriteriaStep<E> addContains(String property, Object value) { - return forAll().addContains(property, value); - } - - public TopiaQueryBuilderAddCriteriaStep<E> addNull(String property) { - return forAll().addNull(property); - } - - public TopiaQueryBuilderRunQueryStep<E> setOrderByArguments(Set<String> orderByArguments) { - return forAll().setOrderByArguments(orderByArguments); - } - - public TopiaQueryBuilderRunQueryStep<E> setOrderByArguments(String... orderByArguments) { - return forAll().setOrderByArguments(orderByArguments); - } - - } - - public static class TopiaQueryBuilderAddCriteriaStep<E extends TopiaEntity> { - - protected AbstractTopiaDAO<E> topiaDAO; - - protected HqlAndParametersBuilder<E> hqlAndParametersBuilder; - - protected boolean hasOrderByClause = false; - - protected TopiaQueryBuilderAddCriteriaStep(AbstractTopiaDAO<E> topiaDAO, HqlAndParametersBuilder<E> hqlAndParametersBuilder) { - this.topiaDAO = topiaDAO; - this.hqlAndParametersBuilder = hqlAndParametersBuilder; - } - - public TopiaQueryBuilderRunQueryStep<E> setOrderByArguments(Set<String> orderByArguments) { - hasOrderByClause = ! Iterables.isEmpty(orderByArguments); - hqlAndParametersBuilder.setOrderByArguments(orderByArguments); - return getNextStep(); - } - - public TopiaQueryBuilderRunQueryStep<E> setOrderByArguments(String... orderByArguments) { - hqlAndParametersBuilder.setOrderByArguments(orderByArguments); - return getNextStep(); - } - - public TopiaQueryBuilderAddCriteriaStep<E> addEquals(String property, Object value) { - hqlAndParametersBuilder.addEquals(property, value); - return this; - } - - public TopiaQueryBuilderAddCriteriaStep<E> addIn(String property, Iterable<Object> values) { - hqlAndParametersBuilder.addIn(property, values); - return this; - } - - public TopiaQueryBuilderAddCriteriaStep<E> addContains(String property, Object value) { - hqlAndParametersBuilder.addContains(property, value); - return this; - } - - public TopiaQueryBuilderAddCriteriaStep<E> addNull(String property) { - hqlAndParametersBuilder.addNull(property); - return this; - } - - public void addTopiaIdEquals(String property, String topiaId) { - hqlAndParametersBuilder.addTopiaIdEquals(property, topiaId); - } - - public void addTopiaIdIn(String property, Iterable<String> topiaIds) { - hqlAndParametersBuilder.addTopiaIdIn(property, topiaIds); - } - - // shortcuts to next step - - public boolean exists() { - return getNextStep().exists(); - } - - public E findAnyOrNull() { - return getNextStep().findAnyOrNull(); - } - - public E findUniqueOrNull() { - return getNextStep().findUniqueOrNull(); - } - - public E findAny() { - return getNextStep().findAny(); - } - - public E findUnique() { - return getNextStep().findUnique(); - } - - public E findFirst() { - return getNextStep().findFirst(); - } - - public E findFirstOrNull() { - return getNextStep().findFirstOrNull(); - } - - public Optional<E> tryFindAny() { - return getNextStep().tryFindAny(); - } - - public Optional<E> tryFindFirst() { - return getNextStep().tryFindFirst(); - } - - public Optional<E> tryFindUnique() { - return getNextStep().tryFindUnique(); - } - - public List<E> findAll() { - return getNextStep().findAll(); - } - - public List<E> findAll(int startIndex, int endIndex) { - return getNextStep().findAll(startIndex, endIndex); - } - - public Iterable<E> findAllLazy() { - return getNextStep().findAllLazy(); - } - - public long count() { - return getNextStep().count(); - } - - public List<String> findAllIds(int startIndex, int endIndex) { - return getNextStep().findAllIds(startIndex, endIndex); - } - - public List<String> findAllIds() { - return getNextStep().findAllIds(); - } - - protected TopiaQueryBuilderRunQueryStep<E> getNextStep() { - String hql = hqlAndParametersBuilder.getHql(); - Map<String, Object> hqlParameters = hqlAndParametersBuilder.getHqlParameters(); - TopiaQueryBuilderRunQueryStep nextStep = new TopiaQueryBuilderRunQueryStep(topiaDAO, hql, hqlParameters); - return nextStep; - } - - } - - public static class TopiaQueryBuilderRunQueryStep<E extends TopiaEntity> { - - protected final String hql; - - protected final Map<String, Object> hqlParameters; - - protected AbstractTopiaDAO<E> topiaDAO; - - protected TopiaQueryBuilderRunQueryStep(AbstractTopiaDAO<E> topiaDAO, String hql, Map<String, Object> hqlParameters) { - this.hql = hql; - this.hqlParameters = hqlParameters; - this.topiaDAO = topiaDAO; - } - - public boolean exists() { - return topiaDAO.exists(hql, hqlParameters); - } - - public long count() { - String hqlWithSelectClause = "select count(topiaId) " + hql; - return topiaDAO.count(hqlWithSelectClause, hqlParameters); - } - - public E findUnique() { - return topiaDAO.findUnique(hql, hqlParameters); - } - - public E findUniqueOrNull() { - return topiaDAO.findUniqueOrNull(hql, hqlParameters); - } - - public Optional<E> tryFindUnique() { - return topiaDAO.tryFindUnique(hql, hqlParameters); - } - - public E findFirst() { - return topiaDAO.findFirst(hql, hqlParameters); - } - - public E findFirstOrNull() { - return topiaDAO.findFirstOrNull(hql, hqlParameters); - } - - public Optional<E> tryFindFirst() { - return topiaDAO.tryFindFirst(hql, hqlParameters); - } - - public E findAny() { - return topiaDAO.findAny(hql, hqlParameters); - } - - public E findAnyOrNull() { - return topiaDAO.findAnyOrNull(hql, hqlParameters); - } - - public Optional<E> tryFindAny() { - return topiaDAO.tryFindAny(hql, hqlParameters); - } - - public List<E> findAll() { - return topiaDAO.findAll(hql, hqlParameters); - } - - public Iterable<E> findAllLazy() { - return topiaDAO.findAllLazy(hql, hqlParameters); - } - - public List<E> findAll(int startIndex, int endIndex) { - return topiaDAO.findAll(hql, hqlParameters, startIndex, endIndex); - } - - public List<String> findAllIds() { - // XXX brendan 30/09/13 does this truely work ? - String hqlWithSelectClause = "select topiaId " + hql; - return topiaDAO.findAll(hqlWithSelectClause, hqlParameters, String.class); - } - - public List<String> findAllIds(int startIndex, int endIndex) { - // XXX brendan 30/09/13 does this truely work ? - String hqlWithSelectClause = "select topiaId " + hql; - return topiaDAO.findAll(hqlWithSelectClause, hqlParameters, String.class, startIndex, endIndex); - } - - } - - protected boolean exists(String hql, Map<String, Object> hqlParameters) { - List<E> entities = topiaJpaSupport.find(hql, 0, 0, hqlParameters); - boolean exists = !entities.isEmpty(); - return exists; - } - - protected long count(String hql, Map<String, Object> hqlParameters) { - Preconditions.checkArgument(hql.toLowerCase().trim().startsWith("select count(")); - Long count = findUnique(hql, hqlParameters, Long.class); - return count; - } - - protected E findUnique(String hql, Map<String, Object> hqlParameters) { - E unique = findUnique(hql, hqlParameters, getEntityClass()); - return unique; - } - - protected E findUniqueOrNull(String hql, Map<String, Object> hqlParameters) { - E uniqueOrNull = findUniqueOrNull(hql, hqlParameters, getEntityClass()); - return uniqueOrNull; - } - - protected Optional<E> tryFindUnique(String hql, Map<String, Object> hqlParameters) { - Optional<E> uniqueOrNull = tryFindUnique(hql, hqlParameters, getEntityClass()); - return uniqueOrNull; - } - - protected E findFirst(String hql, Map<String, Object> hqlParameters) { - E firstOrNull = findFirst(hql, hqlParameters, getEntityClass()); - return firstOrNull; - } - - protected E findFirstOrNull(String hql, Map<String, Object> hqlParameters) { - E anyOrNull = findFirstOrNull(hql, hqlParameters, getEntityClass()); - return anyOrNull; - } - - protected Optional<E> tryFindFirst(String hql, Map<String, Object> hqlParameters) { - Optional<E> anyOrNull = tryFindFirst(hql, hqlParameters, getEntityClass()); - return anyOrNull; - } - - protected E findAny(String hql, Map<String, Object> hqlParameters) { - E anyOrNull = findAny(hql, hqlParameters, getEntityClass()); - return anyOrNull; - } - - protected E findAnyOrNull(String hql, Map<String, Object> hqlParameters) { - E anyOrNull = findAnyOrNull(hql, hqlParameters, getEntityClass()); - return anyOrNull; - } - - protected Optional<E> tryFindAny(String hql, Map<String, Object> hqlParameters) { - Optional<E> anyOrNull = tryFindAny(hql, hqlParameters, getEntityClass()); - return anyOrNull; - } - - protected <R> R findUnique(String hql, Map<String, Object> hqlParameters, Class<R> type) { - R uniqueOrNull = findUniqueOrNull(hql, hqlParameters, type); - if (uniqueOrNull == null) { - // TODO brendan 30/09/13 throw another exception if no result - throw new TopiaException("query " + hql + " returns no elements"); - } - return uniqueOrNull; - } - - protected <R> Optional<R> tryFindUnique(String hql, Map<String, Object> hqlParameters, Class<R> type) { - R uniqueOrNull = findUniqueOrNull(hql, hqlParameters, type); - return Optional.fromNullable(uniqueOrNull); - } - - protected <R> R findUniqueOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) { - List<R> results = findAll(hql, hqlParameters, type, 0, 1); - // If there is more than 1 result, throw an exception - if (results.size() > 1) { - String message = String.format( - "The query '%s' returns more than 1 unique result", hql); - // TODO AThimel 02/08/13 Throw another exception if more than 1 result is found - throw new TopiaException(message); - } - // otherwise return the first one, or null - R uniqueOrNull = Iterables.getOnlyElement(results, null); - return uniqueOrNull; - } - - protected <R> R findFirst(String hql, Map<String, Object> hqlParameters, Class<R> type) { - R firstOrNull = findFirstOrNull(hql, hqlParameters, type); - if (firstOrNull == null) { - // TODO brendan 30/09/13 throw another exception if no result - throw new TopiaException("query " + hql + " returns no elements"); - } - return firstOrNull; - } - - protected <R> Optional<R> tryFindFirst(String hql, Map<String, Object> hqlParameters, Class<R> type) { - R firstOrNull = findFirstOrNull(hql, hqlParameters, type); - return Optional.fromNullable(firstOrNull); - } - - protected <R> R findFirstOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) { - Preconditions.checkArgument(hql.toLowerCase().contains("order by")); - R anyOrNull = findAnyOrNull(hql, hqlParameters, type); - return anyOrNull; - } - - protected <R> R findAny(String hql, Map<String, Object> hqlParameters, Class<R> type) { - R anyOrNull = findAnyOrNull(hql, hqlParameters, type); - if (anyOrNull == null) { - // TODO brendan 30/09/13 throw another exception if no result - throw new TopiaException("query " + hql + " returns no elements"); - } - return anyOrNull; - } - - protected <R> Optional<R> tryFindAny(String hql, Map<String, Object> hqlParameters, Class<R> type) { - R anyOrNull = findAnyOrNull(hql, hqlParameters, type); - return Optional.fromNullable(anyOrNull); - } - - protected <R> R findAnyOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) { - Preconditions.checkNotNull(hql); - Preconditions.checkNotNull(hqlParameters); - List<R> results = findAll(hql, hqlParameters, type, 0, 0); - R anyOrNull = Iterables.getOnlyElement(results, null); - return anyOrNull; - } - - protected List<E> findAll(String hql, Map<String, Object> hqlParameters) { - Preconditions.checkNotNull(hql); - Preconditions.checkNotNull(hqlParameters); - List<E> all = topiaJpaSupport.findAll(hql, hqlParameters); - return all; - } - - protected <R> List<R> findAll(String hql, Map<String, Object> hqlParameters, Class<R> type) { - Preconditions.checkNotNull(hql); - Preconditions.checkNotNull(hqlParameters); - Preconditions.checkNotNull(type); - List<R> all = topiaJpaSupport.findAll(hql, hqlParameters); - return all; - } - - protected List<E> findAll(String hql, Map<String, Object> hqlParameters, int startIndex, int endIndex) { - Preconditions.checkNotNull(hql); - Preconditions.checkNotNull(hqlParameters); - List<E> all = topiaJpaSupport.find(hql, startIndex, endIndex, hqlParameters); - return all; - } - - protected <R> List<R> findAll(String hql, Map<String, Object> hqlParameters, Class<R> type, int startIndex, int endIndex) { - Preconditions.checkNotNull(hql); - Preconditions.checkNotNull(hqlParameters); - Preconditions.checkNotNull(type); - List<R> all = topiaJpaSupport.find(hql, startIndex, endIndex, hqlParameters); - return all; - } - - protected <R> List<R> findAll(String hql, Map<String, Object> hqlParameters, Class<R> type, TopiaPagerBean pager) { - Preconditions.checkNotNull(hql); - Preconditions.checkNotNull(hqlParameters); - Preconditions.checkNotNull(type); - Preconditions.checkNotNull(pager); - - if (StringUtils.isNotBlank(pager.getSortColumn())) { - hql += " order by " + pager.getSortColumn(); - if (!pager.isSortAscendant()) { - hql += " desc"; - } - } - - List<R> result = topiaJpaSupport.find( - hql, - (int) pager.getRecordStartIndex(), - (int) pager.getRecordEndIndex() - 1, - hqlParameters); - - return result; - - } - - protected Iterable<E> findAllLazy(String hql, Map<String, Object> hqlParameters) { - - Preconditions.checkNotNull(hql); - Preconditions.checkNotNull(hqlParameters); - - final Iterator<E> iterator = new FindAllIterator<E, E>(this, - getEntityClass(), - batchSize, - hql, - hqlParameters); - Iterable<E> result = new Iterable<E>() { - @Override - public Iterator<E> iterator() { - return iterator; - } - }; - return result; - } - - protected <R> Iterable<R> findAllLazy(String hql, Map<String, Object> hqlParameters, Class<R> type) { - - Preconditions.checkNotNull(hql); - Preconditions.checkNotNull(hqlParameters); - Preconditions.checkNotNull(type); - - final Iterator<R> iterator = new FindAllIterator<E, R>(this, - type, - batchSize, - hql, - hqlParameters); - Iterable<R> result = new Iterable<R>() { - @Override - public Iterator<R> iterator() { - return iterator; - } - }; - return result; - } - - public TopiaQueryBuilderRunQueryStep<E> forTopiaId(String topiaId) { - Preconditions.checkNotNull(topiaId, "given topiaId is null"); - return forEquals(TopiaEntity.PROPERTY_TOPIA_ID, topiaId); - } - - public TopiaQueryBuilderRunQueryStep<E> forTopiaIds(Iterable<String> topiaIds) { - Preconditions.checkNotNull(topiaIds, "given topiaIds is null"); - return forIn(TopiaEntity.PROPERTY_TOPIA_ID, (Iterable) topiaIds); - } - - @Deprecated - public E findByTopiaId(String id) { - return forTopiaId(id).findUniqueOrNull(); - } - - @Deprecated - public E findByProperty(String propertyName, Object value) { - return newQueryBuilder().forProperties(propertyName, value).findAnyOrNull(); - } - - @Override - public <R> R findByQuery(Class<R> type, String hql, Object... propertyNamesAndValues) { - Map<String, Object> properties = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); - return findAny(hql, properties, type); - } - - @Override - public E findByPrimaryKey(Map<String, Object> keys) { - return newQueryBuilder().forProperties(keys).findUniqueOrNull(); - } - - @Override - @Deprecated - public E findByPrimaryKey(Object... propertyNamesAndValues) { - Map<String, Object> properties = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); - E byPrimaryKey = findByPrimaryKey(properties); - return byPrimaryKey; - } - - @Override - public List<E> findAllWithOrder(String... propertyNames) { - return newQueryBuilder().forAll().setOrderByArguments(propertyNames).findAll(); - } - - @Override - public <R> List<R> findAllByQuery(Class<R> type, String hql, Object... propertyNamesAndValues) { - Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); - List<R> all = findAll(hql, hqlParameters, type); - return all; - } - - @Deprecated - public E findByProperties(String propertyName, Object value, - Object... propertyNamesAndValues) { - return newQueryBuilder().forProperties(propertyName, value, propertyNamesAndValues).findUniqueOrNull(); - } - - @Deprecated - public E findByProperties(Map<String, Object> properties) { - return newQueryBuilder().forProperties(properties).findUniqueOrNull(); - } - - public List<E> findAll() { - return newQueryBuilder().forAll().findAll(); - } - - public List<String> findAllIds() { - List<String> find = newQueryBuilder().forAll().findAllIds(); - return find; - } - - @Deprecated - public List<E> findAllByProperty(String propertyName, Object value) { - List<E> all = newQueryBuilder().forProperties(propertyName, value).findAll(); - return all; - } - - @Deprecated - public List<E> findAllByProperties(String propertyName, Object value, Object... propertyNamesAndValues) { - List<E> all = newQueryBuilder().forProperties(propertyName, value, propertyNamesAndValues).findAll(); - return all; - } - - @Deprecated - public List<E> findAllByProperties(Map<String, Object> properties) { - List<E> all = newQueryBuilder().forProperties(properties).findAll(); - return all; - } - - - public E findContains(String propertyName, Object value) { - E find = newQueryBuilder().forAll().addContains(propertyName, value).findAny(); - return find; - } - - - public List<E> findAllContains(String propertyName, - Object value) { - List<E> find = newQueryBuilder().forAll().addContains(propertyName, value).findAll(); - return find; - } - - @Deprecated - public boolean existByTopiaId(String topiaId) { - boolean exists = forTopiaId(topiaId).exists(); - return exists; - } - - @Deprecated - public boolean existByProperties(String propertyName, Object propertyValue, - Object... propertyNamesAndValues) { - boolean exists = newQueryBuilder().forProperties(propertyName, propertyValue, propertyNamesAndValues).exists(); - return exists; - } - - public long count() { - long count = newQueryBuilder().forAll().count(); - return count; - } - - - @Deprecated - public boolean existsByQuery(String hql, Object... propertyNamesAndValues) { - Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); - boolean exists = exists(hql, hqlParameters); - return exists; - } - - - @Deprecated - public long countByQuery(String hql, - Object... propertyNamesAndValues) { - - Preconditions.checkNotNull(StringUtils.isNotBlank(hql)); - Preconditions.checkArgument(hql.toUpperCase().trim().startsWith("SELECT COUNT(")); - Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); - long count = forHql(hql, hqlParameters).count(); - return count; - } - - - @Deprecated - public E findByQuery(String hql, - Object... propertyNamesAndValues) { - Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); - E uniqueOrNull = forHql(hql, hqlParameters).findUniqueOrNull(); - return uniqueOrNull; - } - - - @Deprecated - public List<E> findAllByQuery(String hql, - Object... propertyNamesAndValues) { - Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); - List<E> all = forHql(hql, hqlParameters).findAll(); - return all; - } - - - @Deprecated - public Iterable<E> findAllLazyByQuery(String hql, - Object... propertyNamesAndValues) { - Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); - Iterable<E> result = findAllLazy(hql, hqlParameters); - return result; - } - - - @Deprecated - public <R> Iterable<R> findAllLazyByQuery(Class<R> type, - String hql, - Object... propertyNamesAndValues) { - Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); - Iterable<R> result = findAllLazy(hql, hqlParameters, type); - return result; - } - - - @Deprecated - public Iterable<E> findAllLazyByQuery(int batchSize, - String hql, - Object... propertyNamesAndValues) { - return findAllLazyByQuery(getEntityClass(), batchSize, hql, propertyNamesAndValues); - } - - - /** - * @deprecated use {@link #findAllLazy(String, java.util.Map, Class)} - */ - @Deprecated - public <R> Iterable<R> findAllLazyByQuery(Class<R> type, - int batchSize, - String hql, - Object... propertyNamesAndValues) { - setBatchSize(batchSize); - Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); - Iterable<R> allLazy = findAllLazy(hql, hqlParameters, type); - return allLazy; - } - - - @Deprecated - public <R> List<R> findAllByQueryWithBound(Class<R> type, - String hql, - int startIndex, - int endIndex, - Object... propertyNamesAndValues) { - Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); - List<R> all = findAll(hql, hqlParameters, type, startIndex, endIndex); - return all; - } - - - @Deprecated - public List<E> findAllByQueryWithBound(String hql, - int startIndex, - int endIndex, - Object... propertyNamesAndValues) { - List<E> result = findAllByQueryWithBound(getEntityClass(), - hql, - startIndex, - endIndex, - propertyNamesAndValues); - return result; - } - - - @Deprecated - public <R> List<R> findAllByQueryAndPager(Class<R> type, - String hql, - TopiaPagerBean pager, - Object... propertyNamesAndValues) { - Preconditions.checkNotNull(pager); - Preconditions.checkNotNull(hql); - - if (StringUtils.isNotBlank(pager.getSortColumn())) { - hql += " ORDER BY " + pager.getSortColumn(); - if (!pager.isSortAscendant()) { - hql += " DESC"; - } - } - List<R> result = findAllByQueryWithBound(type, hql, - (int) pager.getRecordStartIndex(), - (int) pager.getRecordEndIndex() - 1, - propertyNamesAndValues); - return result; - } - - - @Deprecated - public List<E> findAllByQueryAndPager(String hql, - TopiaPagerBean pager, - Object... propertyNamesAndValues) { - - List<E> result = findAllByQueryAndPager(getEntityClass(), - hql, - pager, - propertyNamesAndValues); - return result; - } - - - public void computeAndAddRecordsToPager(String hql, - TopiaPagerBean pager, - Object... propertyNamesAndValues) { - - long records = countByQuery(hql, propertyNamesAndValues); - - pager.setRecords(records); - PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); - } - - /** - * package locale method because this is hibernate specific method and - * we don't want expose it. - * - * @return the meta-data of the entity - * @throws org.nuiton.topia.TopiaException if any pb - */ - protected ClassMetadata getClassMetadata() { - ClassMetadata meta = topiaHibernateSupport.getHibernateFactory() - .getClassMetadata(getEntityClass()); - if (meta == null) { - meta = topiaHibernateSupport.getHibernateFactory().getClassMetadata( - getTopiaEntityEnum().getImplementationFQN()); - } - return meta; - } - - public static class FindAllIterator<E extends TopiaEntity, R> implements Iterator<R> { - - protected Iterator<R> data; - - protected final AbstractTopiaDAO<E> dao; - - protected final Class<R> type; - - protected final String hql; - - protected final Map<String, Object> params; - - protected TopiaPagerBean pager; - - public FindAllIterator(AbstractTopiaDAO<E> dao, - Class<R> type, - int batchSize, - String hql, - Map<String, Object> params) { - this.dao = dao; - this.type = type; - this.hql = hql; - this.params = params; - - String hql2 = hql.toLowerCase(); - int i = hql2.indexOf("order by"); - if (i == -1) { - throw new IllegalStateException( - "must have a *order by* in hql, " + - "but did not find it in " + hql); - } - - // get the count (removing the order-by) - long count2 = dao.count("SELECT COUNT(*) " + - hql.substring(0, i), params); - pager = new TopiaPagerBean(); - pager.setRecords(count2); - pager.setPageSize(batchSize); - PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); - - // empty iterator (will be changed at first next call) - data = Iterators.emptyIterator(); - } - - - public boolean hasNext() { - boolean result = data.hasNext() || // no more data - pager.getPageIndex() < pager.getPagesNumber(); - return result; - } - - - public R next() { - if (!hasNext()) { - throw new NoSuchElementException(); - } - - if (!data.hasNext()) { - - // must load iterator - - // increments page index - pager.setPageIndex(pager.getPageIndex() + 1); - PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); - - // load new window of data - data = dao.findAll(hql, params, type, pager).iterator(); - - } - - R next = data.next(); - return next; - } - - - public void remove() { - throw new UnsupportedOperationException( - "This iterator does not support remove operation."); - } - } - - @Override - public List<Permission> getRequestPermission(String topiaId, int actions) { - throw new UnsupportedOperationException(); - } - - @Override - public TopiaContextImplementor getContext() { - throw new UnsupportedOperationException(); - } - - @Override - public TopiaContext getTopiaContext() { - throw new UnsupportedOperationException(); - } - -} //TopiaDAOImpl Copied: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java (from rev 2846, trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java) =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -0,0 +1,1000 @@ +/* + * #%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% + */ + +/* * + * TopiaDAOAbstract.java + * + * Created: 31 déc. 2005 13:10:34 + * + * @author poussin <poussin(a)codelutin.com> + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ + +package org.nuiton.topia.persistence; + +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; +import com.google.common.collect.Iterators; +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.HibernateException; +import org.hibernate.metadata.ClassMetadata; +import org.nuiton.topia.TopiaDaoSupplier; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaHibernateSupport; +import org.nuiton.topia.TopiaJpaSupport; +import org.nuiton.topia.TopiaListenableSupport; +import org.nuiton.topia.TopiaSqlSupport; +import org.nuiton.topia.event.TopiaEntityListener; +import org.nuiton.topia.event.TopiaEntityVetoable; +import org.nuiton.topia.framework.TopiaFiresSupport; +import org.nuiton.topia.framework.TopiaUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.PagerBeanUtil; + +import java.lang.reflect.InvocationTargetException; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; + +/** + * Cette classe permet d'avoir un ensemble de méthode implantée de façon + * standard et plus spécifiquement pour Hibernate. + * + * Certains accès à Hibernate sont tout de même fait ici, car on a pris le choix + * de se baser entièrement sur hibernate pour la persistence, et il est ainsi + * possible d'accèder au meta information hibernate sur les classes lorque l'on + * en a besoin. + * + * @param <E> le type de l'entite + * @author bpoussin <poussin(a)codelutin.com> + * @version $Id$ + */ +public abstract class AbstractTopiaDao<E extends TopiaEntity> extends LegacyTopiaDao<E> { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + private static Log log = LogFactory.getLog(AbstractTopiaDao.class); + + /** + * Default batch size used to iterate on data. + * + * @since 2.6.14 + */ + protected int batchSize = 1000; + + protected TopiaHibernateSupport topiaHibernateSupport; + + protected TopiaJpaSupport topiaJpaSupport; + + protected TopiaSqlSupport topiaSqlSupport; + + protected TopiaListenableSupport topiaListenableSupport; + + protected TopiaIdFactory topiaIdFactory; + + protected TopiaFiresSupport topiaFiresSupport; + + protected TopiaDaoSupplier topiaDaoSupplier; + + public abstract TopiaEntityEnum getTopiaEntityEnum(); + + public abstract Class<E> getEntityClass(); + + /** + * When AbstractTopiaContext create the TopiaDAOHibernate, it must call this + * method just after. + */ + public void init( + TopiaHibernateSupport topiaHibernateSupport, + TopiaJpaSupport topiaJpaSupport, + TopiaSqlSupport topiaSqlSupport, + TopiaListenableSupport topiaListenableSupport, + TopiaIdFactory topiaIdFactory, + TopiaFiresSupport topiaFiresSupport, + TopiaDaoSupplier topiaDaoSupplier) { + if (log.isDebugEnabled()) { + log.debug("init dao for " + getEntityClass()); + } + this.topiaHibernateSupport = topiaHibernateSupport; + this.topiaJpaSupport = topiaJpaSupport; + this.topiaSqlSupport = topiaSqlSupport; + this.topiaListenableSupport = topiaListenableSupport; + this.topiaIdFactory = topiaIdFactory; + this.topiaFiresSupport = topiaFiresSupport; + this.topiaDaoSupplier = topiaDaoSupplier; + } + + public TopiaFiresSupport getTopiaFiresSupport() { + return topiaFiresSupport; + } + + @Override + public int getBatchSize() { + return batchSize; + } + + @Override + public void setBatchSize(int batchSize) { + this.batchSize = batchSize; + } + + protected String newFromClause(String alias) { + String hql = "from " + getTopiaEntityEnum().getImplementationFQN(); + if (StringUtils.isNotBlank(alias)) { + hql += " " + alias; + } + return hql; + } + + @Override + public E newInstance() { + if (log.isTraceEnabled()) { + log.trace("entityClass = " + getEntityClass()); + } + Class<E> implementation = (Class<E>) + getTopiaEntityEnum().getImplementation(); + try { + E newInstance = implementation.newInstance(); + return newInstance; + } catch (InstantiationException e) { + throw new TopiaException( + "Impossible de trouver ou d'instancier la classe " + + implementation); + } catch (IllegalAccessException e) { + throw new TopiaException( + "Impossible de trouver ou d'instancier la classe " + + implementation); + } + } + + @Override + public void addTopiaEntityListener(TopiaEntityListener listener) { + topiaListenableSupport.addTopiaEntityListener(getEntityClass(), listener); + } + + @Override + public void addTopiaEntityVetoable(TopiaEntityVetoable vetoable) { + topiaListenableSupport.addTopiaEntityVetoable(getEntityClass(), vetoable); + } + + @Override + public void removeTopiaEntityListener(TopiaEntityListener listener) { + topiaListenableSupport.removeTopiaEntityListener(getEntityClass(), listener); + } + + @Override + public void removeTopiaEntityVetoable(TopiaEntityVetoable vetoable) { + topiaListenableSupport.removeTopiaEntityVetoable(getEntityClass(), vetoable); + } + + @Override + public E create(E entity) { + try { + // first set topiaId + if (StringUtils.isBlank(entity.getTopiaId())) { + + // only set id if not already on + String topiaId = topiaIdFactory.newTopiaId(getEntityClass(), entity); + entity.setTopiaId(topiaId); + } + + if (entity instanceof TopiaEntityContextable) { + TopiaEntityContextable contextable = (TopiaEntityContextable) entity; + contextable.setTopiaDAOSupplier(this.topiaDaoSupplier); + } + + // save entity + topiaHibernateSupport.getHibernateSession().save(entity); + topiaFiresSupport.warnOnCreateEntity(entity); + return entity; + } catch (HibernateException eee) { + throw new TopiaException(eee); + } + } + + @Override + public E create(String propertyName, Object propertyValue, Object... otherPropertyNamesAndValues) { + Map<String, Object> properties = + TopiaUtil.convertPropertiesArrayToMap(propertyName, propertyValue, otherPropertyNamesAndValues); + E result = create(properties); + return result; + } + + @Override + public E create(Map<String, Object> properties) { + + E result = newInstance(); + + try { + for (Map.Entry<String, Object> e : properties.entrySet()) { + String propertyName = e.getKey(); + Object value = e.getValue(); + PropertyUtils.setProperty(result, propertyName, value); + } + } catch (IllegalAccessException eee) { + throw new IllegalArgumentException( + "Can't put properties on new Object", eee); + } catch (InvocationTargetException eee) { + throw new IllegalArgumentException( + "Can't put properties on new Object", eee); + } catch (NoSuchMethodException eee) { + throw new IllegalArgumentException( + "Can't put properties on new Object", eee); + } + + create(result); + + return result; + } + + @Override + public E create() { + E result = newInstance(); + create(result); + return result; + } + + @Override + public Iterable<E> createAll(Iterable<E> entities) { + for (E entity : entities) { + create(entity); + } + return entities; + } + + @Override + public E update(E entity) { + try { + topiaHibernateSupport.getHibernateSession().saveOrUpdate(entity); + topiaFiresSupport.warnOnUpdateEntity(entity); + return entity; + } catch (HibernateException eee) { + throw new TopiaException(eee); + } + } + + @Override + public Iterable<E> updateAll(Iterable<E> entities) { + for (E entity : entities) { + update(entity); + } + return entities; + } + + @Override + public void delete(E entity) { + try { + topiaHibernateSupport.getHibernateSession().delete(entity); + entity.notifyDeleted(); + topiaFiresSupport.warnOnDeleteEntity(entity); + } catch (HibernateException eee) { + throw new TopiaException(eee); + } + } + + @Override + public void deleteAll(Iterable<E> entities) { + for (E entity : entities) { + delete(entity); + } + } + + protected HqlAndParametersBuilder<E> newHqlAndParametersBuilder() { + return new HqlAndParametersBuilder<E>(getEntityClass()); + } + + protected HqlAndParametersBuilder<E> getHqlForProperties(String propertyName, + Object propertyValue, + Object... otherPropertyNamesAndValues) { + Map<String, Object> properties = + TopiaUtil.convertPropertiesArrayToMap(propertyName, propertyValue, otherPropertyNamesAndValues); + return getHqlForProperties(properties); + } + + protected HqlAndParametersBuilder<E> getHqlForNoConstraint() { + Map<String, Object> properties = Collections.emptyMap(); + return getHqlForProperties(properties); + } + + protected HqlAndParametersBuilder<E> getHqlForProperties(Map<String, Object> properties) { + HqlAndParametersBuilder<E> hqlAndParametersBuilder = newHqlAndParametersBuilder(); + for (Map.Entry<String, Object> property : properties.entrySet()) { + hqlAndParametersBuilder.addEquals(property.getKey(), property.getValue()); + } + return hqlAndParametersBuilder; + } + + protected TopiaQueryBuilderRunQueryStep<E> forHql(String hql) { + Map<String, Object> properties = Collections.emptyMap(); + return forHql(hql, properties); + } + + protected TopiaQueryBuilderRunQueryStep<E> forHql(String hql, Map<String, Object> hqlParameters) { + return new TopiaQueryBuilderRunQueryStep(this, hql, hqlParameters); + } + + protected TopiaQueryBuilderRunQueryStep<E> forHql(String hql, String parameterName, + Object parameterValue, + Object... otherParameterNamesAndValues) { + Map<String, Object> hqlParameters = + TopiaUtil.convertPropertiesArrayToMap(parameterName, parameterValue, otherParameterNamesAndValues); + return forHql(hql, hqlParameters); + } + + @Override + public TopiaQueryBuilderAddCriteriaStep<E> forProperties(Map<String, Object> properties) { + HqlAndParametersBuilder<E> hqlAndParametersBuilder = getHqlForProperties(properties); + TopiaQueryBuilderAddCriteriaStep nextStep = new TopiaQueryBuilderAddCriteriaStep(this, hqlAndParametersBuilder); + return nextStep; + } + + @Override + public TopiaQueryBuilderAddCriteriaStep<E> forProperties(String propertyName, + Object propertyValue, + Object... otherPropertyNamesAndValues) { + HqlAndParametersBuilder<E> hqlAndParametersBuilder = getHqlForProperties(propertyName, propertyValue, otherPropertyNamesAndValues); + TopiaQueryBuilderAddCriteriaStep nextStep = new TopiaQueryBuilderAddCriteriaStep(this, hqlAndParametersBuilder); + return nextStep; + } + + @Override + public TopiaQueryBuilderAddCriteriaStep<E> newQueryBuilder() { + HqlAndParametersBuilder<E> hqlAndParametersBuilder = newHqlAndParametersBuilder(); + TopiaQueryBuilderAddCriteriaStep nextStep = new TopiaQueryBuilderAddCriteriaStep(this, hqlAndParametersBuilder); + return nextStep; + } + + @Override + public TopiaQueryBuilderRunQueryStep<E> forContains(String propertyName, Object propertyValue) { + return newQueryBuilder().addContains(propertyName, propertyValue).getNextStep(); + } + + @Override + public TopiaQueryBuilderRunQueryStep<E> forEquals(String propertyName, Object propertyValue) { + return newQueryBuilder().addEquals(propertyName, propertyValue).getNextStep(); + } + + @Override + public TopiaQueryBuilderRunQueryStep<E> forIn(String propertyName, Iterable<Object> propertyValues) { + return newQueryBuilder().addIn(propertyName, propertyValues).getNextStep(); + } + + protected boolean exists(String hql, Map<String, Object> hqlParameters) { + List<E> entities = topiaJpaSupport.find(hql, 0, 0, hqlParameters); + boolean exists = !entities.isEmpty(); + return exists; + } + + protected long count(String hql, Map<String, Object> hqlParameters) { + Preconditions.checkArgument(hql.toLowerCase().trim().startsWith("select count(")); + Long count = findUnique(hql, hqlParameters, Long.class); + return count; + } + + protected E findUnique(String hql, Map<String, Object> hqlParameters) { + E unique = findUnique(hql, hqlParameters, getEntityClass()); + return unique; + } + + protected E findUniqueOrNull(String hql, Map<String, Object> hqlParameters) { + E uniqueOrNull = findUniqueOrNull(hql, hqlParameters, getEntityClass()); + return uniqueOrNull; + } + + protected Optional<E> tryFindUnique(String hql, Map<String, Object> hqlParameters) { + Optional<E> uniqueOrNull = tryFindUnique(hql, hqlParameters, getEntityClass()); + return uniqueOrNull; + } + + protected E findFirst(String hql, Map<String, Object> hqlParameters) { + E firstOrNull = findFirst(hql, hqlParameters, getEntityClass()); + return firstOrNull; + } + + protected E findFirstOrNull(String hql, Map<String, Object> hqlParameters) { + E anyOrNull = findFirstOrNull(hql, hqlParameters, getEntityClass()); + return anyOrNull; + } + + protected Optional<E> tryFindFirst(String hql, Map<String, Object> hqlParameters) { + Optional<E> anyOrNull = tryFindFirst(hql, hqlParameters, getEntityClass()); + return anyOrNull; + } + + protected E findAny(String hql, Map<String, Object> hqlParameters) { + E anyOrNull = findAny(hql, hqlParameters, getEntityClass()); + return anyOrNull; + } + + protected E findAnyOrNull(String hql, Map<String, Object> hqlParameters) { + E anyOrNull = findAnyOrNull(hql, hqlParameters, getEntityClass()); + return anyOrNull; + } + + protected Optional<E> tryFindAny(String hql, Map<String, Object> hqlParameters) { + Optional<E> anyOrNull = tryFindAny(hql, hqlParameters, getEntityClass()); + return anyOrNull; + } + + protected <R> R findUnique(String hql, Map<String, Object> hqlParameters, Class<R> type) { + R uniqueOrNull = findUniqueOrNull(hql, hqlParameters, type); + if (uniqueOrNull == null) { + // TODO brendan 30/09/13 throw another exception if no result + throw new TopiaException("query " + hql + " returns no elements"); + } + return uniqueOrNull; + } + + protected <R> Optional<R> tryFindUnique(String hql, Map<String, Object> hqlParameters, Class<R> type) { + R uniqueOrNull = findUniqueOrNull(hql, hqlParameters, type); + return Optional.fromNullable(uniqueOrNull); + } + + protected <R> R findUniqueOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) { + List<R> results = findAll(hql, hqlParameters, type, 0, 1); + // If there is more than 1 result, throw an exception + if (results.size() > 1) { + String message = String.format( + "The query '%s' returns more than 1 unique result", hql); + // TODO AThimel 02/08/13 Throw another exception if more than 1 result is found + throw new TopiaException(message); + } + // otherwise return the first one, or null + R uniqueOrNull = Iterables.getOnlyElement(results, null); + return uniqueOrNull; + } + + protected <R> R findFirst(String hql, Map<String, Object> hqlParameters, Class<R> type) { + R firstOrNull = findFirstOrNull(hql, hqlParameters, type); + if (firstOrNull == null) { + // TODO brendan 30/09/13 throw another exception if no result + throw new TopiaException("query " + hql + " returns no elements"); + } + return firstOrNull; + } + + protected <R> Optional<R> tryFindFirst(String hql, Map<String, Object> hqlParameters, Class<R> type) { + R firstOrNull = findFirstOrNull(hql, hqlParameters, type); + return Optional.fromNullable(firstOrNull); + } + + protected <R> R findFirstOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) { + Preconditions.checkArgument(hql.toLowerCase().contains("order by")); + R anyOrNull = findAnyOrNull(hql, hqlParameters, type); + return anyOrNull; + } + + protected <R> R findAny(String hql, Map<String, Object> hqlParameters, Class<R> type) { + R anyOrNull = findAnyOrNull(hql, hqlParameters, type); + if (anyOrNull == null) { + // TODO brendan 30/09/13 throw another exception if no result + throw new TopiaException("query " + hql + " returns no elements"); + } + return anyOrNull; + } + + protected <R> Optional<R> tryFindAny(String hql, Map<String, Object> hqlParameters, Class<R> type) { + R anyOrNull = findAnyOrNull(hql, hqlParameters, type); + return Optional.fromNullable(anyOrNull); + } + + protected <R> R findAnyOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) { + Preconditions.checkNotNull(hql); + Preconditions.checkNotNull(hqlParameters); + List<R> results = findAll(hql, hqlParameters, type, 0, 0); + R anyOrNull = Iterables.getOnlyElement(results, null); + return anyOrNull; + } + + protected List<E> findAll(String hql, Map<String, Object> hqlParameters) { + Preconditions.checkNotNull(hql); + Preconditions.checkNotNull(hqlParameters); + List<E> all = topiaJpaSupport.findAll(hql, hqlParameters); + return all; + } + + protected List<E> findAll(String hql, Map<String, Object> hqlParameters, int startIndex, int endIndex) { + Preconditions.checkNotNull(hql); + Preconditions.checkNotNull(hqlParameters); + List<E> all = topiaJpaSupport.find(hql, startIndex, endIndex, hqlParameters); + return all; + } + + protected List<E> findAll(String hql, Map<String, Object> hqlParameters, TopiaPagerBean pager) { + List<E> all = findAll(hql, hqlParameters, getEntityClass(), pager); + return all; + } + + protected <R> List<R> findAll(String hql, Map<String, Object> hqlParameters, Class<R> type) { + Preconditions.checkNotNull(hql); + Preconditions.checkNotNull(hqlParameters); + Preconditions.checkNotNull(type); + List<R> all = topiaJpaSupport.findAll(hql, hqlParameters); + return all; + } + + protected <R> List<R> findAll(String hql, Map<String, Object> hqlParameters, Class<R> type, int startIndex, int endIndex) { + Preconditions.checkNotNull(hql); + Preconditions.checkNotNull(hqlParameters); + Preconditions.checkNotNull(type); + List<R> all = topiaJpaSupport.find(hql, startIndex, endIndex, hqlParameters); + return all; + } + + protected <R> List<R> findAll(String hql, Map<String, Object> hqlParameters, Class<R> type, TopiaPagerBean pager) { + Preconditions.checkNotNull(hql); + Preconditions.checkNotNull(hqlParameters); + Preconditions.checkNotNull(type); + Preconditions.checkNotNull(pager); + + if (StringUtils.isNotBlank(pager.getSortColumn())) { + hql += " order by " + pager.getSortColumn(); + if (!pager.isSortAscendant()) { + hql += " desc"; + } + } + + List<R> result = topiaJpaSupport.find( + hql, + (int) pager.getRecordStartIndex(), + (int) pager.getRecordEndIndex() - 1, + hqlParameters); + + return result; + } + + protected Iterable<E> findAllLazy(String hql, Map<String, Object> hqlParameters) { + Iterable<E> allLazy = findAllLazy(hql, hqlParameters, getEntityClass()); + return allLazy; + } + + protected <R> Iterable<R> findAllLazy(String hql, Map<String, Object> hqlParameters, Class<R> type) { + + Preconditions.checkNotNull(hql); + Preconditions.checkNotNull(hqlParameters); + Preconditions.checkNotNull(type); + + final Iterator<R> iterator = new FindAllIterator<E, R>(this, + type, + batchSize, + hql, + hqlParameters); + + Iterable<R> result = new Iterable<R>() { + @Override + public Iterator<R> iterator() { + return iterator; + } + }; + + return result; + } + + @Override + public TopiaQueryBuilderRunQueryStep<E> forTopiaIdEquals(String topiaId) { + Preconditions.checkNotNull(topiaId, "given topiaId is null"); + return forEquals(TopiaEntity.PROPERTY_TOPIA_ID, topiaId); + } + + @Override + public TopiaQueryBuilderRunQueryStep<E> forTopiaIdIn(Iterable<String> topiaIds) { + Preconditions.checkNotNull(topiaIds, "given topiaIds is null"); + return forIn(TopiaEntity.PROPERTY_TOPIA_ID, (Iterable) topiaIds); + } + + @Override + public List<String> findAllIds() { + List<String> find = newQueryBuilder().findAllIds(); + return find; + } + + @Override + public List<E> findAll() { + List<E> all = newQueryBuilder().findAll(); + return all; + } + + @Override + public Iterable<E> findAllLazy() { + String hql = "from " + getTopiaEntityEnum().getImplementationFQN() + " order by id"; + Map<String, Object> hqlParameters = Collections.emptyMap(); + Iterable<E> allLazy = findAllLazy(hql, hqlParameters); + return allLazy; + } + + @Override + public Iterator<E> iterator() { + Iterator<E> iterator = findAllLazy().iterator(); + return iterator; + } + + @Override + public long count() { + long count = newQueryBuilder().count(); + return count; + } + + /** + * package locale method because this is hibernate specific method and + * we don't want expose it. + * + * @return the meta-data of the entity + * @throws org.nuiton.topia.TopiaException if any pb + */ + protected ClassMetadata getClassMetadata() { + ClassMetadata meta = topiaHibernateSupport.getHibernateFactory() + .getClassMetadata(getEntityClass()); + if (meta == null) { + meta = topiaHibernateSupport.getHibernateFactory().getClassMetadata( + getTopiaEntityEnum().getImplementationFQN()); + } + return meta; + } + + public static class FindAllIterator<E extends TopiaEntity, R> implements Iterator<R> { + + protected Iterator<R> data; + + protected final AbstractTopiaDao<E> dao; + + protected final Class<R> type; + + protected final String hql; + + protected final Map<String, Object> params; + + protected TopiaPagerBean pager; + + public FindAllIterator(AbstractTopiaDao<E> dao, + Class<R> type, + int batchSize, + String hql, + Map<String, Object> params) { + this.dao = dao; + this.type = type; + this.hql = hql; + this.params = params; + + String hql2 = hql.toLowerCase(); + int i = hql2.indexOf("order by"); + if (i == -1) { + throw new IllegalStateException( + "must have a *order by* in hql, " + + "but did not find it in " + hql); + } + + // get the count (removing the order-by) + long count2 = dao.count("SELECT COUNT(*) " + + hql.substring(0, i), params); + pager = new TopiaPagerBean(); + pager.setRecords(count2); + pager.setPageSize(batchSize); + PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); + + // empty iterator (will be changed at first next call) + data = Iterators.emptyIterator(); + } + + + public boolean hasNext() { + boolean result = data.hasNext() || // no more data + pager.getPageIndex() < pager.getPagesNumber(); + return result; + } + + + public R next() { + if (!hasNext()) { + throw new NoSuchElementException(); + } + + if (!data.hasNext()) { + + // must load iterator + + // increments page index + pager.setPageIndex(pager.getPageIndex() + 1); + PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); + + // load new window of data + data = dao.findAll(hql, params, type, pager).iterator(); + + } + + R next = data.next(); + return next; + } + + + public void remove() { + throw new UnsupportedOperationException( + "This iterator does not support remove operation."); + } + } + + public static class TopiaQueryBuilderAddCriteriaStep<E extends TopiaEntity> implements TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> { + + protected AbstractTopiaDao<E> topiaDAO; + + protected HqlAndParametersBuilder<E> hqlAndParametersBuilder; + + protected boolean hasOrderByClause = false; + + protected TopiaQueryBuilderAddCriteriaStep(AbstractTopiaDao<E> topiaDAO, HqlAndParametersBuilder<E> hqlAndParametersBuilder) { + this.topiaDAO = topiaDAO; + this.hqlAndParametersBuilder = hqlAndParametersBuilder; + } + + @Override + public TopiaQueryBuilderRunQueryStep<E> setOrderByArguments(Set<String> orderByArguments) { + hasOrderByClause = ! Iterables.isEmpty(orderByArguments); + hqlAndParametersBuilder.setOrderByArguments(orderByArguments); + return getNextStep(); + } + + @Override + public TopiaQueryBuilderRunQueryStep<E> setOrderByArguments(String... orderByArguments) { + hqlAndParametersBuilder.setOrderByArguments(orderByArguments); + return getNextStep(); + } + + @Override + public TopiaQueryBuilderAddCriteriaStep<E> addEquals(String property, Object value) { + hqlAndParametersBuilder.addEquals(property, value); + return this; + } + + @Override + public TopiaQueryBuilderAddCriteriaStep<E> addIn(String property, Iterable<Object> values) { + hqlAndParametersBuilder.addIn(property, values); + return this; + } + + @Override + public TopiaQueryBuilderAddCriteriaStep<E> addContains(String property, Object value) { + hqlAndParametersBuilder.addContains(property, value); + return this; + } + + @Override + public TopiaQueryBuilderAddCriteriaStep<E> addNull(String property) { + hqlAndParametersBuilder.addNull(property); + return this; + } + + @Override + public TopiaQueryBuilderAddCriteriaStep<E> addTopiaIdEquals(String property, String topiaId) { + hqlAndParametersBuilder.addTopiaIdEquals(property, topiaId); + return this; + } + + @Override + public TopiaQueryBuilderAddCriteriaStep<E> addTopiaIdIn(String property, Iterable<String> topiaIds) { + hqlAndParametersBuilder.addTopiaIdIn(property, topiaIds); + return this; + } + + // shortcuts to next step + + @Override + public boolean exists() { + return getNextStep().exists(); + } + + @Override + public E findAnyOrNull() { + return getNextStep().findAnyOrNull(); + } + + @Override + public E findUniqueOrNull() { + return getNextStep().findUniqueOrNull(); + } + + @Override + public E findAny() { + return getNextStep().findAny(); + } + + @Override + public E findUnique() { + return getNextStep().findUnique(); + } + + @Override + public E findFirst() { + return getNextStep().findFirst(); + } + + @Override + public E findFirstOrNull() { + return getNextStep().findFirstOrNull(); + } + + @Override + public Optional<E> tryFindAny() { + return getNextStep().tryFindAny(); + } + + @Override + public Optional<E> tryFindFirst() { + return getNextStep().tryFindFirst(); + } + + @Override + public Optional<E> tryFindUnique() { + return getNextStep().tryFindUnique(); + } + + @Override + public List<E> findAll() { + return getNextStep().findAll(); + } + + @Override + public List<E> findAll(int startIndex, int endIndex) { + return getNextStep().findAll(startIndex, endIndex); + } + + @Override + public Iterable<E> findAllLazy() { + return getNextStep().findAllLazy(); + } + + @Override + public long count() { + return getNextStep().count(); + } + + @Override + public List<String> findAllIds(int startIndex, int endIndex) { + return getNextStep().findAllIds(startIndex, endIndex); + } + + @Override + public List<String> findAllIds() { + return getNextStep().findAllIds(); + } + + protected TopiaQueryBuilderRunQueryStep<E> getNextStep() { + String hql = hqlAndParametersBuilder.getHql(); + Map<String, Object> hqlParameters = hqlAndParametersBuilder.getHqlParameters(); + TopiaQueryBuilderRunQueryStep nextStep = new TopiaQueryBuilderRunQueryStep(topiaDAO, hql, hqlParameters); + return nextStep; + } + + } + + public static class TopiaQueryBuilderRunQueryStep<E extends TopiaEntity> implements org.nuiton.topia.persistence.TopiaQueryBuilderRunQueryStep<E> { + + protected final String hql; + + protected final Map<String, Object> hqlParameters; + + protected AbstractTopiaDao<E> topiaDAO; + + protected TopiaQueryBuilderRunQueryStep(AbstractTopiaDao<E> topiaDAO, String hql, Map<String, Object> hqlParameters) { + this.hql = hql; + this.hqlParameters = hqlParameters; + this.topiaDAO = topiaDAO; + } + + @Override + public boolean exists() { + return topiaDAO.exists(hql, hqlParameters); + } + + @Override + public long count() { + String hqlWithSelectClause = "select count(topiaId) " + hql; + return topiaDAO.count(hqlWithSelectClause, hqlParameters); + } + + @Override + public E findUnique() { + return topiaDAO.findUnique(hql, hqlParameters); + } + + @Override + public E findUniqueOrNull() { + return topiaDAO.findUniqueOrNull(hql, hqlParameters); + } + + @Override + public Optional<E> tryFindUnique() { + return topiaDAO.tryFindUnique(hql, hqlParameters); + } + + @Override + public E findFirst() { + return topiaDAO.findFirst(hql, hqlParameters); + } + + @Override + public E findFirstOrNull() { + return topiaDAO.findFirstOrNull(hql, hqlParameters); + } + + @Override + public Optional<E> tryFindFirst() { + return topiaDAO.tryFindFirst(hql, hqlParameters); + } + + @Override + public E findAny() { + return topiaDAO.findAny(hql, hqlParameters); + } + + @Override + public E findAnyOrNull() { + return topiaDAO.findAnyOrNull(hql, hqlParameters); + } + + @Override + public Optional<E> tryFindAny() { + return topiaDAO.tryFindAny(hql, hqlParameters); + } + + @Override + public List<E> findAll() { + return topiaDAO.findAll(hql, hqlParameters); + } + + @Override + public Iterable<E> findAllLazy() { + return topiaDAO.findAllLazy(hql, hqlParameters); + } + + @Override + public List<E> findAll(int startIndex, int endIndex) { + return topiaDAO.findAll(hql, hqlParameters, startIndex, endIndex); + } + + @Override + public List<String> findAllIds() { + // XXX brendan 30/09/13 does this truely work ? + String hqlWithSelectClause = "select topiaId " + hql; + return topiaDAO.findAll(hqlWithSelectClause, hqlParameters, String.class); + } + + @Override + public List<String> findAllIds(int startIndex, int endIndex) { + // XXX brendan 30/09/13 does this truely work ? + String hqlWithSelectClause = "select topiaId " + hql; + return topiaDAO.findAll(hqlWithSelectClause, hqlParameters, String.class, startIndex, endIndex); + } + + } + +} Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/LegacyTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/LegacyTopiaDao.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/LegacyTopiaDao.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -0,0 +1,309 @@ +package org.nuiton.topia.persistence; + +import com.google.common.base.Preconditions; +import org.apache.commons.lang3.StringUtils; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaUtil; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.PagerBeanUtil; + +import java.security.Permission; +import java.util.List; +import java.util.Map; + +/** + * Implements deprecated method from {@link TopiaDAO}, should be deleted. + */ +public abstract class LegacyTopiaDao<E extends TopiaEntity> implements TopiaDAO<E> { + + @Override + public E create(Object... propertyNamesAndValues) { + Map<String, Object> properties = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + E result = create(properties); + return result; + } + + @Deprecated + public boolean existByTopiaId(String topiaId) { + return forTopiaIdEquals(topiaId).exists(); + } + + @Deprecated + public boolean existByProperties(String propertyName, Object propertyValue, + Object... propertyNamesAndValues) { + return forProperties(propertyName, propertyValue, propertyNamesAndValues).exists(); + } + + @Deprecated + protected String createSimpleQuery() { + return newFromClause(null); + } + + @Deprecated + public String createSimpleQuery(String alias) { + return newFromClause(alias); + } + + protected abstract String newFromClause(String alias); + + @Deprecated + public E findByTopiaId(String id) { + return forTopiaIdEquals(id).findUniqueOrNull(); + } + + @Deprecated + public E findByProperty(String propertyName, Object value) { + return forProperties(propertyName, value).findAnyOrNull(); + } + + @Override + @Deprecated + public <R> R findByQuery(Class<R> type, String hql, Object... propertyNamesAndValues) { + Map<String, Object> properties = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + return findAny(hql, properties, type); + } + + @Override + @Deprecated + public E findByPrimaryKey(Map<String, Object> keys) { + return forProperties(keys).findUniqueOrNull(); + } + + @Override + @Deprecated + public E findByPrimaryKey(Object... propertyNamesAndValues) { + Map<String, Object> properties = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + E byPrimaryKey = findByPrimaryKey(properties); + return byPrimaryKey; + } + + @Override + @Deprecated + public List<E> findAllWithOrder(String... propertyNames) { + return newQueryBuilder().setOrderByArguments(propertyNames).findAll(); + } + + @Override + @Deprecated + public <R> List<R> findAllByQuery(Class<R> type, String hql, Object... propertyNamesAndValues) { + Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + List<R> all = findAll(hql, hqlParameters, type); + return all; + } + + @Deprecated + public E findByProperties(String propertyName, Object value, + Object... propertyNamesAndValues) { + return forProperties(propertyName, value, propertyNamesAndValues).findUniqueOrNull(); + } + + @Deprecated + public E findByProperties(Map<String, Object> properties) { + return forProperties(properties).findUniqueOrNull(); + } + + @Deprecated + public List<E> findAllByProperty(String propertyName, Object value) { + List<E> all = forProperties(propertyName, value).findAll(); + return all; + } + + @Deprecated + public List<E> findAllByProperties(String propertyName, Object value, Object... propertyNamesAndValues) { + List<E> all = forProperties(propertyName, value, propertyNamesAndValues).findAll(); + return all; + } + + @Deprecated + public List<E> findAllByProperties(Map<String, Object> properties) { + return forProperties(properties).findAll(); + } + + @Deprecated + public E findContains(String propertyName, Object value) { + return newQueryBuilder().addContains(propertyName, value).findAny(); + } + + @Deprecated + public List<E> findAllContains(String propertyName, + Object value) { + return newQueryBuilder().addContains(propertyName, value).findAll(); + } + + @Deprecated + public boolean existsByQuery(String hql, Object... propertyNamesAndValues) { + Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + boolean exists = exists(hql, hqlParameters); + return exists; + } + + @Deprecated + public long countByQuery(String hql, + Object... propertyNamesAndValues) { + + Preconditions.checkNotNull(StringUtils.isNotBlank(hql)); + Preconditions.checkArgument(hql.toUpperCase().trim().startsWith("SELECT COUNT(")); + Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + long count = forHql(hql, hqlParameters).count(); + return count; + } + + @Deprecated + public E findByQuery(String hql, + Object... propertyNamesAndValues) { + Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + E uniqueOrNull = forHql(hql, hqlParameters).findUniqueOrNull(); + return uniqueOrNull; + } + + @Deprecated + public List<E> findAllByQuery(String hql, + Object... propertyNamesAndValues) { + Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + List<E> all = forHql(hql, hqlParameters).findAll(); + return all; + } + + @Deprecated + public Iterable<E> findAllLazyByQuery(String hql, + Object... propertyNamesAndValues) { + Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + Iterable<E> result = findAllLazy(hql, hqlParameters); + return result; + } + + @Deprecated + public <R> Iterable<R> findAllLazyByQuery(Class<R> type, + String hql, + Object... propertyNamesAndValues) { + Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + Iterable<R> result = findAllLazy(hql, hqlParameters, type); + return result; + } + + @Deprecated + public Iterable<E> findAllLazyByQuery(int batchSize, + String hql, + Object... propertyNamesAndValues) { + return findAllLazyByQuery(getEntityClass(), batchSize, hql, propertyNamesAndValues); + } + + + /** + * @deprecated use {@link #findAllLazy(String, java.util.Map, Class)} + */ + @Deprecated + public <R> Iterable<R> findAllLazyByQuery(Class<R> type, + int batchSize, + String hql, + Object... propertyNamesAndValues) { + setBatchSize(batchSize); + Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + Iterable<R> allLazy = findAllLazy(hql, hqlParameters, type); + return allLazy; + } + + @Deprecated + public <R> List<R> findAllByQueryWithBound(Class<R> type, + String hql, + int startIndex, + int endIndex, + Object... propertyNamesAndValues) { + Map<String, Object> hqlParameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + List<R> all = findAll(hql, hqlParameters, type, startIndex, endIndex); + return all; + } + + @Deprecated + public List<E> findAllByQueryWithBound(String hql, + int startIndex, + int endIndex, + Object... propertyNamesAndValues) { + List<E> result = findAllByQueryWithBound(getEntityClass(), + hql, + startIndex, + endIndex, + propertyNamesAndValues); + return result; + } + + + @Deprecated + public <R> List<R> findAllByQueryAndPager(Class<R> type, + String hql, + TopiaPagerBean pager, + Object... propertyNamesAndValues) { + Preconditions.checkNotNull(pager); + Preconditions.checkNotNull(hql); + + if (StringUtils.isNotBlank(pager.getSortColumn())) { + hql += " ORDER BY " + pager.getSortColumn(); + if (!pager.isSortAscendant()) { + hql += " DESC"; + } + } + List<R> result = findAllByQueryWithBound(type, hql, + (int) pager.getRecordStartIndex(), + (int) pager.getRecordEndIndex() - 1, + propertyNamesAndValues); + return result; + } + + @Deprecated + public List<E> findAllByQueryAndPager(String hql, + TopiaPagerBean pager, + Object... propertyNamesAndValues) { + + List<E> result = findAllByQueryAndPager(getEntityClass(), + hql, + pager, + propertyNamesAndValues); + return result; + } + + @Deprecated + public void computeAndAddRecordsToPager(String hql, + TopiaPagerBean pager, + Object... propertyNamesAndValues) { + + long records = countByQuery(hql, propertyNamesAndValues); + + pager.setRecords(records); + PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); + } + + @Override + public List<Permission> getRequestPermission(String topiaId, int actions) { + throw new UnsupportedOperationException(); + } + + @Override + public TopiaContextImplementor getContext() { + throw new UnsupportedOperationException(); + } + + + @Override + public TopiaContext getTopiaContext() { + throw new UnsupportedOperationException(); + } + + + // let's use method written in AbstractTopiaDao + + protected abstract Iterable<E> findAllLazy(String hql, Map<String, Object> hqlParameters); + + protected abstract <R> R findAny(String hql, Map<String, Object> properties, Class<R> type); + + protected abstract TopiaQueryBuilderRunQueryStep<E> forHql(String hql, Map<String, Object> hqlParameters); + + protected abstract <R> List<R> findAll(String hql, Map<String, Object> hqlParameters, Class<R> type); + + protected abstract <R> Iterable<R> findAllLazy(String hql, Map<String, Object> hqlParameters, Class<R> type); + + protected abstract <R> List<R> findAll(String hql, Map<String, Object> hqlParameters, Class<R> type, int startIndex, int endIndex); + + protected abstract boolean exists(String hql, Map<String, Object> hqlParameters); + +} 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 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -38,8 +38,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.event.TopiaEntityListener; -import org.nuiton.topia.event.TopiaEntityVetoable; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.pager.TopiaPagerBean; @@ -60,23 +58,16 @@ * @author fdesbois <fdesbois(a)codelutin.com> * @author tchemit <chemit(a)codelutin.com> * @version $Id$ + * @deprecated prefer {@link TopiaDao} */ -public interface TopiaDAO<E extends TopiaEntity> extends Iterable<E> { +@Deprecated +public interface TopiaDAO<E extends TopiaEntity> extends TopiaDao<E> { //------------------------------------------------------------------------// //-- Create - update - delete methods ------------------------------------// //------------------------------------------------------------------------// /** - * Create a new instance of managed entity not persisted. - * - * @return new entity instance - * @throws TopiaException if any pb while creating the entity - * @since 2.3.1 - */ - E newInstance() throws TopiaException; - - /** * Creates a new instance of the entity managed by the DAO * * @param propertyNamesAndValues the list of properties that the created entity will have. Arguments are key-value @@ -87,57 +78,10 @@ * if some property type is not the * expected one * @see #create(Map) + * @deprecated use {@link TopiaDao#create(String, Object, Object...)} */ E create(Object... propertyNamesAndValues) throws TopiaException; - /** - * Creates a new instance of the entity managed by the DAO - * - * @param properties the key-value list of properties that the created entity will have. - * @return the newly created entity - * @throws TopiaException if any problem during instantiation - * @throws IllegalArgumentException if some property type is not the - * expected one - */ - E create(Map<String, Object> properties) throws TopiaException; - - /** - * Creates an entity not created without the DAO. Generally used when DAO - * is layered after a service layer where the {@link #create(Object...)} - * would be to onerous. - * - * @param e the instance to persist - * @return the persisted entity (with its topiaId valued) - * @throws TopiaException if any problem while creating data - * @since 2.3.1 - */ - E create(E e) throws TopiaException; - - /** - * Update an entity. May be used for an entity coming from another context. - * - * @param e the entity to create or update - * @return the given entity - * @throws TopiaException if any problem while updating datas - */ - E update(E e) throws TopiaException; - - /** - * Removes the given entity from the storage - * - * @param e the entity to remove - * @throws TopiaException if any problem while deleting datas - */ - void delete(E e) throws TopiaException; - - /** - * Permet de supprimer des entités. - * - * @param entities les entités à supprimer - * @throws TopiaException if any pb while deleting datas - */ - void deleteAll(Iterable<E> entities) throws TopiaException; - //------------------------------------------------------------------------// //-- findByXXX methods ---------------------------------------------------// //------------------------------------------------------------------------// @@ -149,6 +93,7 @@ * @param id topiaId of the entity to found * @return the entity found or null if not * @throws TopiaException for Topia errors on query + * @deprecated ambiguous signature use new API and inline {@link TopiaDao#forTopiaIdEquals(String)} */ E findByTopiaId(String id) throws TopiaException; @@ -159,6 +104,7 @@ * @param value value of the property to match * @return the first entity matching the request * @throws TopiaException if any pb while getting datas + * @deprecated @deprecated use new API and inline {@link LegacyTopiaDao#findByProperties(String, Object, Object...)} */ E findByProperty(String propertyName, Object value) throws TopiaException; @@ -172,6 +118,7 @@ * [propertyName;value;propertyName;value;...] * @return the first entity matching the request * @throws TopiaException if any pb while getting datas + * @deprecated @deprecated use new API and inline {@link LegacyTopiaDao#findByProperties(String, Object, Object...)} */ E findByProperties(String propertyName, Object value, @@ -183,6 +130,7 @@ * @param properties the properties key + value to match * @return the first entity matching the request * @throws TopiaException if any pb while getting datas + * @deprecated @deprecated use new API and inline {@link LegacyTopiaDao#findByProperties(java.util.Map)} */ E findByProperties(Map<String, Object> properties) throws TopiaException; @@ -195,6 +143,7 @@ * @return the entity E found or null * @throws TopiaException if any pb while getting datas * @since 2.6.12 + * @deprecated move your code inside the DAO and use a suitable protected method */ E findByQuery(String hql, Object... propertyNamesAndValues) throws TopiaException; @@ -212,6 +161,7 @@ * @throws TopiaException if any pb while getting datas * @throws ClassCastException if the found type is not the expected one * @since 2.6.12 + * @deprecated move your code inside the DAO and use a suitable protected method */ <R> R findByQuery(Class<R> type, String hql, @@ -225,6 +175,7 @@ * @param keys Map with the natural id property name as Map.key, and value as Map.value * @return the entity E found or null * @throws TopiaException if any pb while getting datas + * @deprecated use new API and inline {@link LegacyTopiaDao#findByPrimaryKey(java.util.Map)} */ E findByPrimaryKey(Map<String, Object> keys) throws TopiaException; @@ -236,6 +187,7 @@ * [propertyName;value;propertyName;value;...] * @return the entity E found or null * @throws TopiaException if any pb while getting datas + * @deprecated use new API and inline {@link LegacyTopiaDao#findByPrimaryKey(Object...)} */ E findByPrimaryKey(Object... propertyNamesAndValues) throws TopiaException; @@ -248,6 +200,7 @@ * @return the entity E found or null * @throws TopiaException if any pb while getting datas * @since 2.5.4 + * @deprecated use new API and inline {@link LegacyTopiaDao#findContains(String, Object)} */ E findContains(String propertyName, Object value) throws TopiaException; @@ -257,14 +210,6 @@ //------------------------------------------------------------------------// /** - * Finds all the entities managed by this DAO. - * - * @return the full list of entities - * @throws TopiaException if any pb while getting datas - */ - List<E> findAll() throws TopiaException; - - /** * Finds all entites E managed by this DAO. The returned list will be ordered according to the given * {@code propertyNames}. * @@ -274,19 +219,11 @@ * @param propertyNames property names of order to apply * @return all entities E of the dao entity type with given order * @throws TopiaException if any pb while getting datas + * @deprecated use new API and inline {@link LegacyTopiaDao#findAllWithOrder(String...)} */ List<E> findAllWithOrder(String... propertyNames) throws TopiaException; /** - * Find all the ids for the E entity type - * - * @return the full list of ids - * @throws TopiaException if any pb while getting datas - */ - // TODO AThimel 20/07/13 This method should return a Set ? - List<String> findAllIds() throws TopiaException; - - /** * Finds all entities E which value for the given {@code propertyName} is * {@code value} * @@ -294,6 +231,7 @@ * @param value value to expect * @return the list of entities E having the given value * @throws TopiaException if any pb while getting datas + * @deprecated use new API and inline {@link LegacyTopiaDao#findAllByProperties(String, Object, Object...)} */ List<E> findAllByProperty(String propertyName, Object value) throws TopiaException; @@ -308,6 +246,7 @@ * [propertyName;value;propertyName;value;...] * @return the list of entities E having the given value * @throws TopiaException if any pb while getting datas + * @deprecated use new API and inline {@link LegacyTopiaDao#findAllByProperties(String, Object, Object...)} */ List<E> findAllByProperties(String propertyName, Object value, @@ -319,6 +258,7 @@ * @param properties properties to match * @return the list of entities E having the given values * @throws TopiaException if any pb while getting datas + * @deprecated use new API and inline {@link LegacyTopiaDao#findAllByProperties(java.util.Map)} */ List<E> findAllByProperties(Map<String, Object> properties) throws TopiaException; @@ -331,6 +271,7 @@ * @return the list of entities E found by the query and parameters * @throws TopiaException if any pb while getting datas * @since 2.6.12 + * @deprecated move your code inside the DAO and use {@link AbstractTopiaDao#findAll(String, java.util.Map)} */ List<E> findAllByQuery(String hql, Object... propertyNamesAndValues) throws TopiaException; @@ -348,6 +289,7 @@ * @return entites of the query result * @throws TopiaException if any pb while getting datas * @since 2.6.12 + * @deprecated move your code inside the DAO and use {@link AbstractTopiaDao#findAll(String, java.util.Map, Class)} */ <R> List<R> findAllByQuery(Class<R> type, String hql, @@ -367,6 +309,7 @@ * @return entites E of the query result * @throws TopiaException if any pb while getting datas * @since 2.6.14 + * @deprecated move your code inside the DAO and use {@link AbstractTopiaDao#findAllLazy(String, java.util.Map, Class)} */ Iterable<E> findAllLazyByQuery(String hql, Object... propertyNamesAndValues) throws TopiaException; @@ -384,6 +327,7 @@ * @return entites R of the query result * @throws TopiaException if any pb while getting datas * @since 2.6.14 + * @deprecated move your code inside the DAO and use {@link AbstractTopiaDao#findAllLazy(String, java.util.Map, Class)} */ <R> Iterable<R> findAllLazyByQuery(Class<R> type, String hql, @@ -402,6 +346,7 @@ * @return entites E of the query result * @throws TopiaException if any pb while getting datas * @since 2.6.14 + * @deprecated move your code inside the DAO and use {@link AbstractTopiaDao#findAllLazy(String, java.util.Map)} */ Iterable<E> findAllLazyByQuery(int batchSize, String hql, @@ -421,6 +366,7 @@ * @return entites R of the query result * @throws TopiaException if any pb while getting datas * @since 2.6.14 + * @deprecated move your code inside the DAO and use {@link AbstractTopiaDao#findAllLazy(String, java.util.Map, Class)} */ <R> Iterable<R> findAllLazyByQuery(Class<R> type, int batchSize, @@ -441,6 +387,7 @@ * @return entites E of the paginated query result * @throws TopiaException if any pb while getting datas * @since 2.6.12 + * @deprecated move your code inside the DAO and use {@link AbstractTopiaDao#findAll(String, java.util.Map, int, int)} */ List<E> findAllByQueryWithBound(String hql, int startIndex, @@ -462,6 +409,7 @@ * @return entites R of the paginated query result * @throws TopiaException if any pb while getting datas * @since 2.6.12 + * @deprecated move your code inside the DAO and use {@link AbstractTopiaDao#findAll(String, java.util.Map, Class, int, int)} */ <R> List<R> findAllByQueryWithBound(Class<R> type, String hql, @@ -481,6 +429,7 @@ * @throws TopiaException if any pb while getting datas * @see TopiaPagerBean * @since 2.6.12 + * @deprecated move your code inside the DAO and use {@link AbstractTopiaDao#findAll(String, java.util.Map, org.nuiton.topia.persistence.pager.TopiaPagerBean)} */ List<E> findAllByQueryAndPager(String hql, TopiaPagerBean pager, @@ -499,6 +448,7 @@ * @throws TopiaException if any pb while getting datas * @see TopiaPagerBean * @since 2.6.12 + * @deprecated move your code inside the DAO and use {@link AbstractTopiaDao#findAll(String, java.util.Map, Class, org.nuiton.topia.persistence.pager.TopiaPagerBean)} */ <R> List<R> findAllByQueryAndPager(Class<R> type, String hql, @@ -514,6 +464,7 @@ * @return all the entities E found * @throws TopiaException if any pb while getting datas * @since 2.5.4 + * @deprecated use new API and inline {@link LegacyTopiaDao#findAllContains(String, Object)} */ List<E> findAllContains(String propertyName, Object value) throws TopiaException; @@ -529,6 +480,7 @@ * @return true if entity exists, false otherwise * @throws TopiaException for any error * @since 2.3.4 + * @deprecated use new API and inline {@link LegacyTopiaDao#existByTopiaId(String)} */ boolean existByTopiaId(String id) throws TopiaException; @@ -544,6 +496,7 @@ * @return true if entity exists, false otherwise * @throws TopiaException for Topia errors * @since 2.3.4 + * @deprecated move your code inside the DAO and use {@link AbstractTopiaDao#exists(String, java.util.Map)} */ boolean existByProperties(String propertyName, Object propertyValue, @@ -558,6 +511,7 @@ * @return true if entity exists, false otherwise * @throws TopiaException * @since 2.6.12 + * @deprecated move your code inside the DAO and use {@link AbstractTopiaDao#exists(String, java.util.Map)} */ boolean existsByQuery(String hql, Object... propertyNamesAndValues) throws TopiaException; @@ -567,15 +521,6 @@ //------------------------------------------------------------------------// /** - * Count the number of existing entities. - * - * @return number of total entities - * @throws TopiaException if any pb while getting datas - * @since 2.3.4 - */ - long count() throws TopiaException; - - /** * Count the number of entities based on a the given HQL query. * * @param hql the HQL query to use @@ -584,6 +529,7 @@ * @return number of entities filtered by the query * @throws TopiaException if any pb while getting datas * @since 2.6.12 + * @deprecated move your call to inside the DAO and use {@link AbstractTopiaDao#count(String, java.util.Map)} */ long countByQuery(String hql, Object... propertyNamesAndValues) throws TopiaException; @@ -593,33 +539,6 @@ //------------------------------------------------------------------------// /** - * Find usages of the given {@code entity} in the entities of the given - * {@code type}. - * - * @param type the type of entity to search - * @param entity the entity on which search is done - * @param <R> type of entity to search - * @return the list of entities R which uses the given entity - * @throws TopiaException if any problem while getting data - * @since 2.3.0 - */ - <R extends TopiaEntity> List<R> findUsages(Class<R> type, - E entity) throws TopiaException; - - /** - * Find all usages of the given {@code entity}. - * - * @param entity the entity - * @return the dictionnary of usages of the given entities (keys are entity - * usage container, values are the list of this type of entity to - * use the given entity). - * @throws TopiaException if any pb while getting data - * @since 2.3.0 - */ - - Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> findAllUsages(E entity) throws TopiaException; - - /** * Execute the count {@code hql} query and then synch the pager to this * result (says fill the * {@link TopiaPagerBean#records} field and then adapt @@ -632,6 +551,8 @@ * @throws TopiaException if any pb while getting datas * @see TopiaPagerBean * @since 2.6.12 + * // TODO brendan 17/10/13 really ?? + * @deprecated */ void computeAndAddRecordsToPager(String hql, TopiaPagerBean pager, @@ -642,13 +563,6 @@ //------------------------------------------------------------------------// /** - * Return the class of the entity managed by this DAO. - * - * @return this DAO's managed entity's class - */ - Class<E> getEntityClass(); - - /** * Returns the context used by this DAO. * * @return Returns the context. @@ -669,28 +583,12 @@ * Get the entityEnum of the type of entity managed by this DAO. * * @return entity type enum managed by this DAO + * @deprecated you should get it from persistence context or application context */ + @Deprecated TopiaEntityEnum getTopiaEntityEnum(); /** - * Obtains the batch size used to load data. - * - * Default value if 1000. - * - * @return the batch size. - * @since 2.6.14 - */ - int getBatchSize(); - - /** - * Set a new default batch size. - * - * @param batchSize new batch size to use when iterating. - * @since 2.6.14 - */ - void setBatchSize(int batchSize); - - /** * Create the simple HQL query for the entity managed by the dao. * * A optional alias can be passed: @@ -705,22 +603,6 @@ @Deprecated String createSimpleQuery(String alias); - //------------------------------------------------------------------------// - //-- Listener methods ----------------------------------------------------// - //------------------------------------------------------------------------// - - // TODO AThimel 20/07/13 Javadoc - void addTopiaEntityListener(TopiaEntityListener listener); - - // TODO AThimel 20/07/13 Javadoc - void addTopiaEntityVetoable(TopiaEntityVetoable vetoable); - - // TODO AThimel 20/07/13 Javadoc - void removeTopiaEntityListener(TopiaEntityListener listener); - - // TODO AThimel 20/07/13 Javadoc - void removeTopiaEntityVetoable(TopiaEntityVetoable vetoable); - /** * Retourne les permissions a verifier pour l'acces a l'entite pour le * service Taas. 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 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -85,8 +85,7 @@ * @version $Id$ */ -public class TopiaDAOImpl<E extends TopiaEntity> implements - TopiaDAO<E> { // TopiaDAOImpl +public class TopiaDAOImpl<E extends TopiaEntity> implements TopiaDAO<E> { // TopiaDAOImpl /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(TopiaDAOImpl.class); Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -0,0 +1,214 @@ +package org.nuiton.topia.persistence; + +import org.nuiton.topia.event.TopiaEntityListener; +import org.nuiton.topia.event.TopiaEntityVetoable; + +import java.util.List; +import java.util.Map; + +/** + * This contract represents the common operation any DAO should + * be able to provide as API. + * + * @author bleny + * @since 3.0 + */ +public interface TopiaDao<E extends TopiaEntity> extends Iterable<E> { + + /** + * Return the class of the entity managed by this DAO. + * + * @return this DAO's managed entity's class + */ + Class<E> getEntityClass(); + + /** + * Obtains the batch size used to load data. + * + * Default value if 1000. + * + * @return the batch size. + * @since 2.6.14 + */ + int getBatchSize(); + + /** + * Set a new default batch size. + * + * @param batchSize new batch size to use when iterating. + * @since 2.6.14 + */ + void setBatchSize(int batchSize); + + /** + * Create a new instance of managed entity not persisted. + * + * @since 2.3.1 + */ + E newInstance(); + + /** + * Creates an entity not created without the DAO using any of the others + * create methods. The instance may have been created elsewhere. + * + * @param entity the instance to persist + * @return the persisted entity (with its topiaId valued) + * @since 2.3.1 + */ + E create(E entity); + + /** + * @since 3.0 + */ + E create(String propertyName, Object propertyValue, Object... otherPropertyNamesAndValues); + + /** + * Creates a new instance of the entity managed by the DAO + * + * @param properties the key-value list of properties that the created entity will have. + * @return the newly created entity + * @throws IllegalArgumentException if some property type is not the + * expected one + */ + E create(Map<String, Object> properties); + + /** + * @since 3.0 + */ + E create(); + + /** + * Update an entity. May be used for an entity coming from another context. + * + * @param entity the entity to create or update + * @return the given entity + */ + E update(E entity); + + /** + * Deletes the given entity from the storage + * + * @param entity the entity to remove + */ + void delete(E entity); + + /** + * Deletes all given entities from the storage + * + * @param entities entities to delete + * @since 3.0 + */ + void deleteAll(Iterable<E> entities); + + /** + * Finds all the entities managed by this DAO. + * + * @return the full list of entities in no particular + * (non-determinisic) order + */ + List<E> findAll(); + + /** + * @since 3.0 + */ + Iterable<E> findAllLazy(); + + /** + * @since 3.0 + */ + Iterable<E> createAll(Iterable<E> entities); + + /** + * @since 3.0 + */ + Iterable<E> updateAll(Iterable<E> entities); + + /** + * Find all the ids for the entities managed by this DAO. + * + * @return the ids of all the entities + */ + // TODO AThimel 20/07/13 This method should return a Set ? + List<String> findAllIds(); + + /** + * Count the number of existing entities. + * + * @return number of total entities + * @since 2.3.4 + */ + long count(); + + /** + * @since 3.0 + */ + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forProperties(Map<String, Object> properties); + + /** + * @since 3.0 + */ + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forProperties(String propertyName, + Object propertyValue, + Object... otherPropertyNamesAndValues); + /** + * @since 3.0 + */ + TopiaQueryBuilderAddCriteriaStep<E> newQueryBuilder(); + + /** + * @since 3.0 + */ + TopiaQueryBuilderRunQueryStep<E> forContains(String propertyName, Object propertyValue); + + /** + * @since 3.0 + */ + TopiaQueryBuilderRunQueryStep<E> forEquals(String propertyName, Object propertyValue); + + /** + * @since 3.0 + */ + TopiaQueryBuilderRunQueryStep<E> forIn(String propertyName, Iterable<Object> propertyValues); + + /** + * @since 3.0 + */ + TopiaQueryBuilderRunQueryStep<E> forTopiaIdEquals(String topiaId); + + /** + * @since 3.0 + */ + TopiaQueryBuilderRunQueryStep<E> forTopiaIdIn(Iterable<String> topiaIds); + + void addTopiaEntityListener(TopiaEntityListener listener); + + void addTopiaEntityVetoable(TopiaEntityVetoable vetoable); + + void removeTopiaEntityListener(TopiaEntityListener listener); + + void removeTopiaEntityVetoable(TopiaEntityVetoable vetoable); + + /** + * Find usages of the given {@code entity} in the entities of the given + * {@code type}. + * + * @param type the type of entity to search + * @param entity the entity on which search is done + * @param <R> type of entity to search + * @return the list of entities R which uses the given entity + * @since 2.3.0 + */ + <R extends TopiaEntity> List<R> findUsages(Class<R> type, E entity); + + /** + * Find all usages of the given {@code entity}. + * + * @param entity the entity + * @return the dictionnary of usages of the given entities (keys are entity + * usage container, values are the list of this type of entity to + * use the given entity). + * @since 2.3.0 + */ + Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> findAllUsages(E entity); + +} Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -208,7 +208,7 @@ if (fireSupport == null) { if (this instanceof TopiaEntityContextable) { TopiaEntityContextable contextable = (TopiaEntityContextable) this; - AbstractTopiaDAO topiaDAO = (AbstractTopiaDAO)contextable.getTopiaDAOSupplier().getDao(getClass()); + AbstractTopiaDao topiaDAO = (AbstractTopiaDao)contextable.getTopiaDAOSupplier().getDao(getClass()); fireSupport = topiaDAO.getTopiaFiresSupport(); } } Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaOrRunQueryStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaOrRunQueryStep.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaOrRunQueryStep.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -0,0 +1,5 @@ +package org.nuiton.topia.persistence; + +public interface TopiaQueryBuilderAddCriteriaOrRunQueryStep<E extends TopiaEntity> extends TopiaQueryBuilderAddCriteriaStep<E>, TopiaQueryBuilderRunQueryStep<E> { + +} Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -0,0 +1,59 @@ +package org.nuiton.topia.persistence; + +import java.util.Set; + +/** + * Represents a step when building a query to add a constraint. + * + * The builder implements the fluent interface DP, so you can add multiple + * constraints by chaining calls. + * + * @author bleny + * @since 3.0 + */ +public interface TopiaQueryBuilderAddCriteriaStep<E extends TopiaEntity> { + + /** + * @param property the name of a field of the queried entity, must be + * a one-to-one or a many-to-one property. + * @param value the value the field of the entity must be equals to argument + */ + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addEquals(String property, Object value); + + /** + * @param property the name of a field of the queried entity, must be + * a one-to-one or a many-to-one property + * @param values the value the field of the entity must be equals to argument + */ + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addIn(String property, Iterable<Object> values); + + /** + * @param property the name of a field of the queried entity, must be + * a one-to-many or a many-to-many property + * @param value the value the field of the entity must be equals to argument + */ + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addContains(String property, Object value); + + /** + * @param property the name of a field of the queried entity, must be + * a one-to-one or a many-to-one property + */ + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNull(String property); + + /** + * This method has the same behavior as {@link #addEquals(String, Object)} but + * you don't need to have the entity but only the topiaId. + * + * @param property the name of a field of the queried entity, must be + * a one-to-one or a many-to-one property + * @param topiaId the + */ + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdEquals(String property, String topiaId); + + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdIn(String property, Iterable<String> topiaIds); + + TopiaQueryBuilderRunQueryStep<E> setOrderByArguments(Set<String> orderByArguments); + + TopiaQueryBuilderRunQueryStep<E> setOrderByArguments(String... orderByArguments); + +} Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -0,0 +1,44 @@ +package org.nuiton.topia.persistence; + +import com.google.common.base.Optional; + +import java.util.List; + +/** + * @author bleny + */ +public interface TopiaQueryBuilderRunQueryStep<E extends TopiaEntity> { + + boolean exists(); + + long count(); + + E findUnique(); + + E findUniqueOrNull(); + + Optional<E> tryFindUnique(); + + E findFirst(); + + E findFirstOrNull(); + + Optional<E> tryFindFirst(); + + E findAny(); + + E findAnyOrNull(); + + Optional<E> tryFindAny(); + + List<E> findAll(); + + Iterable<E> findAllLazy(); + + List<E> findAll(int startIndex, int endIndex); + + List<String> findAllIds(); + + List<String> findAllIds(int startIndex, int endIndex); + +} Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/GeneratedPersonneTopiaDao.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/GeneratedPersonneTopiaDao.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/GeneratedPersonneTopiaDao.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; -import org.nuiton.topia.persistence.AbstractTopiaDAO; +import org.nuiton.topia.persistence.AbstractTopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topiatest.Personne; @@ -35,7 +35,7 @@ /** * @author Arnaud Thimel <thimel(a)codelutin.com> */ -public abstract class GeneratedPersonneTopiaDao<E extends Personne> extends AbstractTopiaDAO<E> implements PersonneDao { +public abstract class GeneratedPersonneTopiaDao<E extends Personne> extends AbstractTopiaDao<E> implements PersonneDao { @Override public TopiaEntityEnum getTopiaEntityEnum() { Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaJpaSupportTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaJpaSupportTest.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaJpaSupportTest.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -28,10 +28,10 @@ import org.junit.Rule; import org.junit.Test; import org.nuiton.topiatest.Address; -import org.nuiton.topiatest.AddressDAO; +import org.nuiton.topiatest.AddressTopiaDao; import org.nuiton.topiatest.Gender; import org.nuiton.topiatest.Personne; -import org.nuiton.topiatest.PersonneDAO; +import org.nuiton.topiatest.PersonneTopiaDao; import java.util.List; @@ -47,8 +47,8 @@ protected TopiaTestTopiaPersistenceContext persistenceContext; protected TopiaJpaSupport jpaSupport; - protected AddressDAO addressDAO; - protected PersonneDAO personneDAO; + protected AddressTopiaDao addressDAO; + protected PersonneTopiaDao personneDAO; protected Address address; @Before Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -33,7 +33,8 @@ import org.nuiton.topia.TopiaTestDAOHelper; import org.nuiton.topia.TopiaTestTopiaPersistenceContext; import org.nuiton.topia.test.entities.Person; -import org.nuiton.topia.test.entities.PersonDAO; +import org.nuiton.topia.test.entities.PersonDao; +import org.nuiton.topia.test.entities.PersonTopiaDao; import org.nuiton.topiatest.Personne; import java.io.File; @@ -125,7 +126,7 @@ TopiaTestTopiaPersistenceContext transaction = db.beginTransaction(); try { - PersonDAO dao = TopiaTestDAOHelper.getPersonDAO(transaction); + PersonTopiaDao dao = TopiaTestDAOHelper.getPersonDAO(transaction); Person personne = dao.create(Personne.PROPERTY_NAME, "Jack Bauer"); transaction.commitTransaction(); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextReplicateTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextReplicateTest.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextReplicateTest.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -27,15 +27,14 @@ import org.junit.Assert; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaTestDAOHelper; import org.nuiton.topia.TopiaTestTopiaPersistenceContext; import org.nuiton.topia.test.entities.Person; -import org.nuiton.topia.test.entities.PersonDAO; +import org.nuiton.topia.test.entities.PersonDao; import org.nuiton.topia.test.entities.Pet; -import org.nuiton.topia.test.entities.PetDAO; +import org.nuiton.topia.test.entities.PetDao; import java.io.File; import java.util.Properties; @@ -93,8 +92,8 @@ TopiaTestTopiaPersistenceContext txSource; TopiaTestTopiaPersistenceContext txTarget; - PersonDAO daoSource, daoTarget; - PetDAO petDAOSource, petDAOTarget; + PersonDao daoSource, daoTarget; + PetDao petDAOSource, petDAOTarget; Person personSource, personTarget; Pet petSource, petTarget; Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -35,9 +35,9 @@ import org.nuiton.topia.TopiaTestDAOHelper; import org.nuiton.topia.TopiaTestTopiaPersistenceContext; import org.nuiton.topiatest.Company; -import org.nuiton.topiatest.CompanyDAO; +import org.nuiton.topiatest.CompanyDao; import org.nuiton.topiatest.Department; -import org.nuiton.topiatest.DepartmentDAO; +import org.nuiton.topiatest.DepartmentDao; /** * TopiaTestCase. @@ -123,8 +123,8 @@ // try { TopiaTestTopiaPersistenceContext newContext = db.beginTransaction(); - CompanyDAO companyDAO = newContext.getCompanyDao(); - DepartmentDAO departmentDAO = newContext.getDepartmentDao(); + CompanyDao companyDAO = newContext.getCompanyDao(); + DepartmentDao departmentDAO = newContext.getDepartmentDao(); Company company = companyDAO.create(); company.setName("Ma société"); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -34,13 +34,13 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTestTopiaPersistenceContext; import org.nuiton.topiatest.Address; -import org.nuiton.topiatest.AddressDAO; +import org.nuiton.topiatest.AddressTopiaDao; import org.nuiton.topiatest.Company; -import org.nuiton.topiatest.CompanyDAO; +import org.nuiton.topiatest.CompanyTopiaDao; import org.nuiton.topiatest.Department; -import org.nuiton.topiatest.DepartmentDAO; +import org.nuiton.topiatest.DepartmentTopiaDao; import org.nuiton.topiatest.Employe; -import org.nuiton.topiatest.EmployeDAO; +import org.nuiton.topiatest.EmployeTopiaDao; /** * Test de visitor. @@ -72,14 +72,14 @@ TopiaTestTopiaPersistenceContext newContext = db.beginTransaction(); try { // company - CompanyDAO companyDAO = newContext.getCompanyDao(); + CompanyTopiaDao companyDAO = newContext.getCompanyDao(); Company clCompany = companyDAO.create(Company.PROPERTY_NAME, "CodeLutin"); // employe - EmployeDAO employeDAO = newContext.getEmployeDao(); + EmployeTopiaDao employeDAO = newContext.getEmployeDao(); Employe empl1 = employeDAO.create(Employe.PROPERTY_NAME, "boss", Employe.PROPERTY_SALARY, 30000); - AddressDAO adressDAO = newContext.getAddressDao(); + AddressTopiaDao adressDAO = newContext.getAddressDao(); Address addr1 = adressDAO.create(Address.PROPERTY_CITY, "Nantes", Address.PROPERTY_ADRESS, "12 Avenue Jules Vernes"); empl1.setAddress(addr1); @@ -88,7 +88,7 @@ empl2.setAddress(addr2); // departement - DepartmentDAO departmentDAO = newContext.getDepartmentDao(); + DepartmentTopiaDao departmentDAO = newContext.getDepartmentDao(); Department depComm = departmentDAO.create(Department.PROPERTY_NAME, "Commercial"); depComm.setLeader(empl1); @@ -117,7 +117,7 @@ TopiaTestTopiaPersistenceContext context = db.beginTransaction(); - CompanyDAO companyDAO = context.getCompanyDao(); + CompanyTopiaDao companyDAO = context.getCompanyDao(); Company clCompany = companyDAO.findByName("CodeLutin"); EntityVisitor delegateVisitor = new ExportXMLVisitor(); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -36,7 +36,7 @@ import org.nuiton.topia.TopiaTestDAOHelper; import org.nuiton.topia.TopiaTestTopiaPersistenceContext; import org.nuiton.topiatest.NaturalizedEntity; -import org.nuiton.topiatest.NaturalizedEntityDAO; +import org.nuiton.topiatest.NaturalizedEntityDao; /** * NaturalIdTest @@ -61,7 +61,7 @@ log.debug("Test naturalId : create succesfull"); TopiaTestTopiaPersistenceContext persistenceContext = db.beginTransaction(); - NaturalizedEntityDAO dao = + NaturalizedEntityDao dao = persistenceContext.getNaturalizedEntityDao(); // No exception will be thrown with the two properties @@ -82,7 +82,7 @@ log.debug("Test naturalId : create failed"); TopiaTestTopiaPersistenceContext persistenceContext = db.beginTransaction(); - NaturalizedEntityDAO dao = + NaturalizedEntityDao dao = persistenceContext.getNaturalizedEntityDao(); // Exception will be throw @@ -108,7 +108,7 @@ TopiaTestTopiaPersistenceContext persistenceContext = db.beginTransaction(); - NaturalizedEntityDAO dao = + NaturalizedEntityDao dao = persistenceContext.getNaturalizedEntityDao(); NaturalizedEntity entity = @@ -131,7 +131,7 @@ TopiaTestTopiaPersistenceContext persistenceContext = db.beginTransaction(); - NaturalizedEntityDAO dao = + NaturalizedEntityDao dao = persistenceContext.getNaturalizedEntityDao(); NaturalizedEntity entity = @@ -149,7 +149,7 @@ TopiaTestTopiaPersistenceContext persistenceContext = db.beginTransaction(); - NaturalizedEntityDAO dao = + NaturalizedEntityDao dao = persistenceContext.getNaturalizedEntityDao(); dao.createByNaturalId(5, "str"); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -35,7 +35,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTestTopiaPersistenceContext; import org.nuiton.topia.test.entities.Person; -import org.nuiton.topia.test.entities.PersonDAO; +import org.nuiton.topia.test.entities.PersonDao; import java.util.List; @@ -55,7 +55,7 @@ protected TopiaTestTopiaPersistenceContext context; - protected PersonDAO dao; + protected PersonDao dao; @Before public void setup() throws TopiaException { Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -26,7 +26,6 @@ import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaTestDAOHelper; import org.nuiton.topia.TopiaTestTopiaPersistenceContext; @@ -42,7 +41,7 @@ public void testAno1882() throws Exception { TopiaTestTopiaPersistenceContext transaction = db.beginTransaction(); - FrenchCompanyDAO dao = TopiaTestDAOHelper.getFrenchCompanyDAO(transaction); + FrenchCompanyDao dao = TopiaTestDAOHelper.getFrenchCompanyDAO(transaction); SIRETDAO siretDAO = TopiaTestDAOHelper.getSIRETDAO(transaction); SIRET siret = siretDAO.create(); FrenchCompany entity = Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -27,7 +27,6 @@ import org.junit.Assert; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTestDAOHelper; @@ -54,7 +53,7 @@ public void storeEntityWithEnumValue() throws TopiaException { TopiaTestTopiaPersistenceContext transaction = db.beginTransaction(); - PersonneDAO dao = TopiaTestDAOHelper.getPersonneDAO(transaction); + PersonneDao dao = TopiaTestDAOHelper.getPersonneDAO(transaction); Personne personne = new PersonneImpl(); personne.setGender(Gender.FEMALE); personne.setOtherGender(Gender.MALE); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java 2013-10-17 16:14:18 UTC (rev 2846) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java 2013-10-25 12:03:15 UTC (rev 2847) @@ -43,14 +43,13 @@ import org.junit.Assert; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTestDAOHelper; import org.nuiton.topia.TopiaTestTopiaPersistenceContext; import org.nuiton.topiatest.Gender; import org.nuiton.topiatest.Personne; -import org.nuiton.topiatest.PersonneDAO; +import org.nuiton.topiatest.PersonneDao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -85,7 +84,7 @@ TopiaTestTopiaPersistenceContext transaction = db.beginTransaction(); log.debug("DAO : PersonneDAO"); - PersonneDAO dao = TopiaTestDAOHelper.getPersonneDAO(transaction); + PersonneDao dao = TopiaTestDAOHelper.getPersonneDAO(transaction); log.debug("CREATE PERSONNE : Bob Marley"); Personne personne = dao.create(Personne.PROPERTY_NAME, "Bob Marley"); @@ -135,7 +134,7 @@ TopiaTestTopiaPersistenceContext transaction = db.beginTransaction(); - PersonneDAO dao = TopiaTestDAOHelper.getPersonneDAO(transaction); + PersonneDao dao = TopiaTestDAOHelper.getPersonneDAO(transaction); log.debug("CREATE PERSONNE : Bob Marley"); Personne personne = dao.create(Personne.PROPERTY_NAME, "Bob Marley"); @@ -186,7 +185,7 @@ TopiaTestTopiaPersistenceContext transaction = db.beginTransaction(); - PersonneDAO dao = TopiaTestDAOHelper.getPersonneDAO(transaction); + PersonneDao dao = TopiaTestDAOHelper.getPersonneDAO(transaction); Personne person = dao.newInstance(); Assert.assertNull(person.getTopiaId());

1 0

r2846 - in trunk: topia-persistence/src/main/java/org/nuiton/topia topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence/src/main/java/org/nuiton/topia/persistence topia-service-replication/src/main/java/org/nuiton/topia/replication topia-service-replication/src/main/java/org/nuiton/topia/replication/operation topia-service-replication/src/test/java/org/nuiton/topia/replication
by bleny＠users.nuiton.org Oct. 17, 2013

Oct. 17, 2013

Author: bleny Date: 2013-10-17 18:14:18 +0200 (Thu, 17 Oct 2013) New Revision: 2846 Url: http://nuiton.org/projects/topia/repository/revisions/2846 Log: refs #2086 rename DAO to Dao to prevent confusing names Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaDaoSupplier.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDaoTransformer.java Removed: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaDAOSupplier.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/LegacyEntityDAOTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/PersistenceContextTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -212,7 +212,7 @@ checkClosed(); Class<E> entityClass = getTopiaIdFactory().getClassName(topiaId); - TopiaDAO<E> dao = getDAO(entityClass); + TopiaDAO<E> dao = getDao(entityClass); E result = dao.findByTopiaId(topiaId); return result; } @@ -223,7 +223,7 @@ String topiaId = entity.getTopiaId(); Class<TopiaEntity> entityClass = getTopiaIdFactory().getClassName(topiaId); - TopiaDAO<TopiaEntity> dao = getDAO(entityClass); + TopiaDAO<TopiaEntity> dao = getDao(entityClass); dao.update(entity); } @@ -234,8 +234,8 @@ } @Override - public <E extends TopiaEntity> TopiaDAO<E> getDAO(Class<E> entityClass) { - Preconditions.checkArgument(entityClass != null, "The method 'getDAO' requires a non null 'entityClass' parameter"); + public <E extends TopiaEntity> TopiaDAO<E> getDao(Class<E> entityClass) { + Preconditions.checkArgument(entityClass != null, "The method 'getDao' requires a non null 'entityClass' parameter"); SessionFactory hibernateFactory = hibernateSupport.getHibernateFactory(); if (hibernateFactory.getClassMetadata(entityClass) == null && @@ -291,8 +291,8 @@ } @Override - public <E extends TopiaEntity, D extends TopiaDAO<E>> D getDAO(Class<E> entityClass, Class<D> daoClass) { - return (D) getDAO(entityClass); + public <E extends TopiaEntity, D extends TopiaDAO<E>> D getDao(Class<E> entityClass, Class<D> daoClass) { + return (D) getDao(entityClass); } @Override Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaDAOSupplier.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaDAOSupplier.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaDAOSupplier.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -1,54 +0,0 @@ -package org.nuiton.topia; - -/* - * #%L - * ToPIA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2013 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% - */ - -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.TopiaEntity; - -/** - * @author bleny - */ -public interface TopiaDAOSupplier { - - /** - * Get DAO for specified class. If Specialized DAO exists then it returned - * otherwize TopiaDAO<entityClass> is returned - * - * @param entityClass type of entity - * @return the expected dao - */ - <E extends TopiaEntity> TopiaDAO<E> getDAO(Class<E> entityClass); - - /** - * Get DAO for specified class. If Specialized DAO exists then it returned - * otherwize TopiaDAO<entityClass> is returned - * - * @param entityClass type of entity - * @param daoClass the concrete dao class to use - * @return the expected dao - */ - <E extends TopiaEntity, D extends TopiaDAO<E>> D getDAO(Class<E> entityClass, Class<D> daoClass); - -} Copied: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaDaoSupplier.java (from rev 2845, trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaDAOSupplier.java) =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaDaoSupplier.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaDaoSupplier.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -0,0 +1,54 @@ +package org.nuiton.topia; + +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; + +/** + * @author bleny + */ +public interface TopiaDaoSupplier { + + /** + * Get DAO for specified class. If Specialized DAO exists then it returned + * otherwize TopiaDAO<entityClass> is returned + * + * @param entityClass type of entity + * @return the expected dao + */ + <E extends TopiaEntity> TopiaDAO<E> getDao(Class<E> entityClass); + + /** + * Get DAO for specified class. If Specialized DAO exists then it returned + * otherwize TopiaDAO<entityClass> is returned + * + * @param entityClass type of entity + * @param daoClass the concrete dao class to use + * @return the expected dao + */ + <E extends TopiaEntity, D extends TopiaDAO<E>> D getDao(Class<E> entityClass, Class<D> daoClass); + +} Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -38,7 +38,7 @@ * @author Arnaud Thimel <thimel(a)codelutin.com> * @since 3.0 */ -public interface TopiaPersistenceContext extends TopiaReplicationSupport, TopiaReplicationDestination, TopiaDAOSupplier, TopiaTransaction { +public interface TopiaPersistenceContext extends TopiaReplicationSupport, TopiaReplicationDestination, TopiaDaoSupplier, TopiaTransaction { /** * Retrieve {@link org.nuiton.topia.persistence.TopiaEntity} using its unique {@code topiaId}. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -707,12 +707,12 @@ /* -------------------- CHILD CONTEXT AND DAOS --------------------------*/ @Override - public <E extends TopiaEntity> TopiaDAO<E> getDAO(Class<E> entityClass) + public <E extends TopiaEntity> TopiaDAO<E> getDao(Class<E> entityClass) throws TopiaException { if (entityClass == null) { throw new IllegalArgumentException( String.format("The method '%1$s' requires a non null parameter '%2$s'.", - "entityClass", "getDAO")); + "entityClass", "getDao")); } if (equals(getRootContext())) { throw new TopiaException( @@ -761,9 +761,9 @@ @SuppressWarnings({"unchecked"}) @Override - public <E extends TopiaEntity, D extends TopiaDAO<E>> D getDAO(Class<E> entityClass, + public <E extends TopiaEntity, D extends TopiaDAO<E>> D getDao(Class<E> entityClass, Class<D> daoClass) throws TopiaException { - return (D) getDAO(entityClass); + return (D) getDao(entityClass); } @Override @@ -983,7 +983,7 @@ "findByTopiaId")); Class<E> entityClass = getTopiaIdFactory().getClassName(id); - TopiaDAO<E> dao = getDAO(entityClass); + TopiaDAO<E> dao = getDao(entityClass); E result = dao.findByTopiaId(id); return result; } @@ -1612,7 +1612,7 @@ String id = entity.getTopiaId(); Class<TopiaEntity> entityClass = getTopiaIdFactory().getClassName(id); - TopiaDAO<TopiaEntity> dao = getDAO(entityClass); + TopiaDAO<TopiaEntity> dao = getDao(entityClass); dao.update(entity); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -146,7 +146,7 @@ * @deprecated use method from {@link org.nuiton.topia.TopiaPersistenceContext} */ @Deprecated - <E extends TopiaEntity> TopiaDAO<E> getDAO(Class<E> entityClass) + <E extends TopiaEntity> TopiaDAO<E> getDao(Class<E> entityClass) throws TopiaException; /** @@ -161,7 +161,7 @@ * @deprecated use method from {@link org.nuiton.topia.TopiaPersistenceContext} */ @Deprecated - <E extends TopiaEntity, D extends TopiaDAO<E>> D getDAO(Class<E> entityClass, Class<D> daoClass) + <E extends TopiaEntity, D extends TopiaDAO<E>> D getDao(Class<E> entityClass, Class<D> daoClass) throws TopiaException; /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -47,7 +47,7 @@ import org.hibernate.event.spi.PreUpdateEventListener; import org.hibernate.event.spi.SaveOrUpdateEvent; import org.hibernate.event.spi.SaveOrUpdateEventListener; -import org.nuiton.topia.TopiaDAOSupplier; +import org.nuiton.topia.TopiaDaoSupplier; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.AbstractTopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; @@ -116,7 +116,7 @@ } private void attachContext(Object entity, - TopiaDAOSupplier daoSupplier) { + TopiaDaoSupplier daoSupplier) { if (entity instanceof TopiaEntityContextable) { TopiaEntityContextable topiaEntityContextable = (TopiaEntityContextable) entity; if (topiaEntityContextable.getTopiaDAOSupplier() == null) { @@ -184,11 +184,11 @@ public void onPostLoad(PostLoadEvent event) { // TopiaContextImplementor context = getContext(rootContext, event // .getSession()); - TopiaDAOSupplier daoSupplier = null; // TODO brendan 30/09/13 Implment + TopiaDaoSupplier daoSupplier = null; // TODO brendan 30/09/13 Implment if (daoSupplier != null && event.getEntity() instanceof TopiaEntity) { attachContext(event.getEntity(), daoSupplier); TopiaEntity entity = (TopiaEntity) event.getEntity(); - AbstractTopiaDAO<? extends TopiaEntity> dao = (AbstractTopiaDAO) daoSupplier.getDAO(entity.getClass()); + AbstractTopiaDAO<? extends TopiaEntity> dao = (AbstractTopiaDAO) daoSupplier.getDao(entity.getClass()); dao.getTopiaFiresSupport().fireOnPostLoad(dao, (TopiaEntity) event.getEntity(), new Object[]{}); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -39,7 +39,7 @@ import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; import org.nuiton.eugene.models.object.xml.ObjectModelEnumerationImpl; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaDAOSupplier; +import org.nuiton.topia.TopiaDaoSupplier; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; @@ -184,12 +184,12 @@ // specialized getXXXDao method op = addOperation(daoHelper, "get" + daoClazzName, clazz.getPackageName() + '.' + daoClazzName, ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); - addParameter(op, TopiaDAOSupplier.class, "supplier"); + addParameter(op, TopiaDaoSupplier.class, "supplier"); addImport(daoHelper, clazz); addException(op, TopiaException.class); setOperationBody(op, "" /*{ - <%=daoClazzName%> result = supplier.getDAO(<%=clazzName%>.class, <%=daoClazzName%>.class); + <%=daoClazzName%> result = supplier.getDao(<%=clazzName%>.class, <%=daoClazzName%>.class); return result; }*/ ); @@ -197,26 +197,26 @@ } // generic getDao method - op = addOperation(daoHelper, "getDAO", "<T extends TopiaEntity, D extends TopiaDAO<? super T>> D", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); + op = addOperation(daoHelper, "getDao", "<T extends TopiaEntity, D extends TopiaDAO<? super T>> D", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); addParameter(op, TopiaContext.class, "context"); addParameter(op, "Class<T>", "klass"); addException(op, TopiaException.class); setOperationBody(op, "" /*{ <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); - D dao = (D) context.getDAO(constant.getContract()); + D dao = (D) context.getDao(constant.getContract()); return dao; }*/ ); - op = addOperation(daoHelper, "getDAO", "<T extends TopiaEntity, D extends TopiaDAO<? super T>> D", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); + op = addOperation(daoHelper, "getDao", "<T extends TopiaEntity, D extends TopiaDAO<? super T>> D", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); addParameter(op, TopiaContext.class, "context"); addParameter(op, "T", "entity"); addException(op, TopiaException.class); setOperationBody(op, "" /*{ <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(entity); - D dao = (D) context.getDAO(constant.getContract()); + D dao = (D) context.getDao(constant.getContract()); return dao; }*/ ); Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -1,1113 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2011 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% - */ -package org.nuiton.topia.generator; - -/*{generator option: parentheses = false}*/ -/*{generator option: writeString = +}*/ - -import com.google.common.collect.Sets; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.java.JavaGeneratorUtil; -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.ObjectModel; -import org.nuiton.eugene.models.object.ObjectModelAssociationClass; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.ObjectModelDependency; -import org.nuiton.eugene.models.object.ObjectModelInterface; -import org.nuiton.eugene.models.object.ObjectModelJavaModifier; -import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaEntity; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; - -/** - * To generate all <code>DAO</code> related classes for a given entity. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.5.4 - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityDAOTransformer" - */ -public class EntityDAOTransformer extends ObjectModelTransformerToJava { - - /** Logger. */ - private static final Log log = - LogFactory.getLog(EntityDAOTransformer.class); - - /** - * map of direct usages (values) for each entity (key). - * - * This map is used to generate the findUsages methods for DAOAbstract. - */ - protected Map<ObjectModelClass, Set<ObjectModelClass>> usages; - - /** - * All entities fqn of the model (used to detect if an attribute is not - * an entity). - */ - protected Set<String> allEntitiesFqn; - - /** - * The class of abstract dao to use. - * @since 2.5 - */ - protected Class<?> daoImplementation; - - protected String entityEnumName; - - protected String entityEnumPackage; - - /** - * Map of extra operations for DAO. The key of the map is the qualified - * name of the entity relative to the DAO. - */ - protected Map<String, Collection<ObjectModelOperation>> extraOperations = - new HashMap<String, Collection<ObjectModelOperation>>(); - - @Override - public void transformFromModel(ObjectModel model) { - - boolean generateStandaloneEnum = - TopiaGeneratorUtil.shouldGenerateStandaloneEnumForDAOHelper(model); - String modelName = model.getName(); - - entityEnumName = modelName + "EntityEnum"; - - String packageName = - getOutputProperties().getProperty(PROP_DEFAULT_PACKAGE); - - if (generateStandaloneEnum) { - entityEnumPackage = packageName + "." + entityEnumName; - } else { - String daoHelperClazzName = modelName + "DAOHelper"; - entityEnumPackage = packageName + "." + daoHelperClazzName + "." + entityEnumName; - } - - usages = TopiaGeneratorUtil.searchDirectUsages(model); - - daoImplementation = TopiaGeneratorUtil.getDAOImplementation(model); - - - // keep all classifiers on the model which are entities - List<ObjectModelClass> allEntities = - TopiaGeneratorUtil.getEntityClasses(model, true); - allEntitiesFqn = new HashSet<String>(allEntities.size()); - for (ObjectModelClass entity : allEntities) { - String fqn = entity.getQualifiedName(); - allEntitiesFqn.add(fqn); - Collection<ObjectModelOperation> daoOperations = - new HashSet<ObjectModelOperation>(); - for (ObjectModelOperation op : entity.getOperations()) { - if (TopiaGeneratorUtil.hasDaoStereotype(op)) { - daoOperations.add(op); - } - } - - if (daoOperations.isEmpty()) { - - // found some dao operations - extraOperations.put(fqn, daoOperations); - } - } - } - - @Override - public void transformFromInterface(ObjectModelInterface interfacez) { - if (!TopiaGeneratorUtil.hasDaoStereotype(interfacez)) { - return; - } - - /** - * EVO #636 : Manage extra operations for DAO from "dao" dependency - * between an interface with stereotype <<dao>> (dependency client) and - * a class with stereotype <<entity>> (dependency supplier). - */ - - ObjectModelDependency dependency = - interfacez.getDependency(TopiaGeneratorUtil.DEPENDENCIES_DAO); - - if (dependency == null) { - if (log.isWarnEnabled()) { - log.warn("Could not find dependency " + - TopiaGeneratorUtil.DEPENDENCIES_DAO + - " but DAO stereotype was placed on the interface " + - interfacez.getName()); - } - return; - } - - ObjectModelClassifier classifier = dependency.getSupplier(); - - if (!TopiaGeneratorUtil.isEntity(classifier)) { - - // dependency supplier is not an entity... - if (log.isWarnEnabled()) { - log.warn("Dependency supplier " + - classifier.getQualifiedName() + - " is not an entity."); - } - return; - } - - // keep only direct operations - Collection<ObjectModelOperation> operations = - interfacez.getOperations(); - - if (CollectionUtils.isEmpty(operations)) { - - // no operations on interface, this is not normal - if (log.isWarnEnabled()) { - log.warn("No operation found on interface with DAO " + - "stereotype "+classifier.getQualifiedName()); - } - return; - } - if (log.isDebugEnabled()) { - log.debug("add "+operations.size()+" extra operation(s) for DAO"); - } - - extraOperations.put(classifier.getQualifiedName(), operations); - } - - @Override - public void transformFromClass(ObjectModelClass clazz) { - if (!TopiaGeneratorUtil.isEntity(clazz)) { - // not an entity - return; - } - String clazzName = clazz.getName(); - String clazzFQN = clazz.getQualifiedName(); - - if (isGenerateGeneratedDao(clazz)) { - generateGeneratedDao(clazz, clazzName, clazzFQN); - } - - if (isGenerateAbstractDao(clazz)) { - generateAbstractDao(clazz, clazzName, clazzFQN); - } - - if (isGenerateLegacyDao(clazz)) { - generateLegacyDao(clazz, clazzName, clazzFQN); - } - - if (isGenerateConcreteDao(clazz)) { - generateConcreteDao(clazz, clazzName, clazzFQN); - } - - } - - protected boolean isGenerateLegacyDao(ObjectModelClass input) { - - String daoLegacyFqn = TopiaGeneratorUtil.getLegacyDaoFqn(input); - - if (isInClassPath(daoLegacyFqn)) { - - // already in class-path - return false; - } - - // can safely generate the dao impl - return true; - } - - protected boolean isGenerateConcreteDao(ObjectModelClass input) { - - String daoConcreteFqn = TopiaGeneratorUtil.getConcreteDaoFqn(input); - - if (isInClassPath(daoConcreteFqn)) { - - // already in class-path - return false; - } - - // can safely generate the dao impl - return true; - } - - protected boolean isGenerateGeneratedDao(ObjectModelClass input) { - - String daoGeneratedFqn = TopiaGeneratorUtil.getGeneratedDaoFqn(input); - - if (isInClassPath(daoGeneratedFqn)) { - - // already in class-path - return false; - } - - // can safely generate the dao impl - return true; - - } - - protected boolean isGenerateAbstractDao(ObjectModelClass input) { - - String fqn = TopiaGeneratorUtil.getAbstractDaoFqn(input); - - if (isInClassPath(fqn)) { - - // already in class-path - return false; - } - - Collection<ObjectModelOperation> moreOperations = - extraOperations.get(input.getQualifiedName()); - - if (CollectionUtils.isNotEmpty(moreOperations)) { - - // no user operations, can not generate it - return false; - } - - // can safely generate the dao impl - return true; - - } - - protected void generateLegacyDao(ObjectModelClass clazz, String clazzName, String clazzFQN) { - ObjectModelClass daoClass = createClass(TopiaGeneratorUtil.getLegacyDaoName(clazz), clazz.getPackageName()); - addAnnotation(daoClass, daoClass, Deprecated.class); - setDocumentation(daoClass, "/**\n" + - " * Cette classe etend le DAOImpl pour parametrer la classe avec le bon type\n" + - " * Cette classe est marque finale car l'heritage entre les DAO se fait\n" + - " * sur les DOAImpl, c-a-d que DAOAbstract peut etendre le DAOImpl\n" + - " */"); - setSuperClass(daoClass, TopiaGeneratorUtil.getAbstractDaoFqn(clazz) + "<" + clazzName + ">"); - } - - protected void generateConcreteDao(ObjectModelClass clazz, String clazzName, String clazzFQN) { - ObjectModelClass daoClass = createClass(TopiaGeneratorUtil.getConcreteDaoName(clazz), clazz.getPackageName()); - setDocumentation(daoClass, "/**\n" + - " * Cette classe etend le DAOImpl pour parametrer la classe avec le bon type\n" + - " * Cette classe est marque finale car l'heritage entre les DAO se fait\n" + - " * sur les DOAImpl, c-a-d que DAOAbstract peut etendre le DAOImpl\n" + - " */"); - // to support legacy dao - setSuperClass(daoClass, TopiaGeneratorUtil.getLegacyDaoFqn(clazz)); - // TODO brendan 04/10/13 above line should be replaced by - // setSuperClass(daoClass, TopiaGeneratorUtil.getAbstractDaoFqn(clazz) + "<" + clazzName + ">"); - } - - protected void generateAbstractDao(ObjectModelClass clazz, - String clazzName, - String clazzFQN) { - - Collection<ObjectModelOperation> moreOperations = - extraOperations.get(clazz.getQualifiedName()); - - if (CollectionUtils.isEmpty(moreOperations)) { - - // no business dao found, can safely generate the daoImpl class - - ObjectModelClass daoImplClass = createClass(TopiaGeneratorUtil.getAbstractDaoName(clazz) + "<E extends " + clazzName + ">", clazz.getPackageName()); - setDocumentation(daoImplClass, "/**\n" + - " Implantation du DAO pour l'entité " + clazzName + ".\n" + - " * L'utilisateur peut remplacer cette classe par la sienne en la mettant \n" + - " * simplement dans ces sources. Cette classe générée sera alors simplement\n" + - " * écrasée\n" + - " */"); - setSuperClass(daoImplClass, TopiaGeneratorUtil.getGeneratedDaoFqn(clazz) + "<E>"); - } - } - - protected void generateGeneratedDao(ObjectModelClass clazz, - String clazzName, - String clazzFQN) { - ObjectModelClass daoAbstractClass = createAbstractClass(TopiaGeneratorUtil.getGeneratedDaoName(clazz) + "<E extends " + clazzName + '>', - clazz.getPackageName()); - - // super class - - String superClassName = null; - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (TopiaGeneratorUtil.isEntity(parent)) { - superClassName = TopiaGeneratorUtil.getAbstractDaoFqn(parent) + "<E>"; - // in java no multi-inheritance - break; - } - } - if (superClassName == null) { - superClassName = daoImplementation.getName() + "<E>"; - } - if (log.isDebugEnabled()) { - log.debug("super class = " + superClassName); - } - setSuperClass(daoAbstractClass, superClassName); - - String prefix = getConstantPrefix(clazz, ""); - setConstantPrefix(prefix); - - // imports - - Collection<ObjectModelOperation> DAOoperations = - getDAOOperations(clazz); - - if (TopiaGeneratorUtil.isCollectionNeeded(DAOoperations)) { - addImport(daoAbstractClass, Collection.class); - } - if (TopiaGeneratorUtil.isSetNeeded(DAOoperations)) { - addImport(daoAbstractClass, Set.class); - } - addImport(daoAbstractClass, List.class); - addImport(daoAbstractClass, TopiaException.class); - - ObjectModelOperation op; - - // getEntityClass - - op = addOperation(daoAbstractClass, - "getEntityClass", - "Class<E>", - ObjectModelJavaModifier.PUBLIC); - addAnnotation(daoAbstractClass, op,Override.class); - setOperationBody(op, "" -/*{ - return (Class<E>) <%=clazzName%>.class; - }*/ - ); - - // getTopiaEntityEnum - addImport(daoAbstractClass, entityEnumPackage); - op = addOperation(daoAbstractClass, - "getTopiaEntityEnum", - entityEnumName, - ObjectModelJavaModifier.PUBLIC); - addAnnotation(daoAbstractClass, op,Override.class); - setOperationBody(op, "" -/*{ - return <%=entityEnumName%>.<%=clazzName%>; - }*/ - ); - - generateDAOOperations(daoAbstractClass, DAOoperations); - - generateDelete(clazz, daoAbstractClass); - - generateNaturalId(daoAbstractClass, clazz); - - generateNotNull(daoAbstractClass, clazz); - - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (!attr.isNavigable()) { - continue; - } - - if (!GeneratorUtil.isNMultiplicity(attr)) { - generateNoNMultiplicity(clazzName, daoAbstractClass, attr, false); - } else { - generateNMultiplicity(clazzName, daoAbstractClass, attr); - } - } - - if (clazz instanceof ObjectModelAssociationClass) { - ObjectModelAssociationClass assocClass = - (ObjectModelAssociationClass) clazz; - for (ObjectModelAttribute attr : assocClass.getParticipantsAttributes()) { - if (attr != null) { - if (!GeneratorUtil.isNMultiplicity(attr)) { - generateNoNMultiplicity(clazzName, daoAbstractClass, attr, true); - } else { - generateNMultiplicity(clazzName, daoAbstractClass, attr); - } - } - } - } - - Set<ObjectModelClass> usagesForclass = usages.get(clazz); - generateFindUsages(clazz, daoAbstractClass, usagesForclass); - } - - protected void generateDelete(ObjectModelClass clazz, - ObjectModelClass result) { - - StringBuilder body = new StringBuilder(); - String modelName = StringUtils.capitalize(model.getName()); - String providerFQN = getOutputProperties().getProperty( - PROP_DEFAULT_PACKAGE) + '.' + modelName + - "DAOHelper.getImplementationClass"; - - for (ObjectModelAttribute attr : clazz.getAttributes()) { - - String attrType = GeneratorUtil.getSimpleName(attr.getType()); - - String reverseAttrName = attr.getReverseAttributeName(); - ObjectModelAttribute reverse = attr.getReverseAttribute(); - if (attr.hasAssociationClass() || - reverse == null || !reverse.isNavigable()) { - - // never treate a non reverse and navigable attribute - // never treate an association class attribute - continue; - } - - // at this point we are sure to have a attribute which is - // - reverse - // - navigable - // - not from an association class - if (!allEntitiesFqn.contains(attr.getType())) { - - // this attribute is not from an entity, don't treate it - if (log.isDebugEnabled()) { - log.debug("[" + result.getName() + "] Skip attribute [" + - attr.getName() + "] with type " + attr.getType()); - } - continue; - } - - // At this point, the attribute type is a entity - if (GeneratorUtil.isNMultiplicity(attr) && - GeneratorUtil.isNMultiplicity(reverse)) { - // On doit absolument supprimer pour les relations many-to-many - // le this de la collection de l'autre cote - - String attrDBName = TopiaGeneratorUtil.getDbName(attr); - String attrClassifierDBName = TopiaGeneratorUtil.getDbName(attr.getClassifier()); - String attrJoinTableName = TopiaGeneratorUtil.getManyToManyTableName(attr); - String attrReverseDBName = TopiaGeneratorUtil.getReverseDbName(attr); - - //FIXME_-FC-20100413 Use a TopiaQuery (use HQLin elements) -// // Add DAOHelper -// String daoHelper = modelName + "DAOHelper"; -// String daoHelperFQN = getOutputProperties(). -// getProperty(PROP_DEFAULT_PACKAGE) + '.' + daoHelper; -// addImport(result, daoHelperFQN); -// -// // Add import for TopiaQuery -// addImport(result, TopiaQuery.class); -// -// // Entity DAO and reversePropertyName -// String entityDAO = attrType + "DAO"; -// String reverseAttrNameProperty = -// attrType + "." + getConstantName(reverseAttrName); -// -// -// <%=entityDAO%> dao = <%=daoHelper%>.get<%=entityDAO%>(getTopiaContext()); -// TopiaQuery query = dao.createQuery("B"). -// addFrom(entity.getClass(), "A"). -// add("A", entity). -// addInElements("A", "B." + <%=reverseAttrNameProperty%>); -// -// System.out.println("Query : " + query); -// List<<%=attrType%>> list = dao.findAllByQuery(query); - - String removeName = getJavaBeanMethodName("remove", reverseAttrName); - body.append("" -/*{ - { - List<<%=attrType%>> list = topiaHibernateSupport.getHibernateSession().createSQLQuery( - "SELECT main.topiaid " + - "from <%=attrClassifierDBName%> main, <%=attrJoinTableName%> secondary " + - "where main.topiaid=secondary.<%=attrDBName%>" + - " and secondary.<%=attrReverseDBName%>='" + entity.getTopiaId() + "'") - .addEntity("main", <%=providerFQN%>(<%=attrType%>.class)).list(); - - for (<%=attrType%> item : list) { - item.<%=removeName%>(entity); - } - } -}*/ - ); - } else if (!GeneratorUtil.isNMultiplicity(reverse)) { - // On doit mettre a null les attributs qui ont cet objet sur les - // autres entites en one-to-* - // TODO peut-etre qu'hibernate est capable de faire ca tout seul ? - // THIMEL: J'ai remplacé reverse.getName() par reverseAttrName sans certitude - addImport(result, attrType); - String attrSimpleType = TopiaGeneratorUtil.getClassNameFromQualifiedName(attrType); - // XXX brendan 04/10/13 do not hard code concrete dao name - String attrConcreteDaoClassName = attrSimpleType + "TopiaDao"; - String getName = getJavaBeanMethodName("get", reverseAttrName); - String setName = getJavaBeanMethodName("set", reverseAttrName); - - body.append("" - /*{ - { - List<<%=attrSimpleType%>> list = topiaDAOSupplier - .getDAO(<%=attrSimpleType%>.class, <%=attrConcreteDaoClassName%>.class) - .forProperties(<%=attrSimpleType%>.<%=getConstantName(reverseAttrName)%>, entity).findAll(); - for (<%=attrSimpleType%> item : list) { - - // sletellier : Set null only if target is concerned by deletion - if (entity.equals(item.<%=getName%>())) { - item.<%=setName%>(null); - } - }*/ - ); - if (attr.isAggregate()) { - body.append("" -/*{ - topiaDAOSupplier.getDAO(<%=attrSimpleType%>.class).delete(item); -}*/ - ); - } - body.append("" -/*{ - } - } -}*/ - ); - - } - } - - if (body.length()>0) { - // something specific was done, need to generate the method - ObjectModelOperation op; - op = addOperation(result, "delete", "void", ObjectModelJavaModifier.PUBLIC); - addAnnotation(result, op,Override.class); - addParameter(op, "E", "entity"); - body.append("" -/*{ - super.delete(entity); - }*/ - ); - setOperationBody(op, body.toString()); - } - - - - } - - protected void generateFindUsages(ObjectModelClass clazz, - ObjectModelClass result, - Set<ObjectModelClass> usagesForclass) { - - builder.addImport(result, LinkedList.class.getName()); - builder.addImport(result, Map.class.getName()); - builder.addImport(result, HashMap.class.getName()); - builder.addImport(result, TopiaEntity.class.getName()); - - if (clazz instanceof ObjectModelAssociationClass || - usagesForclass.isEmpty()) { - // not for an association class - // just let a null method - ObjectModelOperation operation; - operation = addOperation(result, - "findUsages", - " List", - ObjectModelJavaModifier.PUBLIC); - - addParameter(operation, "Class", "type"); - addParameter(operation, "E", "entity"); - addAnnotation(result, operation, Override.class); - setOperationBody(operation, "" -/*{ - return new LinkedList(); - }*/ - ); - - operation = addOperation(result, - "findAllUsages", - "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", - ObjectModelJavaModifier.PUBLIC); - - addParameter(operation, "E", "entity"); - addAnnotation(result, operation, Override.class); - setOperationBody(operation, "" -/*{ - return new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(); - }*/ - ); - - return; - } - List<ObjectModelClass> allEntities; - Map<String, ObjectModelClass> allEntitiesByFQN; - - allEntities = TopiaGeneratorUtil.getEntityClasses(model, true); - allEntitiesByFQN = new TreeMap<String, ObjectModelClass>(); - - // prepare usages map and fill allEntitiesByFQN map - for (ObjectModelClass klass : allEntities) { - allEntitiesByFQN.put(klass.getQualifiedName(), klass); - } - - ObjectModelOperation operation; - operation = addOperation(result, - "findUsages", - " List", - ObjectModelJavaModifier.PUBLIC); - - addParameter(operation, "Class", "type"); - addParameter(operation, "E", "entity"); - addAnnotation(result, operation, Override.class); - StringBuilder buffer = new StringBuilder(300); - buffer.append("" -/*{ - List<?> result = new LinkedList(); - List tmp; -}*/ - ); - - for (ObjectModelClass usageClass : usagesForclass) { - String usageType = usageClass.getQualifiedName(); - builder.addImport(result, usageType); - String usageSimpleType = - TopiaGeneratorUtil.getClassNameFromQualifiedName(usageType); - String usageSimplePropertyMethod = "findAllBy" + usageSimpleType; - String usageCollectionPropertyMethod = "findAllContaining" + usageSimpleType; - for (ObjectModelAttribute attr : usageClass.getAttributes()) { - if (!attr.isNavigable()) { - // skip this case - continue; - } - String type; - String attrName = attr.getName(); - if (attr.hasAssociationClass()) { - //FIXME-TC20100224 dont known how to do this ? - continue; -// type = attr.getAssociationClass().getQualifiedName(); -// //FIXME-TC20100224 : this is crazy ??? must find the good name -// // Perhaps need to make different cases? -// attrName = attrName + "_" + TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName()); - } else { - type = attr.getType(); - } - if (!allEntitiesByFQN.containsKey(type)) { - // not a entity, can skip for this attribute - continue; - } - ObjectModelClass targetEntity = allEntitiesByFQN.get(type); -// if (!type.equals(clazz.getQualifiedName())) { - if (!targetEntity.equals(clazz)) { - // not a good attribute reference - continue; - } - // found something to seek - - String methodName; - if (TopiaGeneratorUtil.isNMultiplicity(attr)) { - methodName = getJavaBeanMethodName("findAllContains", attrName); - } else { - methodName = getJavaBeanMethodName("findAllBy", attrName); - } - String daoName = StringUtils.capitalize(usageSimpleType) + "DAO"; - - builder.addImport(result, usageClass.getPackageName() + '.' + daoName); - - buffer.append("" -/*{ - if (type == <%=usageSimpleType%>.class) { - <%=daoName%> dao = (<%=daoName%>) - topiaDAOSupplier.getDAO(<%=usageSimpleType%>.class); - tmp = dao.<%=methodName%>(entity); - result.addAll(tmp); - } -}*/ - ); - } - } - - buffer.append("" -/*{ - return (List) result; - }*/ - ); - setOperationBody(operation, buffer.toString()); - - operation = addOperation(result, - "findAllUsages", - "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", - ObjectModelJavaModifier.PUBLIC); - - addParameter(operation, "E", "entity"); - addAnnotation(result, operation, Override.class); - - buffer = new StringBuilder(300); - buffer.append("" -/*{ - Map<Class<? extends TopiaEntity>,List<? extends TopiaEntity>> result; - result = new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(<%=usagesForclass.size()%>); - - List<? extends TopiaEntity> list; -}*/ - ); - for (ObjectModelClass usageClass : usagesForclass) { - - String fqn = usageClass.getName(); - buffer.append("" -/*{ - list = findUsages(<%=fqn%>.class, entity); - if (!list.isEmpty()) { - result.put(<%=fqn%>.class, list); - } -}*/ - ); - - } - buffer.append("" -/*{ - return result; - }*/ - ); - - setOperationBody(operation, buffer.toString()); - } - - /** - * Generation of DAO operations signatures from class. These operations are - * abstract and identified by <<dao>> stereotype in the model. The - * developper must defined these methods in the DAOImpl associated to this - * DAOAbstract. - * - * @param result clazz where to add operations - * @param operations operations to generate - * @deprecated will be removed ASAP in topia 3.0 - */ - @Deprecated - protected void generateDAOOperations(ObjectModelClass result, - Collection<ObjectModelOperation> - operations) { - if (CollectionUtils.isEmpty(operations)) { - - // no extra operations to generate - return; - } - - for (ObjectModelOperation op : operations) { - - Set<String> exceptions = op.getExceptions(); - cloneOperation(op, - result, - true, - ObjectModelJavaModifier.ABSTRACT, - ObjectModelJavaModifier.fromVisibility(op.getVisibility()) - ); - } - } - - - protected void generateNoNMultiplicity(String clazzName, - ObjectModelClass result, - ObjectModelAttribute attr, - boolean isAssoc) { - String attrName = attr.getName(); - String attrType = attr.getType(); - String propertyName = clazzName + "." + getConstantName(attrName); - - String attrTypeForGeneric; - if (JavaGeneratorUtil.isPrimitiveType(attrType)) { - attrTypeForGeneric = TopiaGeneratorUtil.getClassForPrimitiveType(attr); - } else { - attrTypeForGeneric = attrType; - } - - if (!isAssoc && attr.hasAssociationClass()) { - String assocClassName = attr.getAssociationClass().getName(); - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); - // It is about transitivity : use the property to access the - // associationClass + '.' + the property to access the expected - // attribute - // <class>.<attrAssoc> + '.' + <assocClass>.<attr> - propertyName = - clazzName + '.' + getConstantName(assocAttrName) + - " + '.' + " + - assocClassName + '.' + getConstantName(attrName); - } - - ObjectModelOperation op; - op = addOperation(result, - getJavaBeanMethodName("for", attrName, "In"), - "TopiaQueryBuilderRunQueryStep<E>", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, "Iterable<" + attrTypeForGeneric + ">", "v"); - setOperationBody(op, "" -/*{ - TopiaQueryBuilderRunQueryStep<E> result = forIn(<%=propertyName%>, (Iterable) v); - return result; - }*/ - ); - - op = addOperation(result, - getJavaBeanMethodName("for", attrName, "Equals"), - "TopiaQueryBuilderRunQueryStep<E>", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, attrType, "v"); - setOperationBody(op, "" -/*{ - TopiaQueryBuilderRunQueryStep<E> result = forEquals(<%=propertyName%>, v); - return result; - }*/ - ); - - String methodToDelegateName = op.getName(); - - op = addOperation(result, - getJavaBeanMethodName("findBy", attrName), - "E", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, attrType, "v"); - setOperationBody(op, "" -/*{ - return <%=methodToDelegateName%>(v).findAnyOrNull(); - }*/ - ); - - addAnnotation(result, op, Deprecated.class); - - op = addOperation(result, - getJavaBeanMethodName("findAllBy", attrName), - "List<E>", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, attrType, "v"); - setOperationBody(op, "" -/*{ - return <%=methodToDelegateName%>(v).findAll(); - }*/ - ); - - addAnnotation(result, op, Deprecated.class); - - if (!isAssoc && attr.hasAssociationClass()) { - String assocClassName = attr.getAssociationClass().getName(); - String assocClassFQN = attr.getAssociationClass().getQualifiedName(); - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); - String assocPropertyConstantName = getConstantName(assocAttrName); - op = addOperation(result, - getJavaBeanMethodName("findBy", assocClassName), - "E", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, assocClassFQN, "value"); - setOperationBody(op, "" -/*{ - E result = findByProperty(<%=clazzName + "." + assocPropertyConstantName%>, value); - return result; - }*/ - ); - - op = addOperation(result, - getJavaBeanMethodName("findAllBy", assocClassName), - "List<E>", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, assocClassFQN, "value"); - setOperationBody(op, "" -/*{ - List<E> result = findAllByProperty(<%=clazzName + "." + assocPropertyConstantName%>, value); - return result; - }*/ - ); - } - } - - protected void generateNMultiplicity(String clazzName, - ObjectModelClass result, - ObjectModelAttribute attr) { - String attrName = attr.getName(); - String attrType = attr.getType(); - if (attr.hasAssociationClass()) { - // do nothing for association class, too complex... - return; - } - ObjectModelOperation op; - - op = addOperation(result, - getJavaBeanMethodName("for", attrName, "Contains"), - "TopiaQueryBuilderRunQueryStep<E>", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, attrType, "v"); - setOperationBody(op, "" -/*{ - return forContains(<%=clazzName + "." + getConstantName(attrName)%>, v); - }*/ - ); - - String methodToDelegateName = op.getName(); - - op = addOperation(result, - getJavaBeanMethodName("findContains", attrName), - "E", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, attrType, "v"); - setOperationBody(op, "" -/*{ - return <%=methodToDelegateName%>(v).findAnyOrNull(); - }*/ - ); - - addAnnotation(result, op, Deprecated.class); - - op = addOperation(result, - getJavaBeanMethodName("findAllContains", attrName), - "List<E>", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, attrType, "v"); - setOperationBody(op, "" -/*{ - return <%=methodToDelegateName%>(v).findAll(); - }*/ - ); - - addAnnotation(result, op, Deprecated.class); - - } - - - /** - * Obtain business operations of the DAO. - * - * This operations can not be generated, but must be written by developper. - * - * @param clazz the clazz to test. - * @return collections of extra operations, or empty collection if none found. - */ - public Collection<ObjectModelOperation> getDAOOperations( - ObjectModelClass clazz) { - -// // Note : this collection will contains extra operations for DAO. -// // Overriding existing generated methods is not managed yet -// Collection<ObjectModelOperation> results = -// new ArrayList<ObjectModelOperation>(); - -// // This code will be deprecated -// for (ObjectModelOperation op : clazz.getOperations()) { -// if (TopiaGeneratorUtil.hasDaoStereotype(op)) { -// results.add(op); -// } -// } - - if (log.isWarnEnabled()) { - log.warn("dao contract in model will not be supported in topia 3.0"); - } - Collection<ObjectModelOperation> extra = - extraOperations.get(clazz.getQualifiedName()); - return extra; -// if (extra != null) { -// for (ObjectModelOperation op : extra) { -// results.add(op); -// } -// } - -// return results; - } - - private void generateNaturalId(ObjectModelClass result, - ObjectModelClass clazz) { - Set<ObjectModelAttribute> props = - TopiaGeneratorUtil.getNaturalIdAttributes(clazz); - - if (!props.isEmpty()) { - - if (log.isDebugEnabled()) { - log.debug("generateNaturalId for " + props); - } - ObjectModelOperation findByNaturalId = addOperation(result, - "findByNaturalId", "E", ObjectModelJavaModifier.PUBLIC); - - ObjectModelOperation existByNaturalId = addOperation(result, - "existByNaturalId", "boolean", ObjectModelJavaModifier.PUBLIC); - - ObjectModelOperation createByNaturalId = addOperation(result, - "createByNaturalId", "E", ObjectModelJavaModifier.PUBLIC); - - Set<String> properties = Sets.newLinkedHashSet(); - String clazzName = clazz.getName(); - - for (ObjectModelAttribute attr : props) { - - String propName = attr.getName(); - String type = attr.getType(); - - addParameter(findByNaturalId, type, propName); - addParameter(existByNaturalId, type, propName); - addParameter(createByNaturalId, type, propName); - - String property = clazzName + '.' + getConstantName(propName) + ", " + propName; - properties.add(property); - - } - - String arguments = StringUtils.join(properties, ", "); - - setOperationBody(findByNaturalId, "" -/*{ - return forProperties(<%=arguments%>).findUnique(); - }*/ - ); - - setOperationBody(existByNaturalId, "" -/*{ - return forProperties(<%=arguments%>).exists(); - }*/ - ); - - setOperationBody(createByNaturalId, "" -/*{ - return create(<%=arguments%>); - }*/ - ); - } - } - - protected void generateNotNull(ObjectModelClass result, - ObjectModelClass clazz) { - - Set<ObjectModelAttribute> props = - TopiaGeneratorUtil.getNotNullAttributes(clazz); - - if (!props.isEmpty()) { - - if (log.isDebugEnabled()) { - log.debug("generateNotNull for " + props); - } - - ObjectModelOperation createByNotNull = addOperation(result, - "createByNotNull", "E", ObjectModelJavaModifier.PUBLIC); - - String createProperties = ""; -// String params = ""; - String clazzName = clazz.getName(); - for (ObjectModelAttribute attr : props) { - String propName = attr.getName(); - // add property as param in both methods - addParameter(createByNotNull, attr.getType(), propName); - - createProperties += - ", " + clazzName + '.' + getConstantName(propName) + - ", " + propName; - //params += ", " + propName; - } - createProperties = createProperties.substring(2); - //params = params.substring(2); - - setOperationBody(createByNotNull, "" -/*{ - return create(<%=createProperties%>); - }*/ - ); - } - } -} Copied: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDaoTransformer.java (from rev 2845, trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java) =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDaoTransformer.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDaoTransformer.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -0,0 +1,1113 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 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% + */ +package org.nuiton.topia.generator; + +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ + +import com.google.common.collect.Sets; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.JavaGeneratorUtil; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelDependency; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + +/** + * To generate all <code>DAO</code> related classes for a given entity. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.4 + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityDaoTransformer" + */ +public class EntityDaoTransformer extends ObjectModelTransformerToJava { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(EntityDaoTransformer.class); + + /** + * map of direct usages (values) for each entity (key). + * + * This map is used to generate the findUsages methods for DAOAbstract. + */ + protected Map<ObjectModelClass, Set<ObjectModelClass>> usages; + + /** + * All entities fqn of the model (used to detect if an attribute is not + * an entity). + */ + protected Set<String> allEntitiesFqn; + + /** + * The class of abstract dao to use. + * @since 2.5 + */ + protected Class<?> daoImplementation; + + protected String entityEnumName; + + protected String entityEnumPackage; + + /** + * Map of extra operations for DAO. The key of the map is the qualified + * name of the entity relative to the DAO. + */ + protected Map<String, Collection<ObjectModelOperation>> extraOperations = + new HashMap<String, Collection<ObjectModelOperation>>(); + + @Override + public void transformFromModel(ObjectModel model) { + + boolean generateStandaloneEnum = + TopiaGeneratorUtil.shouldGenerateStandaloneEnumForDAOHelper(model); + String modelName = model.getName(); + + entityEnumName = modelName + "EntityEnum"; + + String packageName = + getOutputProperties().getProperty(PROP_DEFAULT_PACKAGE); + + if (generateStandaloneEnum) { + entityEnumPackage = packageName + "." + entityEnumName; + } else { + String daoHelperClazzName = modelName + "DAOHelper"; + entityEnumPackage = packageName + "." + daoHelperClazzName + "." + entityEnumName; + } + + usages = TopiaGeneratorUtil.searchDirectUsages(model); + + daoImplementation = TopiaGeneratorUtil.getDAOImplementation(model); + + + // keep all classifiers on the model which are entities + List<ObjectModelClass> allEntities = + TopiaGeneratorUtil.getEntityClasses(model, true); + allEntitiesFqn = new HashSet<String>(allEntities.size()); + for (ObjectModelClass entity : allEntities) { + String fqn = entity.getQualifiedName(); + allEntitiesFqn.add(fqn); + Collection<ObjectModelOperation> daoOperations = + new HashSet<ObjectModelOperation>(); + for (ObjectModelOperation op : entity.getOperations()) { + if (TopiaGeneratorUtil.hasDaoStereotype(op)) { + daoOperations.add(op); + } + } + + if (daoOperations.isEmpty()) { + + // found some dao operations + extraOperations.put(fqn, daoOperations); + } + } + } + + @Override + public void transformFromInterface(ObjectModelInterface interfacez) { + if (!TopiaGeneratorUtil.hasDaoStereotype(interfacez)) { + return; + } + + /** + * EVO #636 : Manage extra operations for DAO from "dao" dependency + * between an interface with stereotype <<dao>> (dependency client) and + * a class with stereotype <<entity>> (dependency supplier). + */ + + ObjectModelDependency dependency = + interfacez.getDependency(TopiaGeneratorUtil.DEPENDENCIES_DAO); + + if (dependency == null) { + if (log.isWarnEnabled()) { + log.warn("Could not find dependency " + + TopiaGeneratorUtil.DEPENDENCIES_DAO + + " but DAO stereotype was placed on the interface " + + interfacez.getName()); + } + return; + } + + ObjectModelClassifier classifier = dependency.getSupplier(); + + if (!TopiaGeneratorUtil.isEntity(classifier)) { + + // dependency supplier is not an entity... + if (log.isWarnEnabled()) { + log.warn("Dependency supplier " + + classifier.getQualifiedName() + + " is not an entity."); + } + return; + } + + // keep only direct operations + Collection<ObjectModelOperation> operations = + interfacez.getOperations(); + + if (CollectionUtils.isEmpty(operations)) { + + // no operations on interface, this is not normal + if (log.isWarnEnabled()) { + log.warn("No operation found on interface with DAO " + + "stereotype "+classifier.getQualifiedName()); + } + return; + } + if (log.isDebugEnabled()) { + log.debug("add "+operations.size()+" extra operation(s) for DAO"); + } + + extraOperations.put(classifier.getQualifiedName(), operations); + } + + @Override + public void transformFromClass(ObjectModelClass clazz) { + if (!TopiaGeneratorUtil.isEntity(clazz)) { + // not an entity + return; + } + String clazzName = clazz.getName(); + String clazzFQN = clazz.getQualifiedName(); + + if (isGenerateGeneratedDao(clazz)) { + generateGeneratedDao(clazz, clazzName, clazzFQN); + } + + if (isGenerateAbstractDao(clazz)) { + generateAbstractDao(clazz, clazzName, clazzFQN); + } + + if (isGenerateLegacyDao(clazz)) { + generateLegacyDao(clazz, clazzName, clazzFQN); + } + + if (isGenerateConcreteDao(clazz)) { + generateConcreteDao(clazz, clazzName, clazzFQN); + } + + } + + protected boolean isGenerateLegacyDao(ObjectModelClass input) { + + String daoLegacyFqn = TopiaGeneratorUtil.getLegacyDaoFqn(input); + + if (isInClassPath(daoLegacyFqn)) { + + // already in class-path + return false; + } + + // can safely generate the dao impl + return true; + } + + protected boolean isGenerateConcreteDao(ObjectModelClass input) { + + String daoConcreteFqn = TopiaGeneratorUtil.getConcreteDaoFqn(input); + + if (isInClassPath(daoConcreteFqn)) { + + // already in class-path + return false; + } + + // can safely generate the dao impl + return true; + } + + protected boolean isGenerateGeneratedDao(ObjectModelClass input) { + + String daoGeneratedFqn = TopiaGeneratorUtil.getGeneratedDaoFqn(input); + + if (isInClassPath(daoGeneratedFqn)) { + + // already in class-path + return false; + } + + // can safely generate the dao impl + return true; + + } + + protected boolean isGenerateAbstractDao(ObjectModelClass input) { + + String fqn = TopiaGeneratorUtil.getAbstractDaoFqn(input); + + if (isInClassPath(fqn)) { + + // already in class-path + return false; + } + + Collection<ObjectModelOperation> moreOperations = + extraOperations.get(input.getQualifiedName()); + + if (CollectionUtils.isNotEmpty(moreOperations)) { + + // no user operations, can not generate it + return false; + } + + // can safely generate the dao impl + return true; + + } + + protected void generateLegacyDao(ObjectModelClass clazz, String clazzName, String clazzFQN) { + ObjectModelClass daoClass = createClass(TopiaGeneratorUtil.getLegacyDaoName(clazz), clazz.getPackageName()); + addAnnotation(daoClass, daoClass, Deprecated.class); + setDocumentation(daoClass, "/**\n" + + " * Cette classe etend le DAOImpl pour parametrer la classe avec le bon type\n" + + " * Cette classe est marque finale car l'heritage entre les DAO se fait\n" + + " * sur les DOAImpl, c-a-d que DAOAbstract peut etendre le DAOImpl\n" + + " */"); + setSuperClass(daoClass, TopiaGeneratorUtil.getAbstractDaoFqn(clazz) + "<" + clazzName + ">"); + } + + protected void generateConcreteDao(ObjectModelClass clazz, String clazzName, String clazzFQN) { + ObjectModelClass daoClass = createClass(TopiaGeneratorUtil.getConcreteDaoName(clazz), clazz.getPackageName()); + setDocumentation(daoClass, "/**\n" + + " * Cette classe etend le DAOImpl pour parametrer la classe avec le bon type\n" + + " * Cette classe est marque finale car l'heritage entre les DAO se fait\n" + + " * sur les DOAImpl, c-a-d que DAOAbstract peut etendre le DAOImpl\n" + + " */"); + // to support legacy dao + setSuperClass(daoClass, TopiaGeneratorUtil.getLegacyDaoFqn(clazz)); + // TODO brendan 04/10/13 above line should be replaced by + // setSuperClass(daoClass, TopiaGeneratorUtil.getAbstractDaoFqn(clazz) + "<" + clazzName + ">"); + } + + protected void generateAbstractDao(ObjectModelClass clazz, + String clazzName, + String clazzFQN) { + + Collection<ObjectModelOperation> moreOperations = + extraOperations.get(clazz.getQualifiedName()); + + if (CollectionUtils.isEmpty(moreOperations)) { + + // no business dao found, can safely generate the daoImpl class + + ObjectModelClass daoImplClass = createClass(TopiaGeneratorUtil.getAbstractDaoName(clazz) + "<E extends " + clazzName + ">", clazz.getPackageName()); + setDocumentation(daoImplClass, "/**\n" + + " Implantation du DAO pour l'entité " + clazzName + ".\n" + + " * L'utilisateur peut remplacer cette classe par la sienne en la mettant \n" + + " * simplement dans ces sources. Cette classe générée sera alors simplement\n" + + " * écrasée\n" + + " */"); + setSuperClass(daoImplClass, TopiaGeneratorUtil.getGeneratedDaoFqn(clazz) + "<E>"); + } + } + + protected void generateGeneratedDao(ObjectModelClass clazz, + String clazzName, + String clazzFQN) { + ObjectModelClass daoAbstractClass = createAbstractClass(TopiaGeneratorUtil.getGeneratedDaoName(clazz) + "<E extends " + clazzName + '>', + clazz.getPackageName()); + + // super class + + String superClassName = null; + for (ObjectModelClass parent : clazz.getSuperclasses()) { + if (TopiaGeneratorUtil.isEntity(parent)) { + superClassName = TopiaGeneratorUtil.getAbstractDaoFqn(parent) + "<E>"; + // in java no multi-inheritance + break; + } + } + if (superClassName == null) { + superClassName = daoImplementation.getName() + "<E>"; + } + if (log.isDebugEnabled()) { + log.debug("super class = " + superClassName); + } + setSuperClass(daoAbstractClass, superClassName); + + String prefix = getConstantPrefix(clazz, ""); + setConstantPrefix(prefix); + + // imports + + Collection<ObjectModelOperation> DAOoperations = + getDAOOperations(clazz); + + if (TopiaGeneratorUtil.isCollectionNeeded(DAOoperations)) { + addImport(daoAbstractClass, Collection.class); + } + if (TopiaGeneratorUtil.isSetNeeded(DAOoperations)) { + addImport(daoAbstractClass, Set.class); + } + addImport(daoAbstractClass, List.class); + addImport(daoAbstractClass, TopiaException.class); + + ObjectModelOperation op; + + // getEntityClass + + op = addOperation(daoAbstractClass, + "getEntityClass", + "Class<E>", + ObjectModelJavaModifier.PUBLIC); + addAnnotation(daoAbstractClass, op,Override.class); + setOperationBody(op, "" +/*{ + return (Class<E>) <%=clazzName%>.class; + }*/ + ); + + // getTopiaEntityEnum + addImport(daoAbstractClass, entityEnumPackage); + op = addOperation(daoAbstractClass, + "getTopiaEntityEnum", + entityEnumName, + ObjectModelJavaModifier.PUBLIC); + addAnnotation(daoAbstractClass, op,Override.class); + setOperationBody(op, "" +/*{ + return <%=entityEnumName%>.<%=clazzName%>; + }*/ + ); + + generateDAOOperations(daoAbstractClass, DAOoperations); + + generateDelete(clazz, daoAbstractClass); + + generateNaturalId(daoAbstractClass, clazz); + + generateNotNull(daoAbstractClass, clazz); + + for (ObjectModelAttribute attr : clazz.getAttributes()) { + if (!attr.isNavigable()) { + continue; + } + + if (!GeneratorUtil.isNMultiplicity(attr)) { + generateNoNMultiplicity(clazzName, daoAbstractClass, attr, false); + } else { + generateNMultiplicity(clazzName, daoAbstractClass, attr); + } + } + + if (clazz instanceof ObjectModelAssociationClass) { + ObjectModelAssociationClass assocClass = + (ObjectModelAssociationClass) clazz; + for (ObjectModelAttribute attr : assocClass.getParticipantsAttributes()) { + if (attr != null) { + if (!GeneratorUtil.isNMultiplicity(attr)) { + generateNoNMultiplicity(clazzName, daoAbstractClass, attr, true); + } else { + generateNMultiplicity(clazzName, daoAbstractClass, attr); + } + } + } + } + + Set<ObjectModelClass> usagesForclass = usages.get(clazz); + generateFindUsages(clazz, daoAbstractClass, usagesForclass); + } + + protected void generateDelete(ObjectModelClass clazz, + ObjectModelClass result) { + + StringBuilder body = new StringBuilder(); + String modelName = StringUtils.capitalize(model.getName()); + String providerFQN = getOutputProperties().getProperty( + PROP_DEFAULT_PACKAGE) + '.' + modelName + + "DAOHelper.getImplementationClass"; + + for (ObjectModelAttribute attr : clazz.getAttributes()) { + + String attrType = GeneratorUtil.getSimpleName(attr.getType()); + + String reverseAttrName = attr.getReverseAttributeName(); + ObjectModelAttribute reverse = attr.getReverseAttribute(); + if (attr.hasAssociationClass() || + reverse == null || !reverse.isNavigable()) { + + // never treate a non reverse and navigable attribute + // never treate an association class attribute + continue; + } + + // at this point we are sure to have a attribute which is + // - reverse + // - navigable + // - not from an association class + if (!allEntitiesFqn.contains(attr.getType())) { + + // this attribute is not from an entity, don't treate it + if (log.isDebugEnabled()) { + log.debug("[" + result.getName() + "] Skip attribute [" + + attr.getName() + "] with type " + attr.getType()); + } + continue; + } + + // At this point, the attribute type is a entity + if (GeneratorUtil.isNMultiplicity(attr) && + GeneratorUtil.isNMultiplicity(reverse)) { + // On doit absolument supprimer pour les relations many-to-many + // le this de la collection de l'autre cote + + String attrDBName = TopiaGeneratorUtil.getDbName(attr); + String attrClassifierDBName = TopiaGeneratorUtil.getDbName(attr.getClassifier()); + String attrJoinTableName = TopiaGeneratorUtil.getManyToManyTableName(attr); + String attrReverseDBName = TopiaGeneratorUtil.getReverseDbName(attr); + + //FIXME_-FC-20100413 Use a TopiaQuery (use HQLin elements) +// // Add DAOHelper +// String daoHelper = modelName + "DAOHelper"; +// String daoHelperFQN = getOutputProperties(). +// getProperty(PROP_DEFAULT_PACKAGE) + '.' + daoHelper; +// addImport(result, daoHelperFQN); +// +// // Add import for TopiaQuery +// addImport(result, TopiaQuery.class); +// +// // Entity DAO and reversePropertyName +// String entityDAO = attrType + "DAO"; +// String reverseAttrNameProperty = +// attrType + "." + getConstantName(reverseAttrName); +// +// +// <%=entityDAO%> dao = <%=daoHelper%>.get<%=entityDAO%>(getTopiaContext()); +// TopiaQuery query = dao.createQuery("B"). +// addFrom(entity.getClass(), "A"). +// add("A", entity). +// addInElements("A", "B." + <%=reverseAttrNameProperty%>); +// +// System.out.println("Query : " + query); +// List<<%=attrType%>> list = dao.findAllByQuery(query); + + String removeName = getJavaBeanMethodName("remove", reverseAttrName); + body.append("" +/*{ + { + List<<%=attrType%>> list = topiaHibernateSupport.getHibernateSession().createSQLQuery( + "SELECT main.topiaid " + + "from <%=attrClassifierDBName%> main, <%=attrJoinTableName%> secondary " + + "where main.topiaid=secondary.<%=attrDBName%>" + + " and secondary.<%=attrReverseDBName%>='" + entity.getTopiaId() + "'") + .addEntity("main", <%=providerFQN%>(<%=attrType%>.class)).list(); + + for (<%=attrType%> item : list) { + item.<%=removeName%>(entity); + } + } +}*/ + ); + } else if (!GeneratorUtil.isNMultiplicity(reverse)) { + // On doit mettre a null les attributs qui ont cet objet sur les + // autres entites en one-to-* + // TODO peut-etre qu'hibernate est capable de faire ca tout seul ? + // THIMEL: J'ai remplacé reverse.getName() par reverseAttrName sans certitude + addImport(result, attrType); + String attrSimpleType = TopiaGeneratorUtil.getClassNameFromQualifiedName(attrType); + // XXX brendan 04/10/13 do not hard code concrete dao name + String attrConcreteDaoClassName = attrSimpleType + "TopiaDao"; + String getName = getJavaBeanMethodName("get", reverseAttrName); + String setName = getJavaBeanMethodName("set", reverseAttrName); + + body.append("" + /*{ + { + List<<%=attrSimpleType%>> list = topiaDaoSupplier + .getDao(<%=attrSimpleType%>.class, <%=attrConcreteDaoClassName%>.class) + .forProperties(<%=attrSimpleType%>.<%=getConstantName(reverseAttrName)%>, entity).findAll(); + for (<%=attrSimpleType%> item : list) { + + // sletellier : Set null only if target is concerned by deletion + if (entity.equals(item.<%=getName%>())) { + item.<%=setName%>(null); + } + }*/ + ); + if (attr.isAggregate()) { + body.append("" +/*{ + topiaDaoSupplier.getDao(<%=attrSimpleType%>.class).delete(item); +}*/ + ); + } + body.append("" +/*{ + } + } +}*/ + ); + + } + } + + if (body.length()>0) { + // something specific was done, need to generate the method + ObjectModelOperation op; + op = addOperation(result, "delete", "void", ObjectModelJavaModifier.PUBLIC); + addAnnotation(result, op,Override.class); + addParameter(op, "E", "entity"); + body.append("" +/*{ + super.delete(entity); + }*/ + ); + setOperationBody(op, body.toString()); + } + + + + } + + protected void generateFindUsages(ObjectModelClass clazz, + ObjectModelClass result, + Set<ObjectModelClass> usagesForclass) { + + builder.addImport(result, LinkedList.class.getName()); + builder.addImport(result, Map.class.getName()); + builder.addImport(result, HashMap.class.getName()); + builder.addImport(result, TopiaEntity.class.getName()); + + if (clazz instanceof ObjectModelAssociationClass || + usagesForclass.isEmpty()) { + // not for an association class + // just let a null method + ObjectModelOperation operation; + operation = addOperation(result, + "findUsages", + " List", + ObjectModelJavaModifier.PUBLIC); + + addParameter(operation, "Class", "type"); + addParameter(operation, "E", "entity"); + addAnnotation(result, operation, Override.class); + setOperationBody(operation, "" +/*{ + return new LinkedList(); + }*/ + ); + + operation = addOperation(result, + "findAllUsages", + "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", + ObjectModelJavaModifier.PUBLIC); + + addParameter(operation, "E", "entity"); + addAnnotation(result, operation, Override.class); + setOperationBody(operation, "" +/*{ + return new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(); + }*/ + ); + + return; + } + List<ObjectModelClass> allEntities; + Map<String, ObjectModelClass> allEntitiesByFQN; + + allEntities = TopiaGeneratorUtil.getEntityClasses(model, true); + allEntitiesByFQN = new TreeMap<String, ObjectModelClass>(); + + // prepare usages map and fill allEntitiesByFQN map + for (ObjectModelClass klass : allEntities) { + allEntitiesByFQN.put(klass.getQualifiedName(), klass); + } + + ObjectModelOperation operation; + operation = addOperation(result, + "findUsages", + " List", + ObjectModelJavaModifier.PUBLIC); + + addParameter(operation, "Class", "type"); + addParameter(operation, "E", "entity"); + addAnnotation(result, operation, Override.class); + StringBuilder buffer = new StringBuilder(300); + buffer.append("" +/*{ + List<?> result = new LinkedList(); + List tmp; +}*/ + ); + + for (ObjectModelClass usageClass : usagesForclass) { + String usageType = usageClass.getQualifiedName(); + builder.addImport(result, usageType); + String usageSimpleType = + TopiaGeneratorUtil.getClassNameFromQualifiedName(usageType); + String usageSimplePropertyMethod = "findAllBy" + usageSimpleType; + String usageCollectionPropertyMethod = "findAllContaining" + usageSimpleType; + for (ObjectModelAttribute attr : usageClass.getAttributes()) { + if (!attr.isNavigable()) { + // skip this case + continue; + } + String type; + String attrName = attr.getName(); + if (attr.hasAssociationClass()) { + //FIXME-TC20100224 dont known how to do this ? + continue; +// type = attr.getAssociationClass().getQualifiedName(); +// //FIXME-TC20100224 : this is crazy ??? must find the good name +// // Perhaps need to make different cases? +// attrName = attrName + "_" + TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName()); + } else { + type = attr.getType(); + } + if (!allEntitiesByFQN.containsKey(type)) { + // not a entity, can skip for this attribute + continue; + } + ObjectModelClass targetEntity = allEntitiesByFQN.get(type); +// if (!type.equals(clazz.getQualifiedName())) { + if (!targetEntity.equals(clazz)) { + // not a good attribute reference + continue; + } + // found something to seek + + String methodName; + if (TopiaGeneratorUtil.isNMultiplicity(attr)) { + methodName = getJavaBeanMethodName("findAllContains", attrName); + } else { + methodName = getJavaBeanMethodName("findAllBy", attrName); + } + String daoName = StringUtils.capitalize(usageSimpleType) + "DAO"; + + builder.addImport(result, usageClass.getPackageName() + '.' + daoName); + + buffer.append("" +/*{ + if (type == <%=usageSimpleType%>.class) { + <%=daoName%> dao = (<%=daoName%>) + topiaDaoSupplier.getDao(<%=usageSimpleType%>.class); + tmp = dao.<%=methodName%>(entity); + result.addAll(tmp); + } +}*/ + ); + } + } + + buffer.append("" +/*{ + return (List) result; + }*/ + ); + setOperationBody(operation, buffer.toString()); + + operation = addOperation(result, + "findAllUsages", + "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", + ObjectModelJavaModifier.PUBLIC); + + addParameter(operation, "E", "entity"); + addAnnotation(result, operation, Override.class); + + buffer = new StringBuilder(300); + buffer.append("" +/*{ + Map<Class<? extends TopiaEntity>,List<? extends TopiaEntity>> result; + result = new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(<%=usagesForclass.size()%>); + + List<? extends TopiaEntity> list; +}*/ + ); + for (ObjectModelClass usageClass : usagesForclass) { + + String fqn = usageClass.getName(); + buffer.append("" +/*{ + list = findUsages(<%=fqn%>.class, entity); + if (!list.isEmpty()) { + result.put(<%=fqn%>.class, list); + } +}*/ + ); + + } + buffer.append("" +/*{ + return result; + }*/ + ); + + setOperationBody(operation, buffer.toString()); + } + + /** + * Generation of DAO operations signatures from class. These operations are + * abstract and identified by <<dao>> stereotype in the model. The + * developper must defined these methods in the DAOImpl associated to this + * DAOAbstract. + * + * @param result clazz where to add operations + * @param operations operations to generate + * @deprecated will be removed ASAP in topia 3.0 + */ + @Deprecated + protected void generateDAOOperations(ObjectModelClass result, + Collection<ObjectModelOperation> + operations) { + if (CollectionUtils.isEmpty(operations)) { + + // no extra operations to generate + return; + } + + for (ObjectModelOperation op : operations) { + + Set<String> exceptions = op.getExceptions(); + cloneOperation(op, + result, + true, + ObjectModelJavaModifier.ABSTRACT, + ObjectModelJavaModifier.fromVisibility(op.getVisibility()) + ); + } + } + + + protected void generateNoNMultiplicity(String clazzName, + ObjectModelClass result, + ObjectModelAttribute attr, + boolean isAssoc) { + String attrName = attr.getName(); + String attrType = attr.getType(); + String propertyName = clazzName + "." + getConstantName(attrName); + + String attrTypeForGeneric; + if (JavaGeneratorUtil.isPrimitiveType(attrType)) { + attrTypeForGeneric = TopiaGeneratorUtil.getClassForPrimitiveType(attr); + } else { + attrTypeForGeneric = attrType; + } + + if (!isAssoc && attr.hasAssociationClass()) { + String assocClassName = attr.getAssociationClass().getName(); + String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + // It is about transitivity : use the property to access the + // associationClass + '.' + the property to access the expected + // attribute + // <class>.<attrAssoc> + '.' + <assocClass>.<attr> + propertyName = + clazzName + '.' + getConstantName(assocAttrName) + + " + '.' + " + + assocClassName + '.' + getConstantName(attrName); + } + + ObjectModelOperation op; + op = addOperation(result, + getJavaBeanMethodName("for", attrName, "In"), + "TopiaQueryBuilderRunQueryStep<E>", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, "Iterable<" + attrTypeForGeneric + ">", "v"); + setOperationBody(op, "" +/*{ + TopiaQueryBuilderRunQueryStep<E> result = forIn(<%=propertyName%>, (Iterable) v); + return result; + }*/ + ); + + op = addOperation(result, + getJavaBeanMethodName("for", attrName, "Equals"), + "TopiaQueryBuilderRunQueryStep<E>", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, attrType, "v"); + setOperationBody(op, "" +/*{ + TopiaQueryBuilderRunQueryStep<E> result = forEquals(<%=propertyName%>, v); + return result; + }*/ + ); + + String methodToDelegateName = op.getName(); + + op = addOperation(result, + getJavaBeanMethodName("findBy", attrName), + "E", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, attrType, "v"); + setOperationBody(op, "" +/*{ + return <%=methodToDelegateName%>(v).findAnyOrNull(); + }*/ + ); + + addAnnotation(result, op, Deprecated.class); + + op = addOperation(result, + getJavaBeanMethodName("findAllBy", attrName), + "List<E>", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, attrType, "v"); + setOperationBody(op, "" +/*{ + return <%=methodToDelegateName%>(v).findAll(); + }*/ + ); + + addAnnotation(result, op, Deprecated.class); + + if (!isAssoc && attr.hasAssociationClass()) { + String assocClassName = attr.getAssociationClass().getName(); + String assocClassFQN = attr.getAssociationClass().getQualifiedName(); + String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + String assocPropertyConstantName = getConstantName(assocAttrName); + op = addOperation(result, + getJavaBeanMethodName("findBy", assocClassName), + "E", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, assocClassFQN, "value"); + setOperationBody(op, "" +/*{ + E result = findByProperty(<%=clazzName + "." + assocPropertyConstantName%>, value); + return result; + }*/ + ); + + op = addOperation(result, + getJavaBeanMethodName("findAllBy", assocClassName), + "List<E>", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, assocClassFQN, "value"); + setOperationBody(op, "" +/*{ + List<E> result = findAllByProperty(<%=clazzName + "." + assocPropertyConstantName%>, value); + return result; + }*/ + ); + } + } + + protected void generateNMultiplicity(String clazzName, + ObjectModelClass result, + ObjectModelAttribute attr) { + String attrName = attr.getName(); + String attrType = attr.getType(); + if (attr.hasAssociationClass()) { + // do nothing for association class, too complex... + return; + } + ObjectModelOperation op; + + op = addOperation(result, + getJavaBeanMethodName("for", attrName, "Contains"), + "TopiaQueryBuilderRunQueryStep<E>", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, attrType, "v"); + setOperationBody(op, "" +/*{ + return forContains(<%=clazzName + "." + getConstantName(attrName)%>, v); + }*/ + ); + + String methodToDelegateName = op.getName(); + + op = addOperation(result, + getJavaBeanMethodName("findContains", attrName), + "E", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, attrType, "v"); + setOperationBody(op, "" +/*{ + return <%=methodToDelegateName%>(v).findAnyOrNull(); + }*/ + ); + + addAnnotation(result, op, Deprecated.class); + + op = addOperation(result, + getJavaBeanMethodName("findAllContains", attrName), + "List<E>", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, attrType, "v"); + setOperationBody(op, "" +/*{ + return <%=methodToDelegateName%>(v).findAll(); + }*/ + ); + + addAnnotation(result, op, Deprecated.class); + + } + + + /** + * Obtain business operations of the DAO. + * + * This operations can not be generated, but must be written by developper. + * + * @param clazz the clazz to test. + * @return collections of extra operations, or empty collection if none found. + */ + public Collection<ObjectModelOperation> getDAOOperations( + ObjectModelClass clazz) { + +// // Note : this collection will contains extra operations for DAO. +// // Overriding existing generated methods is not managed yet +// Collection<ObjectModelOperation> results = +// new ArrayList<ObjectModelOperation>(); + +// // This code will be deprecated +// for (ObjectModelOperation op : clazz.getOperations()) { +// if (TopiaGeneratorUtil.hasDaoStereotype(op)) { +// results.add(op); +// } +// } + + if (log.isWarnEnabled()) { + log.warn("dao contract in model will not be supported in topia 3.0"); + } + Collection<ObjectModelOperation> extra = + extraOperations.get(clazz.getQualifiedName()); + return extra; +// if (extra != null) { +// for (ObjectModelOperation op : extra) { +// results.add(op); +// } +// } + +// return results; + } + + private void generateNaturalId(ObjectModelClass result, + ObjectModelClass clazz) { + Set<ObjectModelAttribute> props = + TopiaGeneratorUtil.getNaturalIdAttributes(clazz); + + if (!props.isEmpty()) { + + if (log.isDebugEnabled()) { + log.debug("generateNaturalId for " + props); + } + ObjectModelOperation findByNaturalId = addOperation(result, + "findByNaturalId", "E", ObjectModelJavaModifier.PUBLIC); + + ObjectModelOperation existByNaturalId = addOperation(result, + "existByNaturalId", "boolean", ObjectModelJavaModifier.PUBLIC); + + ObjectModelOperation createByNaturalId = addOperation(result, + "createByNaturalId", "E", ObjectModelJavaModifier.PUBLIC); + + Set<String> properties = Sets.newLinkedHashSet(); + String clazzName = clazz.getName(); + + for (ObjectModelAttribute attr : props) { + + String propName = attr.getName(); + String type = attr.getType(); + + addParameter(findByNaturalId, type, propName); + addParameter(existByNaturalId, type, propName); + addParameter(createByNaturalId, type, propName); + + String property = clazzName + '.' + getConstantName(propName) + ", " + propName; + properties.add(property); + + } + + String arguments = StringUtils.join(properties, ", "); + + setOperationBody(findByNaturalId, "" +/*{ + return forProperties(<%=arguments%>).findUnique(); + }*/ + ); + + setOperationBody(existByNaturalId, "" +/*{ + return forProperties(<%=arguments%>).exists(); + }*/ + ); + + setOperationBody(createByNaturalId, "" +/*{ + return create(<%=arguments%>); + }*/ + ); + } + } + + protected void generateNotNull(ObjectModelClass result, + ObjectModelClass clazz) { + + Set<ObjectModelAttribute> props = + TopiaGeneratorUtil.getNotNullAttributes(clazz); + + if (!props.isEmpty()) { + + if (log.isDebugEnabled()) { + log.debug("generateNotNull for " + props); + } + + ObjectModelOperation createByNotNull = addOperation(result, + "createByNotNull", "E", ObjectModelJavaModifier.PUBLIC); + + String createProperties = ""; +// String params = ""; + String clazzName = clazz.getName(); + for (ObjectModelAttribute attr : props) { + String propName = attr.getName(); + // add property as param in both methods + addParameter(createByNotNull, attr.getType(), propName); + + createProperties += + ", " + clazzName + '.' + getConstantName(propName) + + ", " + propName; + //params += ", " + propName; + } + createProperties = createProperties.substring(2); + //params = params.substring(2); + + setOperationBody(createByNotNull, "" +/*{ + return create(<%=createProperties%>); + }*/ + ); + } + } +} 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 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -39,7 +39,7 @@ import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; -import org.nuiton.topia.TopiaDAOSupplier; +import org.nuiton.topia.TopiaDaoSupplier; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; @@ -338,24 +338,24 @@ if (TopiaGeneratorUtil.isContextable(input)) { - addImport(outputAbstract, TopiaDAOSupplier.class); + addImport(outputAbstract, TopiaDaoSupplier.class); // topiaContext attribute ObjectModelAttribute topiaContextAttribute = addAttribute( - outputAbstract, "topiaDAOSupplier", TopiaDAOSupplier.class, null, + outputAbstract, "topiaDaoSupplier", TopiaDaoSupplier.class, null, ObjectModelJavaModifier.PROTECTED, ObjectModelJavaModifier.TRANSIENT); setDocumentation(topiaContextAttribute, "TopiaDAO instance associated with the current \n" + "instance. For internal usage only"); ObjectModelOperation op = addOperation(outputAbstract, - "getTopiaDAOSupplier", TopiaDAOSupplier.class, + "getTopiaDAOSupplier", TopiaDaoSupplier.class, ObjectModelJavaModifier.PUBLIC); setDocumentation(op,"@since 3.0"); addAnnotation(outputAbstract, op, Override.class); setOperationBody(op, "" /*{ - return topiaDAOSupplier; + return topiaDaoSupplier; }*/ ); @@ -363,7 +363,7 @@ "setTopiaDAOSupplier", "void", ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); - addParameter(op, TopiaDAOSupplier.class, "topiaDAOSupplier"); + addParameter(op, TopiaDaoSupplier.class, "topiaDaoSupplier"); setDocumentation(op, // "@param context The context to set.\n" + // "@throws TopiaException if trying to replace a context\n" + @@ -371,8 +371,8 @@ addAnnotation(outputAbstract, op, Override.class); setOperationBody(op, "" /*{ - if (this.topiaDAOSupplier == null) { - this.topiaDAOSupplier = topiaDAOSupplier; + if (this.topiaDaoSupplier == null) { + this.topiaDaoSupplier = topiaDaoSupplier; // } else { // throw new TopiaException("TopiaContext replacement is forbidden"); } @@ -386,7 +386,7 @@ addAnnotation(outputAbstract, op, Override.class); setOperationBody(op, "" /*{ - getTopiaDAOSupplier().getDAO(<%=input.getName()%>.class).update(this); + getTopiaDAOSupplier().getDao(<%=input.getName()%>.class).update(this); }*/ ); @@ -396,7 +396,7 @@ addAnnotation(outputAbstract, op, Override.class); setOperationBody(op, "" /*{ - getTopiaDAOSupplier().getDAO(<%=input.getName()%>.class).delete(this); + getTopiaDAOSupplier().getDao(<%=input.getName()%>.class).delete(this); }*/ ); } @@ -1407,7 +1407,7 @@ body.append("" /*{ { - org.nuiton.topia.persistence.TopiaDAO<<%=assocClassFQN%>> dao = getTopiaContext().getDAO(<%=assocClassFQN%>.class); + org.nuiton.topia.persistence.TopiaDAO<<%=assocClassFQN%>> dao = getTopiaContext().getDao(<%=assocClassFQN%>.class); List<<%=assocClassFQN%>> findAllByProperties = dao.findAllByProperties("<%=reverseAttrName%>", this); if (findAllByProperties != null) { tmp.addAll(findAllByProperties); Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/LegacyEntityDAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/LegacyEntityDAOTransformer.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/LegacyEntityDAOTransformer.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -1,1204 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2011 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% - */ -package org.nuiton.topia.generator; - -/*{generator option: parentheses = false}*/ -/*{generator option: writeString = +}*/ - -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.ObjectModel; -import org.nuiton.eugene.models.object.ObjectModelAssociationClass; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.ObjectModelDependency; -import org.nuiton.eugene.models.object.ObjectModelInterface; -import org.nuiton.eugene.models.object.ObjectModelJavaModifier; -import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.StringUtil; - -import java.security.Permission; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * To generate all <code>DAO</code> related classes for a given entity. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.5.4 - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityDAOTransformer" - */ -public class LegacyEntityDAOTransformer extends ObjectModelTransformerToJava { - - /** Logger. */ - private static final Log log = - LogFactory.getLog(EntityDAOTransformer.class); - - /** - * map of direct usages (values) for each entity (key). - * - * This map is used to generate the findUsages methods for DAOAbstract. - */ - protected Map<ObjectModelClass, Set<ObjectModelClass>> usages; - - /** - * All entities fqn of the model (used to detect if an attribute is not - * an entity). - */ - protected Set<String> allEntitiesFqn; - - /** - * The class of abstract dao to use. - * @since 2.5 - */ - protected Class<?> daoImplementation; - - protected String entityEnumName; - - protected String entityEnumPackage; - - /** - * Map of extra operations for DAO. The key of the map is the qualified - * name of the entity relative to the DAO. - */ - protected Map<String, Collection<ObjectModelOperation>> extraOperations = - new HashMap<String, Collection<ObjectModelOperation>>(); - - @Override - public void transformFromModel(ObjectModel model) { - - boolean generateStandaloneEnum = - TopiaGeneratorUtil.shouldGenerateStandaloneEnumForDAOHelper(model); - String modelName = model.getName(); - - entityEnumName = modelName + "EntityEnum"; - - String packageName = - getOutputProperties().getProperty(PROP_DEFAULT_PACKAGE); - - if (generateStandaloneEnum) { - entityEnumPackage = packageName + "." + entityEnumName; - } else { - String daoHelperClazzName = modelName + "DAOHelper"; - entityEnumPackage = packageName + "." + daoHelperClazzName + "." + entityEnumName; - } - - usages = TopiaGeneratorUtil.searchDirectUsages(model); - - daoImplementation = TopiaGeneratorUtil.getDAOImplementation(model); - - - // keep all classifiers on the model which are entities - List<ObjectModelClass> allEntities = - TopiaGeneratorUtil.getEntityClasses(model, true); - allEntitiesFqn = new HashSet<String>(allEntities.size()); - for (ObjectModelClass entity : allEntities) { - String fqn = entity.getQualifiedName(); - allEntitiesFqn.add(fqn); - Collection<ObjectModelOperation> daoOperations = - new HashSet<ObjectModelOperation>(); - for (ObjectModelOperation op : entity.getOperations()) { - if (TopiaGeneratorUtil.hasDaoStereotype(op)) { - daoOperations.add(op); - } - } - - if (daoOperations.isEmpty()) { - - // found some dao operations - extraOperations.put(fqn, daoOperations); - } - } - } - - @Override - public void transformFromInterface(ObjectModelInterface interfacez) { - if (!TopiaGeneratorUtil.hasDaoStereotype(interfacez)) { - return; - } - - /** - * EVO #636 : Manage extra operations for DAO from "dao" dependency - * between an interface with stereotype <<dao>> (dependency client) and - * a class with stereotype <<entity>> (dependency supplier). - */ - - ObjectModelDependency dependency = - interfacez.getDependency(TopiaGeneratorUtil.DEPENDENCIES_DAO); - - if (dependency == null) { - if (log.isWarnEnabled()) { - log.warn("Could not find dependency " + - TopiaGeneratorUtil.DEPENDENCIES_DAO + - " but DAO stereotype was placed on the interface " + - interfacez.getName()); - } - return; - } - - ObjectModelClassifier classifier = dependency.getSupplier(); - - if (!TopiaGeneratorUtil.isEntity(classifier)) { - - // dependency supplier is not an entity... - if (log.isWarnEnabled()) { - log.warn("Dependency supplier " + - classifier.getQualifiedName() + - " is not an entity."); - } - return; - } - - // keep only direct operations - Collection<ObjectModelOperation> operations = - interfacez.getOperations(); - - if (CollectionUtils.isEmpty(operations)) { - - // no operations on interface, this is not normal - if (log.isWarnEnabled()) { - log.warn("No operation found on interface with DAO " + - "stereotype "+classifier.getQualifiedName()); - } - return; - } - if (log.isDebugEnabled()) { - log.debug("add "+operations.size()+" extra operation(s) for DAO"); - } - - extraOperations.put(classifier.getQualifiedName(), operations); - } - - @Override - public void transformFromClass(ObjectModelClass clazz) { - if (!TopiaGeneratorUtil.isEntity(clazz)) { - // not an entity - return; - } - String clazzName = clazz.getName(); - String clazzFQN = clazz.getQualifiedName(); - - if (isGenerateDAO(clazz)) { - - // generate DAO - generateDAOClass(clazz, clazzName, clazzFQN); - - } - if (isGenerateImpl(clazz)) { - - // generate DAOImpl - generateDAOImpl(clazz, clazzName, clazzFQN); - } - - if (isGenerateDAOAbstract(clazz)) { - - // generate DAOAbstract - generateDAOAbstract(clazz, clazzName, clazzFQN); - } - } - - protected boolean isGenerateDAO(ObjectModelClass input) { - - String fqn = input.getQualifiedName() + "DAO"; - - if (isInClassPath(fqn)) { - - // already in class-path - return false; - } - - // can safely generate the dao impl - return true; - } - - protected boolean isGenerateDAOAbstract(ObjectModelClass input) { - - String fqn = input.getQualifiedName() + "DAOAbstract"; - - if (isInClassPath(fqn)) { - - // already in class-path - return false; - } - - // can safely generate the dao impl - return true; - } - - protected boolean isGenerateImpl(ObjectModelClass input) { - - String fqn = input.getQualifiedName() + "DAOImpl"; - - if (isInClassPath(fqn)) { - - // already in class-path - return false; - } - - Collection<ObjectModelOperation> moreOperations = - extraOperations.get(input.getQualifiedName()); - - if (CollectionUtils.isNotEmpty(moreOperations)) { - - // no user operations, can generate it - return false; - } - - // can safely generate the dao impl - return true; - } - - protected void generateDAOClass(ObjectModelClass clazz, String clazzName, String clazzFQN) { - ObjectModelClass daoClass = createClass(clazzName + "DAO", clazz.getPackageName()); - setDocumentation(daoClass, "/**\n" + - " * Cette classe etend le DAOImpl pour parametrer la classe avec le bon type\n" + - " * Cette classe est marque finale car l'heritage entre les DAO se fait\n" + - " * sur les DOAImpl, c-a-d que DAOAbstract peut etendre le DAOImpl\n" + - " */"); - setSuperClass(daoClass, clazzFQN + "DAOImpl<" + clazzName + ">"); - } - - protected void generateDAOImpl(ObjectModelClass clazz, - String clazzName, - String clazzFQN) { - - Collection<ObjectModelOperation> moreOperations = - extraOperations.get(clazz.getQualifiedName()); - - if (CollectionUtils.isEmpty(moreOperations)) { - - // no business dao found, can safely generate the daoImpl class - - ObjectModelClass daoImplClass = createClass(clazzName + "DAOImpl<E extends " + clazzName + ">", clazz.getPackageName()); - setDocumentation(daoImplClass, "/**\n" + - " Implantation du DAO pour l'entité " + clazzName + ".\n" + - " * L'utilisateur peut remplacer cette classe par la sienne en la mettant \n" + - " * simplement dans ces sources. Cette classe générée sera alors simplement\n" + - " * écrasée\n" + - " */"); - setSuperClass(daoImplClass, clazzFQN + "DAOAbstract<E>"); - } - } - - protected void generateDAOAbstract(ObjectModelClass clazz, - String clazzName, - String clazzFQN) { - ObjectModelClass daoAbstractClass = createAbstractClass( - clazzName + "DAOAbstract<E extends " + clazzName + '>', - clazz.getPackageName()); - - // super class - - String extendClass = ""; - for (ObjectModelClass parent : clazz.getSuperclasses()) { - extendClass = parent.getQualifiedName(); - if (TopiaGeneratorUtil.isEntity(parent)) { - extendClass += "DAOImpl<E>"; - // in java no multi-inheritance - break; - } - } - if (extendClass.length() == 0) { - extendClass = daoImplementation.getName() + "<E>"; - } - if (log.isDebugEnabled()) { - log.debug("super class = " + extendClass); - } - setSuperClass(daoAbstractClass, extendClass); - - String prefix = getConstantPrefix(clazz, ""); - setConstantPrefix(prefix); - - // imports - - Collection<ObjectModelOperation> DAOoperations = - getDAOOperations(clazz); - - if (TopiaGeneratorUtil.isCollectionNeeded(DAOoperations)) { - addImport(daoAbstractClass, Collection.class); - } - if (TopiaGeneratorUtil.isSetNeeded(DAOoperations)) { - addImport(daoAbstractClass, Set.class); - } - addImport(daoAbstractClass, List.class); - addImport(daoAbstractClass, TopiaException.class); - - boolean enableSecurity = TopiaGeneratorUtil.isClassWithSecurity(clazz); - - if (enableSecurity) { - addImport(daoAbstractClass, ArrayList.class); - addImport(daoAbstractClass, Permission.class); - addImport(daoAbstractClass, "org.nuiton.topia.taas.entities.TaasAuthorizationImpl"); - addImport(daoAbstractClass, "org.nuiton.topia.taas.jaas.TaasPermission"); - addImport(daoAbstractClass, "org.nuiton.topia.taas.TaasUtil"); - addImport(daoAbstractClass, TopiaDAO.class); - - //FIXME : how to do static imports ? -//import static org.nuiton.topia.taas.TaasUtil.CREATE; -//import static org.nuiton.topia.taas.TaasUtil.DELETE; -//import static org.nuiton.topia.taas.TaasUtil.LOAD; -//import static org.nuiton.topia.taas.TaasUtil.UPDATE; - } - - ObjectModelOperation op; - - // getEntityClass - - op = addOperation(daoAbstractClass, - "getEntityClass", - "Class<E>", - ObjectModelJavaModifier.PUBLIC); - addAnnotation(daoAbstractClass, op,Override.class); - setOperationBody(op, "" -/*{ - return (Class<E>)<%=clazzName%>.class; - }*/ - ); - - // getTopiaEntityEnum - addImport(daoAbstractClass, entityEnumPackage); - op = addOperation(daoAbstractClass, - "getTopiaEntityEnum", - entityEnumName, - ObjectModelJavaModifier.PUBLIC); - addAnnotation(daoAbstractClass, op,Override.class); - setOperationBody(op, "" -/*{ - return <%=entityEnumName%>.<%=clazzName%>; - }*/ - ); - - generateDAOOperations(daoAbstractClass, DAOoperations); - - generateDelete(clazz, daoAbstractClass); - - generateNaturalId(daoAbstractClass, clazz); - - generateNotNull(daoAbstractClass, clazz); - - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (!attr.isNavigable()) { - continue; - } - - if (!GeneratorUtil.isNMultiplicity(attr)) { - generateNoNMultiplicity(clazzName, daoAbstractClass, attr, false); - } else { - generateNMultiplicity(clazzName, daoAbstractClass, attr); - } - } - - if (clazz instanceof ObjectModelAssociationClass) { - ObjectModelAssociationClass assocClass = - (ObjectModelAssociationClass) clazz; - for (ObjectModelAttribute attr : assocClass.getParticipantsAttributes()) { - if (attr != null) { - if (!GeneratorUtil.isNMultiplicity(attr)) { - generateNoNMultiplicity(clazzName, daoAbstractClass, attr, true); - } else { - generateNMultiplicity(clazzName, daoAbstractClass, attr); - } - } - } - } - - if (enableSecurity) { - - // getRequestPermission - - op = addOperation(daoAbstractClass, - "getRequestPermission", - "List<Permission>", - ObjectModelJavaModifier.PUBLIC); -// setDocumentation(op, "Retourne les permissions a verifier pour " + -// "l'acces a l'entite pour le service Taas"); - addException(op, TopiaException.class); - addParameter(op, String.class, "topiaId"); - addParameter(op, int.class, "actions"); - StringBuilder buffer = new StringBuilder(); - buffer.append("" -/*{ - List<Permission> resultPermissions = new ArrayList<Permission>(); - if ((actions & TaasUtil.CREATE) == TaasUtil.CREATE) { -}*/ - ); - buffer.append(generateSecurity(daoAbstractClass, clazz, - TopiaGeneratorUtil.getSecurityCreateTagValue(clazz))); - buffer.append("" -/*{ - } - if ((actions & TaasUtil.LOAD) == TaasUtil.LOAD) { -}*/ - ); - buffer.append(generateSecurity(daoAbstractClass, clazz, - TopiaGeneratorUtil.getSecurityLoadTagValue(clazz))); - buffer.append("" -/*{ - } - if ((actions & TaasUtil.UPDATE) == TaasUtil.UPDATE) { -}*/ - ); - buffer.append(generateSecurity(daoAbstractClass, clazz, - TopiaGeneratorUtil.getSecurityUpdateTagValue(clazz))); - buffer.append("" -/*{ - } - if ((actions & TaasUtil.DELETE) == TaasUtil.DELETE) { -}*/ - ); - buffer.append(generateSecurity(daoAbstractClass, clazz, - TopiaGeneratorUtil.getSecurityDeleteTagValue(clazz))); - buffer.append("" -/*{ - } - return resultPermissions; - }*/ - ); - - setOperationBody(op, buffer.toString()); - - // THIMEL : Le code suivant doit pouvoir être déplacé dans DAODelegator ? - - // getRequestPermission - - - op = addOperation(daoAbstractClass, - "getRequestPermission", - "List<Permission>", - ObjectModelJavaModifier.PROTECTED); - addParameter(op, String.class, "topiaId"); - addParameter(op, int.class, "actions"); - addParameter(op, String.class, "query"); - addParameter(op, Class.class, "daoClass"); - addException(op, TopiaException.class); -// setDocumentation(op, "Retourne les permissions a verifier pour " + -// "l'acces a l'entite pour le service Taas"); - setOperationBody(op, "" -/*{ TopiaContext context = getTopiaContext(); - List<String> result = context.findAll(query, "id", topiaId); - - List<Permission> resultPermissions = new ArrayList<Permission>(); - for (String topiaIdPermission : result) { - TopiaDAO dao = context.getDAO(daoClass); - List<Permission> permissions = dao.getRequestPermission(topiaIdPermission, actions); - if(permissions != null) { - resultPermissions.addAll(permissions); - } else { - TaasPermission permission = new TaasPermission(topiaIdPermission, actions); - resultPermissions.add(permission); - } - } - return resultPermissions; - }*/ - ); - } - - Set<ObjectModelClass> usagesForclass = usages.get(clazz); - generateFindUsages(clazz, daoAbstractClass, usagesForclass); - } - - protected void generateDelete(ObjectModelClass clazz, - ObjectModelClass result) { - - StringBuilder body = new StringBuilder(); - String modelName = StringUtils.capitalize(model.getName()); - String providerFQN = getOutputProperties().getProperty( - PROP_DEFAULT_PACKAGE) + '.' + modelName + - "DAOHelper.getImplementationClass"; - - for (ObjectModelAttribute attr : clazz.getAttributes()) { - - String attrType = GeneratorUtil.getSimpleName(attr.getType()); - - String reverseAttrName = attr.getReverseAttributeName(); - ObjectModelAttribute reverse = attr.getReverseAttribute(); - if (attr.hasAssociationClass() || - reverse == null || !reverse.isNavigable()) { - - // never treate a non reverse and navigable attribute - // never treate an association class attribute - continue; - } - - // at this point we are sure to have a attribute which is - // - reverse - // - navigable - // - not from an association class - if (!allEntitiesFqn.contains(attr.getType())) { - - // this attribute is not from an entity, don't treate it - if (log.isDebugEnabled()) { - log.debug("[" + result.getName() + "] Skip attribute [" + - attr.getName() + "] with type " + attr.getType()); - } - continue; - } - - // At this point, the attribute type is a entity - if (GeneratorUtil.isNMultiplicity(attr) && - GeneratorUtil.isNMultiplicity(reverse)) { - // On doit absolument supprimer pour les relations many-to-many - // le this de la collection de l'autre cote - - String attrDBName = TopiaGeneratorUtil.getDbName(attr); - String attrClassifierDBName = TopiaGeneratorUtil.getDbName(attr.getClassifier()); - String attrJoinTableName = TopiaGeneratorUtil.getManyToManyTableName(attr); - String attrReverseDBName = TopiaGeneratorUtil.getReverseDbName(attr); - - //FIXME_-FC-20100413 Use a TopiaQuery (use HQLin elements) -// // Add DAOHelper -// String daoHelper = modelName + "DAOHelper"; -// String daoHelperFQN = getOutputProperties(). -// getProperty(PROP_DEFAULT_PACKAGE) + '.' + daoHelper; -// addImport(result, daoHelperFQN); -// -// // Add import for TopiaQuery -// addImport(result, TopiaQuery.class); -// -// // Entity DAO and reversePropertyName -// String entityDAO = attrType + "DAO"; -// String reverseAttrNameProperty = -// attrType + "." + getConstantName(reverseAttrName); -// -// -// <%=entityDAO%> dao = <%=daoHelper%>.get<%=entityDAO%>(getTopiaContext()); -// TopiaQuery query = dao.createQuery("B"). -// addFrom(entity.getClass(), "A"). -// add("A", entity). -// addInElements("A", "B." + <%=reverseAttrNameProperty%>); -// -// System.out.println("Query : " + query); -// List<<%=attrType%>> list = dao.findAllByQuery(query); - - String removeName = getJavaBeanMethodName("remove", reverseAttrName); - body.append("" -/*{ - { - List<<%=attrType%>> list = getTopiaContext().getHibernateSession().createSQLQuery( - "SELECT main.topiaid " + - "from <%=attrClassifierDBName%> main, <%=attrJoinTableName%> secondary " + - "where main.topiaid=secondary.<%=attrDBName%>" + - " and secondary.<%=attrReverseDBName%>='" + entity.getTopiaId() + "'") - .addEntity("main", <%=providerFQN%>(<%=attrType%>.class)).list(); - - for (<%=attrType%> item : list) { - item.<%=removeName%>(entity); - } - } -}*/ - ); - } else if (!GeneratorUtil.isNMultiplicity(reverse)) { - // On doit mettre a null les attributs qui ont cet objet sur les - // autres entites en one-to-* - // TODO peut-etre qu'hibernate est capable de faire ca tout seul ? - // THIMEL: J'ai remplacé reverse.getName() par reverseAttrName sans certitude - addImport(result, attrType); - String attrSimpleType = TopiaGeneratorUtil.getClassNameFromQualifiedName(attrType); - String getName = getJavaBeanMethodName("get", reverseAttrName); - String setName = getJavaBeanMethodName("set", reverseAttrName); - - body.append("" - /*{ - { - List<<%=attrSimpleType%>> list = topiaDAOSupplier - .getDAO(<%=attrSimpleType%>.class) - .findAllByProperties(<%=attrSimpleType%>.<%=getConstantName(reverseAttrName)%>, entity); - for (<%=attrSimpleType%> item : list) { - - // sletellier : Set null only if target is concerned by deletion - if (entity.equals(item.<%=getName%>())) { - item.<%=setName%>(null); - } - }*/ - ); - if (attr.isAggregate()) { - body.append("" -/*{ - topiaDAOSupplier.getDAO(<%=attrSimpleType%>.class).delete(item); -}*/ - ); - } - body.append("" -/*{ - } - } -}*/ - ); - - } - } - - if (body.length()>0) { - // something specific was done, need to generate the method - ObjectModelOperation op; - op = addOperation(result, "delete", "void", ObjectModelJavaModifier.PUBLIC); - addAnnotation(result, op,Override.class); - addParameter(op, "E", "entity"); - body.append("" -/*{ - super.delete(entity); - }*/ - ); - setOperationBody(op, body.toString()); - } - - - - } - - protected void generateFindUsages(ObjectModelClass clazz, - ObjectModelClass result, - Set<ObjectModelClass> usagesForclass) { - - builder.addImport(result, ArrayList.class.getName()); - builder.addImport(result, Map.class.getName()); - builder.addImport(result, HashMap.class.getName()); - builder.addImport(result, TopiaEntity.class.getName()); - - if (clazz instanceof ObjectModelAssociationClass || - usagesForclass.isEmpty()) { - // not for an association class - // just let a null method - ObjectModelOperation operation; - operation = addOperation(result, - "findUsages", - " List", - ObjectModelJavaModifier.PUBLIC); - - addParameter(operation, "Class", "type"); - addParameter(operation, "E", "entity"); - addAnnotation(result, operation, Override.class); - setOperationBody(operation, "" -/*{ - return new ArrayList(); - }*/ - ); - - operation = addOperation(result, - "findAllUsages", - "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", - ObjectModelJavaModifier.PUBLIC); - - addParameter(operation, "E", "entity"); - addAnnotation(result, operation, Override.class); - setOperationBody(operation, "" -/*{ - return new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(); - }*/ - ); - - return; - } - List<ObjectModelClass> allEntities; - Map<String, ObjectModelClass> allEntitiesByFQN; - - allEntities = TopiaGeneratorUtil.getEntityClasses(model, true); - allEntitiesByFQN = new TreeMap<String, ObjectModelClass>(); - - // prepare usages map and fill allEntitiesByFQN map - for (ObjectModelClass klass : allEntities) { - allEntitiesByFQN.put(klass.getQualifiedName(), klass); - } - - ObjectModelOperation operation; - operation = addOperation(result, - "findUsages", - " List", - ObjectModelJavaModifier.PUBLIC); - - addParameter(operation, "Class", "type"); - addParameter(operation, "E", "entity"); - addAnnotation(result, operation, Override.class); - StringBuilder buffer = new StringBuilder(300); - buffer.append("" -/*{ - List<?> result = new ArrayList(); - List tmp; -}*/ - ); - - for (ObjectModelClass usageClass : usagesForclass) { - String usageType = usageClass.getQualifiedName(); - builder.addImport(result, usageType); - String usageSimpleType = - TopiaGeneratorUtil.getClassNameFromQualifiedName(usageType); - String usageSimplePropertyMethod = "findAllBy" + usageSimpleType; - String usageCollectionPropertyMethod = "findAllContaining" + usageSimpleType; - for (ObjectModelAttribute attr : usageClass.getAttributes()) { - if (!attr.isNavigable()) { - // skip this case - continue; - } - String type; - String attrName = attr.getName(); - if (attr.hasAssociationClass()) { - //FIXME-TC20100224 dont known how to do this ? - continue; -// type = attr.getAssociationClass().getQualifiedName(); -// //FIXME-TC20100224 : this is crazy ??? must find the good name -// // Perhaps need to make different cases? -// attrName = attrName + "_" + TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName()); - } else { - type = attr.getType(); - } - if (!allEntitiesByFQN.containsKey(type)) { - // not a entity, can skip for this attribute - continue; - } - ObjectModelClass targetEntity = allEntitiesByFQN.get(type); -// if (!type.equals(clazz.getQualifiedName())) { - if (!targetEntity.equals(clazz)) { - // not a good attribute reference - continue; - } - // found something to seek - - String methodName; - if (TopiaGeneratorUtil.isNMultiplicity(attr)) { - methodName = getJavaBeanMethodName("findAllContains", attrName); - } else { - methodName = getJavaBeanMethodName("findAllBy", attrName); - } - String daoName = StringUtils.capitalize(usageSimpleType) + "DAO"; - - builder.addImport(result, usageClass.getPackageName() + '.' + daoName); - - buffer.append("" -/*{ - if (type == <%=usageSimpleType%>.class) { - <%=daoName%> dao = (<%=daoName%>) - topiaDAOSupplier.getDAO(<%=usageSimpleType%>.class); - tmp = dao.<%=methodName%>(entity); - result.addAll(tmp); - } -}*/ - ); - } - } - - buffer.append("" -/*{ - return (List) result; - }*/ - ); - setOperationBody(operation, buffer.toString()); - - operation = addOperation(result, - "findAllUsages", - "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", - ObjectModelJavaModifier.PUBLIC); - - addParameter(operation, "E", "entity"); - addAnnotation(result, operation, Override.class); - - buffer = new StringBuilder(300); - buffer.append("" -/*{ - Map<Class<? extends TopiaEntity>,List<? extends TopiaEntity>> result; - result = new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(<%=usagesForclass.size()%>); - - List<? extends TopiaEntity> list; -}*/ - ); - for (ObjectModelClass usageClass : usagesForclass) { - - String fqn = usageClass.getName(); - buffer.append("" -/*{ - list = findUsages(<%=fqn%>.class, entity); - if (!list.isEmpty()) { - result.put(<%=fqn%>.class, list); - } -}*/ - ); - - } - buffer.append("" -/*{ - return result; - }*/ - ); - - setOperationBody(operation, buffer.toString()); - } - - /** - * Generation of DAO operations signatures from class. These operations are - * abstract and identified by <<dao>> stereotype in the model. The - * developper must defined these methods in the DAOImpl associated to this - * DAOAbstract. - * - * @param result clazz where to add operations - * @param operations operations to generate - */ - private void generateDAOOperations(ObjectModelClass result, - Collection<ObjectModelOperation> - operations) { - if (CollectionUtils.isEmpty(operations)) { - - // no extra operations to generate - return; - } - - for (ObjectModelOperation op : operations) { - - Set<String> exceptions = op.getExceptions(); - cloneOperation(op, - result, - true, - ObjectModelJavaModifier.ABSTRACT, - ObjectModelJavaModifier.fromVisibility(op.getVisibility()) - ); - } - } - - - - - private String generateSecurity(ObjectModelClass result, - ObjectModelClass clazz, - String tagValue) { - StringBuilder buffer = new StringBuilder(); - - if (StringUtils.isNotEmpty(tagValue)) { - String security = tagValue; - Pattern propertiesPattern = Pattern - .compile("((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)attribute\\.(?:([_a-z0-9][_a-zA-Z0-9]*))#(?:(create|load|update|delete))"); - String[] valuesSecurity = security.split(":"); - - for (String valueSecurity : valuesSecurity) { - Matcher matcher = propertiesPattern.matcher(valueSecurity); - matcher.find(); - // className is fully qualified name of class - String className = matcher.group(1); - className = StringUtil.substring(className, 0, -1); // remove ended - // . - // target is class, attribute or operation - String attributeName = matcher.group(2); - String actions = matcher.group(3).toUpperCase(); - - String query = ""; - String daoClass = ""; - if (className.equals(clazz.getQualifiedName())) { - query = "select " + attributeName + ".topiaId from " + clazz.getQualifiedName() + " where topiaId = :id"; - daoClass = clazz.getAttribute(attributeName).getClassifier().getQualifiedName(); - } else { - query = "select at.topiaId from " + className + " at inner join at." + attributeName + " cl where cl.topiaId = :id"; - daoClass = className; - } - buffer.append("" -/*{ - resultPermissions.addAll(getRequestPermission(topiaId, - <%=actions%>, - "<%=query%>", - <%=daoClass%>.class)); -}*/ - ); - } - } else { - buffer.append("" -/*{ return null; - }*/ - ); - } - return buffer.toString(); - } - - protected void generateNoNMultiplicity(String clazzName, - ObjectModelClass result, - ObjectModelAttribute attr, - boolean isAssoc) { - String attrName = attr.getName(); - String attrType = attr.getType(); - String propertyName = clazzName + "." + getConstantName(attrName); - if (!isAssoc && attr.hasAssociationClass()) { - String assocClassName = attr.getAssociationClass().getName(); - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); - // It is about transitivity : use the property to access the - // associationClass + '.' + the property to access the expected - // attribute - // <class>.<attrAssoc> + '.' + <assocClass>.<attr> - propertyName = - clazzName + '.' + getConstantName(assocAttrName) + - " + '.' + " + - assocClassName + '.' + getConstantName(attrName); - } - - ObjectModelOperation op; - op = addOperation(result, - getJavaBeanMethodName("findBy", attrName), - "E", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, attrType, "v"); - setOperationBody(op, "" -/*{ - E result = findByProperty(<%=propertyName%>, v); - return result; - }*/ - ); - - op = addOperation(result, - getJavaBeanMethodName("findAllBy", attrName), - "List<E>", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, attrType, "v"); - setOperationBody(op, "" -/*{ - List<E> result = findAllByProperty(<%=propertyName%>, v); - return result; - }*/ - ); - - if (!isAssoc && attr.hasAssociationClass()) { - String assocClassName = attr.getAssociationClass().getName(); - String assocClassFQN = attr.getAssociationClass().getQualifiedName(); - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); - String assocPropertyConstantName = getConstantName(assocAttrName); - op = addOperation(result, - getJavaBeanMethodName("findBy", assocClassName), - "E", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, assocClassFQN, "value"); - setOperationBody(op, "" -/*{ - E result = findByProperty(<%=clazzName + "." + assocPropertyConstantName%>, value); - return result; - }*/ - ); - - op = addOperation(result, - getJavaBeanMethodName("findAllBy", assocClassName), - "List<E>", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, assocClassFQN, "value"); - setOperationBody(op, "" -/*{ - List<E> result = findAllByProperty(<%=clazzName + "." + assocPropertyConstantName%>, value); - return result; - }*/ - ); - } - } - - protected void generateNMultiplicity(String clazzName, - ObjectModelClass result, - ObjectModelAttribute attr) { - String attrName = attr.getName(); - String attrType = attr.getType(); - if (attr.hasAssociationClass()) { - // do nothing for association class, too complex... - return; - } - ObjectModelOperation op; - // Since 2.4 do nothing, findContains and findAllContains are not generated anymore - op = addOperation(result, - getJavaBeanMethodName("findContains", attrName), - "E", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, attrType, "v"); - setOperationBody(op, "" -/*{ - E result = findContains(<%=clazzName + "." + getConstantName(attrName)%>, v); - return result; - }*/ - ); - - op = addOperation(result, - getJavaBeanMethodName("findAllContains", attrName), - "List<E>", - ObjectModelJavaModifier.PUBLIC); - addParameter(op, attrType, "v"); - setOperationBody(op, "" -/*{ - List<E> result = findAllContains(<%=clazzName + "." + getConstantName(attrName)%>, v); - return result; - }*/ - ); - } - - - /** - * Obtain business operations of the DAO. - * - * This operations can not be generated, but must be written by developper. - * - * @param clazz the clazz to test. - * @return collections of extra operations, or empty collection if none found. - */ - public Collection<ObjectModelOperation> getDAOOperations( - ObjectModelClass clazz) { - -// // Note : this collection will contains extra operations for DAO. -// // Overriding existing generated methods is not managed yet -// Collection<ObjectModelOperation> results = -// new ArrayList<ObjectModelOperation>(); - -// // This code will be deprecated -// for (ObjectModelOperation op : clazz.getOperations()) { -// if (TopiaGeneratorUtil.hasDaoStereotype(op)) { -// results.add(op); -// } -// } - Collection<ObjectModelOperation> extra = - extraOperations.get(clazz.getQualifiedName()); - return extra; -// if (extra != null) { -// for (ObjectModelOperation op : extra) { -// results.add(op); -// } -// } - -// return results; - } - - private void generateNaturalId(ObjectModelClass result, - ObjectModelClass clazz) { - Set<ObjectModelAttribute> props = - TopiaGeneratorUtil.getNaturalIdAttributes(clazz); - - if (!props.isEmpty()) { - - if (log.isDebugEnabled()) { - log.debug("generateNaturalId for " + props); - } - ObjectModelOperation findByNaturalId = addOperation(result, - "findByNaturalId", "E", ObjectModelJavaModifier.PUBLIC); - - ObjectModelOperation existByNaturalId = addOperation(result, - "existByNaturalId", "boolean", ObjectModelJavaModifier.PUBLIC); - - // TODO sletellier 20120406 : remove method on 3.0 - ObjectModelOperation create = addOperation(result, - "create", "E", ObjectModelJavaModifier.PUBLIC); - - // sletellier : mark as Deprecated (http://nuiton.org/issues/2051) - setDocumentation(create, "@deprecated since 2.6.10, prefer use {@link #createByNaturalId}\n"); - addAnnotation(result, create, "Deprecated"); - - ObjectModelOperation createByNaturalId = addOperation(result, - "createByNaturalId", "E", ObjectModelJavaModifier.PUBLIC); - - // used for calling findByProperties in findByNaturalId - String searchProperties = ""; - // used for calling findByNaturalId in existByNaturalId -// String params = ""; - String clazzName = clazz.getName(); - for (ObjectModelAttribute attr : props) { - String propName = attr.getName(); - // add property as param in both methods - addParameter(findByNaturalId, attr.getType(), propName); - addParameter(existByNaturalId, attr.getType(), propName); - addParameter(create, attr.getType(), propName); - addParameter(createByNaturalId, attr.getType(), propName); - - searchProperties += - ", " + clazzName + '.' + getConstantName(propName) + - ", " + propName; - //params += ", " + propName; - } - searchProperties = searchProperties.substring(2); - //params = params.substring(2); - - setOperationBody(findByNaturalId, "" -/*{ - return findByProperties(<%=searchProperties%>); - }*/ - ); - - setOperationBody(existByNaturalId, "" -/*{ - return existByProperties(<%=searchProperties%>); - }*/ - ); - - setOperationBody(create, "" -/*{ - return create(<%=searchProperties%>); - }*/ - ); - - setOperationBody(createByNaturalId, "" -/*{ - return create(<%=searchProperties%>); - }*/ - ); - } - } - - private void generateNotNull(ObjectModelClass result, - ObjectModelClass clazz) { - - Set<ObjectModelAttribute> props = - TopiaGeneratorUtil.getNotNullAttributes(clazz); - - if (!props.isEmpty()) { - - if (log.isDebugEnabled()) { - log.debug("generateNotNull for " + props); - } - - ObjectModelOperation createByNotNull = addOperation(result, - "createByNotNull", "E", ObjectModelJavaModifier.PUBLIC); - - String createProperties = ""; -// String params = ""; - String clazzName = clazz.getName(); - for (ObjectModelAttribute attr : props) { - String propName = attr.getName(); - // add property as param in both methods - addParameter(createByNotNull, attr.getType(), propName); - - createProperties += - ", " + clazzName + '.' + getConstantName(propName) + - ", " + propName; - //params += ", " + propName; - } - createProperties = createProperties.substring(2); - //params = params.substring(2); - - setOperationBody(createByNotNull, "" -/*{ - return create(<%=createProperties%>); - }*/ - ); - } - } -} Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/PersistenceContextTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/PersistenceContextTransformer.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/PersistenceContextTransformer.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -186,7 +186,7 @@ addImport(output, clazz); setOperationBody(op, "" /*{ - <%=daoClazzName%> result = getDAO(<%=clazzName%>.class, <%=daoClazzName%>.class); + <%=daoClazzName%> result = getDao(<%=clazzName%>.class, <%=daoClazzName%>.class); return result; }*/ ); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -64,7 +64,7 @@ ApplicationContextTransformer.class, PersistenceContextTransformer.class, EntityTransformer.class, - EntityDAOTransformer.class, + EntityDaoTransformer.class, // DAOTransformer.class, // DAOImplTransformer.class, // DAOAbstractTransformer.class, Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -48,7 +48,7 @@ import org.hibernate.HibernateException; import org.hibernate.metadata.ClassMetadata; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaDAOSupplier; +import org.nuiton.topia.TopiaDaoSupplier; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaHibernateSupport; import org.nuiton.topia.TopiaJpaSupport; @@ -109,7 +109,7 @@ protected TopiaFiresSupport topiaFiresSupport; - protected TopiaDAOSupplier topiaDAOSupplier; + protected TopiaDaoSupplier topiaDaoSupplier; public abstract TopiaEntityEnum getTopiaEntityEnum(); @@ -180,7 +180,7 @@ TopiaListenableSupport topiaListenableSupport, TopiaIdFactory topiaIdFactory, TopiaFiresSupport topiaFiresSupport, - TopiaDAOSupplier topiaDAOSupplier) { + TopiaDaoSupplier topiaDaoSupplier) { log.debug("init dao for " + getEntityClass()); this.topiaHibernateSupport = topiaHibernateSupport; this.topiaJpaSupport = topiaJpaSupport; @@ -188,7 +188,7 @@ this.topiaListenableSupport = topiaListenableSupport; this.topiaIdFactory = topiaIdFactory; this.topiaFiresSupport = topiaFiresSupport; - this.topiaDAOSupplier = topiaDAOSupplier; + this.topiaDaoSupplier = topiaDaoSupplier; } public TopiaFiresSupport getTopiaFiresSupport() { @@ -270,7 +270,7 @@ if (entity instanceof TopiaEntityContextable) { TopiaEntityContextable contextable = (TopiaEntityContextable) entity; - contextable.setTopiaDAOSupplier(this.topiaDAOSupplier); + contextable.setTopiaDAOSupplier(this.topiaDaoSupplier); } // save entity 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 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -41,7 +41,6 @@ import org.nuiton.topia.event.TopiaEntityListener; import org.nuiton.topia.event.TopiaEntityVetoable; import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.generator.EntityDAOTransformer; import org.nuiton.topia.persistence.pager.TopiaPagerBean; import java.security.Permission; @@ -53,7 +52,7 @@ * create, delete, update or find entities. * * This interface is implemented by {@link TopiaDAOImpl} overridden by generation - * from {@link EntityDAOTransformer}. + * from {@link org.nuiton.topia.generator.EntityDaoTransformer}. * * * @param <E> the entity type managed by the dao Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -208,7 +208,7 @@ if (fireSupport == null) { if (this instanceof TopiaEntityContextable) { TopiaEntityContextable contextable = (TopiaEntityContextable) this; - AbstractTopiaDAO topiaDAO = (AbstractTopiaDAO)contextable.getTopiaDAOSupplier().getDAO(getClass()); + AbstractTopiaDAO topiaDAO = (AbstractTopiaDAO)contextable.getTopiaDAOSupplier().getDao(getClass()); fireSupport = topiaDAO.getTopiaFiresSupport(); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -26,7 +26,7 @@ package org.nuiton.topia.persistence; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaDAOSupplier; +import org.nuiton.topia.TopiaDaoSupplier; /** * {@link TopiaEntity} with {@link TopiaContext} support (injected by @@ -50,8 +50,8 @@ */ void delete(); - void setTopiaDAOSupplier(TopiaDAOSupplier topiaDAO); + void setTopiaDAOSupplier(TopiaDaoSupplier topiaDAO); - TopiaDAOSupplier getTopiaDAOSupplier(); + TopiaDaoSupplier getTopiaDAOSupplier(); } Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -229,7 +229,7 @@ // on recupere pour chaque type tous les ids des entites a repliquer data = new TopiaEntityIdsMap(); for (TopiaEntityEnum e : replicationModel.getContracts()) { - List<String> ids = srcCtxt.getDAO(e.getContract()).findAllIds(); + List<String> ids = srcCtxt.getDao(e.getContract()).findAllIds(); data.put(e.getContract(), ids); } } else { Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -106,7 +106,7 @@ Class<? extends TopiaEntity> entityClass = operationDef.getEntityType(); TopiaDAO<TopiaEntity> dao = - (TopiaDAO<TopiaEntity>) dstCtxt.getDAO(entityClass); + (TopiaDAO<TopiaEntity>) dstCtxt.getDao(entityClass); List<String> allIds = dao.findAllIds(); try { 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 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -484,8 +484,8 @@ 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()); + TopiaDAO<? extends TopiaEntity> daoSrc = ctxt.getDao(c.getContract()); + TopiaDAO<? extends TopiaEntity> daoDst = ctxt2.getDao(c.getContract()); long nbSrc = daoSrc.count(); long nbDst = daoDst.count(); assertEquals("le nombres d'entites de type " + c + " devrait etre " + nbSrc + " mais est " + nbDst, nbSrc, nbDst); Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -277,13 +277,13 @@ TopiaContextImplementor tx = (TopiaContextImplementor) context.beginTransaction(); - person = tx.getDAO(Person.class).create(Person.PROPERTY_NAME, "pudding master"); - race = tx.getDAO(Race.class).create(Race.PROPERTY_NAME, "race I"); - pet = tx.getDAO(Pet.class).create(Pet.PROPERTY_NAME, "pudding", Pet.PROPERTY_PERSON, person, Pet.PROPERTY_RACE, race); + person = tx.getDao(Person.class).create(Person.PROPERTY_NAME, "pudding master"); + race = tx.getDao(Race.class).create(Race.PROPERTY_NAME, "race I"); + pet = tx.getDao(Pet.class).create(Pet.PROPERTY_NAME, "pudding", Pet.PROPERTY_PERSON, person, Pet.PROPERTY_RACE, race); - person2 = tx.getDAO(Person.class).create(Person.PROPERTY_NAME, "pudding II master"); - pet2 = tx.getDAO(Pet.class).create(Pet.PROPERTY_NAME, "pudding II"); - race2 = tx.getDAO(Race.class).create(Race.PROPERTY_NAME, "race II"); + person2 = tx.getDao(Person.class).create(Person.PROPERTY_NAME, "pudding II master"); + pet2 = tx.getDao(Pet.class).create(Pet.PROPERTY_NAME, "pudding II"); + race2 = tx.getDao(Race.class).create(Race.PROPERTY_NAME, "race II"); tx.commitTransaction(); tx.closeContext(); Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -236,16 +236,16 @@ TopiaContextImplementor tx = (TopiaContextImplementor) context.beginTransaction(); - person = tx.getDAO(Person.class).create(Person.PROPERTY_NAME, "pudding master"); - race = tx.getDAO(Race.class).create(Race.PROPERTY_NAME, "race I"); - pet = tx.getDAO(Pet.class).create(Pet.PROPERTY_NAME, "pudding", Pet.PROPERTY_PERSON, person, Pet.PROPERTY_RACE, race); + person = tx.getDao(Person.class).create(Person.PROPERTY_NAME, "pudding master"); + race = tx.getDao(Race.class).create(Race.PROPERTY_NAME, "race I"); + pet = tx.getDao(Pet.class).create(Pet.PROPERTY_NAME, "pudding", Pet.PROPERTY_PERSON, person, Pet.PROPERTY_RACE, race); - person2 = tx.getDAO(Person.class).create(Person.PROPERTY_NAME, "pudding II master"); - pet2 = tx.getDAO(Pet.class).create(Pet.PROPERTY_NAME, "pudding II"); - race2 = tx.getDAO(Race.class).create(Race.PROPERTY_NAME, "race II"); + person2 = tx.getDao(Person.class).create(Person.PROPERTY_NAME, "pudding II master"); + pet2 = tx.getDao(Pet.class).create(Pet.PROPERTY_NAME, "pudding II"); + race2 = tx.getDao(Race.class).create(Race.PROPERTY_NAME, "race II"); - race3 = tx.getDAO(Race.class).create(Race.PROPERTY_NAME, "race III"); - pet3 = tx.getDAO(Pet.class).create(Pet.PROPERTY_NAME, "pudding III", Pet.PROPERTY_RACE, race3); + race3 = tx.getDao(Race.class).create(Race.PROPERTY_NAME, "race III"); + pet3 = tx.getDao(Pet.class).create(Pet.PROPERTY_NAME, "pudding III", Pet.PROPERTY_RACE, race3); tx.commitTransaction(); tx.closeContext(); Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java 2013-10-15 15:08:16 UTC (rev 2845) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java 2013-10-17 16:14:18 UTC (rev 2846) @@ -395,16 +395,16 @@ TopiaContextImplementor tx = (TopiaContextImplementor) context.beginTransaction(); - person = tx.getDAO(Person.class).create(Person.PROPERTY_NAME, "pudding master"); - race = tx.getDAO(Race.class).create(Race.PROPERTY_NAME, "race I"); - pet = tx.getDAO(Pet.class).create(Pet.PROPERTY_NAME, "pudding", Pet.PROPERTY_PERSON, person, Pet.PROPERTY_RACE, race); + person = tx.getDao(Person.class).create(Person.PROPERTY_NAME, "pudding master"); + race = tx.getDao(Race.class).create(Race.PROPERTY_NAME, "race I"); + pet = tx.getDao(Pet.class).create(Pet.PROPERTY_NAME, "pudding", Pet.PROPERTY_PERSON, person, Pet.PROPERTY_RACE, race); - person2 = tx.getDAO(Person.class).create(Person.PROPERTY_NAME, "pudding II master"); - pet2 = tx.getDAO(Pet.class).create(Pet.PROPERTY_NAME, "pudding II"); - race2 = tx.getDAO(Race.class).create(Race.PROPERTY_NAME, "race II"); + person2 = tx.getDao(Person.class).create(Person.PROPERTY_NAME, "pudding II master"); + pet2 = tx.getDao(Pet.class).create(Pet.PROPERTY_NAME, "pudding II"); + race2 = tx.getDao(Race.class).create(Race.PROPERTY_NAME, "race II"); - race3 = tx.getDAO(Race.class).create(Race.PROPERTY_NAME, "race III"); - pet3 = tx.getDAO(Pet.class).create(Pet.PROPERTY_NAME, "pudding III", Pet.PROPERTY_RACE, race3); + race3 = tx.getDao(Race.class).create(Race.PROPERTY_NAME, "race III"); + pet3 = tx.getDao(Pet.class).create(Pet.PROPERTY_NAME, "pudding III", Pet.PROPERTY_RACE, race3); tx.commitTransaction(); tx.closeContext();

1 0

r2845 - in trunk/topia-persistence/src: main/java/org/nuiton/topia main/java/org/nuiton/topia/generator main/java/org/nuiton/topia/persistence test/java/org/nuiton/topia test/java/org/nuiton/topia/generator test/java/org/nuiton/topia/persistence
by bleny＠users.nuiton.org Oct. 15, 2013

Oct. 15, 2013

Author: bleny Date: 2013-10-15 17:08:16 +0200 (Tue, 15 Oct 2013) New Revision: 2845 Url: http://nuiton.org/projects/topia/repository/revisions/2845 Log: update tests and change contract for generated dao factories Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/PersistenceContextTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaJpaSupportTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-11 22:50:35 UTC (rev 2844) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-15 15:08:16 UTC (rev 2845) @@ -257,7 +257,7 @@ // Looking for specialized DAO // This DAO is supposed to exist, as created by generation - String daoClassName = entityClass.getName() + "DAO"; + String daoClassName = entityClass.getName() + "TopiaDao"; try { Class<TopiaDAO<E>> daoClass = (Class<TopiaDAO<E>>) Class.forName(daoClassName); dao = daoClass.getConstructor().newInstance(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2013-10-11 22:50:35 UTC (rev 2844) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2013-10-15 15:08:16 UTC (rev 2845) @@ -873,8 +873,7 @@ addParameter(op, attrType, "v"); setOperationBody(op, "" /*{ - E result = <%=methodToDelegateName%>(v).findAnyOrNull(); - return result; + return <%=methodToDelegateName%>(v).findAnyOrNull(); }*/ ); @@ -887,8 +886,7 @@ addParameter(op, attrType, "v"); setOperationBody(op, "" /*{ - List<E> result = <%=methodToDelegateName%>(v).findAll(); - return result; + return <%=methodToDelegateName%>(v).findAll(); }*/ ); @@ -956,8 +954,7 @@ addParameter(op, attrType, "v"); setOperationBody(op, "" /*{ - E result = <%=methodToDelegateName%>(v).findAnyOrNull(); - return result; + return <%=methodToDelegateName%>(v).findAnyOrNull(); }*/ ); @@ -970,8 +967,7 @@ addParameter(op, attrType, "v"); setOperationBody(op, "" /*{ - List<E> result = <%=methodToDelegateName%>(v).findAll(); - return result; + return <%=methodToDelegateName%>(v).findAll(); }*/ ); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/PersistenceContextTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/PersistenceContextTransformer.java 2013-10-11 22:50:35 UTC (rev 2844) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/PersistenceContextTransformer.java 2013-10-15 15:08:16 UTC (rev 2845) @@ -176,10 +176,13 @@ for (ObjectModelClass clazz : entityClasses) { String clazzName = clazz.getName(); - String daoClazzName = clazzName + "DAO"; + // TODO brendan 14/10/13 use method + String daoContractName = clazzName + "Dao"; + String daoClazzName = TopiaGeneratorUtil.getConcreteDaoName(clazz); + // specialized getXXXDao method - op = addOperation(output, "get" + daoClazzName, clazz.getPackageName() + '.' + daoClazzName); + op = addOperation(output, "get" + daoContractName, clazz.getPackageName() + '.' + daoClazzName); addImport(output, clazz); setOperationBody(op, "" /*{ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java 2013-10-11 22:50:35 UTC (rev 2844) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java 2013-10-15 15:08:16 UTC (rev 2845) @@ -37,6 +37,7 @@ package org.nuiton.topia.persistence; +import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; @@ -295,12 +296,6 @@ return result; } - /** - * Cette methode appelle fireVetoableCreate et fireOnCreated Si vous la - * surchargé, faites attention a appeler le super ou a appeler vous aussi - * ces deux methodes. - */ - public E create(Map<String, Object> properties) { E result = newInstance(); @@ -327,6 +322,11 @@ return result; } + public E create() { + E result = newInstance(); + create(result); + return result; + } public E update(E e) { try { @@ -570,6 +570,18 @@ return getNextStep().findFirstOrNull(); } + public Optional<E> tryFindAny() { + return getNextStep().tryFindAny(); + } + + public Optional<E> tryFindFirst() { + return getNextStep().tryFindFirst(); + } + + public Optional<E> tryFindUnique() { + return getNextStep().tryFindUnique(); + } + public List<E> findAll() { return getNextStep().findAll(); } @@ -634,6 +646,10 @@ return topiaDAO.findUniqueOrNull(hql, hqlParameters); } + public Optional<E> tryFindUnique() { + return topiaDAO.tryFindUnique(hql, hqlParameters); + } + public E findFirst() { return topiaDAO.findFirst(hql, hqlParameters); } @@ -642,6 +658,10 @@ return topiaDAO.findFirstOrNull(hql, hqlParameters); } + public Optional<E> tryFindFirst() { + return topiaDAO.tryFindFirst(hql, hqlParameters); + } + public E findAny() { return topiaDAO.findAny(hql, hqlParameters); } @@ -650,6 +670,10 @@ return topiaDAO.findAnyOrNull(hql, hqlParameters); } + public Optional<E> tryFindAny() { + return topiaDAO.tryFindAny(hql, hqlParameters); + } + public List<E> findAll() { return topiaDAO.findAll(hql, hqlParameters); } @@ -698,6 +722,11 @@ return uniqueOrNull; } + protected Optional<E> tryFindUnique(String hql, Map<String, Object> hqlParameters) { + Optional<E> uniqueOrNull = tryFindUnique(hql, hqlParameters, getEntityClass()); + return uniqueOrNull; + } + protected E findFirst(String hql, Map<String, Object> hqlParameters) { E firstOrNull = findFirst(hql, hqlParameters, getEntityClass()); return firstOrNull; @@ -708,6 +737,11 @@ return anyOrNull; } + protected Optional<E> tryFindFirst(String hql, Map<String, Object> hqlParameters) { + Optional<E> anyOrNull = tryFindFirst(hql, hqlParameters, getEntityClass()); + return anyOrNull; + } + protected E findAny(String hql, Map<String, Object> hqlParameters) { E anyOrNull = findAny(hql, hqlParameters, getEntityClass()); return anyOrNull; @@ -718,6 +752,11 @@ return anyOrNull; } + protected Optional<E> tryFindAny(String hql, Map<String, Object> hqlParameters) { + Optional<E> anyOrNull = tryFindAny(hql, hqlParameters, getEntityClass()); + return anyOrNull; + } + protected <R> R findUnique(String hql, Map<String, Object> hqlParameters, Class<R> type) { R uniqueOrNull = findUniqueOrNull(hql, hqlParameters, type); if (uniqueOrNull == null) { @@ -727,6 +766,11 @@ return uniqueOrNull; } + protected <R> Optional<R> tryFindUnique(String hql, Map<String, Object> hqlParameters, Class<R> type) { + R uniqueOrNull = findUniqueOrNull(hql, hqlParameters, type); + return Optional.fromNullable(uniqueOrNull); + } + protected <R> R findUniqueOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) { List<R> results = findAll(hql, hqlParameters, type, 0, 1); // If there is more than 1 result, throw an exception @@ -750,6 +794,11 @@ return firstOrNull; } + protected <R> Optional<R> tryFindFirst(String hql, Map<String, Object> hqlParameters, Class<R> type) { + R firstOrNull = findFirstOrNull(hql, hqlParameters, type); + return Optional.fromNullable(firstOrNull); + } + protected <R> R findFirstOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) { Preconditions.checkArgument(hql.toLowerCase().contains("order by")); R anyOrNull = findAnyOrNull(hql, hqlParameters, type); @@ -765,6 +814,11 @@ return anyOrNull; } + protected <R> Optional<R> tryFindAny(String hql, Map<String, Object> hqlParameters, Class<R> type) { + R anyOrNull = findAnyOrNull(hql, hqlParameters, type); + return Optional.fromNullable(anyOrNull); + } + protected <R> R findAnyOrNull(String hql, Map<String, Object> hqlParameters, Class<R> type) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaJpaSupportTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaJpaSupportTest.java 2013-10-11 22:50:35 UTC (rev 2844) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaJpaSupportTest.java 2013-10-15 15:08:16 UTC (rev 2845) @@ -23,8 +23,6 @@ */ package org.nuiton.topia; -import java.util.List; - import org.junit.Assert; import org.junit.Before; import org.junit.Rule; @@ -35,6 +33,8 @@ import org.nuiton.topiatest.Personne; import org.nuiton.topiatest.PersonneDAO; +import java.util.List; + /** * Tests the TopiaContext#find|findAll|findUnique methods * @@ -56,8 +56,8 @@ persistenceContext = db.beginTransaction(); jpaSupport = persistenceContext.jpaSupport; - personneDAO = persistenceContext.getPersonneDAO(); - addressDAO = persistenceContext.getAddressDAO(); + personneDAO = persistenceContext.getPersonneDao(); + addressDAO = persistenceContext.getAddressDao(); address = addressDAO.create( Address.PROPERTY_ADRESS, "17 rue de la Pote Gellée, 44200 NANTES"); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java 2013-10-11 22:50:35 UTC (rev 2844) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java 2013-10-15 15:08:16 UTC (rev 2845) @@ -30,7 +30,6 @@ import org.junit.Assert; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTestDAOHelper; @@ -124,8 +123,8 @@ // try { TopiaTestTopiaPersistenceContext newContext = db.beginTransaction(); - CompanyDAO companyDAO = newContext.getCompanyDAO(); - DepartmentDAO departmentDAO = newContext.getDepartmentDAO(); + CompanyDAO companyDAO = newContext.getCompanyDao(); + DepartmentDAO departmentDAO = newContext.getDepartmentDao(); Company company = companyDAO.create(); company.setName("Ma société"); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java 2013-10-11 22:50:35 UTC (rev 2844) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java 2013-10-15 15:08:16 UTC (rev 2845) @@ -72,14 +72,14 @@ TopiaTestTopiaPersistenceContext newContext = db.beginTransaction(); try { // company - CompanyDAO companyDAO = newContext.getCompanyDAO(); + CompanyDAO companyDAO = newContext.getCompanyDao(); Company clCompany = companyDAO.create(Company.PROPERTY_NAME, "CodeLutin"); // employe - EmployeDAO employeDAO = newContext.getEmployeDAO(); + EmployeDAO employeDAO = newContext.getEmployeDao(); Employe empl1 = employeDAO.create(Employe.PROPERTY_NAME, "boss", Employe.PROPERTY_SALARY, 30000); - AddressDAO adressDAO = newContext.getAddressDAO(); + AddressDAO adressDAO = newContext.getAddressDao(); Address addr1 = adressDAO.create(Address.PROPERTY_CITY, "Nantes", Address.PROPERTY_ADRESS, "12 Avenue Jules Vernes"); empl1.setAddress(addr1); @@ -88,7 +88,7 @@ empl2.setAddress(addr2); // departement - DepartmentDAO departmentDAO = newContext.getDepartmentDAO(); + DepartmentDAO departmentDAO = newContext.getDepartmentDao(); Department depComm = departmentDAO.create(Department.PROPERTY_NAME, "Commercial"); depComm.setLeader(empl1); @@ -117,7 +117,7 @@ TopiaTestTopiaPersistenceContext context = db.beginTransaction(); - CompanyDAO companyDAO = context.getCompanyDAO(); + CompanyDAO companyDAO = context.getCompanyDao(); Company clCompany = companyDAO.findByName("CodeLutin"); EntityVisitor delegateVisitor = new ExportXMLVisitor(); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2013-10-11 22:50:35 UTC (rev 2844) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2013-10-15 15:08:16 UTC (rev 2845) @@ -31,13 +31,10 @@ import org.junit.Assert; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaPersistenceContext; import org.nuiton.topia.TopiaTestDAOHelper; import org.nuiton.topia.TopiaTestTopiaPersistenceContext; -import org.nuiton.topia.TopiaTransaction; import org.nuiton.topiatest.NaturalizedEntity; import org.nuiton.topiatest.NaturalizedEntityDAO; @@ -65,7 +62,7 @@ TopiaTestTopiaPersistenceContext persistenceContext = db.beginTransaction(); NaturalizedEntityDAO dao = - persistenceContext.getNaturalizedEntityDAO(); + persistenceContext.getNaturalizedEntityDao(); // No exception will be thrown with the two properties dao.createByNaturalId(5, "str"); @@ -86,7 +83,7 @@ TopiaTestTopiaPersistenceContext persistenceContext = db.beginTransaction(); NaturalizedEntityDAO dao = - persistenceContext.getNaturalizedEntityDAO(); + persistenceContext.getNaturalizedEntityDao(); // Exception will be throw try { @@ -112,7 +109,7 @@ TopiaTestTopiaPersistenceContext persistenceContext = db.beginTransaction(); NaturalizedEntityDAO dao = - persistenceContext.getNaturalizedEntityDAO(); + persistenceContext.getNaturalizedEntityDao(); NaturalizedEntity entity = dao.createByNaturalId(5, "str"); @@ -135,7 +132,7 @@ NaturalizedEntityDAO dao = - persistenceContext.getNaturalizedEntityDAO(); + persistenceContext.getNaturalizedEntityDao(); NaturalizedEntity entity = dao.createByNaturalId(5, "str"); @@ -153,7 +150,7 @@ NaturalizedEntityDAO dao = - persistenceContext.getNaturalizedEntityDAO(); + persistenceContext.getNaturalizedEntityDao(); dao.createByNaturalId(5, "str"); persistenceContext.commitTransaction(); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2013-10-11 22:50:35 UTC (rev 2844) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2013-10-15 15:08:16 UTC (rev 2845) @@ -61,7 +61,7 @@ public void setup() throws TopiaException { context = db.beginTransaction(); - dao = context.getPersonDAO(); + dao = context.getPersonDao(); } /**

1 0

r2844 - trunk/topia-persistence/src/main/java/org/nuiton/topia
by athimel＠users.nuiton.org Oct. 11, 2013

Oct. 11, 2013

Author: athimel Date: 2013-10-12 00:50:35 +0200 (Sat, 12 Oct 2013) New Revision: 2844 Url: http://nuiton.org/projects/topia/repository/revisions/2844 Log: code style in AbstractTopiaPersistenceContext Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-11 22:40:03 UTC (rev 2843) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-11 22:50:35 UTC (rev 2844) @@ -35,7 +35,6 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.nuiton.topia.framework.TopiaFiresSupport; -import org.nuiton.topia.framework.TopiaHibernateEventListener; import org.nuiton.topia.persistence.AbstractTopiaDAO; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; @@ -243,11 +242,14 @@ hibernateFactory.getClassMetadata(entityClass.getName() + "Impl") == null && hibernateFactory.getClassMetadata(entityClass.getName() + "Abstract") == null) { - log.info(String.format("List of supported persistence classes: %s", - hibernateFactory.getAllClassMetadata().keySet())); - throw new TopiaException( - String.format("The following entity type %s is not managed by this context, you probably forgot to declare it.", - entityClass.getName())); + if (log.isInfoEnabled()) { + String format = "List of supported persistence classes: %s"; + String message = String.format(format, hibernateFactory.getAllClassMetadata().keySet()); + log.info(message); + } + String format = "The following entity type %s is not managed by this context, you probably forgot to declare it."; + String message = String.format(format, entityClass.getName()); + throw new TopiaException(message); } TopiaDAO<E> dao = (TopiaDAO<E>) daoCache.get(entityClass);

1 0

r2843 - in trunk/topia-persistence/src: main/java/org/nuiton/topia main/java/org/nuiton/topia/framework main/java/org/nuiton/topia/generator test/java/org/nuiton/topia test/java/org/nuiton/topia/framework test/java/org/nuiton/topia/generator test/java/org/nuiton/topia/persistence test/java/org/nuiton/topia/test/ano1882 test/java/org/nuiton/topiatest test/java/org/nuiton/topiatest/deletetest
by athimel＠users.nuiton.org Oct. 11, 2013

Oct. 11, 2013

Author: athimel Date: 2013-10-12 00:40:03 +0200 (Sat, 12 Oct 2013) New Revision: 2843 Url: http://nuiton.org/projects/topia/repository/revisions/2843 Log: Migrate tests to the new ToPIa architecture Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaJpaSupportTest.java Removed: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateProvider.java trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaJpaSupport.java trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaReplicationSupport.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaJpaSupport.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaReplicationDestination.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaServiceSupportImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ApplicationContextTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaDatabase.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextReplicateTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -26,12 +26,16 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; import org.hibernate.cfg.Configuration; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; +import org.hibernate.service.spi.Stoppable; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.nuiton.topia.event.TopiaEntitiesVetoable; @@ -40,6 +44,7 @@ import org.nuiton.topia.event.TopiaSchemaListener; import org.nuiton.topia.event.TopiaTransactionListener; import org.nuiton.topia.event.TopiaTransactionVetoable; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaFiresSupport; import org.nuiton.topia.framework.TopiaService; import org.nuiton.topia.framework.TopiaUtil; @@ -48,6 +53,7 @@ import org.nuiton.topia.persistence.TopiaIdFactory; import java.beans.PropertyChangeListener; +import java.lang.ref.WeakReference; import java.util.List; import java.util.Map; import java.util.Properties; @@ -74,6 +80,10 @@ protected HibernateProvider hibernateProvider; + protected boolean closed = false; + + protected List<WeakReference<TopiaPersistenceContext>> persistenceContexts = Lists.newArrayList(); // TODO AThimel 11/10/13 Which implementation ? + public abstract K newPersistenceContext(); public AbstractTopiaApplicationContext(Properties properties) { @@ -89,6 +99,8 @@ } this.configuration = ImmutableMap.copyOf(configurationCopy); this.topiaServiceSupport = new TopiaServiceSupportImpl(this); + // FIXME AThimel 11/10/13 This is not nice, need a 2-step init because of mutual dependency with hibernateProvider + ((TopiaServiceSupportImpl)this.topiaServiceSupport).init(); } protected abstract Class<? extends TopiaEntity>[] getImplementationClasses(); @@ -101,6 +113,10 @@ return buffer.substring(1); } + protected void registerPersistenceContext(TopiaPersistenceContext persistenceContext) { + persistenceContexts.add(new WeakReference<TopiaPersistenceContext>(persistenceContext)); + } + protected HibernateProvider getHibernateProvider() { if (hibernateProvider == null) { hibernateProvider = new HibernateProvider(configuration, topiaServiceSupport); @@ -336,4 +352,29 @@ } } + public void closeContext() throws TopiaException { + // Throw exception if context is already closed + Preconditions.checkState(!closed, "Context was already closed"); + + // TODO AThimel 11/10/13 Implement close on persistence contexts +// // Remove all children context +// for (TopiaPersistenceContext child : getChildContext()) { +// // Avoid to have exception from checkClosed method on child +// if (!child.isClosed()) { +// child.close(); +// } +// } + + hibernateProvider.close(); + closed = true; + + if (log.isDebugEnabled()) { + log.debug("TopiaApplicationContext closed"); + } + } + + public boolean isClosed() { + return closed; + } + } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -35,6 +35,7 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.nuiton.topia.framework.TopiaFiresSupport; +import org.nuiton.topia.framework.TopiaHibernateEventListener; import org.nuiton.topia.persistence.AbstractTopiaDAO; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; @@ -109,6 +110,7 @@ this.listenableSupport = listenableSupport; this.topiaIdFactory = topiaIdFactory; + this.firesSupport = new TopiaFiresSupport(); // Hibernate support can be created using the given hibernateProvider this.hibernateSupport = new InternalTopiaHibernateSupport(hibernateProvider); @@ -117,7 +119,6 @@ startTransaction(); // Create the different supports that may be needed by the DAOs - this.firesSupport = new TopiaFiresSupport(); this.jpaSupport = new HibernateTopiaJpaSupport(hibernateSupport, firesSupport); this.sqlSupport = new HibernateTopiaSqlSupport(hibernateSupport); } @@ -355,7 +356,7 @@ } @Override - public void close() { + public void closeContext() { checkClosed(); closed = true; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateProvider.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateProvider.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -42,7 +42,9 @@ import org.hibernate.event.spi.EventType; import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistryBuilder; -import org.nuiton.topia.framework.TopiaFiresSupport; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; +import org.hibernate.service.spi.Stoppable; +import org.nuiton.topia.framework.TopiaHibernateEventListener; import org.nuiton.topia.framework.TopiaService; import org.nuiton.topia.framework.TopiaUtil; @@ -193,6 +195,18 @@ return hibernateConfiguration; } + public void close() { + if (hibernateSessionFactory != null) { + hibernateSessionFactory.close(); + // close connection provider if possible (http://nuiton.org/issues/2757) + ConnectionProvider service = ((SessionFactoryImplementor) hibernateSessionFactory).getServiceRegistry().getService(ConnectionProvider.class); + if (service instanceof Stoppable) { + Stoppable stoppable = (Stoppable) service; + stoppable.stop(); + } + } + } + public SessionFactory getSessionFactory() { if (hibernateSessionFactory == null) { @@ -208,7 +222,7 @@ ServiceRegistry serviceRegistryInit = ((SessionFactoryImplementor) hibernateSessionFactory).getServiceRegistry(); EventListenerRegistry eventListenerRegistry = serviceRegistryInit.getService(EventListenerRegistry.class); // TopiaFiresSupport.TopiaHibernateEvent listener = new TopiaFiresSupport.TopiaHibernateEvent(this); - TopiaFiresSupport.TopiaHibernateEvent listener = new TopiaFiresSupport.TopiaHibernateEvent(null); // FIXME AThimel 11/10/13 Give a correct instance + TopiaHibernateEventListener listener = new TopiaHibernateEventListener(null); // FIXME AThimel 11/10/13 Give a correct instance eventListenerRegistry.appendListeners(EventType.PRE_INSERT, listener); eventListenerRegistry.appendListeners(EventType.PRE_LOAD, listener); eventListenerRegistry.appendListeners(EventType.PRE_UPDATE, listener); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaJpaSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaJpaSupport.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaJpaSupport.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -24,6 +24,10 @@ * #L% */ +import java.util.Collection; +import java.util.List; +import java.util.Map; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.FlushMode; @@ -32,10 +36,6 @@ import org.nuiton.topia.framework.TopiaFiresSupport; import org.nuiton.topia.framework.TopiaUtil; -import java.util.Collection; -import java.util.List; -import java.util.Map; - /** * This class is the Hibernate implementation of TopiaJpaSupport. It realizes the bridge between the JPA specification * and the technical choice made for its implementation : Hibernate. @@ -119,6 +119,27 @@ } @Override + public <T> T findUnique(String jpaql, Map<String, Object> parameters) { + + // Execute query, and ask for up to 2 results only + List<T> results = find(jpaql, 0, 1, parameters); + + // If there is more than 1 result, throw an exception + if (results.size() > 1) { + String message = String.format( + "Query '%s' returns more than 1 unique result", jpaql); + throw new TopiaException(message); + } + + // otherwise return the first one, or null + T result = null; + if (!results.isEmpty()) { + result = results.get(0); + } + return result; + } + + @Override public <T> List<T> find(String jpaql, int startIndex, int endIndex, Map<String, Object> parameters) { try { Query query = prepareQuery(jpaql, parameters); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaReplicationSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaReplicationSupport.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaReplicationSupport.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -1,5 +1,29 @@ package org.nuiton.topia; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaReplicationSupport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaJpaSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaJpaSupport.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaJpaSupport.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -117,10 +117,25 @@ * support something else than queries on TopiaEntity * * @param jpaql the JPA-QL query + * @param parameters a map which keys are the attribute names and values are the attributes expected values + * @return The result instance or null + */ + <T> T findUnique(String jpaql, + Map<String, Object> parameters); + + /** + * Allow to do some JPA-QL query and return an unique result. If nothing if + * found by the query, will return null. If more than one result is found, + * will throw an exception. + * + * WARNING : Depending on the registered service, this method may not + * support something else than queries on TopiaEntity + * + * @param jpaql the JPA-QL query * @param propertyNamesAndValues the query parameters. Arguments are key-value paired : * [propertyName;value;propertyName;value;...] * @return The result instance or null - * @deprecated prefer using {@link #find(String, int, int, java.util.Map)} + * @deprecated prefer using {@link #findUnique(String, java.util.Map)} */ @Deprecated <T> T findUnique(String jpaql, Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -68,7 +68,7 @@ * Closes the context. All the children contexts will be closed in the same * time. */ - void close(); + void closeContext(); /** * Tells if the context is closed Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaReplicationDestination.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaReplicationDestination.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaReplicationDestination.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -1,5 +1,29 @@ package org.nuiton.topia; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + import org.nuiton.topia.persistence.TopiaEntity; /** Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaReplicationDestination.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaServiceSupportImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaServiceSupportImpl.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaServiceSupportImpl.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -49,6 +49,9 @@ public TopiaServiceSupportImpl(AbstractTopiaApplicationContext applicationContext) { this.applicationContext = applicationContext; this.services = loadServices(applicationContext.getConfiguration()); + } + + public void init() { preInitServices(this.services); applicationContext.getHibernateProvider().getHibernateConfiguration(); // force mapping loading postInitServices(this.services); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -579,7 +579,7 @@ // we must call getServiceRegistry on factory to get a working one ServiceRegistry serviceRegistryInit = ((SessionFactoryImplementor) hibernateFactory).getServiceRegistry(); EventListenerRegistry eventListenerRegistry = serviceRegistryInit.getService(EventListenerRegistry.class); - TopiaFiresSupport.TopiaHibernateEvent listener = new TopiaFiresSupport.TopiaHibernateEvent(this); + TopiaHibernateEventListener listener = new TopiaHibernateEventListener(this); eventListenerRegistry.appendListeners(EventType.PRE_INSERT, listener); eventListenerRegistry.appendListeners(EventType.PRE_LOAD, listener); eventListenerRegistry.appendListeners(EventType.PRE_UPDATE, listener); @@ -613,7 +613,8 @@ if (log.isDebugEnabled()) { log.debug("Load persistence from dir : " + dir); } - hibernateConfiguration.addDirectory(new File(dir)); + File dirFile = new File(dir); + hibernateConfiguration.addDirectory(dirFile); } } @@ -891,11 +892,6 @@ } @Override - public void close() { - closeContext(); - } - - @Override public void closeContext() throws TopiaException { // Throw exception if context is already closed checkClosed("Context was already closed"); @@ -1019,20 +1015,8 @@ checkClosed(String.format("This context is closed, it is not possible to release the operation '%1$s'", "findUnique")); - List<E> results = find(jpaql, 0, 1, propertyNamesAndValues); - - // If there is more than 1 result, throw an exception - if (results.size() > 1) { - String message = String.format( - "Query '%s' returns more than 1 unique result", jpaql); - throw new TopiaException(message); - } - - // otherwise return the first one, or null - E result = null; - if (!results.isEmpty()) { - result = results.get(0); - } + Map<String, Object> parameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + E result = findUnique(jpaql, parameters); return result; } @@ -1113,6 +1097,26 @@ } @Override + public <T> T findUnique(String jpaql, Map<String, Object> parameters) { + + List<T> results = find(jpaql, 0, 1, parameters); + + // If there is more than 1 result, throw an exception + if (results.size() > 1) { + String message = String.format( + "Query '%s' returns more than 1 unique result", jpaql); + throw new TopiaException(message); + } + + // otherwise return the first one, or null + T result = null; + if (!results.isEmpty()) { + result = results.get(0); + } + return result; + } + + @Override public int execute(String jpaql, Map<String, Object> parameters) { checkClosed(String.format("This context is closed, it is not possible to release the operation '%1$s'", "find")); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -25,33 +25,19 @@ package org.nuiton.topia.framework; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.beans.VetoableChangeSupport; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.commons.collections.map.IdentityMap; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.HibernateException; -import org.hibernate.Session; -import org.hibernate.event.spi.PostDeleteEvent; -import org.hibernate.event.spi.PostDeleteEventListener; -import org.hibernate.event.spi.PostInsertEvent; -import org.hibernate.event.spi.PostInsertEventListener; -import org.hibernate.event.spi.PostLoadEvent; -import org.hibernate.event.spi.PostLoadEventListener; -import org.hibernate.event.spi.PostUpdateEvent; -import org.hibernate.event.spi.PostUpdateEventListener; -import org.hibernate.event.spi.PreDeleteEvent; -import org.hibernate.event.spi.PreDeleteEventListener; -import org.hibernate.event.spi.PreInsertEvent; -import org.hibernate.event.spi.PreInsertEventListener; -import org.hibernate.event.spi.PreLoadEvent; -import org.hibernate.event.spi.PreLoadEventListener; -import org.hibernate.event.spi.PreUpdateEvent; -import org.hibernate.event.spi.PreUpdateEventListener; -import org.hibernate.event.spi.SaveOrUpdateEvent; -import org.hibernate.event.spi.SaveOrUpdateEventListener; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaDAOSupplier; -import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaJpaSupport; import org.nuiton.topia.TopiaListenableSupport; import org.nuiton.topia.TopiaPersistenceContext; @@ -70,20 +56,9 @@ import org.nuiton.topia.event.TopiaTransactionVetoable; import org.nuiton.topia.persistence.AbstractTopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaEntityContextable; import org.nuiton.util.CategorisedListenerSet; import org.nuiton.util.ListenerSet; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.beans.VetoableChangeSupport; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * TODO-fdesbois-20100507 : Need translation of javadoc. * @@ -95,44 +70,32 @@ */ public class TopiaFiresSupport implements TopiaListenableSupport { - static private Log log = LogFactory.getLog(TopiaFiresSupport.class); + private static final Log log = LogFactory.getLog(TopiaFiresSupport.class); /** used to fire read event */ final static Object NO_CHANGE = new Object(); /** used to collect entity modification during transaction */ - protected Map<TopiaEntity, EntityState> transactionEntities = - new IdentityMap(); + protected Map<TopiaEntity, EntityState> transactionEntities = new IdentityMap(); - protected Set<PropertyChangeListener> propertyChangeListeners = - new HashSet<PropertyChangeListener>(); + protected Set<PropertyChangeListener> propertyChangeListeners = new HashSet<PropertyChangeListener>(); /* Pour la transaction */ + protected ListenerSet<TopiaTransactionListener> transactionListeners = new ListenerSet<TopiaTransactionListener>(); - protected ListenerSet<TopiaTransactionListener> transactionListeners = - new ListenerSet<TopiaTransactionListener>(); + protected ListenerSet<TopiaTransactionVetoable> transactionVetoables = new ListenerSet<TopiaTransactionVetoable>(); - protected ListenerSet<TopiaTransactionVetoable> transactionVetoables = - new ListenerSet<TopiaTransactionVetoable>(); - /* Pour les entités */ + protected CategorisedListenerSet<TopiaEntityListener> entityListeners = new CategorisedListenerSet<TopiaEntityListener>(); - protected CategorisedListenerSet<TopiaEntityListener> entityListeners = - new CategorisedListenerSet<TopiaEntityListener>(); + protected CategorisedListenerSet<TopiaEntityVetoable> entityVetoables = new CategorisedListenerSet<TopiaEntityVetoable>(); - protected CategorisedListenerSet<TopiaEntityVetoable> entityVetoables = - new CategorisedListenerSet<TopiaEntityVetoable>(); - /* Pour les listes d'entités */ + protected ListenerSet<TopiaEntitiesVetoable> entitiesVetoables = new ListenerSet<TopiaEntitiesVetoable>(); - protected ListenerSet<TopiaEntitiesVetoable> entitiesVetoables = - new ListenerSet<TopiaEntitiesVetoable>(); - /* Pour les actions du topia context */ + protected ListenerSet<TopiaSchemaListener> topiaSchemaListeners = new ListenerSet<TopiaSchemaListener>(); - protected ListenerSet<TopiaSchemaListener> topiaSchemaListeners = - new ListenerSet<TopiaSchemaListener>(); - /** * used to register objects loaded during transaction. * @@ -239,8 +202,7 @@ if (log.isDebugEnabled()) { log.debug("fireOnPostCommit"); } - TopiaTransactionEvent e = new TopiaTransactionEvent(context, - transactionEntities); + TopiaTransactionEvent e = new TopiaTransactionEvent(context, transactionEntities); for (TopiaTransactionListener listener : transactionListeners) { try { listener.commit(e); @@ -257,8 +219,7 @@ if (log.isDebugEnabled()) { log.debug("fireOnPostRollback"); } - TopiaTransactionEvent e = new TopiaTransactionEvent(context, - transactionEntities); + TopiaTransactionEvent e = new TopiaTransactionEvent(context, transactionEntities); for (TopiaTransactionListener listener : transactionListeners) { try { listener.rollback(e); @@ -273,14 +234,13 @@ /* Fires sur les entités */ - public void fireOnPreCreate(TopiaContextImplementor context, + public void fireOnPreCreate(TopiaPersistenceContext context, TopiaEntity entity, Object[] state) { if (log.isDebugEnabled()) { log.debug("fireOnPreCreate"); } TopiaEntityEvent event = new TopiaEntityEvent(context, entity, state); - for (Iterator<TopiaEntityVetoable> l = entityVetoables.iterator(entity - .getClass()); l.hasNext();) { + for (Iterator<TopiaEntityVetoable> l = entityVetoables.iterator(entity.getClass()); l.hasNext();) { try { l.next().create(event); } catch (Exception eee) { @@ -289,34 +249,31 @@ } } - public void fireOnPostCreate(TopiaContextImplementor context, + public void fireOnPostCreate(TopiaPersistenceContext context, TopiaEntity entity, Object[] state) { if (log.isDebugEnabled()) { log.debug("fireOnPostCreate"); } warnOnCreateEntity(entity); TopiaEntityEvent event = new TopiaEntityEvent(context, entity, state); - for (Iterator<TopiaEntityListener> l = entityListeners.iterator(entity - .getClass()); l.hasNext();) { + for (Iterator<TopiaEntityListener> l = entityListeners.iterator(entity.getClass()); l.hasNext();) { try { l.next().create(event); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error("Can't fireOnPostCreate for entity: " + entity, - eee); + log.error("Can't fireOnPostCreate for entity: " + entity, eee); } } } } - public void fireOnPreLoad(TopiaContextImplementor context, + public void fireOnPreLoad(TopiaPersistenceContext context, TopiaEntity entity, Object[] state) { if (log.isDebugEnabled()) { log.debug("fireOnPreLoad"); } TopiaEntityEvent event = new TopiaEntityEvent(context, entity, state); - for (Iterator<TopiaEntityVetoable> l = entityVetoables.iterator(entity - .getClass()); l.hasNext();) { + for (Iterator<TopiaEntityVetoable> l = entityVetoables.iterator(entity .getClass()); l.hasNext();) { try { l.next().load(event); } catch (Exception eee) { @@ -332,29 +289,24 @@ } warnOnLoadEntity(entity); TopiaEntityEvent event = new TopiaEntityEvent(context, entity, state); - for (Iterator<TopiaEntityListener> l = entityListeners.iterator(entity - .getClass()); l.hasNext();) { + for (Iterator<TopiaEntityListener> l = entityListeners.iterator(entity.getClass()); l.hasNext();) { try { l.next().load(event); } catch (Exception eee) { if (log.isErrorEnabled()) { - log - .error( - "Can't fireOnPostLoad for entity: " - + entity, eee); + log.error("Can't fireOnPostLoad for entity: " + entity, eee); } } } } - public void fireOnPreUpdate(TopiaContextImplementor context, + public void fireOnPreUpdate(TopiaPersistenceContext context, TopiaEntity entity, Object[] state) { if (log.isDebugEnabled()) { log.debug("fireOnPreUpdate"); } TopiaEntityEvent event = new TopiaEntityEvent(context, entity, state); - for (Iterator<TopiaEntityVetoable> l = entityVetoables.iterator(entity - .getClass()); l.hasNext();) { + for (Iterator<TopiaEntityVetoable> l = entityVetoables.iterator(entity.getClass()); l.hasNext();) { try { l.next().update(event); } catch (Exception eee) { @@ -363,34 +315,31 @@ } } - public void fireOnPostUpdate(TopiaContextImplementor context, + public void fireOnPostUpdate(TopiaPersistenceContext context, TopiaEntity entity, Object[] state) { if (log.isDebugEnabled()) { log.debug("fireOnPostUpdate"); } warnOnUpdateEntity(entity); TopiaEntityEvent event = new TopiaEntityEvent(context, entity, state); - for (Iterator<TopiaEntityListener> l = entityListeners.iterator(entity - .getClass()); l.hasNext();) { + for (Iterator<TopiaEntityListener> l = entityListeners.iterator(entity.getClass()); l.hasNext();) { try { l.next().update(event); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error("Can't fireOnPostUpdate for entity: " + entity, - eee); + log.error("Can't fireOnPostUpdate for entity: " + entity, eee); } } } } - public void fireOnPreDelete(TopiaContextImplementor context, + public void fireOnPreDelete(TopiaPersistenceContext context, TopiaEntity entity, Object[] state) { if (log.isDebugEnabled()) { log.debug("fireOnPreDelete"); } TopiaEntityEvent event = new TopiaEntityEvent(context, entity, state); - for (Iterator<TopiaEntityVetoable> l = entityVetoables.iterator(entity - .getClass()); l.hasNext();) { + for (Iterator<TopiaEntityVetoable> l = entityVetoables.iterator(entity.getClass()); l.hasNext();) { try { l.next().delete(event); } catch (Exception eee) { @@ -399,21 +348,19 @@ } } - public void fireOnPostDelete(TopiaContextImplementor context, + public void fireOnPostDelete(TopiaPersistenceContext context, TopiaEntity entity, Object[] state) { if (log.isDebugEnabled()) { log.debug("fireOnPostDelete"); } warnOnDeleteEntity(entity); TopiaEntityEvent event = new TopiaEntityEvent(context, entity, state); - for (Iterator<TopiaEntityListener> l = entityListeners.iterator(entity - .getClass()); l.hasNext();) { + for (Iterator<TopiaEntityListener> l = entityListeners.iterator(entity.getClass()); l.hasNext();) { try { l.next().delete(event); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error("Can't fireOnPostDelete for entity: " + entity, - eee); + log.error("Can't fireOnPostDelete for entity: " + entity, eee); } } } @@ -465,8 +412,7 @@ } warnOnReadEntity(entity); try { - listeners.fireIndexedPropertyChange(propertyName, index, value, - NO_CHANGE); + listeners.fireIndexedPropertyChange(propertyName, index, value, NO_CHANGE); } catch (Exception eee) { if (log.isErrorEnabled()) { log.error("Can't fireOnPostRead", eee); @@ -502,15 +448,13 @@ } warnOnUpdateEntity(entity); if (propertyChangeListeners.size() > 0) { - PropertyChangeEvent e = new PropertyChangeEvent(entity, - propertyName, oldValue, newValue); + PropertyChangeEvent e = new PropertyChangeEvent(entity, propertyName, oldValue, newValue); for (PropertyChangeListener l : propertyChangeListeners) { try { l.propertyChange(e); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error("Can't fire property change for: " - + propertyName, eee); + log.error("Can't fire property change for: " + propertyName, eee); } } } @@ -536,8 +480,7 @@ } warnOnUpdateEntity(entity); try { - listeners.fireIndexedPropertyChange(propertyName, index, oldValue, - newValue); + listeners.fireIndexedPropertyChange(propertyName, index, oldValue, newValue); } catch (Exception eee) { if (log.isErrorEnabled()) { log.error("Can't fireOnPostWrite", eee); @@ -546,232 +489,6 @@ } /** - * Object permettant de faire le lien entre les events hibernate et topia - * - * @author poussin <poussin(a)codelutin.com> - */ - static public class TopiaHibernateEvent implements PreInsertEventListener, - PostInsertEventListener, PreLoadEventListener, - PostLoadEventListener, PreUpdateEventListener, - PostUpdateEventListener, PreDeleteEventListener, - PostDeleteEventListener, SaveOrUpdateEventListener { - - private static final long serialVersionUID = 7303593133642169218L; - - protected TopiaContextImplementor rootContext; - - public TopiaHibernateEvent(TopiaContextImplementor rootContext) { - this.rootContext = rootContext; - } - - /** - * Recherche le context utilisant la session hibernate passe en - * parametre - * - * @param parent le context parent - * @param hibernate la session hibernate que doit utiliser le - * TopiaContext pour etre retourne - * @return le TopiaContext utilisant cette session hibernate ou null si - * aucun TopiaContext n'utilise cette session. - */ - protected TopiaContextImplementor getContext( - TopiaContextImplementor parent, Session hibernate) { - TopiaContextImplementor result = null; - - // FD-20100421 : Ano #546 : no need to copy childContext, the - // {@link #getChildContext()} provides a thread-safe copy to iterate - // on it. -// Set<TopiaContextImplementor> contextChilds = new HashSet<TopiaContextImplementor>(parent.getChildContext()); - for (TopiaContextImplementor context : parent.getChildContext()) { - -// by sletellier 24/09/09 : Fix concurent acces error -// ArrayList<TopiaContextImplementor> children = new ArrayList(parent.getChildContext()); -// for (TopiaContextImplementor context : children) { - try { - if (context.getHibernate() == hibernate) { - result = context; - } else { - // TODO: poussin 20090706 on pourrait ameliorer en ne faisant pas un parcours recursif, en utilisant la liste children (sans doute a transformer en stack) - result = getContext(context, hibernate); - } - if (result != null) { - break; - } - } catch (TopiaException eee) { - if (log.isWarnEnabled()) { - log.warn("Error durant la recherche d'un context pour" - + " lancer un event", eee); - } - } - } - return result; - } - - private void attachContext(Object entity, - TopiaDAOSupplier daoSupplier) { - if (entity instanceof TopiaEntityContextable) { - TopiaEntityContextable topiaEntityContextable = (TopiaEntityContextable) entity; - if (topiaEntityContextable.getTopiaDAOSupplier() == null) { - try { - topiaEntityContextable.setTopiaDAOSupplier(daoSupplier); - } catch (TopiaException eee) { - if (log.isWarnEnabled()) { - log.warn("Impossible d'initialiser le TopiaContext" - + " sur cette entité : " + topiaEntityContextable, - eee); - } - } - } - } - } - - /* Création */ - - @Override - public boolean onPreInsert(PreInsertEvent event) { - TopiaContextImplementor context = getContext(rootContext, event - .getSession()); - if (context != null && event.getEntity() instanceof TopiaEntity) { - TopiaEntity entity = (TopiaEntity) event.getEntity(); - context.getFiresSupport().fireOnPreCreate(context, entity, event.getState()); - - // when using composition, hibernate will persist entities by him self - // entity must have an id in this case. - if (StringUtils.isBlank(entity.getTopiaId())) { - if (log.isDebugEnabled()) { - log.debug("Adding topia id on entity " + entity.getClass().getSimpleName()); - } - } - } - - return false; - } - - @Override - public void onPostInsert(PostInsertEvent event) { - TopiaContextImplementor context = getContext(rootContext, event - .getSession()); - if (context != null && event.getEntity() instanceof TopiaEntity) { - context.getFiresSupport().fireOnPostCreate(context, - (TopiaEntity) event.getEntity(), event.getState()); - } - } - - /* Chargement */ - - @Override - public void onPreLoad(PreLoadEvent event) { - TopiaContextImplementor context = getContext(rootContext, event - .getSession()); - if (context != null && event.getEntity() instanceof TopiaEntity) { - // try { - context.getFiresSupport().fireOnPreLoad(context, - (TopiaEntity) event.getEntity(), event.getState()); - //TODO (thimel 20071213) On commente pour le moment @see(TopiaDAOHibernate#filterElements) - // } catch (TopiaVetoException tve) { - // //On ne fait pas de remontee d'exception - // vers Hibernate pour le preLoad, on va agir au niveau du DAO - // } - } - } - - @Override - public void onPostLoad(PostLoadEvent event) { -// TopiaContextImplementor context = getContext(rootContext, event -// .getSession()); - TopiaDAOSupplier daoSupplier = null; // TODO brendan 30/09/13 Implment - if (daoSupplier != null && event.getEntity() instanceof TopiaEntity) { - attachContext(event.getEntity(), daoSupplier); - TopiaEntity entity = (TopiaEntity)event.getEntity(); - AbstractTopiaDAO<? extends TopiaEntity> dao = (AbstractTopiaDAO)daoSupplier.getDAO(entity.getClass()); - dao.getTopiaFiresSupport().fireOnPostLoad(dao, - (TopiaEntity) event.getEntity(), new Object[]{}); - } - } - - /* Modification */ - - @Override - public boolean onPreUpdate(PreUpdateEvent event) { - TopiaContextImplementor context = getContext(rootContext, event - .getSession()); - if (context != null && event.getEntity() instanceof TopiaEntity) { - context.getFiresSupport().fireOnPreUpdate(context, - (TopiaEntity) event.getEntity(), event.getOldState()); - } - return false; - } - - @Override - public void onPostUpdate(PostUpdateEvent event) { - TopiaContextImplementor context = getContext(rootContext, event - .getSession()); - if (context != null && event.getEntity() instanceof TopiaEntity) { - context.getFiresSupport().fireOnPostUpdate(context, - (TopiaEntity) event.getEntity(), event.getState()); - } - // FIXME indexation - // if (!(entity instanceof NotIndexable) && context.isIndexEnabled()) { - // context.getIndexEnginImplementor().recordForIndexation(id, event.getState()); - // } - } - - /* Suppression */ - - @Override - public boolean onPreDelete(PreDeleteEvent event) { - TopiaContextImplementor context = getContext(rootContext, event - .getSession()); - if (context != null && event.getEntity() instanceof TopiaEntity) { - context.getFiresSupport().fireOnPreDelete(context, - (TopiaEntity) event.getEntity(), - event.getDeletedState()); - } - return false; - } - - @Override - public void onPostDelete(PostDeleteEvent event) { - TopiaContextImplementor context = getContext(rootContext, event - .getSession()); - if (context != null && event.getEntity() instanceof TopiaEntity) { - context.getFiresSupport().fireOnPostDelete(context, - (TopiaEntity) event.getEntity(), - event.getDeletedState()); - } -// FIXME indexation -// if (!(entity instanceof NotIndexable) && context.isIndexEnabled()) { -// context.getIndexEnginImplementor().recordForIndexation(id, null); -// } - } - - @Override - public void onSaveOrUpdate(SaveOrUpdateEvent event) throws HibernateException { - try { - // this event is called when hibernate try to persist entities - // using cascade (save) - TopiaContextImplementor context = getContext(rootContext, event.getSession()); - // warning, event.getEntity() return null here :( - if (event.getObject() instanceof TopiaEntity) { - TopiaEntity entity = (TopiaEntity)event.getObject(); - if (StringUtils.isBlank(entity.getTopiaId())) { - if (log.isDebugEnabled()) { - log.debug("Adding topiaId into entity " + entity.getClass()); - } - // FIXME echatellier 20130713 : hack to find interface for current entity class - // #newTopiaId only accept interface - Class entityInterface = Class.forName(event.getEntityName().replace("Impl", "")); - String topiaId = context.getTopiaIdFactory().newTopiaId(entityInterface, entity); - entity.setTopiaId(topiaId); - } - } - } catch (ClassNotFoundException ex) { - throw new HibernateException("Can't set id", ex); - } - } - } - - /** * Notify topia context listeners for create schema pre operation * * @param context topia context @@ -852,7 +569,7 @@ * * @param context topia context */ - public void firePreRestoreSchema(TopiaContext context) { + public void firePreRestoreSchema(TopiaPersistenceContext context) { if (log.isDebugEnabled()) { log.debug("firePreRestoreSchema"); } @@ -871,7 +588,7 @@ * * @param context topia context */ - public void firePostRestoreSchema(TopiaContext context) { + public void firePostRestoreSchema(TopiaPersistenceContext context) { if (log.isDebugEnabled()) { log.debug("firePostRestoreSchema"); } Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -0,0 +1,270 @@ +package org.nuiton.topia.framework; + +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.HibernateException; +import org.hibernate.Session; +import org.hibernate.event.spi.PostDeleteEvent; +import org.hibernate.event.spi.PostDeleteEventListener; +import org.hibernate.event.spi.PostInsertEvent; +import org.hibernate.event.spi.PostInsertEventListener; +import org.hibernate.event.spi.PostLoadEvent; +import org.hibernate.event.spi.PostLoadEventListener; +import org.hibernate.event.spi.PostUpdateEvent; +import org.hibernate.event.spi.PostUpdateEventListener; +import org.hibernate.event.spi.PreDeleteEvent; +import org.hibernate.event.spi.PreDeleteEventListener; +import org.hibernate.event.spi.PreInsertEvent; +import org.hibernate.event.spi.PreInsertEventListener; +import org.hibernate.event.spi.PreLoadEvent; +import org.hibernate.event.spi.PreLoadEventListener; +import org.hibernate.event.spi.PreUpdateEvent; +import org.hibernate.event.spi.PreUpdateEventListener; +import org.hibernate.event.spi.SaveOrUpdateEvent; +import org.hibernate.event.spi.SaveOrUpdateEventListener; +import org.nuiton.topia.TopiaDAOSupplier; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.AbstractTopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityContextable; + +/** + * @author Arnaud Thimel <thimel(a)codelutin.com> + */ +public class TopiaHibernateEventListener implements PreInsertEventListener, PostInsertEventListener, + PreLoadEventListener, PostLoadEventListener, PreUpdateEventListener, PostUpdateEventListener, + PreDeleteEventListener, PostDeleteEventListener, SaveOrUpdateEventListener { + + private static final Log log = LogFactory.getLog(TopiaHibernateEventListener.class); + + private static final long serialVersionUID = -9206039888626756924L; + + protected TopiaContextImplementor rootContext; + + public TopiaHibernateEventListener(TopiaContextImplementor rootContext) { + this.rootContext = rootContext; + } + + /** + * Recherche le context utilisant la session hibernate passe en + * parametre + * + * @param parent le context parent + * @param hibernate la session hibernate que doit utiliser le + * TopiaContext pour etre retourne + * @return le TopiaContext utilisant cette session hibernate ou null si + * aucun TopiaContext n'utilise cette session. + */ + protected TopiaContextImplementor getContext( + TopiaContextImplementor parent, Session hibernate) { + TopiaContextImplementor result = null; + + // FD-20100421 : Ano #546 : no need to copy childContext, the + // {@link #getChildContext()} provides a thread-safe copy to iterate + // on it. +// Set<TopiaContextImplementor> contextChilds = new HashSet<TopiaContextImplementor>(parent.getChildContext()); + if (parent != null) { // TODO AThimel 11/10/13 It should never be null, fix it + for (TopiaContextImplementor context : parent.getChildContext()) { + + // by sletellier 24/09/09 : Fix concurent acces error + // ArrayList<TopiaContextImplementor> children = new ArrayList(parent.getChildContext()); + // for (TopiaContextImplementor context : children) { + try { + if (context.getHibernate() == hibernate) { + result = context; + } else { + // TODO: poussin 20090706 on pourrait ameliorer en ne faisant pas un parcours recursif, en utilisant la liste children (sans doute a transformer en stack) + result = getContext(context, hibernate); + } + if (result != null) { + break; + } + } catch (TopiaException eee) { + if (log.isWarnEnabled()) { + log.warn("Error durant la recherche d'un context pour" + + " lancer un event", eee); + } + } + } + } + return result; + } + + private void attachContext(Object entity, + TopiaDAOSupplier daoSupplier) { + if (entity instanceof TopiaEntityContextable) { + TopiaEntityContextable topiaEntityContextable = (TopiaEntityContextable) entity; + if (topiaEntityContextable.getTopiaDAOSupplier() == null) { + try { + topiaEntityContextable.setTopiaDAOSupplier(daoSupplier); + } catch (TopiaException eee) { + if (log.isWarnEnabled()) { + log.warn("Impossible d'initialiser le TopiaContext" + + " sur cette entité : " + topiaEntityContextable, + eee); + } + } + } + } + } + + /* Création */ + + @Override + public boolean onPreInsert(PreInsertEvent event) { + TopiaContextImplementor context = getContext(rootContext, event.getSession()); + if (context != null && event.getEntity() instanceof TopiaEntity) { + TopiaEntity entity = (TopiaEntity) event.getEntity(); + context.getFiresSupport().fireOnPreCreate(context, entity, event.getState()); + + // when using composition, hibernate will persist entities by him self + // entity must have an id in this case. + if (StringUtils.isBlank(entity.getTopiaId())) { + if (log.isDebugEnabled()) { + log.debug("Adding topia id on entity " + entity.getClass().getSimpleName()); + } + } + } + + return false; + } + + @Override + public void onPostInsert(PostInsertEvent event) { + TopiaContextImplementor context = getContext(rootContext, event + .getSession()); + if (context != null && event.getEntity() instanceof TopiaEntity) { + context.getFiresSupport().fireOnPostCreate(context, (TopiaEntity) event.getEntity(), event.getState()); + } + } + + /* Chargement */ + + @Override + public void onPreLoad(PreLoadEvent event) { + TopiaContextImplementor context = getContext(rootContext, event + .getSession()); + if (context != null && event.getEntity() instanceof TopiaEntity) { + // try { + context.getFiresSupport().fireOnPreLoad(context, (TopiaEntity) event.getEntity(), event.getState()); + //TODO (thimel 20071213) On commente pour le moment @see(TopiaDAOHibernate#filterElements) + // } catch (TopiaVetoException tve) { + // //On ne fait pas de remontee d'exception + // vers Hibernate pour le preLoad, on va agir au niveau du DAO + // } + } + } + + @Override + public void onPostLoad(PostLoadEvent event) { +// TopiaContextImplementor context = getContext(rootContext, event +// .getSession()); + TopiaDAOSupplier daoSupplier = null; // TODO brendan 30/09/13 Implment + if (daoSupplier != null && event.getEntity() instanceof TopiaEntity) { + attachContext(event.getEntity(), daoSupplier); + TopiaEntity entity = (TopiaEntity) event.getEntity(); + AbstractTopiaDAO<? extends TopiaEntity> dao = (AbstractTopiaDAO) daoSupplier.getDAO(entity.getClass()); + dao.getTopiaFiresSupport().fireOnPostLoad(dao, (TopiaEntity) event.getEntity(), new Object[]{}); + } + } + + /* Modification */ + + @Override + public boolean onPreUpdate(PreUpdateEvent event) { + TopiaContextImplementor context = getContext(rootContext, event + .getSession()); + if (context != null && event.getEntity() instanceof TopiaEntity) { + context.getFiresSupport().fireOnPreUpdate(context, (TopiaEntity) event.getEntity(), event.getOldState()); + } + return false; + } + + @Override + public void onPostUpdate(PostUpdateEvent event) { + TopiaContextImplementor context = getContext(rootContext, event + .getSession()); + if (context != null && event.getEntity() instanceof TopiaEntity) { + context.getFiresSupport().fireOnPostUpdate(context, (TopiaEntity) event.getEntity(), event.getState()); + } + // FIXME indexation + // if (!(entity instanceof NotIndexable) && context.isIndexEnabled()) { + // context.getIndexEnginImplementor().recordForIndexation(id, event.getState()); + // } + } + + /* Suppression */ + + @Override + public boolean onPreDelete(PreDeleteEvent event) { + TopiaContextImplementor context = getContext(rootContext, event + .getSession()); + if (context != null && event.getEntity() instanceof TopiaEntity) { + context.getFiresSupport().fireOnPreDelete(context, (TopiaEntity) event.getEntity(), event.getDeletedState()); + } + return false; + } + + @Override + public void onPostDelete(PostDeleteEvent event) { + TopiaContextImplementor context = getContext(rootContext, event + .getSession()); + if (context != null && event.getEntity() instanceof TopiaEntity) { + context.getFiresSupport().fireOnPostDelete(context, (TopiaEntity) event.getEntity(), event.getDeletedState()); + } +// FIXME indexation +// if (!(entity instanceof NotIndexable) && context.isIndexEnabled()) { +// context.getIndexEnginImplementor().recordForIndexation(id, null); +// } + } + + @Override + public void onSaveOrUpdate(SaveOrUpdateEvent event) throws HibernateException { + try { + // this event is called when hibernate try to persist entities + // using cascade (save) + TopiaContextImplementor context = getContext(rootContext, event.getSession()); + // warning, event.getEntity() return null here :( + if (event.getObject() instanceof TopiaEntity) { + TopiaEntity entity = (TopiaEntity) event.getObject(); + if (StringUtils.isBlank(entity.getTopiaId())) { + if (log.isDebugEnabled()) { + log.debug("Adding topiaId into entity " + entity.getClass()); + } + // FIXME echatellier 20130713 : hack to find interface for current entity class + // #newTopiaId only accept interface + Class entityInterface = Class.forName(event.getEntityName().replace("Impl", "")); + String topiaId = context.getTopiaIdFactory().newTopiaId(entityInterface, entity); + entity.setTopiaId(topiaId); + } + } + } catch (ClassNotFoundException ex) { + throw new HibernateException("Can't set id", ex); + } + } +} Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaHibernateEventListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -68,7 +68,7 @@ public class TopiaUtil { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TopiaUtil.class); + private static final Log log = LogFactory.getLog(TopiaUtil.class); /** * Permet de récupérer le fichier de propriété ayant le nom passé en @@ -81,7 +81,7 @@ * le fichier devant contenir les propriétés * n'est pas retrouvé. */ - static public Properties getProperties(String pathOrUrl) + public static Properties getProperties(String pathOrUrl) throws TopiaNotFoundException { return getProperties(null, pathOrUrl); } @@ -99,7 +99,7 @@ * le fichier devant contenir les propriétés * n'est pas retrouvé. */ - static public Properties getProperties(Properties parent, String pathOrUrl) + public static Properties getProperties(Properties parent, String pathOrUrl) throws TopiaNotFoundException { Properties result = new RecursiveProperties(parent); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ApplicationContextTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ApplicationContextTransformer.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ApplicationContextTransformer.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -174,7 +174,10 @@ addAnnotation(output, op, Override.class); setOperationBody(op, "" /*{ - return new <%=persistenceContextConcreteName%>(getHibernateProvider(), getTopiaListenableSupport(), getTopiaIdFactory()); + <%=persistenceContextConcreteName%> newContext = new <%=persistenceContextConcreteName%>( + getHibernateProvider(), getTopiaListenableSupport(), getTopiaIdFactory()); + registerPersistenceContext(newContext); + return newContext; }*/ ); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -39,6 +39,7 @@ import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; import org.nuiton.eugene.models.object.xml.ObjectModelEnumerationImpl; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaDAOSupplier; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; @@ -183,12 +184,12 @@ // specialized getXXXDao method op = addOperation(daoHelper, "get" + daoClazzName, clazz.getPackageName() + '.' + daoClazzName, ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); - addParameter(op, TopiaContext.class, "context"); + addParameter(op, TopiaDAOSupplier.class, "supplier"); addImport(daoHelper, clazz); addException(op, TopiaException.class); setOperationBody(op, "" /*{ - <%=daoClazzName%> result = context.getDAO(<%=clazzName%>.class, <%=daoClazzName%>.class); + <%=daoClazzName%> result = supplier.getDAO(<%=clazzName%>.class, <%=daoClazzName%>.class); return result; }*/ ); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaDatabase.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaDatabase.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaDatabase.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -26,6 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.cfg.Configuration; import org.junit.rules.TestWatcher; import org.junit.runner.Description; @@ -70,8 +71,10 @@ private Properties dbConfiguration; - private TopiaContext rootCtxt; + private TopiaTestTopiaApplicationContext applicationContext; + private Configuration hibernateCfg; + private final String configurationPath; public TopiaDatabase() { @@ -122,7 +125,15 @@ onDbConfigurationCreate(dbConfiguration, testBasedir, dbPath); - rootCtxt = TopiaContextFactory.getContext(dbConfiguration); +// rootCtxt = TopiaContextFactory.getContext(dbConfiguration); + applicationContext = new TopiaTestTopiaApplicationContext(dbConfiguration) { + @Override + protected HibernateProvider getHibernateProvider() { + HibernateProvider provider = super.getHibernateProvider(); + hibernateCfg = provider.getHibernateConfiguration(); + return provider; + } + }; } catch (Exception e) { throw new IllegalStateException( "Could not start db at " + testBasedir, e); @@ -132,16 +143,16 @@ @Override public void finished(Description description) { - if (rootCtxt != null && !rootCtxt.isClosed()) { + if (applicationContext != null && !applicationContext.isClosed()) { try { - rootCtxt.closeContext(); + applicationContext.closeContext(); } catch (TopiaException e) { if (log.isErrorEnabled()) { log.error("Could not close topia root context", e); } } } - rootCtxt = null; + applicationContext = null; dbConfiguration = null; } @@ -149,18 +160,22 @@ return testBasedir; } - public TopiaContext getRootCtxt() { - return rootCtxt; - } - public Properties getDbConfiguration() { return dbConfiguration; } - public TopiaContext beginTransaction() throws TopiaException { - return rootCtxt.beginTransaction(); + public TopiaTestTopiaApplicationContext getApplicationContext() { + return applicationContext; } + public Configuration getHibernateCfg() { + return hibernateCfg; + } + + public TopiaTestTopiaPersistenceContext beginTransaction() throws TopiaException { + return applicationContext.newPersistenceContext(); + } + protected void onDbConfigurationCreate(Properties configuration, File testDir, String dbPath) { Copied: trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaJpaSupportTest.java (from rev 2842, trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java) =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaJpaSupportTest.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/TopiaJpaSupportTest.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -0,0 +1,161 @@ +/* + * #%L + * ToPIA :: Persistence :: Test Compatibility Kit + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 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% + */ +package org.nuiton.topia; + +import java.util.List; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.nuiton.topiatest.Address; +import org.nuiton.topiatest.AddressDAO; +import org.nuiton.topiatest.Gender; +import org.nuiton.topiatest.Personne; +import org.nuiton.topiatest.PersonneDAO; + +/** + * Tests the TopiaContext#find|findAll|findUnique methods + * + * @author Arnaud Thimel <thimel(a)codelutin.com> + */ +public class TopiaJpaSupportTest { + + @Rule + public final TopiaDatabase db = new TopiaDatabase(); + + protected TopiaTestTopiaPersistenceContext persistenceContext; + protected TopiaJpaSupport jpaSupport; + protected AddressDAO addressDAO; + protected PersonneDAO personneDAO; + protected Address address; + + @Before + public void createCompanies() throws TopiaException { + persistenceContext = db.beginTransaction(); + jpaSupport = persistenceContext.jpaSupport; + + personneDAO = persistenceContext.getPersonneDAO(); + addressDAO = persistenceContext.getAddressDAO(); + + address = addressDAO.create( + Address.PROPERTY_ADRESS, "17 rue de la Pote Gellée, 44200 NANTES"); + + personneDAO.create( + Personne.PROPERTY_NAME, "Arnaud", + Personne.PROPERTY_GENDER, Gender.MALE); + personneDAO.create( + Personne.PROPERTY_NAME, "Charlotte", + Personne.PROPERTY_GENDER, Gender.FEMALE); + personneDAO.create( + Personne.PROPERTY_NAME, "Hortense", + Personne.PROPERTY_GENDER, Gender.FEMALE); + persistenceContext.commitTransaction(); + } + + @Test + public void testFindDAO() throws TopiaException { + Assert.assertEquals(3, personneDAO.count()); + + Assert.assertEquals(2, personneDAO.findAllByGender(Gender.FEMALE).size()); + Assert.assertNotNull(personneDAO.findByGender(Gender.FEMALE)); + Assert.assertNotNull(personneDAO.findByGender(Gender.MALE)); + Assert.assertNull(personneDAO.findByGender(null)); + + Assert.assertEquals(0, personneDAO.findAllByName("nobody").size()); + } + + @Test + public void testFindAll() throws TopiaException { + Assert.assertEquals(3, personneDAO.count()); + + String query = "from " + Personne.class.getName() + + " where " + Personne.PROPERTY_GENDER + "=:g"; + + List females = jpaSupport.findAll(query, "g", Gender.FEMALE); + Assert.assertEquals(2, females.size()); + + List males = jpaSupport.findAll(query, "g", Gender.MALE); + Assert.assertEquals(1, males.size()); + + List all = jpaSupport.findAll("from " + Personne.class.getName()); + Assert.assertEquals(3, all.size()); + + List none = jpaSupport.findAll("from " + Personne.class.getName() + + " where " + Personne.PROPERTY_NAME + "=:pax", "pax", "nobody"); + Assert.assertEquals(0, none.size()); + } + + @Test + public void testFind() throws TopiaException { + Assert.assertEquals(3, personneDAO.count()); + + String query = "from " + Personne.class.getName() + + " where " + Personne.PROPERTY_GENDER + "=:g"; + + List females = jpaSupport.find(query, 0, 100, "g", Gender.FEMALE); + Assert.assertEquals(2, females.size()); + + females = jpaSupport.find(query, 0, 0, "g", Gender.FEMALE); + Assert.assertEquals(1, females.size()); + Personne charlotte = (Personne)females.get(0); + + females = jpaSupport.find(query, 1, 1, "g", Gender.FEMALE); + Assert.assertEquals(1, females.size()); + Personne hortense = (Personne)females.get(0); + + Assert.assertFalse(hortense.equals(charlotte)); + + // endIndex = -1 not supported in ToPIA 2.6, wait for 3.0 +// females = context.find(query, 0, -1, "g", Gender.FEMALE); +// Assert.assertEquals(2, females.size()); + } + + @Test + public void testFindUnique() throws TopiaException { + Assert.assertEquals(3, personneDAO.count()); + + String query = "from " + Personne.class.getName() + + " where " + Personne.PROPERTY_GENDER + "=:g"; + + Object male = jpaSupport.findUnique(query, "g", Gender.MALE); + Assert.assertNotNull(male); + + Object none = jpaSupport.findUnique("from " + Personne.class.getName() + + " where " + Personne.PROPERTY_NAME + "=:pax", "pax", "nobody"); + Assert.assertNull(none); + } + + @Test(expected = TopiaException.class) + public void testFindUniqueOutOfBounds() throws TopiaException { + Assert.assertEquals(3, personneDAO.count()); + + String query = "from " + Personne.class.getName() + + " where " + Personne.PROPERTY_GENDER + "=:g"; + + Object female = jpaSupport.findUnique(query, "g", Gender.FEMALE); + Assert.assertNotNull(female); + } + +} Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -27,11 +27,11 @@ import org.junit.Assert; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topia.TopiaTestTopiaPersistenceContext; import org.nuiton.topia.test.entities.Person; import org.nuiton.topia.test.entities.PersonDAO; import org.nuiton.topiatest.Personne; @@ -122,7 +122,7 @@ } private void doStuffOnDb() throws TopiaException { - TopiaContext transaction = db.beginTransaction(); + TopiaTestTopiaPersistenceContext transaction = db.beginTransaction(); try { PersonDAO dao = TopiaTestDAOHelper.getPersonDAO(transaction); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextReplicateTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextReplicateTest.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextReplicateTest.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -31,6 +31,7 @@ import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topia.TopiaTestTopiaPersistenceContext; import org.nuiton.topia.test.entities.Person; import org.nuiton.topia.test.entities.PersonDAO; import org.nuiton.topia.test.entities.Pet; @@ -85,21 +86,19 @@ // "replicateTarget"); // - TopiaContext contextSource = dbSource.getRootCtxt(); - TopiaContext contextTarget = dbTarget.getRootCtxt(); // try { // contextSource = TopiaContextFactory.getContext(configSource); // contextTarget = TopiaContextFactory.getContext(configTarget); - TopiaContext txSource; - TopiaContext txTarget; + TopiaTestTopiaPersistenceContext txSource; + TopiaTestTopiaPersistenceContext txTarget; PersonDAO daoSource, daoTarget; PetDAO petDAOSource, petDAOTarget; Person personSource, personTarget; Pet petSource, petTarget; - txSource = contextSource.beginTransaction(); + txSource = dbSource.beginTransaction(); daoSource = TopiaTestDAOHelper.getPersonDAO(txSource); petDAOSource = TopiaTestDAOHelper.getPetDAO(txSource); @@ -126,7 +125,7 @@ Assert.assertEquals(1, personSource.sizePet()); Assert.assertEquals(petSource, personSource.getPet().iterator().next()); - txTarget = contextTarget.beginTransaction(); + txTarget = dbTarget.beginTransaction(); txSource.replicateEntity(txTarget, petSource); txSource.replicateEntity(txTarget, personSource); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -25,16 +25,16 @@ package org.nuiton.topia.framework; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.hibernate.cfg.Configuration; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.test.entities.PersonImpl; import org.nuiton.topiatest.Personne; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -92,24 +92,22 @@ @Test(expected = IllegalArgumentException.class) public void testIsSchemaExistFailed() throws Exception { - TopiaUtil.isSchemaExist(db.getRootCtxt(), "fake"); + TopiaUtil.isSchemaExist(db.getHibernateCfg(), "fake"); } @Test public void testIsSchemaExist() throws Exception { - TopiaContext rootContext = db.getRootCtxt(); - boolean actual = TopiaUtil.isSchemaExist(rootContext, - PersonImpl.class.getName()); - // FIXME echatellier 20130315 ce test fail depuis probablement a cause - // de hibernate.hbm2ddl.auto=update, à confirmer... - assertTrue(actual); - TopiaContext tx = rootContext.beginTransaction(); + String personClassName = PersonImpl.class.getName(); + Configuration hibernateCfg = db.getHibernateCfg(); - tx.createSchema(); - actual = TopiaUtil.isSchemaExist(rootContext, PersonImpl.class.getName()); + // First, test before DB is created, the table should not exist + assertFalse(TopiaUtil.isSchemaExist(hibernateCfg, personClassName)); - assertTrue(actual); + // Create schema + db.getApplicationContext().createSchema(); + // Now table should exist + assertTrue(TopiaUtil.isSchemaExist(hibernateCfg, personClassName)); } } Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -34,6 +34,7 @@ import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topia.TopiaTestTopiaPersistenceContext; import org.nuiton.topiatest.Company; import org.nuiton.topiatest.CompanyDAO; import org.nuiton.topiatest.Department; @@ -121,10 +122,10 @@ } // try { - TopiaContext newContext = db.beginTransaction(); + TopiaTestTopiaPersistenceContext newContext = db.beginTransaction(); - CompanyDAO companyDAO = TopiaTestDAOHelper.getCompanyDAO(newContext); - DepartmentDAO departmentDAO = TopiaTestDAOHelper.getDepartmentDAO(newContext); + CompanyDAO companyDAO = newContext.getCompanyDAO(); + DepartmentDAO departmentDAO = newContext.getDepartmentDAO(); Company company = companyDAO.create(); company.setName("Ma société"); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -30,10 +30,9 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topia.TopiaTestTopiaPersistenceContext; import org.nuiton.topiatest.Address; import org.nuiton.topiatest.AddressDAO; import org.nuiton.topiatest.Company; @@ -70,17 +69,17 @@ @Before public void setUp() throws TopiaException { - TopiaContext newContext = db.beginTransaction(); + TopiaTestTopiaPersistenceContext newContext = db.beginTransaction(); try { // company - CompanyDAO companyDAO = TopiaTestDAOHelper.getCompanyDAO(newContext); + CompanyDAO companyDAO = newContext.getCompanyDAO(); Company clCompany = companyDAO.create(Company.PROPERTY_NAME, "CodeLutin"); // employe - EmployeDAO employeDAO = TopiaTestDAOHelper.getEmployeDAO(newContext); + EmployeDAO employeDAO = newContext.getEmployeDAO(); Employe empl1 = employeDAO.create(Employe.PROPERTY_NAME, "boss", Employe.PROPERTY_SALARY, 30000); - AddressDAO adressDAO = TopiaTestDAOHelper.getAddressDAO(newContext); + AddressDAO adressDAO = newContext.getAddressDAO(); Address addr1 = adressDAO.create(Address.PROPERTY_CITY, "Nantes", Address.PROPERTY_ADRESS, "12 Avenue Jules Vernes"); empl1.setAddress(addr1); @@ -89,7 +88,7 @@ empl2.setAddress(addr2); // departement - DepartmentDAO departmentDAO = TopiaTestDAOHelper.getDepartmentDAO(newContext); + DepartmentDAO departmentDAO = newContext.getDepartmentDAO(); Department depComm = departmentDAO.create(Department.PROPERTY_NAME, "Commercial"); depComm.setLeader(empl1); @@ -116,9 +115,9 @@ @Test public void testExportXMLDepth() throws TopiaException { - TopiaContext context = db.beginTransaction(); + TopiaTestTopiaPersistenceContext context = db.beginTransaction(); - CompanyDAO companyDAO = TopiaTestDAOHelper.getCompanyDAO(context); + CompanyDAO companyDAO = context.getCompanyDAO(); Company clCompany = companyDAO.findByName("CodeLutin"); EntityVisitor delegateVisitor = new ExportXMLVisitor(); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -34,7 +34,10 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaPersistenceContext; import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topia.TopiaTestTopiaPersistenceContext; +import org.nuiton.topia.TopiaTransaction; import org.nuiton.topiatest.NaturalizedEntity; import org.nuiton.topiatest.NaturalizedEntityDAO; @@ -59,36 +62,36 @@ @Test public void testCreateSucessfull() throws Exception { log.debug("Test naturalId : create succesfull"); - TopiaContext transaction = db.beginTransaction(); + TopiaTestTopiaPersistenceContext persistenceContext = db.beginTransaction(); NaturalizedEntityDAO dao = - TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); + persistenceContext.getNaturalizedEntityDAO(); // No exception will be thrown with the two properties dao.createByNaturalId(5, "str"); - transaction.commitTransaction(); + persistenceContext.commitTransaction(); // No exception will only the need property dao.createByNotNull(3); - transaction.commitTransaction(); + persistenceContext.commitTransaction(); // No exception will only the need property dao.create(NaturalizedEntity.PROPERTY_NATURAL_ID_NOT_NULL, 3); - transaction.commitTransaction(); + persistenceContext.commitTransaction(); } @Test public void testCreateFailed() throws Exception { log.debug("Test naturalId : create failed"); - TopiaContext transaction = db.beginTransaction(); + TopiaTestTopiaPersistenceContext persistenceContext = db.beginTransaction(); NaturalizedEntityDAO dao = - TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); + persistenceContext.getNaturalizedEntityDAO(); // Exception will be throw try { dao.create(); - transaction.commitTransaction(); + persistenceContext.commitTransaction(); // Note : this is possible to create an empty entity if the type // is primitive like 'int' which have a default value of '0' @@ -106,19 +109,19 @@ public void testUpdateFailed() throws Exception { log.debug("Test naturalId : update failed"); - TopiaContext transaction = db.beginTransaction(); + TopiaTestTopiaPersistenceContext persistenceContext = db.beginTransaction(); NaturalizedEntityDAO dao = - TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); + persistenceContext.getNaturalizedEntityDAO(); NaturalizedEntity entity = dao.createByNaturalId(5, "str"); - transaction.commitTransaction(); + persistenceContext.commitTransaction(); // Exception will be throw : not allowed to modify a naturalId property try { entity.setNaturalIdNotNull(8); - transaction.commitTransaction(); + persistenceContext.commitTransaction(); } catch (TopiaException eee) { Assert.assertEquals("org.hibernate.HibernateException", eee.getCause().getClass().getName()); @@ -128,14 +131,15 @@ @Test public void testFindByNaturalId() throws Exception { log.debug("Test naturalId : findByNaturalId"); - TopiaContext transaction = db.beginTransaction(); + TopiaTestTopiaPersistenceContext persistenceContext = db.beginTransaction(); + NaturalizedEntityDAO dao = - TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); + persistenceContext.getNaturalizedEntityDAO(); NaturalizedEntity entity = dao.createByNaturalId(5, "str"); - transaction.commitTransaction(); + persistenceContext.commitTransaction(); NaturalizedEntity result = dao.findByNaturalId(5, "str"); @@ -145,13 +149,14 @@ @Test public void testExistNaturalId() throws Exception { log.debug("Test naturalId : existNaturalId"); - TopiaContext transaction = db.beginTransaction(); + TopiaTestTopiaPersistenceContext persistenceContext = db.beginTransaction(); + NaturalizedEntityDAO dao = - TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); + persistenceContext.getNaturalizedEntityDAO(); dao.createByNaturalId(5, "str"); - transaction.commitTransaction(); + persistenceContext.commitTransaction(); boolean result = dao.existByNaturalId(5, "str"); Deleted: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -1,162 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence :: Test Compatibility Kit - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2012 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% - */ -package org.nuiton.topia.persistence; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaDatabase; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaTestDAOHelper; -import org.nuiton.topiatest.Address; -import org.nuiton.topiatest.AddressDAO; -import org.nuiton.topiatest.Gender; -import org.nuiton.topiatest.Personne; -import org.nuiton.topiatest.PersonneDAO; - -import java.util.List; - -/** - * Tests the TopiaContext#find|findAll|findUnique methods - * - * @author Arnaud Thimel <thimel(a)codelutin.com> - */ -public class TopiaContextFindTest { - - @Rule - public final TopiaDatabase db = new TopiaDatabase(); - - protected TopiaContext context; - protected AddressDAO addressDAO; - protected PersonneDAO personneDAO; - protected Address address; - - @Before - public void createCompanies() throws TopiaException { - context = db.beginTransaction(); - personneDAO = TopiaTestDAOHelper.getPersonneDAO(context); - addressDAO = TopiaTestDAOHelper.getAddressDAO(context); - - address = addressDAO.create( - Address.PROPERTY_ADRESS, "17 rue de la Pote Gellée, 44200 NANTES"); - - personneDAO.create( - Personne.PROPERTY_NAME, "Arnaud", - Personne.PROPERTY_GENDER, Gender.MALE); - personneDAO.create( - Personne.PROPERTY_NAME, "Charlotte", - Personne.PROPERTY_GENDER, Gender.FEMALE); - personneDAO.create( - Personne.PROPERTY_NAME, "Hortense", - Personne.PROPERTY_GENDER, Gender.FEMALE); - context.commitTransaction(); - } - - @Test - public void testFindDAO() throws TopiaException { - Assert.assertEquals(3, personneDAO.count()); - - Assert.assertEquals(2, personneDAO.findAllByGender(Gender.FEMALE).size()); - Assert.assertNotNull(personneDAO.findByGender(Gender.FEMALE)); - Assert.assertNotNull(personneDAO.findByGender(Gender.MALE)); - Assert.assertNull(personneDAO.findByGender(null)); - - Assert.assertEquals(0, personneDAO.findAllByName("nobody").size()); - } - - @Test - public void testFindAll() throws TopiaException { - Assert.assertEquals(3, personneDAO.count()); - - String query = "from " + Personne.class.getName() + - " where " + Personne.PROPERTY_GENDER + "=:g"; - - List females = context.findAll(query, "g", Gender.FEMALE); - Assert.assertEquals(2, females.size()); - - List males = context.findAll(query, "g", Gender.MALE); - Assert.assertEquals(1, males.size()); - - List all = context.findAll("from " + Personne.class.getName()); - Assert.assertEquals(3, all.size()); - - List none = context.findAll("from " + Personne.class.getName() + - " where " + Personne.PROPERTY_NAME + "=:pax", "pax", "nobody"); - Assert.assertEquals(0, none.size()); - } - - @Test - public void testFind() throws TopiaException { - Assert.assertEquals(3, personneDAO.count()); - - String query = "from " + Personne.class.getName() + - " where " + Personne.PROPERTY_GENDER + "=:g"; - - List females = context.find(query, 0, 100, "g", Gender.FEMALE); - Assert.assertEquals(2, females.size()); - - females = context.find(query, 0, 0, "g", Gender.FEMALE); - Assert.assertEquals(1, females.size()); - Personne charlotte = (Personne)females.get(0); - - females = context.find(query, 1, 1, "g", Gender.FEMALE); - Assert.assertEquals(1, females.size()); - Personne hortense = (Personne)females.get(0); - - Assert.assertFalse(hortense.equals(charlotte)); - - // endIndex = -1 not supported in ToPIA 2.6, wait for 3.0 -// females = context.find(query, 0, -1, "g", Gender.FEMALE); -// Assert.assertEquals(2, females.size()); - } - - @Test - public void testFindUnique() throws TopiaException { - Assert.assertEquals(3, personneDAO.count()); - - String query = "from " + Personne.class.getName() + - " where " + Personne.PROPERTY_GENDER + "=:g"; - - Object male = context.findUnique(query, "g", Gender.MALE); - Assert.assertNotNull(male); - - Object none = context.findUnique("from " + Personne.class.getName() + - " where " + Personne.PROPERTY_NAME + "=:pax", "pax", "nobody"); - Assert.assertNull(none); - } - - @Test(expected = TopiaException.class) - public void testFindUniqueOutOfBounds() throws TopiaException { - Assert.assertEquals(3, personneDAO.count()); - - String query = "from " + Personne.class.getName() + - " where " + Personne.PROPERTY_GENDER + "=:g"; - - Object female = context.findUnique(query, "g", Gender.FEMALE); - Assert.assertNotNull(female); - } - -} Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -31,10 +31,9 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topia.TopiaTestTopiaPersistenceContext; import org.nuiton.topia.test.entities.Person; import org.nuiton.topia.test.entities.PersonDAO; @@ -54,7 +53,7 @@ @Rule public final TopiaDatabase db = new TopiaDatabase(); - protected TopiaContext context; + protected TopiaTestTopiaPersistenceContext context; protected PersonDAO dao; @@ -62,8 +61,7 @@ public void setup() throws TopiaException { context = db.beginTransaction(); - - dao = TopiaTestDAOHelper.getPersonDAO(context); + dao = context.getPersonDAO(); } /** Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -29,6 +29,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topia.TopiaTestTopiaPersistenceContext; import java.util.Arrays; @@ -39,7 +40,7 @@ @Test public void testAno1882() throws Exception { - TopiaContext transaction = db.beginTransaction(); + TopiaTestTopiaPersistenceContext transaction = db.beginTransaction(); FrenchCompanyDAO dao = TopiaTestDAOHelper.getFrenchCompanyDAO(transaction); SIRETDAO siretDAO = TopiaTestDAOHelper.getSIRETDAO(transaction); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -31,6 +31,7 @@ import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topia.TopiaTestTopiaPersistenceContext; /** * Test the support of possibility to have an attribute of type enumeration @@ -51,7 +52,7 @@ */ @Test public void storeEntityWithEnumValue() throws TopiaException { - TopiaContext transaction = db.beginTransaction(); + TopiaTestTopiaPersistenceContext transaction = db.beginTransaction(); PersonneDAO dao = TopiaTestDAOHelper.getPersonneDAO(transaction); Personne personne = new PersonneImpl(); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java 2013-10-11 16:53:04 UTC (rev 2842) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java 2013-10-11 22:40:03 UTC (rev 2843) @@ -47,6 +47,7 @@ import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topia.TopiaTestTopiaPersistenceContext; import org.nuiton.topiatest.Gender; import org.nuiton.topiatest.Personne; import org.nuiton.topiatest.PersonneDAO; @@ -81,7 +82,7 @@ public void testDeleteEntityWithInheritance() throws TopiaException { log.debug("START TEST : testDeleteEntityWithInheritance"); - TopiaContext transaction = db.beginTransaction(); + TopiaTestTopiaPersistenceContext transaction = db.beginTransaction(); log.debug("DAO : PersonneDAO"); PersonneDAO dao = TopiaTestDAOHelper.getPersonneDAO(transaction); @@ -132,7 +133,7 @@ public void testDeleteEntityWithManyToManyRelation() throws TopiaException { log.debug("START TEST : testDeleteEntityWithManyToManyRelation"); - TopiaContext transaction = db.beginTransaction(); + TopiaTestTopiaPersistenceContext transaction = db.beginTransaction(); PersonneDAO dao = TopiaTestDAOHelper.getPersonneDAO(transaction); @@ -183,7 +184,7 @@ public void testIsPersisted() { log.debug("START TEST : testIsPersisted"); - TopiaContext transaction = db.beginTransaction(); + TopiaTestTopiaPersistenceContext transaction = db.beginTransaction(); PersonneDAO dao = TopiaTestDAOHelper.getPersonneDAO(transaction);

1 0

r2842 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: . framework
by bleny＠users.nuiton.org Oct. 11, 2013

Oct. 11, 2013

Author: bleny Date: 2013-10-11 18:53:04 +0200 (Fri, 11 Oct 2013) New Revision: 2842 Url: http://nuiton.org/projects/topia/repository/revisions/2842 Log: implements TopiaReplicationSupport and move it on PersitenceContext Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaReplicationSupport.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaReplicationDestination.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaReplicationSupport.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java 2013-10-11 16:47:08 UTC (rev 2841) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java 2013-10-11 16:53:04 UTC (rev 2842) @@ -60,7 +60,7 @@ * @author Arnaud Thimel <thimel(a)codelutin.com> * @since 3.0 */ -public abstract class AbstractTopiaApplicationContext<K extends TopiaPersistenceContext> implements TopiaReplicationSupport, TopiaListenableSupport, TopiaServiceSupport { +public abstract class AbstractTopiaApplicationContext<K extends TopiaPersistenceContext> implements TopiaListenableSupport, TopiaServiceSupport { private static final Log log = LogFactory.getLog(AbstractTopiaApplicationContext.class); @@ -68,8 +68,6 @@ protected ImmutableMap<String, String> configuration; - protected TopiaReplicationSupport topiaReplicationSupport; - protected TopiaFiresSupport topiaFiresSupport = new TopiaFiresSupport(); protected TopiaServiceSupport topiaServiceSupport; @@ -146,21 +144,6 @@ } @Override - public void replicate(TopiaContext destinationContext, Object... entityAndCondition) throws IllegalArgumentException { - topiaReplicationSupport.replicate(destinationContext, entityAndCondition); - } - - @Override - public <T extends TopiaEntity> void replicateEntity(TopiaContext destinationContext, T entity) throws IllegalArgumentException { - topiaReplicationSupport.replicateEntity(destinationContext, entity); - } - - @Override - public <T extends TopiaEntity> void replicateEntities(TopiaContext destinationContext, List<T> entities) throws IllegalArgumentException { - topiaReplicationSupport.replicateEntities(destinationContext, entities); - } - - @Override public void addTopiaEntityListener(TopiaEntityListener listener) { topiaFiresSupport.addTopiaEntityListener(listener); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-11 16:47:08 UTC (rev 2841) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-11 16:53:04 UTC (rev 2842) @@ -24,9 +24,8 @@ * #L% */ -import java.lang.reflect.InvocationTargetException; -import java.util.Map; - +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.FlushMode; @@ -41,8 +40,9 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaIdFactory; -import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; +import java.lang.reflect.InvocationTargetException; +import java.util.List; +import java.util.Map; /** * Abstract implementation of the TopiaPersistenceContext. This class will be extended by a generated one in order to @@ -60,6 +60,8 @@ */ protected Map<Class<? extends TopiaEntity>, TopiaDAO<? extends TopiaEntity>> daoCache = Maps.newConcurrentMap(); + protected HibernateTopiaReplicationSupport hibernateTopiaReplicationSupport; + // TODO AThimel 27/09/13 Javadoc protected TopiaListenableSupport listenableSupport; @@ -366,4 +368,30 @@ return closed; } + protected HibernateTopiaReplicationSupport getHibernateTopiaReplicationSupport() { + if (hibernateTopiaReplicationSupport == null) { + hibernateTopiaReplicationSupport = new HibernateTopiaReplicationSupport(hibernateSupport); + } + return hibernateTopiaReplicationSupport; + } + + @Override + public void replicate(TopiaEntity entity) { + getHibernateTopiaReplicationSupport().replicate(entity); + } + + @Override + public <T extends TopiaEntity> void replicateEntities(TopiaReplicationDestination topiaReplicationDestination, List<T> entities) throws IllegalArgumentException { + getHibernateTopiaReplicationSupport().replicateEntities(topiaReplicationDestination, entities); + } + + @Override + public <T extends TopiaEntity> void replicateEntity(TopiaReplicationDestination topiaReplicationDestination, T entity) throws IllegalArgumentException { + getHibernateTopiaReplicationSupport().replicateEntity(topiaReplicationDestination, entity); + } + + @Override + public void replicate(TopiaReplicationDestination topiaReplicationDestination, Object... entityAndCondition) throws IllegalArgumentException { + getHibernateTopiaReplicationSupport().replicate(topiaReplicationDestination, entityAndCondition); + } } Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaReplicationSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaReplicationSupport.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaReplicationSupport.java 2013-10-11 16:53:04 UTC (rev 2842) @@ -0,0 +1,156 @@ +package org.nuiton.topia; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.HibernateException; +import org.hibernate.ReplicationMode; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.List; +import java.util.Map; + +public class HibernateTopiaReplicationSupport implements TopiaReplicationSupport, TopiaReplicationDestination { + + private static final Log log = LogFactory.getLog(HibernateTopiaReplicationSupport.class); + + protected TopiaHibernateSupport topiaHibernateSupport; + + public HibernateTopiaReplicationSupport(TopiaHibernateSupport topiaHibernateSupport) { + this.topiaHibernateSupport = topiaHibernateSupport; + } + + @Override + public void replicate( + TopiaReplicationDestination topiaReplicationDestination, + Object... entityAndCondition) throws IllegalArgumentException { + + String[] queries = buildQueries(entityAndCondition); + + try { + for (String query : queries) { + if (log.isDebugEnabled()) { + log.debug("acquire entities " + query); + } + // acquire data to replicate + List<?> entities = topiaHibernateSupport.getHibernateSession().createQuery(query).list(); + replicate0(topiaReplicationDestination, entities.toArray()); + if (log.isDebugEnabled()) { + log.debug("replication of entities " + query + + " was sucessfully done."); + } + } + } catch (HibernateException eee) { + throw new TopiaException(String.format("An error occurs while a replication operation: %s", + eee.getMessage()), eee); + } + } + + @Override + public <T extends TopiaEntity> void replicateEntity( + TopiaReplicationDestination topiaReplicationDestination, + T entity) throws IllegalArgumentException { + + replicate0(topiaReplicationDestination, entity); + + } + + @Override + public <T extends TopiaEntity> void replicateEntities( + TopiaReplicationDestination topiaReplicationDestination, + List<T> entities) throws IllegalArgumentException { + + replicate0(topiaReplicationDestination, entities.toArray()); + + } + + protected void replicate0(TopiaReplicationDestination topiaReplicationDestination, + Object... entities) { + try { + for (Object entity : entities) { + // dettach entity to source session, to make possible copy of + // collection without a hibernate exception (list opened in + // two session...) + topiaHibernateSupport.getHibernateSession().evict(entity); + topiaReplicationDestination.replicate((TopiaEntity) entity); + } + + } catch (HibernateException eee) { + throw new TopiaException(String.format("An error occurs while a replication operation : %s", + eee.getMessage()), eee); + } + } + + /** + * Build the list of queries from the given parameter + * <code>entityAndCondition</code>. + * + * If no parameter is given, then build the queries for all entities is db, + * with no condition. + * + * @param entityAndCondition the list of tuples (Class,String) + * @return the list of queries. + * @throws TopiaException if any pb of db while getting entities + * classes. + * @throws IllegalArgumentException if any pb with the given parameter + * (mainly ClassCastException). + */ + protected String[] buildQueries(Object... entityAndCondition) + throws TopiaException, IllegalArgumentException { + Class<?> entityClass; + String condition; + + // si entityAndcondition est vide alors il faut le remplir + // avec toutes les entités du mapping (class, null) + if (entityAndCondition.length == 0) { + Map<?, ?> classMetadata = topiaHibernateSupport.getHibernateFactory().getAllClassMetadata(); + entityAndCondition = new Object[classMetadata.size() * 2]; + int i = 0; + for (Object className : classMetadata.keySet()) { + try { + entityAndCondition[i++] = Class.forName((String) className); + } catch (ClassNotFoundException e) { + // should never happen! + throw new TopiaException( + "class cast exception for entity " + className); + } + entityAndCondition[i++] = null; + + } + } + + // prepare queries to perform beofre opening any transaction + if (entityAndCondition.length % 2 != 0) { + throw new IllegalArgumentException( + "entityAndCondition must be a couple of (Class, String)"); + } + String queries[] = new String[entityAndCondition.length / 2]; + for (int i = 0; i < entityAndCondition.length; ) { + try { + entityClass = (Class<?>) entityAndCondition[i++]; + condition = (String) entityAndCondition[i++]; + String query = "from " + entityClass.getName(); + if (condition != null && !condition.isEmpty()) { + query += " where " + condition; + } + queries[(i - 1) / 2] = query; + } catch (ClassCastException e) { + if (i % 2 == 0) { + throw new IllegalArgumentException( + "Others arguement must be String not " + + entityAndCondition[i - 1], e); + } else { + throw new IllegalArgumentException( + "Others arguement must be Class not " + + entityAndCondition[i - 1], e); + } + } + } + return queries; + } + + @Override + public void replicate(TopiaEntity entity) { + topiaHibernateSupport.getHibernateSession().replicate(entity, ReplicationMode.EXCEPTION); + } + +} Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2013-10-11 16:47:08 UTC (rev 2841) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2013-10-11 16:53:04 UTC (rev 2842) @@ -25,10 +25,6 @@ package org.nuiton.topia; -import java.beans.PropertyChangeListener; -import java.io.File; -import java.util.List; - import org.nuiton.topia.event.TopiaContextListener; import org.nuiton.topia.event.TopiaEntitiesVetoable; import org.nuiton.topia.event.TopiaEntityListener; @@ -38,6 +34,10 @@ import org.nuiton.topia.framework.TopiaService; import org.nuiton.topia.persistence.TopiaEntity; +import java.beans.PropertyChangeListener; +import java.io.File; +import java.util.List; + /** * The TopiaContext is the most important class of ToPIA. It contains all the * methods to manipulate data : transaction management, entities querying, event @@ -54,7 +54,7 @@ * @version $Id$ */ public interface TopiaContext extends TopiaTransaction, TopiaListenableSupport, TopiaSqlSupport, TopiaJpaSupport, - TopiaPersistenceContext, TopiaServiceSupport, TopiaReplicationSupport, TopiaHibernateSupport { + TopiaPersistenceContext, TopiaServiceSupport, TopiaReplicationSupport, TopiaReplicationDestination, TopiaHibernateSupport { /* -------------------- TRANSACTION MANAGEMENT --------------------------*/ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java 2013-10-11 16:47:08 UTC (rev 2841) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java 2013-10-11 16:53:04 UTC (rev 2842) @@ -38,7 +38,7 @@ * @author Arnaud Thimel <thimel(a)codelutin.com> * @since 3.0 */ -public interface TopiaPersistenceContext extends TopiaDAOSupplier, TopiaTransaction { +public interface TopiaPersistenceContext extends TopiaReplicationSupport, TopiaReplicationDestination, TopiaDAOSupplier, TopiaTransaction { /** * Retrieve {@link org.nuiton.topia.persistence.TopiaEntity} using its unique {@code topiaId}. Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaReplicationDestination.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaReplicationDestination.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaReplicationDestination.java 2013-10-11 16:53:04 UTC (rev 2842) @@ -0,0 +1,19 @@ +package org.nuiton.topia; + +import org.nuiton.topia.persistence.TopiaEntity; + +/** + * Represent the destination of a replciation process. The source is + * {@link TopiaReplicationSupport} + */ +public interface TopiaReplicationDestination { + + /** + * Must replicate given entity in current database + * + * @since 3.0 + * @param entity + */ + void replicate(TopiaEntity entity); + +} Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaReplicationSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaReplicationSupport.java 2013-10-11 16:47:08 UTC (rev 2841) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaReplicationSupport.java 2013-10-11 16:53:04 UTC (rev 2842) @@ -24,12 +24,12 @@ * #L% */ +import org.nuiton.topia.persistence.TopiaEntity; + import java.util.List; -import org.nuiton.topia.persistence.TopiaEntity; - /** - * This API provides methods about entities replication + * This API provides methods about entities replication to a destination * * @author Arnaud Thimel <thimel(a)codelutin.com> * @since 3.0 @@ -45,9 +45,9 @@ * * Note 2: The simple replication may not be sufficent. You may want * to replicate only a part of some entities : use the method {@link - * #replicateEntities(TopiaContext, java.util.List)}. + * #replicateEntities(TopiaReplicationDestination, java.util.List)}. * - * @param destinationContext the destination context + * @param topiaReplicationDestination the destination context * @param entityAndCondition [key;value;...] parameter which key is the * entity class to replicate, and value the * "where" condition to use when querying entities @@ -55,32 +55,32 @@ * trying to replicate within the same * database */ - void replicate(TopiaContext destinationContext, + void replicate(TopiaReplicationDestination topiaReplicationDestination, Object... entityAndCondition) throws IllegalArgumentException; /** * Replicate a given entity from this context to the given context. * - * @param destinationContext the destination context + * @param topiaReplicationDestination the destination context * @param entity the entity instance to replicate * @throws IllegalArgumentException if one of the context is closed or if * trying to replicate within the same * database */ - <T extends TopiaEntity> void replicateEntity(TopiaContext destinationContext, + <T extends TopiaEntity> void replicateEntity(TopiaReplicationDestination topiaReplicationDestination, T entity) throws IllegalArgumentException; /** * Makes a replication of some entities from this context to the given * context without any entity modification. * - * @param destinationContext the destination context + * @param topiaReplicationDestination the destination context * @param entities the list of entities instance to replicate * @throws IllegalArgumentException if one of the context is closed or if * trying to replicate within the same * database */ - <T extends TopiaEntity> void replicateEntities(TopiaContext destinationContext, + <T extends TopiaEntity> void replicateEntities(TopiaReplicationDestination topiaReplicationDestination, List<T> entities) throws IllegalArgumentException; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java 2013-10-11 16:47:08 UTC (rev 2841) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java 2013-10-11 16:53:04 UTC (rev 2842) @@ -51,6 +51,7 @@ import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.TopiaReplicationDestination; import org.nuiton.topia.event.TopiaContextListener; import org.nuiton.topia.event.TopiaEntitiesVetoable; import org.nuiton.topia.event.TopiaEntityListener; @@ -1203,6 +1204,26 @@ } @Override + public void replicate(TopiaEntity entity) { + getHibernateSession().replicate(entity, ReplicationMode.EXCEPTION); + } + + @Override + public void replicate(TopiaReplicationDestination topiaReplicationDestination, Object... entityAndCondition) throws IllegalArgumentException { + replicate((TopiaContext) topiaReplicationDestination, entityAndCondition); + } + + @Override + public <T extends TopiaEntity> void replicateEntity(TopiaReplicationDestination topiaReplicationDestination, T entity) throws IllegalArgumentException { + replicateEntity((TopiaContext) topiaReplicationDestination, entity); + } + + @Override + public <T extends TopiaEntity> void replicateEntities(TopiaReplicationDestination topiaReplicationDestination, List<T> entities) throws IllegalArgumentException { + replicateEntities((TopiaContext) topiaReplicationDestination, entities); + } + + @Override public TopiaFiresSupport getFiresSupport() { return firesSupport; }

1 0

r2841 - trunk/topia-persistence/src/main/java/org/nuiton/topia
by athimel＠users.nuiton.org Oct. 11, 2013

Oct. 11, 2013

Author: athimel Date: 2013-10-11 18:47:08 +0200 (Fri, 11 Oct 2013) New Revision: 2841 Url: http://nuiton.org/projects/topia/repository/revisions/2841 Log: Implement TopiaServiceSupport and initialize it Improve AbstractTopiaPersistenceContext documentation and transaction creation Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaSqlSupport.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaServiceSupportImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaJpaSupport.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java 2013-10-11 15:13:30 UTC (rev 2840) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java 2013-10-11 16:47:08 UTC (rev 2841) @@ -31,7 +31,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; -import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; @@ -84,6 +83,16 @@ this((Map) ImmutableMap.copyOf(properties)); } + public AbstractTopiaApplicationContext(Map<String, String> configuration) { + Map<String, String> configurationCopy = Maps.newHashMap(); + configurationCopy.putAll(configuration); + if ( ! configuration.containsKey(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES)) { + configurationCopy.put(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, getImplementationClassesAsString()); + } + this.configuration = ImmutableMap.copyOf(configurationCopy); + this.topiaServiceSupport = new TopiaServiceSupportImpl(this); + } + protected abstract Class<? extends TopiaEntity>[] getImplementationClasses(); protected String getImplementationClassesAsString() { @@ -94,15 +103,6 @@ return buffer.substring(1); } - public AbstractTopiaApplicationContext(Map<String, String> configuration) { - Map<String, String> configurationCopy = Maps.newHashMap(); - configurationCopy.putAll(configuration); - if ( ! configuration.containsKey(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES)) { - configurationCopy.put(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, getImplementationClassesAsString()); - } - this.configuration = ImmutableMap.copyOf(configurationCopy); - } - protected HibernateProvider getHibernateProvider() { if (hibernateProvider == null) { hibernateProvider = new HibernateProvider(configuration, topiaServiceSupport); @@ -110,10 +110,6 @@ return hibernateProvider; } - protected SessionFactory getSessionFactory() { - return getHibernateProvider().getSessionFactory(); - } - protected TopiaListenableSupport getTopiaListenableSupport() { return topiaFiresSupport; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-11 15:13:30 UTC (rev 2840) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-11 16:47:08 UTC (rev 2841) @@ -58,61 +58,79 @@ /** * Already loaded DAO cache within this persistence context */ - protected Map<Class<? extends TopiaEntity>, TopiaDAO<? extends TopiaEntity>> daoCache = Maps.newHashMap(); // TODO AThimel 27/09/13 Concurrent map ? + protected Map<Class<? extends TopiaEntity>, TopiaDAO<? extends TopiaEntity>> daoCache = Maps.newConcurrentMap(); // TODO AThimel 27/09/13 Javadoc + protected TopiaListenableSupport listenableSupport; + + /** + * Used to affect a new topiaId when create is called. + */ + protected TopiaIdFactory topiaIdFactory; + + // TODO AThimel 27/09/13 Javadoc protected TopiaFiresSupport firesSupport; - // TODO AThimel 27/09/13 Javadoc + /** + * This subclass of TopiaHibernateSupport is made to be used only internally within this persistence context. This + * instance is created by the persistence context itself. + */ protected InternalTopiaHibernateSupport hibernateSupport; - // TODO AThimel 27/09/13 Javadoc + /** + * This instance of TopiaJpaSupport is created by the persistence context itself. It is actually using the + * TopiaHibernateSupport instance. + */ protected TopiaJpaSupport jpaSupport; - // TODO AThimel 27/09/13 Javadoc + /** + * This instance of TopiaSqlSupport is created by the persistence context itself. It is actually using the + * TopiaHibernateSupport instance. + */ protected TopiaSqlSupport sqlSupport; - // TODO AThimel 27/09/13 Javadoc - protected TopiaListenableSupport listenableSupport; - /** - * Used to affect a new topiaId when create is called. - * - * @since 3.0 + * Flog used to check if this persistence context is closed */ - protected TopiaIdFactory topiaIdFactory; - protected boolean closed = false; /** * Creating a new TopiaPersistenceContext is equivalent to creating a new transaction * - * @param hibernateProvider - * @param listenableSupport - * @param topiaIdFactory // * @param config + * @param hibernateProvider holds the Hibernate configuration and session factory + * @param listenableSupport the listenableSupport instance to use within this persistence context + * @param topiaIdFactory the TopiaIdFactory instance created according to the application's configuration */ public AbstractTopiaPersistenceContext(HibernateProvider hibernateProvider, TopiaListenableSupport listenableSupport, TopiaIdFactory topiaIdFactory) { - Session hibernateSession = startTransaction(hibernateProvider); - this.hibernateSupport = new InternalTopiaHibernateSupport(hibernateProvider, hibernateSession); - // TODO brendan 11/10/13 init this.sqlSupport this.listenableSupport = listenableSupport; this.topiaIdFactory = topiaIdFactory; + // Hibernate support can be created using the given hibernateProvider + this.hibernateSupport = new InternalTopiaHibernateSupport(hibernateProvider); + + // Now starts the transaction, as this persistenceContext IS the TopiaTransaction + startTransaction(); + + // Create the different supports that may be needed by the DAOs this.firesSupport = new TopiaFiresSupport(); this.jpaSupport = new HibernateTopiaJpaSupport(hibernateSupport, firesSupport); + this.sqlSupport = new HibernateTopiaSqlSupport(hibernateSupport); } + /** + * This subclass of TopiaHibernateSupport is made to be used only internally within this persistence context. This + * class only acts as an information container (as a structure does). + */ protected class InternalTopiaHibernateSupport implements TopiaHibernateSupport { protected HibernateProvider hibernateProvider; protected Session hibernateSession; - protected InternalTopiaHibernateSupport(HibernateProvider hibernateProvider, Session hibernateSession) { + protected InternalTopiaHibernateSupport(HibernateProvider hibernateProvider) { this.hibernateProvider = hibernateProvider; - this.hibernateSession = hibernateSession; } public void setHibernateSession(Session hibernateSession) { @@ -121,6 +139,7 @@ @Override public Session getHibernateSession() { + Preconditions.checkState(hibernateSession != null, "Session is not yet initialized"); return hibernateSession; } @@ -135,10 +154,11 @@ } } - protected Session startTransaction(HibernateProvider hibernateProvider) throws TopiaException { + protected void startTransaction() throws TopiaException { - SessionFactory factory = hibernateProvider.getSessionFactory(); + SessionFactory factory = hibernateSupport.getHibernateFactory(); Session result = factory.openSession(); + hibernateSupport.setHibernateSession(result); // new TopiaInterceptor(result)); // on ne synchronise jamais les données avec la base tant que @@ -173,7 +193,6 @@ // fire event getFiresSupport().fireOnBeginTransaction(this); - return result; } protected void checkClosed() throws TopiaException { @@ -216,10 +235,6 @@ public <E extends TopiaEntity> TopiaDAO<E> getDAO(Class<E> entityClass) { Preconditions.checkArgument(entityClass != null, "The method 'getDAO' requires a non null 'entityClass' parameter"); -// if (equals(getRootContext())) { -// throw new TopiaException( -// "You are on root context, you MUST open a transaction to perform any database access."); -// } SessionFactory hibernateFactory = hibernateSupport.getHibernateFactory(); if (hibernateFactory.getClassMetadata(entityClass) == null && hibernateFactory.getClassMetadata(entityClass.getName() + "Impl") == null && Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaJpaSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaJpaSupport.java 2013-10-11 15:13:30 UTC (rev 2840) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaJpaSupport.java 2013-10-11 16:47:08 UTC (rev 2841) @@ -74,13 +74,6 @@ this.firesSupport = firesSupport; } - protected void checkClosed() throws TopiaException { - // TODO AThimel 27/09/13 IS it still useful ? -// if (closed) { -// throw new TopiaException("This jpaSupport is closed, it is not possible to use it anymore"); -// } - } - @Override public void setUseFlushMode(boolean useFlushMode) { this.useFlushMode = useFlushMode; @@ -108,8 +101,6 @@ @Override public <T> List<T> findAll(String jpaql, Map<String, Object> parameters) { - checkClosed(); - try { Query query = prepareQuery(jpaql, parameters); @@ -129,8 +120,6 @@ @Override public <T> List<T> find(String jpaql, int startIndex, int endIndex, Map<String, Object> parameters) { - checkClosed(); - try { Query query = prepareQuery(jpaql, parameters); @@ -154,8 +143,6 @@ @Override public int execute(String jpaql, Map<String, Object> parameters) { - checkClosed(); - try { Query query = prepareQuery(jpaql, parameters); Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaSqlSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaSqlSupport.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaSqlSupport.java 2013-10-11 16:47:08 UTC (rev 2841) @@ -0,0 +1,73 @@ +package org.nuiton.topia; + +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +import org.hibernate.HibernateException; +import org.hibernate.jdbc.Work; + +/** + * @author Arnaud Thimel <thimel(a)codelutin.com> + */ +public class HibernateTopiaSqlSupport implements TopiaSqlSupport { + + protected TopiaHibernateSupport hibernateSupport; + + public HibernateTopiaSqlSupport(TopiaHibernateSupport hibernateSupport) { + this.hibernateSupport = hibernateSupport; + } + + @Override + public void executeSQL(String sqlScript) { + SQLWork sqlWork = new SQLWork(sqlScript); + try { + hibernateSupport.getHibernateSession().doWork(sqlWork); + } catch (HibernateException e) { + throw new TopiaException("Could not execute sql code", e); + } + } + + public static class SQLWork implements Work { + private final String script; + + public SQLWork(String script) { + this.script = script; + } + + @Override + public void execute(Connection connection) throws SQLException { + PreparedStatement sta = connection.prepareStatement(script); + try { + sta.execute(); + } finally { + sta.close(); + } + } + } + +} Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaSqlSupport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaServiceSupportImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaServiceSupportImpl.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaServiceSupportImpl.java 2013-10-11 16:47:08 UTC (rev 2841) @@ -0,0 +1,173 @@ +package org.nuiton.topia; + +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 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% + */ + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.framework.TopiaService; + +import com.google.common.collect.ImmutableMap; + +/** + * FIXME AThimel 11/10/13 All this life-cycle has to be reviewed + * + * @author Arnaud Thimel <thimel(a)codelutin.com> + */ +public class TopiaServiceSupportImpl implements TopiaServiceSupport { + + private static final Log log = LogFactory.getLog(TopiaServiceSupportImpl.class); + + protected ImmutableMap<String, TopiaService> services; + protected AbstractTopiaApplicationContext applicationContext; + + public TopiaServiceSupportImpl(AbstractTopiaApplicationContext applicationContext) { + this.applicationContext = applicationContext; + this.services = loadServices(applicationContext.getConfiguration()); + preInitServices(this.services); + applicationContext.getHibernateProvider().getHibernateConfiguration(); // force mapping loading + postInitServices(this.services); + } + + protected void preInitServices(Map<String, TopiaService> services) { + for (TopiaService service : services.values()) { + if (!service.preInit(null)) { // TODO AThimel 11/10/13 was: this (aka TopiaContext) + log.warn(String.format("The service named '%1$s' could not be post-initialized (service not activated)", + service.getServiceName())); + } + } + } + + protected void postInitServices(Map<String, TopiaService> services) { + for (TopiaService service : services.values()) { + if (!service.postInit(null)) { // TODO AThimel 11/10/13 was: this (aka TopiaContext) + log.warn(String.format("The service named '%1$s' could not be pre-initialized (service not activated)", + service.getServiceName())); + } + } + } + + /** + * Retrieve service name using SERVICE_NAME static field on service + * interface. + * + * @param interfaceService class of the service + * @param <E> type of the service that extends {@link + * TopiaService} + * @return the service name + * @throws IllegalAccessException if field SERVICE_NAME can't be accessed + * @throws NoSuchFieldException if no field SERVICE_NAME is defined + */ + protected <E extends TopiaService> String getServiceName( + Class<E> interfaceService) + throws IllegalAccessException, NoSuchFieldException { + Field f = interfaceService.getField("SERVICE_NAME"); + String name = (String) f.get(null); + return name; + } + + protected String getProperExceptionMessage(Throwable eee) { + return eee.getClass().getSimpleName() + " : " + eee.getMessage(); + } + + protected ImmutableMap<String, TopiaService> loadServices(ImmutableMap<String, String> configuration) { + Map<String, TopiaService> result = new HashMap<String, TopiaService>(); + // recherche des services present dans la config + for (String key : result.keySet()) { + if (key.matches("^topia\\.service\\.\\w+$")) { + String serviceClass = configuration.get(key); + try { + Class<?> forName = Class.forName(serviceClass); + Object newInstance = forName.getConstructor().newInstance(); + TopiaService service = (TopiaService) newInstance; + if (key.equals("topia.service." + service.getServiceName())) { + result.put(service.getServiceName(), service); + log.info(String.format("Service '%1$s' loaded (implementation %2$s)", + key, serviceClass)); + } else { + log.warn(String.format("The service with key '%1$s' has a different name '%2$s'! (service not activated)", + key, service.getServiceName())); + } + } catch (Throwable eee) { + String message = + String.format("The service %1$s of type %2$s was not found.", + key, serviceClass); + if (log.isDebugEnabled()) { + log.debug(message, eee); + } else if (log.isErrorEnabled()) { + log.error(message); + } + } + } + } + return ImmutableMap.copyOf(result); + } + + + @Override + public <E extends TopiaService> boolean serviceEnabled(Class<E> interfaceService) { + boolean result = false; + try { + String name = getServiceName(interfaceService); + result = getServices().containsKey(name); + } catch (Exception eee) { + String format = "The service named '%1$s' could not be found for following reason: %2$s"; + String message = String.format(format, interfaceService, getProperExceptionMessage(eee)); + if (log.isDebugEnabled()) { + log.debug(message, eee); + } else if (log.isWarnEnabled()) { + log.warn(message); + } + } + return result; + } + + @Override + public <E extends TopiaService> E getService(Class<E> interfaceService) throws TopiaNotFoundException { + E result; + try { + String name = getServiceName(interfaceService); + result = (E) getServices().get(name); + } catch (Exception eee) { + String format = "Could not retreave service %1$s for following reason: %2$s"; + String message = String.format(format, interfaceService, getProperExceptionMessage(eee)); + throw new TopiaNotFoundException(message, eee); + } + if (result == null) { + String message = String.format("The service %1$s was not found.", interfaceService); + throw new TopiaNotFoundException(message); + } + return result; + } + + @Override + public Map<String, TopiaService> getServices() { + return services; + } + +} Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaServiceSupportImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2840 - in trunk: topia-persistence/src/main/java/org/nuiton/topia topia-persistence/src/main/java/org/nuiton/topia/event topia-persistence/src/main/java/org/nuiton/topia/framework topia-service-migration/src/main/java/org/nuiton/topia/migration
by athimel＠users.nuiton.org Oct. 11, 2013

Oct. 11, 2013

Author: athimel Date: 2013-10-11 17:13:30 +0200 (Fri, 11 Oct 2013) New Revision: 2840 Url: http://nuiton.org/projects/topia/repository/revisions/2840 Log: Implementation Hibernate session open/commit/rollback/close Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaTransaction.java trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-11 15:10:28 UTC (rev 2839) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-10-11 15:13:30 UTC (rev 2840) @@ -24,28 +24,25 @@ * #L% */ -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; +import java.lang.reflect.InvocationTargetException; +import java.util.Map; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.FlushMode; import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.SessionFactory; +import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; -import org.hibernate.tool.hbm2ddl.SchemaExport; -import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.nuiton.topia.framework.TopiaFiresSupport; -import org.nuiton.topia.framework.TopiaUtil; import org.nuiton.topia.persistence.AbstractTopiaDAO; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaIdFactory; -import java.lang.reflect.InvocationTargetException; -import java.util.List; -import java.util.Map; -import java.util.Properties; +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; /** * Abstract implementation of the TopiaPersistenceContext. This class will be extended by a generated one in order to @@ -85,46 +82,46 @@ */ protected TopiaIdFactory topiaIdFactory; -// /** -// * Current context configuration -// */ -// protected Properties config; + protected boolean closed = false; /** * Creating a new TopiaPersistenceContext is equivalent to creating a new transaction * * @param hibernateProvider - * @param sqlSupport * @param listenableSupport - * @param topiaIdFactory -// * @param config + * @param topiaIdFactory // * @param config */ public AbstractTopiaPersistenceContext(HibernateProvider hibernateProvider, TopiaListenableSupport listenableSupport, TopiaIdFactory topiaIdFactory) { - this.hibernateSupport = new InternalTopiaHibernateSupport(hibernateProvider); + Session hibernateSession = startTransaction(hibernateProvider); + this.hibernateSupport = new InternalTopiaHibernateSupport(hibernateProvider, hibernateSession); // TODO brendan 11/10/13 init this.sqlSupport this.listenableSupport = listenableSupport; this.topiaIdFactory = topiaIdFactory; -// this.config = config; this.firesSupport = new TopiaFiresSupport(); this.jpaSupport = new HibernateTopiaJpaSupport(hibernateSupport, firesSupport); - } protected class InternalTopiaHibernateSupport implements TopiaHibernateSupport { protected HibernateProvider hibernateProvider; + protected Session hibernateSession; - protected InternalTopiaHibernateSupport(HibernateProvider hibernateProvider) { + protected InternalTopiaHibernateSupport(HibernateProvider hibernateProvider, Session hibernateSession) { this.hibernateProvider = hibernateProvider; + this.hibernateSession = hibernateSession; } + public void setHibernateSession(Session hibernateSession) { + this.hibernateSession = hibernateSession; + } + @Override public Session getHibernateSession() { - return null; + return hibernateSession; } @Override @@ -138,11 +135,51 @@ } } + protected Session startTransaction(HibernateProvider hibernateProvider) throws TopiaException { + + SessionFactory factory = hibernateProvider.getSessionFactory(); + Session result = factory.openSession(); + + // new TopiaInterceptor(result)); + // on ne synchronise jamais les données avec la base tant que + // l'utilisateur n'a pas fait de commit du context + result.setFlushMode(FlushMode.MANUAL); + + // tchemit 2010-12-06 propagates the value of the flag +// result.useFlushMode = useFlushMode; + + // 20060926 poussin ajouter pour voir si ca regle les problemes de + // deadlock h2. Conclusion, il faut bien ouvrir une transaction + // maintenant, sinon lorsque l'on fait des acces a la base, une + // transaction par defaut est utilisé mais elle n'est jamais vraiment + // fermé ce qui pose des problemes de lock sur les tables. + try { + result.beginTransaction(); + } catch (Exception eee) { + + // on a pas pu ouvrir la transaction, on faut donc tout fermer + // et declancher une exception + try { + result.close(); + } catch (HibernateException e1) { + if (log.isErrorEnabled()) { + log.error("Could not close hibernate session", e1); + } + } + + String message = String.format("An error occurs while asking a new transaction: %1$s", eee.getMessage()); + throw new TopiaException(message, eee); + } + + // fire event + getFiresSupport().fireOnBeginTransaction(this); + return result; + } + protected void checkClosed() throws TopiaException { - // TODO AThimel 27/09/13 IS it still useful ? -// if (closed) { -// throw new TopiaException("This context is closed, it is not possible to use it anymore"); -// } + if (closed) { + throw new TopiaException("This context is closed, it is not possible to use it anymore"); + } } protected TopiaFiresSupport getFiresSupport() { @@ -175,11 +212,6 @@ return topiaIdFactory; } -// @Override -// public Properties getConfig() { -// return config; -// } - @Override public <E extends TopiaEntity> TopiaDAO<E> getDAO(Class<E> entityClass) { Preconditions.checkArgument(entityClass != null, "The method 'getDAO' requires a non null 'entityClass' parameter"); @@ -245,21 +277,78 @@ @Override public void commitTransaction() { - //To change body of implemented methods use File | Settings | File Templates. + checkClosed(); + + try { + + Session hibernateSession = hibernateSupport.getHibernateSession(); + + Transaction tx = hibernateSession.getTransaction(); + hibernateSession.flush(); + tx.commit(); + + getFiresSupport().fireOnPostCommit(this); +// TopiaContextImplementor parent = getParentContext(); +// if (parent != null) { +// parent.getFiresSupport().fireOnPostCommit(this); +// } + + hibernateSession.beginTransaction(); + + // it's seem necessary to change session after commit + // NON, NON, NON, il ne faut surtout pas le faire, ca pose plein de + // probleme + // hibernate = getHibernateFactory().openSession(); + // hibernate.setFlushMode(FlushMode.NEVER); + } catch (Exception eee) { + String message = String.format("An error occurred during commit operation: %1$s", eee.getMessage()); + throw new TopiaException(message, eee); + } } @Override public void rollbackTransaction() { - //To change body of implemented methods use File | Settings | File Templates. + checkClosed(); + try { + Session hibernateSession = hibernateSupport.getHibernateSession(); + + Transaction tx = hibernateSession.getTransaction(); + hibernateSession.clear(); + tx.rollback(); + hibernateSession.close(); + + // it's very important to change the session after rollback + // otherwise there are many error during next Entity's modification + hibernateSession = hibernateSupport.getHibernateFactory().openSession(); + hibernateSupport.setHibernateSession(hibernateSession); + hibernateSession.setFlushMode(FlushMode.MANUAL); + + hibernateSession.beginTransaction(); + + getFiresSupport().fireOnPostRollback(this); +// TopiaContextImplementor parent = getParentContext(); +// if (parent != null) { +// parent.getFiresSupport().fireOnPostRollback(this); +// } + + } catch (HibernateException eee) { + String message = String.format("An error occurred during rollback operation: %1$s", eee.getMessage()); + throw new TopiaException(message, eee); + } } @Override - public void closeContext() { - //To change body of implemented methods use File | Settings | File Templates. + public void close() { + checkClosed(); + closed = true; + + // Now close the current Hibernate session + hibernateSupport.getHibernateSession().close(); } @Override public boolean isClosed() { - return false; //To change body of implemented methods use File | Settings | File Templates. + return closed; } + } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java 2013-10-11 15:10:28 UTC (rev 2839) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaPersistenceContext.java 2013-10-11 15:13:30 UTC (rev 2840) @@ -64,4 +64,17 @@ */ TopiaIdFactory getTopiaIdFactory(); + /** + * Closes the context. All the children contexts will be closed in the same + * time. + */ + void close(); + + /** + * Tells if the context is closed + * + * @return {@code true} if the context is closed, {@code false} otherwise + */ + boolean isClosed(); + } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaTransaction.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaTransaction.java 2013-10-11 15:10:28 UTC (rev 2839) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaTransaction.java 2013-10-11 15:13:30 UTC (rev 2840) @@ -45,17 +45,4 @@ */ void rollbackTransaction(); - /** - * Closes the context. All the children contexts will be closed in the same - * time. - */ - void closeContext(); - - /** - * Tells if the context is closed - * - * @return {@code true} if the context is closed, {@code false} otherwise - */ - boolean isClosed(); - } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java 2013-10-11 15:10:28 UTC (rev 2839) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java 2013-10-11 15:13:30 UTC (rev 2840) @@ -27,6 +27,7 @@ import org.apache.commons.collections.map.IdentityMap; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaTransaction; import org.nuiton.topia.framework.EntityState; import org.nuiton.topia.persistence.TopiaEntity; @@ -47,11 +48,11 @@ private Map<TopiaEntity, EntityState> entities = new IdentityMap(); - public TopiaTransactionEvent(TopiaContext source) { + public TopiaTransactionEvent(TopiaTransaction source) { super(source); } - public TopiaTransactionEvent(TopiaContext source, + public TopiaTransactionEvent(TopiaTransaction source, Map<TopiaEntity, EntityState> entities) { this(source); this.entities.putAll(entities); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java 2013-10-11 15:10:28 UTC (rev 2839) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java 2013-10-11 15:13:30 UTC (rev 2840) @@ -890,6 +890,11 @@ } @Override + public void close() { + closeContext(); + } + + @Override public void closeContext() throws TopiaException { // Throw exception if context is already closed checkClosed("Context was already closed"); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2013-10-11 15:10:28 UTC (rev 2839) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2013-10-11 15:13:30 UTC (rev 2840) @@ -55,6 +55,7 @@ import org.nuiton.topia.TopiaJpaSupport; import org.nuiton.topia.TopiaListenableSupport; import org.nuiton.topia.TopiaPersistenceContext; +import org.nuiton.topia.TopiaTransaction; import org.nuiton.topia.TopiaVetoException; import org.nuiton.topia.event.TopiaContextEvent; import org.nuiton.topia.event.TopiaContextListener; @@ -220,7 +221,7 @@ /* Fires sur les transactions */ - public void fireOnBeginTransaction(TopiaContextImplementor context) { + public void fireOnBeginTransaction(TopiaTransaction context) { if (log.isDebugEnabled()) { log.debug("fireOnBeginTransaction"); } @@ -234,7 +235,7 @@ } } - public void fireOnPostCommit(TopiaContextImplementor context) { + public void fireOnPostCommit(TopiaTransaction context) { if (log.isDebugEnabled()) { log.debug("fireOnPostCommit"); } @@ -252,7 +253,7 @@ transactionEntities.clear(); } - public void fireOnPostRollback(TopiaContextImplementor context) { + public void fireOnPostRollback(TopiaTransaction context) { if (log.isDebugEnabled()) { log.debug("fireOnPostRollback"); } Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2013-10-11 15:10:28 UTC (rev 2839) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2013-10-11 15:13:30 UTC (rev 2840) @@ -38,6 +38,7 @@ import org.nuiton.topia.event.TopiaContextListener; import org.nuiton.topia.event.TopiaTransactionEvent; import org.nuiton.topia.event.TopiaTransactionVetoable; +import org.nuiton.topia.framework.AbstractTopiaContext; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaUtil; import org.nuiton.topia.migration.mappings.TMSVersion; @@ -197,7 +198,7 @@ public boolean preInit(TopiaContext context) { rootContext = context; - Properties config = context.getConfig(); + Properties config = ((AbstractTopiaContext)context).getConfig(); String callbackStr = getSafeParameter(config, MIGRATION_CALLBACK); if (log.isDebugEnabled()) { @@ -657,7 +658,7 @@ * @since 2.5.3 */ protected Configuration createHibernateConfiguration(Configuration configuration) { - Properties config = rootContext.getConfig(); + Properties config = ((AbstractTopiaContext)rootContext).getConfig(); Properties prop = new Properties(); prop.putAll(configuration.getProperties());

1 0

r2839 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by bleny＠users.nuiton.org Oct. 11, 2013

Oct. 11, 2013

Author: bleny Date: 2013-10-11 17:10:28 +0200 (Fri, 11 Oct 2013) New Revision: 2839 Url: http://nuiton.org/projects/topia/repository/revisions/2839 Log: remove usused generated code Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ApplicationContextTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/PersistenceContextTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ApplicationContextTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ApplicationContextTransformer.java 2013-10-11 14:42:42 UTC (rev 2838) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ApplicationContextTransformer.java 2013-10-11 15:10:28 UTC (rev 2839) @@ -241,18 +241,6 @@ }*/ ); - // getImplementationClassesAsString method - op = addOperation(output, "getImplementationClassesAsString", "String", ObjectModelJavaModifier.PUBLIC); - setOperationBody(op, "" -/*{ - StringBuilder buffer = new StringBuilder(); - for (Class<? extends TopiaEntity> aClass : getImplementationClasses()) { - buffer.append(',').append(aClass.getName()); - } - return buffer.substring(1); - }*/ - ); - // getContracts method op = addOperation(output, "getContracts", entityEnumName + "[]", ObjectModelJavaModifier.PUBLIC); setOperationBody(op, "" Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/PersistenceContextTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/PersistenceContextTransformer.java 2013-10-11 14:42:42 UTC (rev 2838) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/PersistenceContextTransformer.java 2013-10-11 15:10:28 UTC (rev 2839) @@ -236,18 +236,6 @@ }*/ ); - // getImplementationClassesAsString method - op = addOperation(output, "getImplementationClassesAsString", "String", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); - setOperationBody(op, "" -/*{ - StringBuilder buffer = new StringBuilder(); - for (Class<? extends TopiaEntity> aClass : getImplementationClasses()) { - buffer.append(',').append(aClass.getName()); - } - return buffer.substring(1); - }*/ - ); - // getContracts method op = addOperation(output, "getContracts", entityEnumName + "[]", ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.STATIC); setOperationBody(op, ""

1 0

r2838 - trunk/topia-persistence/src/main/java/org/nuiton/topia
by athimel＠users.nuiton.org Oct. 11, 2013

Oct. 11, 2013

Author: athimel Date: 2013-10-11 16:42:42 +0200 (Fri, 11 Oct 2013) New Revision: 2838 Url: http://nuiton.org/projects/topia/repository/revisions/2838 Log: Implement TopiaApplicationContextgetPersistenceClasses() Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateProvider.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java 2013-10-11 14:40:39 UTC (rev 2837) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java 2013-10-11 14:42:42 UTC (rev 2838) @@ -270,7 +270,7 @@ } public List<Class<?>> getPersistenceClasses() { - return null; // TODO AThimel 27/09/13 May be moved to TopiaHibernateSupport ? + return getHibernateProvider().getPersistentClasses(); } public boolean isSchemaEmpty() { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateProvider.java 2013-10-11 14:40:39 UTC (rev 2837) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateProvider.java 2013-10-11 14:42:42 UTC (rev 2838) @@ -84,6 +84,14 @@ return result; } + public List<Class<?>> getPersistentClasses() { + if (persistentClasses.isEmpty()) { + // Force configuration load + getHibernateConfiguration(); + } + return persistentClasses; + } + public Configuration getHibernateConfiguration() { if (hibernateConfiguration == null) { hibernateConfiguration = new Configuration();

1 0