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

r2435 - in branches: . 2.6.x-jta
by echatellier＠users.nuiton.org 10 Apr '12

10 Apr '12

Author: echatellier Date: 2012-04-10 11:23:10 +0200 (Tue, 10 Apr 2012) New Revision: 2435 Url: http://nuiton.org/repositories/revision/topia/2435 Log: New branche for refs #336 Use JTA api Added: branches/2.6.x-jta/ Property changes on: branches/2.6.x-jta ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2434 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator site/rst/user test/java/org/nuiton/topia/persistence
by sletellier＠users.nuiton.org 06 Apr '12

06 Apr '12

Author: sletellier Date: 2012-04-06 15:58:37 +0200 (Fri, 06 Apr 2012) New Revision: 2434 Url: http://nuiton.org/repositories/revision/topia/2434 Log: - fixes #2051 : Depreciate method create(naturalId) on DAOs - Update documentation - Update tests Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/site/rst/user/extend_model.rst trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 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 2012-04-06 08:56:17 UTC (rev 2433) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2012-04-06 13:58:37 UTC (rev 2434) @@ -423,6 +423,8 @@ generateNaturalId(daoAbstractClass, clazz); + generateNotNull(daoAbstractClass, clazz); + for (ObjectModelAttribute attr : clazz.getAttributes()) { if (!attr.isNavigable()) { continue; @@ -1118,14 +1120,24 @@ "existByNaturalId", "boolean", ObjectModelModifier.PUBLIC); addException(existByNaturalId, TopiaException.class); + // TODO sletellier 20120406 : remove method on 3.0 ObjectModelOperation create = addOperation(result, "create", "E", ObjectModelModifier.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"); addException(create, TopiaException.class); + ObjectModelOperation createByNaturalId = addOperation(result, + "createByNaturalId", "E", ObjectModelModifier.PUBLIC); + + addException(createByNaturalId, TopiaException.class); + // used for calling findByProperties in findByNaturalId String searchProperties = ""; // used for calling findByNaturalId in existByNaturalId - String params = ""; +// String params = ""; String clazzName = clazz.getName(); for (ObjectModelAttribute attr : props) { String propName = attr.getName(); @@ -1133,6 +1145,7 @@ addParameter(findByNaturalId, attr.getType(), propName); addParameter(existByNaturalId, attr.getType(), propName); addParameter(create, attr.getType(), propName); + addParameter(createByNaturalId, attr.getType(), propName); searchProperties += ", " + clazzName + '.' + getConstantName(propName) + @@ -1159,6 +1172,53 @@ 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", ObjectModelModifier.PUBLIC); + + addException(createByNotNull, TopiaException.class); + + String searchProperties = ""; +// 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); + + searchProperties += + ", " + clazzName + '.' + getConstantName(propName) + + ", " + propName; + //params += ", " + propName; + } + searchProperties = searchProperties.substring(2); + //params = params.substring(2); + + setOperationBody(createByNotNull, "" +/*{ + return create(<%=searchProperties%>); + }*/ + ); + } + } } 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 2012-04-06 08:56:17 UTC (rev 2433) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2012-04-06 13:58:37 UTC (rev 2434) @@ -375,6 +375,33 @@ } /** + * Cherche et renvoie la liste des attributs qui ne doivent pas etre null dans + * une classe. + * + * @param clazz la classe à tester + * @return la liste des attributs qui ne doivent pas etre null + */ + public static Set<ObjectModelAttribute> getNotNullAttributes( + ObjectModelClass clazz) { + + // use {@link LinkedHashSet} to keep order and prevent duplicate not null found + Set<ObjectModelAttribute> results = + new LinkedHashSet<ObjectModelAttribute>(); + for (ObjectModelAttribute attr : clazz.getAttributes()) { + if (isNotNull(attr)) { + results.add(attr); + } + } + + Collection<ObjectModelClass> superclasses = clazz.getSuperclasses(); + for (ObjectModelClass superClass : superclasses) { + Set<ObjectModelAttribute> notNullOfSuperClass = getNotNullAttributes(superClass); + results.addAll(notNullOfSuperClass); + } + return results; + } + + /** * Test if we need to generate {@code toString} method for the given class. * * @param clazz class to test @@ -453,17 +480,19 @@ } /** - * Detecte si un attribut est marué comme non null. + * Detecte si un attribut est marqué comme non null. + * Les naturalId {@link #isNaturalId} sont not null par défaut * * @param attribute l'attribut à tester - * @return {@code true} si l'attribut doit être non null, {@code false} sinon.. + * @return {@code true} si l'attribut doit être non null, + * par défaut pour les naturalId, {@code false} sinon.. * @since 2.6.9 */ public static boolean isNotNull(ObjectModelAttribute attribute) { String value = getNotNullTagValue(attribute); if (StringUtils.isEmpty(value)) { // valeur null, donc pas positionnee - return false; + return isNaturalId(attribute); } try { return Boolean.valueOf(value.trim()); Modified: trunk/topia-persistence/src/site/rst/user/extend_model.rst =================================================================== --- trunk/topia-persistence/src/site/rst/user/extend_model.rst 2012-04-06 08:56:17 UTC (rev 2433) +++ trunk/topia-persistence/src/site/rst/user/extend_model.rst 2012-04-06 13:58:37 UTC (rev 2434) @@ -85,7 +85,13 @@ existante ; à moins de le préciser dans la configuration via le tagValue "naturalIdMutable" placé à "true" (déconseillé). +Le DAO de l'entité se voit ajouté les méthodes suivantes : +- createByNaturalId : qui permet de crée l'entité avec tout les naturalId +- createByNotNull : qui permet de crée l'entité avec tout les naturalId not null (donc obligatoire) +- existByNaturalId : qui permet de vérifié que l'entité correspondant au naturalId existe +- findByNaturalId : qui permet de chercher l'entité sur les naturalId + Ajouter des requêtes complexes ============================== 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 2012-04-06 08:56:17 UTC (rev 2433) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2012-04-06 13:58:37 UTC (rev 2434) @@ -65,10 +65,14 @@ TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); // No exception will be thrown with the two properties - dao.create(5, "str"); + dao.createByNaturalId(5, "str"); transaction.commitTransaction(); // No exception will only the need property + dao.createByNotNull(3); + transaction.commitTransaction(); + + // No exception will only the need property dao.create(NaturalizedEntity.PROPERTY_NATURAL_ID_NOT_NULL, 3); transaction.commitTransaction(); } @@ -103,7 +107,7 @@ TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); NaturalizedEntity entity = - dao.create(5, "str"); + dao.createByNaturalId(5, "str"); transaction.commitTransaction(); // Exception will be throw : not allowed to modify a naturalId property @@ -125,7 +129,7 @@ TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); NaturalizedEntity entity = - dao.create(5, "str"); + dao.createByNaturalId(5, "str"); transaction.commitTransaction(); NaturalizedEntity result = dao.findByNaturalId(5, "str"); @@ -141,7 +145,7 @@ NaturalizedEntityDAO dao = TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); - dao.create(5, "str"); + dao.createByNaturalId(5, "str"); transaction.commitTransaction(); boolean result = dao.existByNaturalId(5, "str");

