Author: athimel Date: 2013-08-05 18:54:23 +0200 (Mon, 05 Aug 2013) New Revision: 2793 Url: http://nuiton.org/projects/topia/repository/revisions/2793 Log: fixes #2802 Any association-class participant should be considered as non-null attribute 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 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-08-05 10:41:12 UTC (rev 2792) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2013-08-05 16:54:23 UTC (rev 2793) @@ -1198,7 +1198,7 @@ addException(createByNotNull, TopiaException.class); - String searchProperties = ""; + String createProperties = ""; // String params = ""; String clazzName = clazz.getName(); for (ObjectModelAttribute attr : props) { @@ -1206,17 +1206,17 @@ // add property as param in both methods addParameter(createByNotNull, attr.getType(), propName); - searchProperties += + createProperties += ", " + clazzName + '.' + getConstantName(propName) + ", " + propName; //params += ", " + propName; } - searchProperties = searchProperties.substring(2); + createProperties = createProperties.substring(2); //params = params.substring(2); setOperationBody(createByNotNull, "" /*{ - return create(<%=searchProperties%>); + return create(<%=createProperties%>); }*/ ); } 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-08-05 10:41:12 UTC (rev 2792) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2013-08-05 16:54:23 UTC (rev 2793) @@ -286,6 +286,13 @@ Set<ObjectModelAttribute> notNullOfSuperClass = getNotNullAttributes(superClass); results.addAll(notNullOfSuperClass); } + + // Association class participants are obviously not null + if (clazz instanceof ObjectModelAssociationClass) { + List<ObjectModelAttribute> participantsAttributes = ((ObjectModelAssociationClass) clazz).getParticipantsAttributes(); + results.addAll(participantsAttributes); + } + return results; }