Author: athimel Date: 2013-10-25 16:48:13 +0200 (Fri, 25 Oct 2013) New Revision: 2848 Url: http://nuiton.org/projects/topia/repository/revisions/2848 Log: Implement missing operations in TopiaDAOImpl Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.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/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/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-10-25 12:03:15 UTC (rev 2847) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-10-25 14:48:13 UTC (rev 2848) @@ -59,12 +59,14 @@ 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.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.security.Permission; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -83,11 +85,11 @@ * @param <E> le type de l'entite * @author bpoussin <poussin@codelutin.com> * @version $Id$ + * @deprecated this class is replaced by {@link AbstractTopiaDao} */ - +@Deprecated 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); /** @@ -959,4 +961,84 @@ "This iterator does not support remove operation."); } } + + @Override + public TopiaQueryBuilderRunQueryStep<E> forTopiaIdIn(Iterable<String> topiaIds) { + throw new UnsupportedOperationException("Please use new Dao implementations"); + } + + @Override + public TopiaQueryBuilderRunQueryStep<E> forTopiaIdEquals(String topiaId) { + throw new UnsupportedOperationException("Please use new Dao implementations"); + } + + @Override + public TopiaQueryBuilderRunQueryStep<E> forIn(String propertyName, Iterable<Object> propertyValues) { + throw new UnsupportedOperationException("Please use new Dao implementations"); + } + + @Override + public TopiaQueryBuilderRunQueryStep<E> forEquals(String propertyName, Object propertyValue) { + throw new UnsupportedOperationException("Please use new Dao implementations"); + } + + @Override + public TopiaQueryBuilderRunQueryStep<E> forContains(String propertyName, Object propertyValue) { + throw new UnsupportedOperationException("Please use new Dao implementations"); + } + + @Override + public TopiaQueryBuilderAddCriteriaStep<E> newQueryBuilder() { + throw new UnsupportedOperationException("Please use new Dao implementations"); + } + + @Override + public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forProperties(String propertyName, Object propertyValue, Object... otherPropertyNamesAndValues) { + throw new UnsupportedOperationException("Please use new Dao implementations"); + } + + @Override + public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forProperties(Map<String, Object> properties) { + throw new UnsupportedOperationException("Please use new Dao implementations"); + } + + @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() { + E result = newInstance(); + create(result); + return result; + } + + @Override + public Iterable<E> findAllLazy() { + String hql = "from " + getTopiaEntityEnum().getImplementationFQN() + " order by id"; + Map<String, Object> hqlParameters = Collections.emptyMap(); + Iterable<E> allLazy = findAllLazyByQuery(hql, hqlParameters); + return allLazy; + } + + @Override + public Iterable<E> createAll(Iterable<E> entities) { + for (E entity : entities) { + create(entity); + } + return entities; + } + + @Override + public Iterable<E> updateAll(Iterable<E> entities) { + for (E entity : entities) { + update(entity); + } + return entities; + } + } //TopiaDAOImpl 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-25 12:03:15 UTC (rev 2847) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java 2013-10-25 14:48:13 UTC (rev 2848) @@ -33,7 +33,7 @@ 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; @@ -126,7 +126,7 @@ TopiaTestTopiaPersistenceContext transaction = db.beginTransaction(); try { - PersonTopiaDao dao = TopiaTestDAOHelper.getPersonDAO(transaction); + PersonDAO 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-25 12:03:15 UTC (rev 2847) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextReplicateTest.java 2013-10-25 14:48:13 UTC (rev 2848) @@ -32,9 +32,9 @@ 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; @@ -92,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-25 12:03:15 UTC (rev 2847) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java 2013-10-25 14:48:13 UTC (rev 2848) @@ -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/NaturalIdTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2013-10-25 12:03:15 UTC (rev 2847) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2013-10-25 14:48:13 UTC (rev 2848) @@ -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-25 12:03:15 UTC (rev 2847) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2013-10-25 14:48:13 UTC (rev 2848) @@ -25,7 +25,8 @@ package org.nuiton.topia.persistence; -import com.google.common.collect.Lists; +import java.util.List; + import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Before; @@ -35,9 +36,9 @@ 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; +import com.google.common.collect.Lists; /** * Test on {@link TopiaDAO}. @@ -55,7 +56,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-25 12:03:15 UTC (rev 2847) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/test/ano1882/DAOAbstractTransformerTest.java 2013-10-25 14:48:13 UTC (rev 2848) @@ -41,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-25 12:03:15 UTC (rev 2847) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2013-10-25 14:48:13 UTC (rev 2848) @@ -53,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-25 12:03:15 UTC (rev 2847) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java 2013-10-25 14:48:13 UTC (rev 2848) @@ -49,7 +49,7 @@ 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; @@ -84,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"); @@ -134,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"); @@ -185,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());