1 0

r2433 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by sletellier＠users.nuiton.org 06 Apr '12

06 Apr '12

Author: sletellier Date: 2012-04-06 10:56:17 +0200 (Fri, 06 Apr 2012) New Revision: 2433 Url: http://nuiton.org/repositories/revision/topia/2433 Log: fixes # :#2052 : Add schema if needed on create and drop index on hibernate mapping Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2012-04-06 07:26:42 UTC (rev 2432) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2012-04-06 08:56:17 UTC (rev 2433) @@ -245,6 +245,12 @@ tableName =TopiaGeneratorUtil.getDbName(attribute.getClassifier()); propertyName = TopiaGeneratorUtil.getDbName(attribute.getReverseAttribute()); } + + // add schema if exist (http://nuiton.org/issues/2052) + String schema = TopiaGeneratorUtil.getDbSchemaNameTagValue(clazz, model); + if (StringUtils.isNotEmpty(schema)) { + tableName = schema + "." + tableName; + } /*{ <database-object> <create>CREATE INDEX <%=indexName%> ON <%=tableName%>(<%=propertyName%>)</create> <drop>DROP INDEX <%=indexName%></drop>

1 0

r2432 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator test/java/org/nuiton/topia/persistence test/xmi
by sletellier＠users.nuiton.org 06 Apr '12

