r2056 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/test/java/org/nuiton/topia/framework topia-persistence/src/test/java/org/nuiton/topia/persistence topia-persistence/src/test/java/org/nuiton/topia/persistence/util topia-persistence/src/test/java/org/nuiton/topiatest/deletetest topia-persistence/src/test/xmi topia-service-replication/src/test/java/org/nuiton/topia/replication
Author: fdesbois Date: 2010-07-09 16:16:44 +0200 (Fri, 09 Jul 2010) New Revision: 2056 Url: http://nuiton.org/repositories/revision/topia/2056 Log: - Evo #767 : remove dao from TopiaQuery - Use prefix for generated constant Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java trunk/topia-persistence/src/test/xmi/topiatest.properties trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/ReplicationEngineAllTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/ReplicationEngineTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-07-09 14:01:56 UTC (rev 2055) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-07-09 14:16:44 UTC (rev 2056) @@ -271,13 +271,6 @@ protected String mainAlias; - /** - * @deprecated since 2.3.4 : need calling right execute method directly from - * DAO - */ - @Deprecated - protected TopiaDAO<? extends TopiaEntity> dao; - /** Enum to simmplify using operation in query */ public enum Op { @@ -347,37 +340,6 @@ } /** - * Create a TopiaQuery from a DAO. The main entity will be automatically - * added to the select part of the query if it is needed. - * - * @param dao DAO linked to the entity to threat - * @deprecated since 2.3.4 : instantiate the query from DAO {@link - * TopiaDAO#createQuery()} - */ - @Deprecated - public TopiaQuery(TopiaDAO<? extends TopiaEntity> dao) { - this(); - setFrom(dao.getEntityClass()); - this.dao = dao; - } - - /** - * Create a TopiaQuery from a DAO with an Alias. The main entity will be - * automatically added to the select part of the query if it is needed. - * - * @param dao DAO linked to the entity to threat - * @param alias of the main entity in the query - * @deprecated since 2.3.4 : instantiate the query from DAO {@link - * TopiaDAO#createQuery(String)} - */ - @Deprecated - public TopiaQuery(TopiaDAO<? extends TopiaEntity> dao, String alias) { - this(); - setFrom(dao.getEntityClass(), alias); - this.dao = dao; - } - - /** * Set the mainEntity in the from part of the query. * * @param mainEntityClass type of the mainEntity @@ -1303,20 +1265,6 @@ } /** - * DAO must be defined to use this method. - * - * @return a List of results - * @throws TopiaException for error during execution - * @see #execute(TopiaContext) - * @deprecated since 2.3.4, need transaction, use {@link #execute(TopiaContext)} - */ - @Deprecated - public List execute() throws TopiaException { - validateDAO(); - return execute(dao.getContext()); - } - - /** * Execute the query and get a List of entity. Some properties will be * loaded if they are prealably set using ${@link #addLoad(String...) }. * @@ -1465,22 +1413,6 @@ } /** - * DAO must be defined to use this method. - * - * @param select part of the query redefined temporarly for execution. - * @return an Object - * @throws TopiaException for error on query execution - * @see #executeToObject(TopiaContext, String) - * @deprecated since 2.3.4, need transaction, use {@link #executeToObject(TopiaContext, - * String)} - */ - @Deprecated - public Object executeToObject(String select) throws TopiaException { - validateDAO(); - return executeToObject(dao.getContext(), select); - } - - /** * Execute the query and get an Integer for result. Used only for query with * aggration select which return a Long : COUNT, SUM ... The select is * overriden to get only the right value for return. @@ -1497,22 +1429,6 @@ } /** - * DAO must be defined to use this method. - * - * @param select part of the query redefined temporarly for execution - * @return an Integer - * @throws TopiaException for error on query execution - * @see #executeToInteger(TopiaContext, String) - * @deprecated since 2.3.4, need transaction, use {@link #executeToInteger(TopiaContext, - * String)} - */ - @Deprecated - public int executeToInteger(String select) throws TopiaException { - validateDAO(); - return executeToInteger(dao.getContext(), select); - } - - /** * Execute the query and get a String for result. Used for query with MAX, * ... The select is overriden to get only the right value for return. * @@ -1528,22 +1444,6 @@ } /** - * DAO must be defined to use this method. - * - * @param select part of the query redefined temporarly for execution. - * @return a String result - * @throws TopiaException for error on query execution - * @see #executeToString(TopiaContext, String) - * @deprecated since 2.3.4, need transaction, use {@link #executeToString(TopiaContext, - * String)} - */ - @Deprecated - public String executeToString(String select) throws TopiaException { - validateDAO(); - return executeToString(dao.getContext(), select); - } - - /** * Execute a simple count on the query, i.e. the number of results get from * the query. The order is not considered to count the elements and will be * temporarly disabled. The distinct constraint will be manage if necessary @@ -1576,29 +1476,6 @@ } /** - * DAO must be defined to use this method. - * - * @return an int corresponding to the number of result in the query - * @throws TopiaException for error on query execution - * @see #executeCount(TopiaContext) - * @deprecated since 2.3.4, use {@link TopiaDAO#countByQuery(TopiaQuery)} - */ - @Deprecated - public int executeCount() throws TopiaException { - validateDAO(); - return executeCount(dao.getContext()); - } - - @Deprecated - protected boolean validateDAO() throws TopiaException { - if (dao == null) { - throw new TopiaException( - "topia.persistence.error.query.dao.notDefined"); - } - return true; - } - - /** * Load all properties for the entity. * * @param entity used to load properties Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2010-07-09 14:01:56 UTC (rev 2055) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2010-07-09 14:16:44 UTC (rev 2056) @@ -43,7 +43,7 @@ // Test with one paramValue String value = "topia"; TopiaQuery query = new TopiaQuery(QueriedEntity.class); - query.addEquals(QueriedEntity.TEST_ADD, value); + query.addEquals(QueriedEntity.PROPERTY_TEST_ADD, value); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + "WHERE testAdd = :testAdd", @@ -52,7 +52,7 @@ // Test with null paramValue //String nullValue = null; query = new TopiaQuery(QueriedEntity.class); - query.addEquals(QueriedEntity.TEST_ADD, null); + query.addEquals(QueriedEntity.PROPERTY_TEST_ADD, null); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + "WHERE testAdd IS NULL", @@ -61,7 +61,7 @@ // Test with two paramValues String value2 = "eugene"; query = new TopiaQuery(QueriedEntity.class); - query.addEquals(QueriedEntity.TEST_ADD, value, value2); + query.addEquals(QueriedEntity.PROPERTY_TEST_ADD, value, value2); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + "WHERE testAdd IN (:testAdd1, :testAdd2)", @@ -69,7 +69,7 @@ // Test with two paramValues + null query = new TopiaQuery(QueriedEntity.class); - query.addEquals(QueriedEntity.TEST_ADD, value, value2, null); + query.addEquals(QueriedEntity.PROPERTY_TEST_ADD, value, value2, null); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + "WHERE (testAdd IN (:testAdd1, :testAdd2) OR testAdd IS NULL)", @@ -81,12 +81,12 @@ // Test 1 : Subquery with two params with different values TopiaQuery query = new TopiaQuery(QueriedEntity.class). - addEquals(QueriedEntity.TEST_ADD, "value1"); + addEquals(QueriedEntity.PROPERTY_TEST_ADD, "value1"); // Exist 2 params Assert.assertEquals(2, query.getParams().size()); TopiaQuery subquery = new TopiaQuery(QueriedEntity.class). - addEquals(QueriedEntity.TEST_ADD, "value2"); + addEquals(QueriedEntity.PROPERTY_TEST_ADD, "value2"); query.addSubQuery("Q1 = (?)", subquery); log.debug(query); @@ -97,12 +97,12 @@ // Test 2 : Subquery with two params with different values // one of them is null query = new TopiaQuery(QueriedEntity.class). - addWhere(QueriedEntity.TEST_ADD, TopiaQuery.Op.EQ, null); + addWhere(QueriedEntity.PROPERTY_TEST_ADD, TopiaQuery.Op.EQ, null); // Exist 0 param (null value) Assert.assertEquals(0, query.getParams().size()); subquery = new TopiaQuery(QueriedEntity.class). - addEquals(QueriedEntity.TEST_ADD, "value1"); + addEquals(QueriedEntity.PROPERTY_TEST_ADD, "value1"); query.addSubQuery("Q1 = (?)", subquery); log.debug(query); @@ -112,12 +112,12 @@ // Test 3 : Subquery with two params with same value query = new TopiaQuery(QueriedEntity.class, "Q1"). - addEquals(QueriedEntity.TEST_ADD, "value1"); + addEquals(QueriedEntity.PROPERTY_TEST_ADD, "value1"); // Exist 2 params Assert.assertEquals(2, query.getParams().size()); subquery = new TopiaQuery(QueriedEntity.class, "Q2"). - addEquals(QueriedEntity.TEST_ADD, "value1"); + addEquals(QueriedEntity.PROPERTY_TEST_ADD, "value1"); query.addSubQuery("Q1 = (?)", subquery); log.debug(query); @@ -136,7 +136,7 @@ EntityFilter filter = new TopiaFilter(); filter.setStartIndex(1); filter.setEndIndex(40); - filter.setOrderBy(QueriedEntity.TEST_ADD); + filter.setOrderBy(QueriedEntity.PROPERTY_TEST_ADD); TopiaQuery query = new TopiaQuery(QueriedEntity.class).addFilter(filter); @@ -144,7 +144,7 @@ Assert.assertEquals(query.fullQuery(), "FROM " + QueriedEntity.class.getName() + - " ORDER BY " + QueriedEntity.TEST_ADD); + " ORDER BY " + QueriedEntity.PROPERTY_TEST_ADD); filter.setOrderBy(null); 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 2010-07-09 14:01:56 UTC (rev 2055) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2010-07-09 14:16:44 UTC (rev 2056) @@ -82,12 +82,12 @@ TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); // No exception will be thrown with the two properties - dao.create(NaturalizedEntity.NATURAL_ID_NOT_NULL, 5, - NaturalizedEntity.NATURAL_ID_NULL, "str"); + dao.create(NaturalizedEntity.PROPERTY_NATURAL_ID_NOT_NULL, 5, + NaturalizedEntity.PROPERTY_NATURAL_ID_NULL, "str"); transaction.commitTransaction(); // No exception will only the need property - dao.create(NaturalizedEntity.NATURAL_ID_NOT_NULL, 3); + dao.create(NaturalizedEntity.PROPERTY_NATURAL_ID_NOT_NULL, 3); transaction.commitTransaction(); transaction.closeContext(); @@ -129,8 +129,8 @@ TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); NaturalizedEntity entity = - dao.create(NaturalizedEntity.NATURAL_ID_NOT_NULL, 5, - NaturalizedEntity.NATURAL_ID_NULL, "str"); + dao.create(NaturalizedEntity.PROPERTY_NATURAL_ID_NOT_NULL, 5, + NaturalizedEntity.PROPERTY_NATURAL_ID_NULL, "str"); transaction.commitTransaction(); // Exception will be throw : not allowed to modify a naturalId property @@ -156,8 +156,8 @@ TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); NaturalizedEntity entity = - dao.create(NaturalizedEntity.NATURAL_ID_NOT_NULL, 5, - NaturalizedEntity.NATURAL_ID_NULL, "str"); + dao.create(NaturalizedEntity.PROPERTY_NATURAL_ID_NOT_NULL, 5, + NaturalizedEntity.PROPERTY_NATURAL_ID_NULL, "str"); transaction.commitTransaction(); NaturalizedEntity result = dao.findByNaturalId(5, "str"); @@ -177,8 +177,8 @@ NaturalizedEntityDAO dao = TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); - dao.create(NaturalizedEntity.NATURAL_ID_NOT_NULL, 5, - NaturalizedEntity.NATURAL_ID_NULL, "str"); + dao.create(NaturalizedEntity.PROPERTY_NATURAL_ID_NOT_NULL, 5, + NaturalizedEntity.PROPERTY_NATURAL_ID_NULL, "str"); transaction.commitTransaction(); boolean result = dao.existByNaturalId(5, "str"); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java 2010-07-09 14:01:56 UTC (rev 2055) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java 2010-07-09 14:16:44 UTC (rev 2056) @@ -110,25 +110,25 @@ String name; e.setName(name = "name"); - actual = operationE.get(Employe.NAME, e); + actual = operationE.get(Employe.PROPERTY_NAME, e); assertEquals(name, actual); - actual = operationP.get(Employe.NAME, e); + actual = operationP.get(Employe.PROPERTY_NAME, e); assertEquals(name, actual); - actual = operationD.get(Department.COMPANY, d); + actual = operationD.get(Department.PROPERTY_COMPANY, d); assertNull(actual); d.setCompany(c); - actual = operationD.get(Department.COMPANY, d); + actual = operationD.get(Department.PROPERTY_COMPANY, d); assertNotNull(actual); assertEquals(c, actual); - actual = operationC.get(Company.DEPARTMENT, c); + actual = operationC.get(Company.PROPERTY_DEPARTMENT, c); assertNull(actual); c.addDepartment(d); - actual = operationC.get(Company.DEPARTMENT, c); + actual = operationC.get(Company.PROPERTY_DEPARTMENT, c); assertNotNull(actual); assertFalse(((Collection<?>) actual).isEmpty()); } @@ -139,10 +139,10 @@ String name; - operationE.set(Employe.NAME, e, name = "name"); + operationE.set(Employe.PROPERTY_NAME, e, name = "name"); assertEquals(name, e.getName()); - operationP.set(Employe.NAME, e, name = "name2"); + operationP.set(Employe.PROPERTY_NAME, e, name = "name2"); assertEquals(name, e.getName()); } @@ -154,23 +154,23 @@ topiaId = "0"; - actual = operationC.get(Company.DEPARTMENT, c); + actual = operationC.get(Company.PROPERTY_DEPARTMENT, c); assertNull(actual); - actual = operationC.getChild(Company.DEPARTMENT, c, topiaId); + actual = operationC.getChild(Company.PROPERTY_DEPARTMENT, c, topiaId); assertNull(actual); c.addDepartment(d); - actual = operationC.get(Company.DEPARTMENT, c); + actual = operationC.get(Company.PROPERTY_DEPARTMENT, c); assertNotNull(actual); assertFalse(((Collection<?>) actual).isEmpty()); - actual = operationC.getChild(Company.DEPARTMENT, c, topiaId); + actual = operationC.getChild(Company.PROPERTY_DEPARTMENT, c, topiaId); assertNull(actual); d.setTopiaId(topiaId); - actual = operationC.getChild(Company.DEPARTMENT, c, topiaId); + actual = operationC.getChild(Company.PROPERTY_DEPARTMENT, c, topiaId); assertNotNull(actual); assertEquals(d, actual); @@ -182,7 +182,7 @@ assertTrue(c.isDepartmentEmpty()); - operationC.addChild(Company.DEPARTMENT, c, d); + operationC.addChild(Company.PROPERTY_DEPARTMENT, c, d); assertFalse(c.isDepartmentEmpty()); assertEquals(d, c.getDepartment().iterator().next()); } @@ -193,12 +193,12 @@ assertTrue(c.isDepartmentEmpty()); - boolean actual = operationC.isChildEmpty(Company.DEPARTMENT, c); + boolean actual = operationC.isChildEmpty(Company.PROPERTY_DEPARTMENT, c); assertTrue(actual); c.addDepartment(d); - actual = operationC.isChildEmpty(Company.DEPARTMENT, c); + actual = operationC.isChildEmpty(Company.PROPERTY_DEPARTMENT, c); assertFalse(actual); } @@ -208,16 +208,16 @@ assertTrue(c.isDepartmentEmpty()); - int actual = operationC.sizeChild(Company.DEPARTMENT, c); + int actual = operationC.sizeChild(Company.PROPERTY_DEPARTMENT, c); assertEquals(0, actual); c.addDepartment(d); - actual = operationC.sizeChild(Company.DEPARTMENT, c); + actual = operationC.sizeChild(Company.PROPERTY_DEPARTMENT, c); assertEquals(1, actual); c.clearDepartment(); - actual = operationC.sizeChild(Company.DEPARTMENT, c); + actual = operationC.sizeChild(Company.PROPERTY_DEPARTMENT, c); assertEquals(0, actual); } @@ -231,7 +231,7 @@ assertFalse(c.isDepartmentEmpty()); - operationC.removeChild(Company.DEPARTMENT, c, d); + operationC.removeChild(Company.PROPERTY_DEPARTMENT, c, d); assertTrue(c.isDepartmentEmpty()); } Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java 2010-07-09 14:01:56 UTC (rev 2055) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java 2010-07-09 14:16:44 UTC (rev 2056) @@ -89,7 +89,7 @@ BinderBuilder builder = new BinderBuilder(); builder.createBinderModel(Company.class, CompanyDTO.class); - builder.addSimpleProperties(Company.NAME, Company.SIRET); + builder.addSimpleProperties(Company.PROPERTY_NAME, Company.PROPERTY_SIRET); builder.addProperties(TopiaEntity.TOPIA_ID, "id"); BinderProvider.registerBinder(builder); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java 2010-07-09 14:01:56 UTC (rev 2055) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java 2010-07-09 14:16:44 UTC (rev 2056) @@ -94,7 +94,7 @@ nextEntry(); assertCurrentEntry(race, 1); - assertNextEntityRef(pet, Pet.RACE, pet, race); + assertNextEntityRef(pet, Pet.PROPERTY_RACE, pet, race); pet.setPerson(person); @@ -102,11 +102,11 @@ nextEntry(); assertCurrentEntry(person, 1); - assertNextEntityRef(pet, Pet.PERSON, pet, person); + assertNextEntityRef(pet, Pet.PROPERTY_PERSON, pet, person); nextEntry(); assertCurrentEntry(race, 1); - assertNextEntityRef(pet, Pet.RACE, pet, race); + assertNextEntityRef(pet, Pet.PROPERTY_RACE, pet, race); person.addPet(pet); @@ -114,7 +114,7 @@ nextEntry(); assertCurrentEntry(pet, 1); - assertNextAssociationEntityRef(person, Person.PET, PET1, person, pet); + assertNextAssociationEntityRef(person, Person.PROPERTY_PET, PET1, person, pet); Pet pet2 = newEntity(TopiaTestEntityEnum.Pet, PET2); @@ -124,15 +124,15 @@ nextEntry(); assertCurrentEntry(pet, 1); - assertNextAssociationEntityRef(person, Person.PET, PET1, person, pet); + assertNextAssociationEntityRef(person, Person.PROPERTY_PET, PET1, person, pet); nextEntry(); assertCurrentEntry(pet2, 1); - assertNextAssociationEntityRef(person, Person.PET, PET2, person, pet2); + assertNextAssociationEntityRef(person, Person.PROPERTY_PET, PET2, person, pet2); nextEntry(); assertCurrentEntry(race, 1); - assertNextEntityRef(pet, Pet.RACE, person, pet, race); + assertNextEntityRef(pet, Pet.PROPERTY_RACE, person, pet, race); pet2.setRace(race); @@ -140,16 +140,16 @@ nextEntry(); assertCurrentEntry(pet, 1); - assertNextAssociationEntityRef(person, Person.PET, PET1, person, pet); + assertNextAssociationEntityRef(person, Person.PROPERTY_PET, PET1, person, pet); nextEntry(); assertCurrentEntry(pet2, 1); - assertNextAssociationEntityRef(person, Person.PET, PET2, person, pet2); + assertNextAssociationEntityRef(person, Person.PROPERTY_PET, PET2, person, pet2); nextEntry(); assertCurrentEntry(race, 2); - assertNextEntityRef(pet, Pet.RACE, person, pet, race); - assertNextEntityRef(pet2, Pet.RACE, person, pet2, race); + assertNextEntityRef(pet, Pet.PROPERTY_RACE, person, pet, race); + assertNextEntityRef(pet2, Pet.PROPERTY_RACE, person, pet2, race); } } 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 2010-07-09 14:01:56 UTC (rev 2055) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java 2010-07-09 14:16:44 UTC (rev 2056) @@ -127,7 +127,7 @@ PersonneDAO dao = TopiaTestDAOHelper.getPersonneDAO(transaction); log.debug("CREATE PERSONNE : Bob Marley"); - Personne personne = dao.create(Personne.NAME, "Bob Marley"); + Personne personne = dao.create(Personne.PROPERTY_NAME, "Bob Marley"); transaction.commitTransaction(); String idPersonne = personne.getTopiaId(); assertNotNull(idPersonne); @@ -141,7 +141,7 @@ log.debug("ENTITY PERSONNE DELETED !"); log.debug("CREATE PERSONNE : Ziggy Marley"); - Personne personne2 = dao.create(Personne.NAME, "Ziggy Marley"); + Personne personne2 = dao.create(Personne.PROPERTY_NAME, "Ziggy Marley"); transaction.commitTransaction(); String idPersonne2 = personne2.getTopiaId(); assertNotNull(idPersonne2); @@ -181,7 +181,7 @@ PersonneDAO dao = TopiaTestDAOHelper.getPersonneDAO(transaction); log.debug("CREATE PERSONNE : Bob Marley"); - Personne personne = dao.create(Personne.NAME, "Bob Marley"); + Personne personne = dao.create(Personne.PROPERTY_NAME, "Bob Marley"); transaction.commitTransaction(); String idPersonne = personne.getTopiaId(); assertNotNull(idPersonne); @@ -190,7 +190,7 @@ Contact2DAO contactDAO = TopiaTestDAOHelper.getContact2DAO(transaction); log.debug("CREATE CONTACT : jaja@codelutin.com"); - Contact2 contact = contactDAO.create(Contact2.CONTACT_VALUE, "jaja@codelutin.com"); + Contact2 contact = contactDAO.create(Contact2.PROPERTY_CONTACT_VALUE, "jaja@codelutin.com"); transaction.commitTransaction(); String idContact = contact.getTopiaId(); assertNotNull(idContact); Modified: trunk/topia-persistence/src/test/xmi/topiatest.properties =================================================================== --- trunk/topia-persistence/src/test/xmi/topiatest.properties 2010-07-09 14:01:56 UTC (rev 2055) +++ trunk/topia-persistence/src/test/xmi/topiatest.properties 2010-07-09 14:16:44 UTC (rev 2056) @@ -1,6 +1,7 @@ model.tagvalue.i18n=topia.test.common. model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.useLegacyDAO=true +model.tagvalue.constantPrefix=PROPERTY_ #org.nuiton.topiatest.Company.class.tagvalue.naturalIdMutable=false #org.nuiton.topiatest.Company.attribute.siret.tagvalue.naturalId=true Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/ReplicationEngineAllTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/ReplicationEngineAllTest.java 2010-07-09 14:01:56 UTC (rev 2055) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/ReplicationEngineAllTest.java 2010-07-09 14:16:44 UTC (rev 2056) @@ -128,7 +128,7 @@ @Override public void testDetectAssociations() throws Exception { - detectAssociations(person, TopiaTestEntityEnum.Person, Person.PET); + detectAssociations(person, TopiaTestEntityEnum.Person, Person.PROPERTY_PET); detectAssociations(race); detectAssociations(pet); @@ -145,7 +145,7 @@ detectDirectDependencies(person); detectDirectDependencies(race); - detectDirectDependencies(pet, TopiaTestEntityEnum.Pet, Pet.PERSON, TopiaTestEntityEnum.Pet, Pet.RACE); + detectDirectDependencies(pet, TopiaTestEntityEnum.Pet, Pet.PROPERTY_PERSON, TopiaTestEntityEnum.Pet, Pet.PROPERTY_RACE); detectDirectDependencies(person2); detectDirectDependencies(race2); @@ -179,7 +179,7 @@ @Override public void testDetectObjectsToDettach() throws Exception { - detectObjectsToDettach(null, TopiaTestEntityEnum.Person, new String[]{Person.PET}); + detectObjectsToDettach(null, TopiaTestEntityEnum.Person, new String[]{Person.PROPERTY_PET}); } // @Ignore @@ -210,16 +210,16 @@ TopiaContextImplementor tx = (TopiaContextImplementor) context.beginTransaction(); - person = tx.getDAO(Person.class).create(Person.NAME, "pudding master"); - race = tx.getDAO(Race.class).create(Race.NAME, "race I"); - pet = tx.getDAO(Pet.class).create(Pet.NAME, "pudding", Pet.PERSON, person, Pet.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.NAME, "pudding II master"); - pet2 = tx.getDAO(Pet.class).create(Pet.NAME, "pudding II"); - race2 = tx.getDAO(Race.class).create(Race.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.NAME, "race III"); - pet3 = tx.getDAO(Pet.class).create(Pet.NAME, "pudding III", Pet.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/ReplicationEngineTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/ReplicationEngineTest.java 2010-07-09 14:01:56 UTC (rev 2055) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/ReplicationEngineTest.java 2010-07-09 14:16:44 UTC (rev 2056) @@ -146,7 +146,7 @@ @Override public void testDetectAssociations() throws Exception { - detectAssociations(person, TopiaTestEntityEnum.Person, Person.PET); + detectAssociations(person, TopiaTestEntityEnum.Person, Person.PROPERTY_PET); detectAssociations(race); detectAssociations(pet); @@ -162,7 +162,7 @@ detectDirectDependencies(person); detectDirectDependencies(race); - detectDirectDependencies(pet, TopiaTestEntityEnum.Pet, Pet.PERSON, TopiaTestEntityEnum.Pet, Pet.RACE); + detectDirectDependencies(pet, TopiaTestEntityEnum.Pet, Pet.PROPERTY_PERSON, TopiaTestEntityEnum.Pet, Pet.PROPERTY_RACE); detectDirectDependencies(person2); detectDirectDependencies(race2); @@ -198,9 +198,9 @@ @Override public void testDetectObjectsToDettach() throws Exception { - detectObjectsToDettach(person, TopiaTestEntityEnum.Person, new String[]{Person.PET}); + detectObjectsToDettach(person, TopiaTestEntityEnum.Person, new String[]{Person.PROPERTY_PET}); detectObjectsToDettach(race); - detectObjectsToDettach(pet, TopiaTestEntityEnum.Person, new String[]{Person.PET}); + detectObjectsToDettach(pet, TopiaTestEntityEnum.Person, new String[]{Person.PROPERTY_PET}); detectObjectsToDettach(person2); detectObjectsToDettach(race2); @@ -393,16 +393,16 @@ TopiaContextImplementor tx = (TopiaContextImplementor) context.beginTransaction(); - person = tx.getDAO(Person.class).create(Person.NAME, "pudding master"); - race = tx.getDAO(Race.class).create(Race.NAME, "race I"); - pet = tx.getDAO(Pet.class).create(Pet.NAME, "pudding", Pet.PERSON, person, Pet.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.NAME, "pudding II master"); - pet2 = tx.getDAO(Pet.class).create(Pet.NAME, "pudding II"); - race2 = tx.getDAO(Race.class).create(Race.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.NAME, "race III"); - pet3 = tx.getDAO(Pet.class).create(Pet.NAME, "pudding III", Pet.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/TopiaReplicationOperationTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java 2010-07-09 14:01:56 UTC (rev 2055) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java 2010-07-09 14:16:44 UTC (rev 2056) @@ -362,13 +362,13 @@ TopiaContextImplementor tx = (TopiaContextImplementor) context.beginTransaction(); - person = tx.getDAO(Person.class).create(Person.NAME, "pudding master"); - race = tx.getDAO(Race.class).create(Race.NAME, "race I"); - pet = tx.getDAO(Pet.class).create(Pet.NAME, "pudding", Pet.PERSON, person, Pet.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.NAME, "pudding II master"); - pet2 = tx.getDAO(Pet.class).create(Pet.NAME, "pudding II"); - race2 = tx.getDAO(Race.class).create(Race.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();
participants (1)
-
fdesbois＠users.nuiton.org