Author: tchemit Date: 2012-08-14 18:41:46 +0200 (Tue, 14 Aug 2012) New Revision: 2614 Url: http://nuiton.org/repositories/revision/topia/2614 Log: fixes #2257: not null are not generated in XXXEntityEnum is not in naturalId Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2012-08-14 16:03:27 UTC (rev 2613) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2012-08-14 16:41:46 UTC (rev 2614) @@ -324,16 +324,17 @@ StringBuilder notNullParams = new StringBuilder(); Set<ObjectModelAttribute> naturalIdsAttributes = TopiaGeneratorUtil.getNaturalIdAttributes(clazz); - for (ObjectModelAttribute naturalIdAttributes : naturalIdsAttributes) { + for (ObjectModelAttribute attribute: naturalIdsAttributes) { withNatural = true; // attribut metier - naturalIdsParams.append(", \"").append(naturalIdAttributes.getName()).append("\""); - if (TopiaGeneratorUtil.isNotNull(naturalIdAttributes)) { - withNotNull = true; - // attribut not-null - notNullParams.append(", \"").append(naturalIdAttributes.getName()).append("\""); - } + naturalIdsParams.append(", \"").append(attribute.getName()).append("\""); } + Set<ObjectModelAttribute> notNullIdsAttributes = TopiaGeneratorUtil.getNotNullAttributes(clazz); + for (ObjectModelAttribute attribute : notNullIdsAttributes) { + withNotNull = true; + // attribut not-null + notNullParams.append(", \"").append(attribute.getName()).append("\""); + } StringBuilder params = new StringBuilder(clazzName + ".class"); if (withNotNull) {