06 Apr '12

Author: sletellier Date: 2012-04-06 09:26:42 +0200 (Fri, 06 Apr 2012) New Revision: 2432 Url: http://nuiton.org/repositories/revision/topia/2432 Log: fixies #2050 : Natural id and not null attributes are not propagated on generalized entities Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java trunk/topia-persistence/src/test/xmi/topiatest.zargo Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2012-03-29 09:47:07 UTC (rev 2431) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2012-04-06 07:26:42 UTC (rev 2432) @@ -963,7 +963,7 @@ private void generateNaturalId(ObjectModelClass result, ObjectModelClass clazz) { - List<ObjectModelAttribute> props = + Set<ObjectModelAttribute> props = TopiaGeneratorUtil.getNaturalIdAttributes(clazz); if (!props.isEmpty()) { 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 2012-03-29 09:47:07 UTC (rev 2431) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2012-04-06 07:26:42 UTC (rev 2432) @@ -25,6 +25,7 @@ package org.nuiton.topia.generator; +import java.util.Set; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -316,23 +317,21 @@ for (ObjectModelClass clazz : classes) { String clazzName = clazz.getName(); - Collection<ObjectModelAttribute> attributes = clazz.getAttributes(); boolean withNatural = false; boolean withNotNull = false; StringBuilder naturalIdsParams = new StringBuilder(); StringBuilder notNullParams = new StringBuilder(); - for (ObjectModelAttribute attr2 : attributes) { - if (TopiaGeneratorUtil.isNaturalId(attr2)) { - withNatural = true; - // attribut metier - naturalIdsParams.append(", \"").append(attr2.getName()).append("\""); - } - if (TopiaGeneratorUtil.isNotNull(attr2)) { + Set<ObjectModelAttribute> naturalIdsAttributes = TopiaGeneratorUtil.getNaturalIdAttributes(clazz); + for (ObjectModelAttribute naturalIdAttributes : naturalIdsAttributes) { + withNatural = true; + // attribut metier + naturalIdsParams.append(", \"").append(naturalIdAttributes.getName()).append("\""); + if (TopiaGeneratorUtil.isNotNull(naturalIdAttributes)) { withNotNull = true; // attribut not-null - notNullParams.append(", \"").append(attr2.getName()).append("\""); + notNullParams.append(", \"").append(naturalIdAttributes.getName()).append("\""); } } 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 2012-03-29 09:47:07 UTC (rev 2431) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2012-04-06 07:26:42 UTC (rev 2432) @@ -1102,7 +1102,7 @@ private void generateNaturalId(ObjectModelClass result, ObjectModelClass clazz) { - List<ObjectModelAttribute> props = + Set<ObjectModelAttribute> props = TopiaGeneratorUtil.getNaturalIdAttributes(clazz); if (!props.isEmpty()) { 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 2012-03-29 09:47:07 UTC (rev 2431) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2012-04-06 07:26:42 UTC (rev 2432) @@ -25,6 +25,7 @@ package org.nuiton.topia.generator; +import java.util.LinkedHashSet; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -352,15 +353,24 @@ * @param clazz la classe à tester * @return la liste des attributs de la clef métier */ - public static List<ObjectModelAttribute> getNaturalIdAttributes( + public static Set<ObjectModelAttribute> getNaturalIdAttributes( ObjectModelClass clazz) { - List<ObjectModelAttribute> results = - new ArrayList<ObjectModelAttribute>(); + + // use {@link LinkedHashSet} to keep order and prevent duplicate natural ids found + Set<ObjectModelAttribute> results = + new LinkedHashSet<ObjectModelAttribute>(); for (ObjectModelAttribute attr : clazz.getAttributes()) { if (isNaturalId(attr)) { results.add(attr); } } + + // sletellier : #2050 Natural id and not null attributes are not propagated on generalized entities (http://nuiton.org/issues/2050) + Collection<ObjectModelClass> superclasses = clazz.getSuperclasses(); + for (ObjectModelClass superClass : superclasses) { + Set<ObjectModelAttribute> naturalIdsOfSuperClass = getNaturalIdAttributes(superClass); + results.addAll(naturalIdsOfSuperClass); + } return results; } 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 2012-03-29 09:47:07 UTC (rev 2431) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2012-04-06 07:26:42 UTC (rev 2432) @@ -65,8 +65,7 @@ TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); // No exception will be thrown with the two properties - dao.create(NaturalizedEntity.PROPERTY_NATURAL_ID_NOT_NULL, 5, - NaturalizedEntity.PROPERTY_NATURAL_ID_NULL, "str"); + dao.create(5, "str"); transaction.commitTransaction(); // No exception will only the need property @@ -104,8 +103,7 @@ TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); NaturalizedEntity entity = - dao.create(NaturalizedEntity.PROPERTY_NATURAL_ID_NOT_NULL, 5, - NaturalizedEntity.PROPERTY_NATURAL_ID_NULL, "str"); + dao.create(5, "str"); transaction.commitTransaction(); // Exception will be throw : not allowed to modify a naturalId property @@ -127,8 +125,7 @@ TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); NaturalizedEntity entity = - dao.create(NaturalizedEntity.PROPERTY_NATURAL_ID_NOT_NULL, 5, - NaturalizedEntity.PROPERTY_NATURAL_ID_NULL, "str"); + dao.create(5, "str"); transaction.commitTransaction(); NaturalizedEntity result = dao.findByNaturalId(5, "str"); @@ -144,8 +141,7 @@ NaturalizedEntityDAO dao = TopiaTestDAOHelper.getNaturalizedEntityDAO(transaction); - dao.create(NaturalizedEntity.PROPERTY_NATURAL_ID_NOT_NULL, 5, - NaturalizedEntity.PROPERTY_NATURAL_ID_NULL, "str"); + dao.create(5, "str"); transaction.commitTransaction(); boolean result = dao.existByNaturalId(5, "str"); @@ -157,4 +153,22 @@ Assert.assertFalse(result); } + + @Test + public void testNaturalIdAreGeneralized() throws Exception { + + // test that natural ids are generalized + String[] generalizedNaturalizedNaturalIds = TopiaTestDAOHelper.TopiaTestEntityEnum.GeneralizedNaturalizedEntity.getNaturalIds(); + String[] naturalizedNaturalIds = TopiaTestDAOHelper.TopiaTestEntityEnum.NaturalizedEntity.getNaturalIds(); + Assert.assertArrayEquals(generalizedNaturalizedNaturalIds, naturalizedNaturalIds); + } + + @Test + public void testNotNullsAreGeneralized() throws Exception { + + // test that not nulls are generalized + String[] generalizedNaturalizedNotNulls = TopiaTestDAOHelper.TopiaTestEntityEnum.GeneralizedNaturalizedEntity.getNotNulls(); + String[] naturalizedNotNulls = TopiaTestDAOHelper.TopiaTestEntityEnum.NaturalizedEntity.getNotNulls(); + Assert.assertArrayEquals(generalizedNaturalizedNotNulls, naturalizedNotNulls); + } } Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0