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

r2541 - in trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck: it/persistence mapping mapping/test12 mapping/test13
by tchemit＠users.nuiton.org 27 May '12

27 May '12

Author: tchemit Date: 2012-05-27 11:39:01 +0200 (Sun, 27 May 2012) New Revision: 2541 Url: http://nuiton.org/repositories/revision/topia/2541 Log: refs #2089: Use JPA (orm) mappings (deal with natural Id) (add tests) Added: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/persistence/NaturalIdTest.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/persistence/NaturalIdTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/persistence/NaturalIdTest.java 2012-05-27 09:38:28 UTC (rev 2540) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/persistence/NaturalIdTest.java 2012-05-27 09:39:01 UTC (rev 2541) @@ -31,12 +31,12 @@ import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.tck.it.TopiaDatabaseIt; -import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; +import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.tck.it.NaturalizedEntity; import org.nuiton.topia.tck.it.NaturalizedEntityDAO; +import org.nuiton.topia.tck.it.TopiaDatabaseIt; +import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import javax.persistence.PersistenceException; @@ -79,7 +79,7 @@ transaction.commitTransaction(); } - @Test + @Test(expected = TopiaException.class) public void testCreateFailed() throws Exception { log.debug("Test naturalId : create failed"); TopiaContext transaction = db.beginTransaction(); @@ -87,16 +87,9 @@ NaturalizedEntityDAO dao = TopiaTckItDAOHelper.getNaturalizedEntityDAO(transaction); - // Exception will be throw -// try { - dao.create(); - transaction.commitTransaction(); - - // Note : this is possible to create an empty entity if the type - // is primitive like 'int' which have a default value of '0' -// } catch (PropertyValueException eee) { -// Assert.assertEquals("naturalIdNotNull", eee.getPropertyName()); -// } + // Exception will be throw (not null not respected) + dao.create(); + transaction.commitTransaction(); } @Test Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java 2012-05-27 09:38:28 UTC (rev 2540) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java 2012-05-27 09:39:01 UTC (rev 2541) @@ -35,7 +35,7 @@ Assert.assertEquals(0, nbA); // a with all fields to null - A12A a = aDAO.create(); + aDAO.create(); tx.commitTransaction(); } Added: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java (rev 0) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test13/EntityWithNaturalIdTest.java 2012-05-27 09:39:01 UTC (rev 2541) @@ -0,0 +1,84 @@ +package org.nuiton.topia.tck.mapping.test13; + +import junit.framework.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.tck.mapping.AbstractMappingTest; + +import java.util.Date; + +/** + * Tests a entity with a {@code natural id}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class EntityWithNaturalIdTest extends AbstractMappingTest { + + protected TopiaContext tx; + + protected A13ADAO aDAO; + + @Before + public void before() throws TopiaException { + tx = db.beginTransaction(); + aDAO = getDAO(tx, A13A.class); + } + + @Test(expected = TopiaException.class) + public void createwithNull() throws TopiaException { + + long nbA = aDAO.count(); + + Assert.assertEquals(0, nbA); + + // a with all fields to null + aDAO.create(); + tx.commitTransaction(); + } + + @Test + public void create() throws TopiaException { + + long nbA = aDAO.count(); + + Assert.assertEquals(0, nbA); + + // a with all fields to null + Date date = new Date(); + A13A a = aDAO.create( + A13A.PROPERTY_NATURAL_ID_STRING, "string", + A13A.PROPERTY_NATURAL_ID_INTEGER, 1, + A13A.PROPERTY_NATURAL_ID_DATE, date + ); + a.setIntegerField(10); + + tx.commitTransaction(); + + nbA = aDAO.count(); + Assert.assertEquals(1, nbA); + + A13A aBis = aDAO.findByTopiaId(a.getTopiaId()); + Assert.assertEquals(a, aBis); + + aBis = aDAO.findByNaturalId(1, "string", date); + Assert.assertEquals(a, aBis); + + aDAO.create( + A13A.PROPERTY_NATURAL_ID_STRING, "string", + A13A.PROPERTY_NATURAL_ID_INTEGER, 1, + A13A.PROPERTY_NATURAL_ID_DATE, date + ); + + try { + tx.commitTransaction(); + // duplicated natural id + Assert.fail(); + } catch (TopiaException e) { + Assert.assertTrue(true); + } + + } +} \ No newline at end of file

1 0

r2540 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 27 May '12

27 May '12

Author: tchemit Date: 2012-05-27 11:38:28 +0200 (Sun, 27 May 2012) New Revision: 2540 Url: http://nuiton.org/repositories/revision/topia/2540 Log: refs #2089: Use JPA (orm) mappings (deal with natural Id) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-05-25 16:40:59 UTC (rev 2539) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-05-27 09:38:28 UTC (rev 2540) @@ -210,7 +210,7 @@ // -- tag 'mapped-superclass' (fields are on Abstract so use a mapped-superclass) - addMappedSuperclass(output, input, attributes); + addMappedSuperclass(output, input, attributes, embeddableAttributes); // -- tag 'entity' @@ -277,7 +277,8 @@ // -- tag 'embeddable' - addAttribute(xmlAttributes, ATTRIBUTE_CLASS, embeddebaleName); + addAttribute(xmlAttributes, ATTRIBUTE_CLASS, + input.getPackageName() + "." + embeddebaleName); //NOTUSED addAttribute(xmlAttributes, ATTRIBUTE_ACCESS, AccessType.FIELD); /*{<%=flushTag(TAG_EMBEDDABLE, xmlAttributes)%> @@ -285,8 +286,7 @@ Collection<ObjectModelAttribute> attrs = embeddableAttributes.get(embeddebaleName); - generateAttributes(output, input, attrs, false); - + generateAttributes(output, input, attrs, null); /*{<%=closeTag(TAG_EMBEDDABLE)%> }*/ // -- tag 'embeddable' @@ -299,7 +299,8 @@ private void addMappedSuperclass(Writer output, ObjectModelClass input, - List<ObjectModelAttribute> attributes) throws IOException { + List<ObjectModelAttribute> attributes, + Multimap<String, ObjectModelAttribute> embeddableAttributes) throws IOException { Map<String, String> xmlAttributes = new TreeMap<String, String>(); @@ -311,7 +312,7 @@ // generate attributes for the entity - generateAttributes(output, input, attributes, true); + generateAttributes(output, input, attributes, embeddableAttributes); /*{<%=closeTag(TAG_MAPPED_SUPERCLASS)%> }*/ @@ -320,7 +321,7 @@ private void generateAttributes(Writer output, ObjectModelClass input, Collection<ObjectModelAttribute> attributes, - boolean mainEntity) throws IOException { + Multimap<String, ObjectModelAttribute> embeddableAttributes) throws IOException { // split attributes by their mapping type Multimap<PROPERTY_TYPE, ObjectModelAttribute> attributesByType = @@ -373,10 +374,31 @@ generateElementCollectionAttribute(output, input, attribute); } + // generate embedded attributes + if (embeddableAttributes != null) { + + // we are on main entity, check if there is some a natural id to generate + if (embeddableAttributes.containsKey(TopiaGeneratorUtil.GET_NATURAL_ID_CLASS_SIMPLE_NAME.apply(input))) { + + // there is a natural id embedded to generate + generateEmbeddedAttribute(output, input); + } + //TODO-tchemit-2012-05-27 Still nedd to deal with other embedded... + } + /*{<%=closeTag(TAG_ATTRIBUTES)%> }*/ } + private void generateEmbeddedAttribute(Writer output, + ObjectModelClass input) throws IOException { + Map<String, String> xmlAttributes = Maps.newTreeMap(); + addAttribute(xmlAttributes, ATTRIBUTE_NAME, EntityTransformer.NATURAL_ID_FIELD_NAME); + addAttribute(xmlAttributes, ATTRIBUTE_ACCESS, AccessType.FIELD); +/*{<%=flushTag(TAG_EMBEDDED, true, xmlAttributes)%> +}*/ + } + private void generateBasicAttribute(Writer output, ObjectModelClass input, ObjectModelAttribute attr) throws IOException { @@ -1105,9 +1127,10 @@ ObjectModelClass input, List<ObjectModelAttribute> normalAttributes) { Multimap<String, ObjectModelAttribute> result = ArrayListMultimap.create(); + String naturalIdClassName = TopiaGeneratorUtil.GET_NATURAL_ID_CLASS_SIMPLE_NAME.apply(input); for (ObjectModelAttribute attribute : input.getAttributes()) { if (TopiaGeneratorUtil.isNaturalId(attribute)) { - result.put("naturalId", attribute); + result.put(naturalIdClassName, attribute); } else { normalAttributes.add(attribute); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2012-05-25 16:40:59 UTC (rev 2539) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2012-05-27 09:38:28 UTC (rev 2540) @@ -85,12 +85,17 @@ /** Logger */ private static final Log log = LogFactory.getLog(EntityTransformer.class); + public static final String NATURAL_ID_FIELD_NAME = "naturalId"; + + protected ObjectModelInterface outputInterface; protected ObjectModelClass outputAbstract; protected ObjectModelClass outputImpl; + protected ObjectModelClass outputNaturalIdEmbedded; + private boolean associationClass; protected boolean generateInterface; @@ -99,12 +104,20 @@ protected boolean generateImpl; + protected boolean generateNaturalIdEmbedded; + protected boolean generateBooleanGetMethods; + // la liste des attributs faisant parti de la clef metier + protected List<ObjectModelAttribute> naturalAttributes = new ArrayList<ObjectModelAttribute>(); + // la liste des autres attributs + protected List<ObjectModelAttribute> noneNaturalAttributes = new ArrayList<ObjectModelAttribute>(); + protected void clean() { outputInterface = null; outputAbstract = null; outputImpl = null; + outputNaturalIdEmbedded = null; } @Override @@ -120,7 +133,11 @@ log.debug("for entity : " + input.getQualifiedName()); log.debug("Will use classLoader " + getClassLoader()); } - + + naturalAttributes = new ArrayList<ObjectModelAttribute>(); + + noneNaturalAttributes = new ArrayList<ObjectModelAttribute>(); + // fix once for all the constant prefix to use String prefix = getConstantPrefix(input, ""); if (StringUtils.isEmpty(prefix)) { @@ -135,9 +152,21 @@ } setConstantPrefix(prefix); + //obtains natural ids + for (ObjectModelAttribute attr : input.getAttributes()) { + if (TopiaGeneratorUtil.isNaturalId(attr)) { + // attribut metier + naturalAttributes.add(attr); + } else { + // attribut normal + noneNaturalAttributes.add(attr); + } + } + generateInterface = isGenerateInterface(input); generateAbstract = isGenerateAbstract(input); generateImpl = isGenerateImpl(input); + generateNaturalIdEmbedded= isGenerateNaturalIdEmbedded(input); String noGenerateBooleanGetMethods = TopiaGeneratorUtil.getDoNotGenerateBooleanGetMethods(model, input); @@ -157,12 +186,23 @@ createEntityAbstractClass(input); } + if (generateNaturalIdEmbedded) { + + // Create Entity Natural Id class and its header + createEntityNaturalIdEmbeddedClass(input); + } + // Generate i18n block String i18nPrefix = TopiaGeneratorUtil.getI18nPrefixTagValue(input, model); if (!StringUtils.isEmpty(i18nPrefix)) { generateI18nBlock(input, outputAbstract, i18nPrefix); } + if (!naturalAttributes.isEmpty()) { + + createNaturalIdField(input); + } + // Create accept operation, will be updated during property generation createAcceptOperation(); @@ -301,17 +341,6 @@ for (ObjectModelClass parent : input.getSuperclasses()) { //tchemit-2011-09-12 What ever abstract or not, we alwyas use an Impl, moreover use the util method instead String extendClass = TopiaGeneratorUtil.getDOType(parent, model); -// String extendClass = parent.getQualifiedName(); -// //Si une des classes parentes définies des méthodes abstraites, son -// // impl ne sera pas créé -// boolean abstractParent = TopiaGeneratorUtil.shouldBeAbstract(parent); -// if (TopiaGeneratorUtil.isEntity(parent)) { -// if (abstractParent) { -// extendClass += "Abstract"; -// } else { -// extendClass += "Impl"; -// } -// } setSuperClass(outputAbstract, extendClass); } @@ -323,6 +352,59 @@ addContextableMethods(input, outputAbstract); } + protected void createNaturalIdField(ObjectModelClass input) { + + String fieldName = NATURAL_ID_FIELD_NAME; + + // add a naturalId field + String naturalIdClassName = getNaturalIdClassName(input); + + addAttribute(outputAbstract, + fieldName, naturalIdClassName, "new " + naturalIdClassName + "()", + //ObjectModelModifier.toValue(attrVisibility), + ObjectModelModifier.PROTECTED + ); + + // add a getter + + // Interface operation + ObjectModelOperation interfaceOperation = + addOperation(outputInterface, getJavaBeanMethodName("get", fieldName), + naturalIdClassName, ObjectModelModifier.PUBLIC); + + // Implementation + ObjectModelOperation implOperation = + createImplOperation(interfaceOperation); + + String attrType = + TopiaGeneratorUtil.getSimpleName(naturalIdClassName); + + setOperationBody(implOperation, "" +/*{ + <%=attrType%> result = this.<%=fieldName%>; + return result; + }*/ + ); + } + + protected void createEntityNaturalIdEmbeddedClass(ObjectModelClass input) { + + outputNaturalIdEmbedded = createClass(getNaturalIdClassName(input), + input.getPackageName()); + + // Documentation + StringBuilder doc = new StringBuilder(); + doc.append("Classe représentant la clef naturel de l'entité {@link "); + doc.append(StringUtils.capitalize(outputInterface.getName())); + doc.append("}\n"); + + setDocumentation(outputNaturalIdEmbedded, doc.toString()); + } + + protected String getNaturalIdClassName(ObjectModelClass input) { + return TopiaGeneratorUtil.GET_NATURAL_ID_CLASS_SIMPLE_NAME.apply(input); + } + /** * Ajout les methodes necessaire à l'interface {@link TopiaEntityContextable} * si le tagValue {@link TopiaTagValues#TAG_CONTEXTABLE} est renseigné. @@ -372,6 +454,19 @@ return alreadyInClassPath; } + protected boolean isGenerateNaturalIdEmbedded(ObjectModelClass input) { + + String fqn = getNaturalIdClassName(input); + boolean alreadyInClassPath = isInClassPath(fqn); + if (alreadyInClassPath) { + + return false; + } + + // On génère le natural Id si l'entité possède une clef naturelle + return !naturalAttributes.isEmpty(); + } + protected boolean isGenerateImpl(ObjectModelClass input) { Collection<ObjectModelOperation> operations = input.getOperations(); @@ -538,9 +633,12 @@ //String attrVisibility = attr.getVisibility(); + boolean isNaturalId = isNaturalId(attribute); + // Declaration ObjectModelAttribute property = - addAttribute(outputAbstract, attrName, attrType, null, + addAttribute(isNaturalId ? outputNaturalIdEmbedded : outputAbstract, + attrName, attrType, null, //ObjectModelModifier.toValue(attrVisibility), ObjectModelModifier.PROTECTED ); @@ -561,8 +659,6 @@ // Annotation String annotation = TopiaGeneratorUtil.getAnnotationTagValue(attribute); if (!StringUtils.isEmpty(annotation)) { - //FIXME Make annotation works... - //TODO tchemit 20100513 Test it still works addAnnotation(outputAbstract, property, annotation); } } @@ -693,12 +789,13 @@ attrType = TopiaGeneratorUtil.getSimpleName(attrType); String constantName = getConstantName(attrName); + String receiverName = getReceiverName(attribute, attrName); setOperationBody(implOperation, "" /*{ - <%=attrType%> oldValue = this.<%=attrName%>; + <%=attrType%> oldValue = <%=receiverName%>; fireOnPreWrite(<%=constantName%>, oldValue, <%=attrName%>); - this.<%=attrName%> = <%=attrName%>; + <%=receiverName%> = <%=attrName%>; fireOnPostWrite(<%=constantName%>, oldValue, <%=attrName%>); }*/ ); @@ -720,6 +817,7 @@ String operationPrefix) { String attrName = getPropertyName(attribute); + String receiverName = getReceiverName(attribute, attrName); if (log.isDebugEnabled()) { log.debug("Generate single '" + operationPrefix + "' operation for property : " @@ -741,12 +839,27 @@ setOperationBody(implOperation, "" /*{ - fireOnPreRead(<%=constantName%>, <%=attrName%>); - <%=attrType%> result = this.<%=attrName%>; - fireOnPostRead(<%=constantName%>, <%=attrName%>); + fireOnPreRead(<%=constantName%>, <%=receiverName%>); + <%=attrType%> result = <%=receiverName%>; + fireOnPostRead(<%=constantName%>, <%=receiverName%>); return result; }*/ ); + + if (isNaturalId(attribute)) { + + // add also a getter in the natural id class + implOperation = + cloneOperationSignature(interfaceOperation, outputNaturalIdEmbedded, false, + ObjectModelModifier.PUBLIC ); + + setOperationBody(implOperation, "" +/*{ + <%=attrType%> result = <%=attrName%>; + return result; + }*/ + ); + } } protected void addMultipleAddOperation(ObjectModelAttribute attribute, @@ -775,13 +888,15 @@ attrType = TopiaGeneratorUtil.getSimpleName(attrType); + String receiverName = getReceiverName(attribute, attrName); + StringBuilder body = new StringBuilder(); body.append("" /*{ fireOnPreWrite(<%=constantName%>, null, <%=attrName%>); - if (this.<%=attrName%> == null) { - this.<%=attrName%> = new <%=collectionImpl%><<%=attrType%>>(); + if (<%=receiverName%> == null) { + <%=receiverName%> = new <%=collectionImpl%><<%=attrType%>>(); } }*/ ); @@ -813,8 +928,8 @@ } body.append("" /*{ - this.<%=attrName%>.add(<%=attrName%>); - fireOnPostWrite(<%=constantName%>, this.<%=attrName%>.size(), null, <%=attrName%>); + <%=receiverName%>.add(<%=attrName%>); + fireOnPostWrite(<%=constantName%>, <%=receiverName%>.size(), null, <%=attrName%>); }*/ ); setOperationBody(implOperation, body.toString()); @@ -880,18 +995,30 @@ attrType = TopiaGeneratorUtil.getSimpleName(attrType); referenceType = TopiaGeneratorUtil.getSimpleName(referenceType); + String receiverName = getReceiverName(attribute, attrName); + // Force fire for collection setOperationBody(implOperation, "" /*{ // Copy elements to keep data for fire with new reference - <%=attrType%> oldValue = this.<%=attrName%> != null ? new <%=collectionImpl%><<%=referenceType%>>(this.<%=attrName%>) : null; + <%=attrType%> oldValue = <%=receiverName%> != null ? new <%=collectionImpl%><<%=referenceType%>>(<%=receiverName%>) : null; fireOnPreWrite(<%=constantName%>, oldValue, <%=attrName%>); - this.<%=attrName%> = <%=attrName%>; + <%=receiverName%> = <%=attrName%>; fireOnPostWrite(<%=constantName%>, oldValue, <%=attrName%>); }*/ ); } + protected String getReceiverName(ObjectModelAttribute attribute, String attrName) { + String receiverName; + if (isNaturalId(attribute)) { + receiverName = NATURAL_ID_FIELD_NAME + "." + attrName; + } else { + receiverName = "this." + attrName; + } + return receiverName; + } + protected void addMultipleRemoveOperation(ObjectModelAttribute attribute) { String attrName = getPropertyName(attribute); @@ -916,12 +1043,14 @@ attrType = TopiaGeneratorUtil.getSimpleName(attrType); + String receiverName = getReceiverName(attribute, attrName); + StringBuilder body = new StringBuilder(); body.append("" /*{ fireOnPreWrite(<%=constantName%>, <%=attrName%>, null); - if (this.<%=attrName%> == null || !this.<%=attrName%>.remove(<%=attrName%>)) { + if (<%=receiverName%> == null || !<%=receiverName%>.remove(<%=attrName%>)) { throw new IllegalArgumentException("List does not contain given element"); } }*/ @@ -948,7 +1077,7 @@ } body.append("" /*{ - fireOnPostWrite(<%=constantName%>, this.<%=attrName%>.size() + 1, <%=attrName%>, null); + fireOnPostWrite(<%=constantName%>, <%=receiverName%>.size() + 1, <%=attrName%>, null); }*/ ); setOperationBody(implOperation, body.toString()); @@ -978,9 +1107,11 @@ attrType = TopiaGeneratorUtil.getSimpleName(attrType); + String receiverName = getReceiverName(attribute, attrName); + StringBuilder body = new StringBuilder("" /*{ - if (this.<%=attrName%> == null) { + if (<%=receiverName%> == null) { return; } }*/ @@ -991,7 +1122,7 @@ String getterName = getJavaBeanMethodName("get", reverse.getName()); String setterName = getJavaBeanMethodName("set", reverse.getName()); body.append("" -/*{ for (<%=attrType%> item : this.<%=attrName%>) { +/*{ for (<%=attrType%> item : <%=receiverName%>) { }*/ ); if (!TopiaGeneratorUtil.isNMultiplicity(reverse)) { @@ -1012,10 +1143,10 @@ ); } body.append("" -/*{ <%=collectionInterface%><<%=attrType%>> oldValue = new <%=collectionImpl%><<%=attrType%>>(this.<%=attrName%>); - fireOnPreWrite(<%=constantName%>, oldValue, this.<%=attrName%>); - this.<%=attrName%>.clear(); - fireOnPostWrite(<%=constantName%>, oldValue, this.<%=attrName%>); +/*{ <%=collectionInterface%><<%=attrType%>> oldValue = new <%=collectionImpl%><<%=attrType%>>(<%=receiverName%>); + fireOnPreWrite(<%=constantName%>, oldValue, <%=receiverName%>); + <%=receiverName%>.clear(); + fireOnPostWrite(<%=constantName%>, oldValue, <%=receiverName%>); }*/ ); setOperationBody(implOperation, body.toString()); @@ -1025,6 +1156,9 @@ String collectionInterface) { String attrName = getPropertyName(attribute); + + String receiverName = getReceiverName(attribute, attrName); + String attrType = collectionInterface + "<" + getPropertyType(attribute) + ">"; if (log.isDebugEnabled()) { @@ -1042,7 +1176,7 @@ setOperationBody(implOperation, "" /*{ - return <%=attrName%>; + return <%=receiverName%>; }*/ ); } @@ -1051,6 +1185,7 @@ String attrName = getPropertyName(attribute); String attrType = getPropertyType(attribute); + String receiverName = getReceiverName(attribute, attrName); if (log.isDebugEnabled()) { log.debug("Generate multiple 'getByTopiaId' operation for property : " + attrName + @@ -1072,7 +1207,7 @@ setOperationBody(implOperation, "" /*{ - return TopiaUtil.getEntityByTopiaId(<%=attrName%>, topiaId); + return TopiaUtil.getEntityByTopiaId(<%=receiverName%>, topiaId); }*/ ); } @@ -1087,6 +1222,7 @@ // association attribute name String attrName = getPropertyName(attribute); String attrType = getPropertyType(attribute); + String receiverName = getReceiverName(attribute, attrName); if (log.isDebugEnabled()) { log.debug("Generate multiple 'getFromEntity' operation for property : " + attrName + @@ -1107,10 +1243,10 @@ setOperationBody(implOperation, "" /*{ - if (<%=referenceName%> == null || this.<%=attrName%> == null) { + if (<%=referenceName%> == null || <%=receiverName%> == null) { return null; } - for (<%=attrType%> item : this.<%=attrName%>) { + for (<%=attrType%> item : <%=receiverName%>) { if (<%=referenceName%>.equals(item.<%=referenceGetterName%>())) { return item; } @@ -1123,6 +1259,7 @@ protected void addMultipleSizeOperation(ObjectModelAttribute attribute) { String attrName = getPropertyName(attribute); + String receiverName = getReceiverName(attribute, attrName); if (log.isDebugEnabled()) { log.debug("Generate multiple 'size' operation for property : " + attrName); @@ -1138,10 +1275,10 @@ setOperationBody(implOperation, "" /*{ - if (<%=attrName%> == null) { + if (<%=receiverName%> == null) { return 0; } - return <%=attrName%>.size(); + return <%=receiverName%>.size(); }*/ ); } @@ -1200,6 +1337,7 @@ protected void updateAcceptOperation(ObjectModelAttribute attribute) { String attrName = TopiaGeneratorUtil.getSimpleName(getPropertyName(attribute)); + String receiverName = getReceiverName(attribute, attrName); String attrType = TopiaGeneratorUtil.getSimpleName(getPropertyType(attribute)); String collectionType = getCollectionType(attribute); @@ -1207,12 +1345,12 @@ if (collectionType != null) { collectionType = TopiaGeneratorUtil.getSimpleName(collectionType); acceptOperationBody.append("" -/*{ visitor.visit(this, <%=constantName%>, <%=collectionType%>.class, <%=attrType%>.class, <%=attrName%>); +/*{ visitor.visit(this, <%=constantName%>, <%=collectionType%>.class, <%=attrType%>.class, <%=receiverName%>); }*/ ); } else { acceptOperationBody.append("" -/*{ visitor.visit(this, <%=constantName%>, <%=attrType%>.class, <%=attrName%>); +/*{ visitor.visit(this, <%=constantName%>, <%=attrType%>.class, <%=receiverName%>); }*/ ); } @@ -1262,9 +1400,10 @@ if (isEntity && (reverse == null || !reverse.isNavigable()) && !attr.hasAssociationClass() || !isEntity) { String attrName = attr.getName(); + String receiverName = getReceiverName(attr, attrName); String constantName = getConstantName(attrName); body.append("" -/*{ append(<%=constantName%>, this.<%=attrName%>). +/*{ append(<%=constantName%>, <%=receiverName%>). }*/ ); } @@ -1588,4 +1727,8 @@ } } + + protected boolean isNaturalId(ObjectModelAttribute attr) { + return naturalAttributes.contains(attr); + } } 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-05-25 16:40:59 UTC (rev 2539) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2012-05-27 09:38:28 UTC (rev 2540) @@ -25,6 +25,7 @@ package org.nuiton.topia.generator; +import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Collections2; @@ -1804,6 +1805,13 @@ return result; } + public static final Function<ObjectModelClassifier, String> GET_NATURAL_ID_CLASS_SIMPLE_NAME = new Function<ObjectModelClassifier, String>() { + @Override + public String apply(ObjectModelClassifier input) { + return input.getName() + "NaturalId"; + } + }; + public static final Predicate<ObjectModelAttribute> IS_ATTRIBUTE_COMPOSITE = new Predicate<ObjectModelAttribute>() { @Override public boolean apply(ObjectModelAttribute input) {

1 0

r2539 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence-tck/src/main/xmi topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12
by tchemit＠users.nuiton.org 25 May '12

25 May '12

Author: tchemit Date: 2012-05-25 18:40:59 +0200 (Fri, 25 May 2012) New Revision: 2539 Url: http://nuiton.org/repositories/revision/topia/2539 Log: add not-null constraints Added: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.properties trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-05-25 16:31:24 UTC (rev 2538) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-05-25 16:40:59 UTC (rev 2539) @@ -422,8 +422,11 @@ addAttribute(columnAttributes, ATTRIBUTE_LENGTH, lengthTagValue); } String notNullTagValue = TopiaGeneratorUtil.getNotNullTagValue(attr); - if ("true".equals(notNullTagValue)) { + if ("true".equals(notNullTagValue) || + (TopiaGeneratorUtil.isNaturalId(attr) && + !"false".equals(notNullTagValue))) { + // notNull to true or default value for a natural Id // not optional addAttribute(xmlAttributes, ATTRIBUTE_OPTIONAL, false); addAttribute(columnAttributes, ATTRIBUTE_NULLABLE, false); Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.properties =================================================================== --- trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.properties 2012-05-25 16:31:24 UTC (rev 2538) +++ trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.properties 2012-05-25 16:40:59 UTC (rev 2539) @@ -24,3 +24,7 @@ ### model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.constantPrefix=PROPERTY_ + +org.nuiton.topia.tck.mapping.test12.A12A.attribute.integerField.tagValue.notNull=true +org.nuiton.topia.tck.mapping.test12.A12A.attribute.dateField.tagValue.notNull=true +org.nuiton.topia.tck.mapping.test12.A12A.attribute.stringField.tagValue.notNull=true Modified: trunk/topia-persistence-tck/src/main/xmi/topia-tck-mapping.zargo =================================================================== (Binary files differ) Added: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java (rev 0) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test12/EntityWithBasicNotNullFieldsTest.java 2012-05-25 16:40:59 UTC (rev 2539) @@ -0,0 +1,65 @@ +package org.nuiton.topia.tck.mapping.test12; + +import junit.framework.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.tck.mapping.AbstractMappingTest; + +import java.util.Date; + +/** + * Tests entity with basic {@code not null} fields. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class EntityWithBasicNotNullFieldsTest extends AbstractMappingTest { + + protected TopiaContext tx; + + protected A12ADAO aDAO; + + @Before + public void before() throws TopiaException { + tx = db.beginTransaction(); + aDAO = getDAO(tx, A12A.class); + } + + @Test(expected = TopiaException.class) + public void createwithNull() throws TopiaException { + + long nbA = aDAO.count(); + + Assert.assertEquals(0, nbA); + + // a with all fields to null + A12A a = aDAO.create(); + tx.commitTransaction(); + } + + @Test + public void create() throws TopiaException { + + long nbA = aDAO.count(); + + Assert.assertEquals(0, nbA); + + // a with all fields to null + A12A a = aDAO.create( + A12A.PROPERTY_STRING_FIELD, "string", + A12A.PROPERTY_INTEGER_FIELD, 1, + A12A.PROPERTY_DATE_FIELD, new Date() + ); + + tx.commitTransaction(); + + nbA = aDAO.count(); + Assert.assertEquals(1, nbA); + + A12A aBis = aDAO.findByTopiaId(a.getTopiaId()); + Assert.assertEquals(a, aBis); + + } +} \ No newline at end of file

1 0

r2538 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by athimel＠users.nuiton.org 25 May '12

25 May '12

Author: athimel Date: 2012-05-25 18:31:24 +0200 (Fri, 25 May 2012) New Revision: 2538 Url: http://nuiton.org/repositories/revision/topia/2538 Log: Deprecate EntityDTOTransformer and DTOTransformer Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java 2012-05-25 16:29:53 UTC (rev 2537) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java 2012-05-25 16:31:24 UTC (rev 2538) @@ -52,7 +52,7 @@ * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DTOTransformer" - * @deprecated Will be remove in ToPIA 3.1. Use {@link JavaBeanTransformer}. + * @deprecated Will be removed in ToPIA 3.1. Use {@link JavaBeanTransformer}. */ @Deprecated public class DTOTransformer extends ObjectModelTransformerToJava { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2012-05-25 16:29:53 UTC (rev 2537) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2012-05-25 16:31:24 UTC (rev 2538) @@ -55,7 +55,7 @@ * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityDTOTransformer" - * @deprecated Will be remove in ToPIA 3.1 + * @deprecated Will be removed in ToPIA 3.1 */ @Deprecated public class EntityDTOTransformer extends ObjectModelTransformerToJava {

1 0

r2537 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by athimel＠users.nuiton.org 25 May '12

25 May '12

Author: athimel Date: 2012-05-25 18:29:53 +0200 (Fri, 25 May 2012) New Revision: 2537 Url: http://nuiton.org/repositories/revision/topia/2537 Log: Deprecate EntityDTOTransformer and DTOTransformer Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java 2012-05-25 15:20:16 UTC (rev 2536) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java 2012-05-25 16:29:53 UTC (rev 2537) @@ -30,6 +30,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.JavaBeanTransformer; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.*; @@ -51,7 +52,9 @@ * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DTOTransformer" + * @deprecated Will be remove in ToPIA 3.1. Use {@link JavaBeanTransformer}. */ +@Deprecated public class DTOTransformer extends ObjectModelTransformerToJava { /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2012-05-25 15:20:16 UTC (rev 2536) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2012-05-25 16:29:53 UTC (rev 2537) @@ -55,7 +55,9 @@ * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityDTOTransformer" + * @deprecated Will be remove in ToPIA 3.1 */ +@Deprecated public class EntityDTOTransformer extends ObjectModelTransformerToJava { public boolean isEntity(String type) {

1 0

r2536 - trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework
by athimel＠users.nuiton.org 25 May '12

25 May '12

Author: athimel Date: 2012-05-25 17:20:16 +0200 (Fri, 25 May 2012) New Revision: 2536 Url: http://nuiton.org/repositories/revision/topia/2536 Log: Update comment Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java 2012-05-25 15:19:57 UTC (rev 2535) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/legacy/framework/TopiaUtilTest.java 2012-05-25 15:20:16 UTC (rev 2536) @@ -104,7 +104,8 @@ TopiaContext rootContext = db.getRootCtxt(); // XXX AThimel 10/05/2012 This cannot be done with ToPIA 3 because of - // independence regarding to the JPA implem, which changes the way EntityManager is created + // independence regarding to the JPA implem, which changes the way + // EntityManager is created // boolean actual = rootContext.isSchemaExist(PersonImpl.class); boolean actual = false; assertFalse(actual);

1 0

r2535 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence
by athimel＠users.nuiton.org 25 May '12

25 May '12

Author: athimel Date: 2012-05-25 17:19:57 +0200 (Fri, 25 May 2012) New Revision: 2535 Url: http://nuiton.org/repositories/revision/topia/2535 Log: Remove obsolete comments Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework/TopiaHibernateEntityListener.java trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-05-25 14:55:00 UTC (rev 2534) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-05-25 15:19:57 UTC (rev 2535) @@ -259,8 +259,6 @@ // -- tag 'inheritance' - // TODO AThimel 22/05/2012 Is the strategy choosable ? - // TODO AThimel 22/05/2012 May only be specified on parent entities ? addAttribute(xmlAttributes, ATTRIBUTE_STRATEGY, InheritanceType.TABLE_PER_CLASS); /*{<%=flushTag(TAG_INHERITANCE, true, xmlAttributes)%> }*/ Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework/TopiaHibernateEntityListener.java =================================================================== --- trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework/TopiaHibernateEntityListener.java 2012-05-25 14:55:00 UTC (rev 2534) +++ trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/framework/TopiaHibernateEntityListener.java 2012-05-25 15:19:57 UTC (rev 2535) @@ -118,10 +118,10 @@ TopiaContextImplementor result = null; // FIXME AThimel 14/05/2012 http://nuiton.org/issues/2078 if (entity instanceof TopiaEntityAbstract) { - TopiaContext enitytContext = + TopiaContext entityContext = ((TopiaEntityAbstract) entity).getTopiaContext(); - if (enitytContext instanceof TopiaContextImplementor) { - result = (TopiaContextImplementor) enitytContext; + if (entityContext instanceof TopiaContextImplementor) { + result = (TopiaContextImplementor) entityContext; } } return result; Modified: trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java =================================================================== --- trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java 2012-05-25 14:55:00 UTC (rev 2534) +++ trunk/topia-persistence-hibernate/src/main/java/org/nuiton/topia/persistence/TopiaHibernateSpecificUtil.java 2012-05-25 15:19:57 UTC (rev 2535) @@ -96,7 +96,7 @@ try { // connection = connectionProvider.getConnection(); - // FIXME AThimel 10/05/2012 It would be better to re-use the ConnectionProvider but I can't find how to do it for the moment + // XXX AThimel 10/05/2012 It would be better to re-use the ConnectionProvider but I can't find how to do it for the moment String url = configuration.getProperty(AvailableSettings.URL); String username = configuration.getProperty(AvailableSettings.USER); String password = configuration.getProperty(AvailableSettings.PASS);

1 0

r2534 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by athimel＠users.nuiton.org 25 May '12

25 May '12

Author: athimel Date: 2012-05-25 16:55:00 +0200 (Fri, 25 May 2012) New Revision: 2534 Url: http://nuiton.org/repositories/revision/topia/2534 Log: TopiaDAOImpl#findByNaturalIds will not be implemented. Prefer using the DAO's generated ffindByNaturalId Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2012-05-25 14:15:39 UTC (rev 2533) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2012-05-25 14:55:00 UTC (rev 2534) @@ -475,7 +475,9 @@ * @param keys la liste des champs de la cle naturelle avec leur valeur * @return l'entite trouvé * @throws TopiaException if any pb while getting datas + * @deprecated Prefer using the DAO generated findByNaturalId */ + @Deprecated E findByNaturalIds(Map<String, Object> keys) throws TopiaException; /** @@ -486,7 +488,9 @@ * @param k l'objet cle naturelle de la classe * @return l'entité trouvé * @throws TopiaException if any pb while getting datas + * @deprecated Prefer using the DAO generated findByNaturalId */ + @Deprecated E findByNaturalIds(Object... k) throws TopiaException; /** 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 2012-05-25 14:15:39 UTC (rev 2533) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2012-05-25 14:55:00 UTC (rev 2534) @@ -50,8 +50,6 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceException; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.Metamodel; import java.lang.reflect.InvocationTargetException; import java.security.Permission; import java.util.Collection; @@ -194,9 +192,9 @@ } /** - * Cette methode appelle fireVetoableCreate et fireOnCreated Si vous la - * surchargé, faites attention a appeler le super ou a appeler vous aussi - * ces deux methodes. + * Cette méthode appelle fireVetoableCreate et fireOnCreated. Si vous la + * surchargez, faites attention à appeler le super ou à appeler vous aussi + * ces deux méthodes. */ @Override public E create(Map<String, Object> properties) throws TopiaException { @@ -479,49 +477,12 @@ @Override public E findByNaturalIds(Map<String, Object> keys) throws TopiaException { - try { - // we used hibernate meta information for all persistence type - // it's more easy than create different for all persistence - EntityType<E> meta = getClassMetadata(); - // TODO AThimel 07/05/2012 See if it is possible to do it with EntityType -// if (meta.hasNaturalIdentifier()) { - E result = findByProperties(keys); - return result; -// } - } catch (PersistenceException eee) { - throw new TopiaException(eee); - } -// throw new TopiaException("La classe " + entityClass.getName() -// + " n'a pas de cle primaire naturelle"); - + throw new UnsupportedOperationException("TopiaDAOImpl#findByNaturalIds"); } @Override public E findByNaturalIds(Object... k) throws TopiaException { - // TODO pour une meilleur gestion des problemes a la compilation - // mettre un premier couple (propName, value) en argument ca evitera - // de pouvoir appeler cette methode sans argument - try { - EntityType<E> meta = getClassMetadata(); - // TODO AThimel 07/05/2012 See if it is possible to do it with EntityType -// if (meta.hasNaturalIdentifier()) { -// int[] ikeys = meta.getNaturalIdentifierProperties(); -// String[] pnames = meta.getPropertyNames(); - - Map<String, Object> keys = new HashMap<String, Object>(); -// for (int ikey : ikeys) { -// keys.put(pnames[ikey], k[ikey]); -// } - - E result = findByProperties(keys); - return result; -// } - } catch (PersistenceException eee) { - throw new TopiaException(eee); - } -// throw new TopiaException("La classe " + entityClass.getName() -// + " n'a pas de cle primaire naturelle"); - + throw new UnsupportedOperationException("TopiaDAOImpl#findByNaturalIds"); } @Override @@ -548,25 +509,6 @@ return getContext().getEntityManager(); } - /** - * package locale method because this is hibernate specific method and - * we don't want expose it. - * - * @return the meta-data of the entity - * @throws TopiaException if any pb - */ - EntityType<E> getClassMetadata() throws TopiaException { - Metamodel metamodel = getContext().getEntityManagerFactory() - .getMetamodel(); - EntityType<E> meta = metamodel.entity(getEntityClass()); - // TODO AThimel 07/05/2012 Maybe there is no need to call this ? -// if (meta == null) { -// Class<E> implementationClass = getTopiaEntityEnum().getImplementation(); -// meta = metamodel.entity(implementationClass); -// } - return meta; - } - protected Multimap<Class<? extends TopiaEntity>, TopiaEntity> fillComposite( Multimap<Class<? extends TopiaEntity>, TopiaEntity> tmp2) throws TopiaException {

1 0

r2533 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: . framework persistence persistence/util
by athimel＠users.nuiton.org 25 May '12

25 May '12

Author: athimel Date: 2012-05-25 16:15:39 +0200 (Fri, 25 May 2012) New Revision: 2533 Url: http://nuiton.org/repositories/revision/topia/2533 Log: Javadoc on TopiaDAO : not finished, I give up for the moment Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2012-05-25 13:48:20 UTC (rev 2532) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2012-05-25 14:15:39 UTC (rev 2533) @@ -138,8 +138,8 @@ void removeTopiaEntityListener(TopiaEntityListener listener); /** - * Unregister the given TopiaEntityListener about he given entity class from - * the context + * Unregister the given TopiaEntityListener about the given entity class + * from the context * * @param entityClass the listened TopiaEntity's class * @param listener the listener instance to unregister @@ -181,8 +181,8 @@ void removeTopiaEntityVetoable(TopiaEntityVetoable vetoable); /** - * Unregister the given TopiaEntityVetoable about he given entity class from - * the context + * Unregister the given TopiaEntityVetoable about the given entity class + * from the context * * @param entityClass the listened TopiaEntity's class * @param vetoable the vetoable instance to unregister Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-05-25 13:48:20 UTC (rev 2532) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-05-25 14:15:39 UTC (rev 2533) @@ -113,7 +113,6 @@ //TODO-fdesbois-20100507 : Need translation of javadoc. public class TopiaContextImpl implements TopiaContextImplementor { - /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(TopiaContextImpl.class); /** @@ -518,8 +517,8 @@ (Class<TopiaDAO<E>>) Class.forName(daoClassname); result = daoClass.getConstructor().newInstance(); } catch (Exception eee) { - log.warn("specialized DAO " + daoClassname + - " not found, use default TopiaDAOHibernate"); + log.warn("Specialized DAO " + daoClassname + + " not found, use default TopiaDAOImpl"); result = new TopiaDAOImpl<E>(); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2012-05-25 13:48:20 UTC (rev 2532) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2012-05-25 14:15:39 UTC (rev 2533) @@ -51,8 +51,7 @@ */ public class TopiaUtil { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TopiaUtil.class); + private static final Log log = LogFactory.getLog(TopiaUtil.class); /** * Permet de récupérer le fichier de propriété ayant le nom passé en Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2012-05-25 13:48:20 UTC (rev 2532) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2012-05-25 14:15:39 UTC (rev 2533) @@ -69,8 +69,8 @@ TopiaEntityEnum getTopiaEntityEnum(); /** - * When TopiaContextImpl create the TopiaDAOHibernate, it must call this - * method just after. + * Method to invoke right after instance creation. It is done by the + * TopiaContext. * * @param context context * @param entityClass entity class @@ -89,14 +89,14 @@ E newInstance() throws TopiaException; /** - * Return class of entity managed by this DAO. + * Return the class of the entity managed by this DAO. * - * @return entity managed by this DAO + * @return this DAO's managed entity's class */ Class<E> getEntityClass(); /** - * Return context used by this DAO. + * Returns the context used by this DAO. * * @return Returns the context. */ @@ -108,7 +108,7 @@ * * @param type the type of entity to search * @param entity the entity - * @param tthe type of entity to search + * @param the type of entity to search * @return the list of entities of the given type which uses the given * entity * @throws TopiaException if any problem while getting data @@ -132,84 +132,106 @@ throws TopiaException; /** - * Retourne les permissions a verifier pour l'acces a l'entite pour le - * service Taas. + * Returns the persmissions to check before the enity access for the + * security service. * - * @param topiaId topiaId d'une entite - * @param actions encoded actions - * @return la liste des permissions + * @param entityId topiaId of the entity + * @param actions encoded actions + * @return the list of permissions * @throws TopiaException if any pb while getting datas */ - List<Permission> getRequestPermission(String topiaId, int actions) + List<Permission> getRequestPermission(String entityId, int actions) throws TopiaException; - /* Adders */ - + /** + * Registers a TopiaEntityListener about the managed entity class. + * <code>listener</code> instance will be notified AFTER any operation on + * the entity. + * + * @param listener the listener instance to register + * @see TopiaContext#addTopiaEntityListener(Class, TopiaEntityListener) + */ void addTopiaEntityListener(TopiaEntityListener listener); + /** + * Unregister the given TopiaEntityListener about the managed entity class. + * + * @param listener the listener instance to unregister + * @see TopiaContext#removeTopiaEntityListener(Class, TopiaEntityListener) + */ + void removeTopiaEntityListener(TopiaEntityListener listener); + + /** + * Register to the context a TopiaEntityVetoable about the managed entity + * class. <code>vetoable</code> instance will be notified BEFORE any + * operation on the entity. + * + * @param vetoable the vetoable instance to register + * @see TopiaContext#addTopiaEntityVetoable(Class, TopiaEntityVetoable) + */ void addTopiaEntityVetoable(TopiaEntityVetoable vetoable); - /* Removers */ - - void removeTopiaEntityListener(TopiaEntityListener listener); - + /** + * Unregister the given TopiaEntityVetoable about the managed entity class. + * + * @param vetoable the vetoable instance to unregister + * @see TopiaContext#removeTopiaEntityVetoable(Class, TopiaEntityVetoable) + */ void removeTopiaEntityVetoable(TopiaEntityVetoable vetoable); /** - * Construit une nouvelle instance de l'objet géré par ce DAO + * Creates a new instance of the entity managed by the DAO * - * @param properties la liste des propriétés que doit avoir l'objet créé les - * arguments vont par paire (propertyName, value) - * @return un nouvel objet - * @throws TopiaException si un problème est rencontré durant - * l'instanciation - * @throws IllegalArgumentException Si le nombre on le type des arguments - * n'est pas bon ou que le type ou le nom - * d'une propriété est fausse + * @param properties the list of properties that the created entity will + * have. Arguments are key-value paired : + * [propertyName;value;propertyName;value;...] + * @return the newly created entity + * @throws TopiaException if any problem during instantiation + * @throws IllegalArgumentException if the arguments count is not correct or + * if some property type is not the + * expected one + * @see #create(Map) */ E create(Object... properties) throws TopiaException; /** - * Construit une nouvelle instance de l'objet géré par ce DAO + * Creates a new instance of the entity managed by the DAO * - * @param properties la liste des propriétés que doit avoir l'objet créé - * @return un nouvel objet - * @throws TopiaException si un problème est rencontré durant - * l'instanciation - * @throws IllegalArgumentException Si le nombre on le type des arguments - * n'est pas bon ou que le type ou le nom - * d'une propriété est fausse + * @param properties the key-value list of properties that the created + * entity will have. + * @return the newly created entity + * @throws TopiaException if any problem during instantiation + * @throws IllegalArgumentException if some property type is not the + * expected one */ E create(Map<String, Object> properties) throws TopiaException; /** - * Permet de sauver un object instancié sans le DAO. - * Utilisé notement dans le cas ou le DAO est situé derriere une couche - * de webservice et que l'appel à la methode {@link #create(Object...)} - * serait trop couteux. + * Creates an entity not created without the DAO. Generally used when DAO + * is layered after a service layer where the {@link #create(Object...)} + * would be to onerous. * - * @param e l'entité instanciée à sauver - * @return l'entité avec son topiaID valorisé - * @throws TopiaException if any pb while creating datas + * @param e the instance to persist + * @return the persisted entity (with its topiaId valued) + * @throws TopiaException if any problem while creating data * @since 2.3.1 */ E create(E e) throws TopiaException; /** - * Permet d'ajouter ou de mettre a jour un objet. Cela permet d'ajouter par - * exemple un objet provenant d'un autre context mais du meme type de DAO. + * Update an entity. May be used for an entity coming from another context. * - * @param e l'entite a ajouter ou mettre a jour - * @return l'entity passé en paramètre. - * @throws TopiaException if any pb while updating datas + * @param e the entity to create or update + * @return the given entity + * @throws TopiaException if any problem while updating datas */ E update(E e) throws TopiaException; /** - * Permet de supprimer une entite. + * Removes the given entity from the storage * - * @param e l'entite a supprimer - * @throws TopiaException if any pb while deleting datas + * @param e the entity to remove + * @throws TopiaException if any problem while deleting datas */ void delete(E e) throws TopiaException; @@ -470,7 +492,7 @@ /** * Obtain from a given entity all objects which will be deleted if * entity is deleted (such objects are called composite). - * + * * Note: result is given as a Multimap indexed their type. * * @param entity entity to scan @@ -484,7 +506,7 @@ * Obtains from a given entity all objects used by this entity but will not * be removed when deleting given entity (such objects are called * aggregate). - * + * * Note: result is given as a Multimap indexed their type. * * @param entity entity to scan 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 2012-05-25 13:48:20 UTC (rev 2532) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2012-05-25 14:15:39 UTC (rev 2533) @@ -60,25 +60,20 @@ import java.util.Map; /** - * Cette classe permet d'avoir un ensemble de méthode implantée de façon - * standard et plus spécifiquement pour Hibernate. + * This class provides some methods in abstraction of JPA. This class is made to + * be overriden by each entity's DAO * - * Certains accès à Hibernate sont tout de même fait ici, car on a pris le choix - * de se baser entièrement sur hibernate pour la persistence, et il est ainsi - * possible d'accèder au meta information hibernate sur les classes lorque l'on - * en a besoin. + * Anyway, there is still some JPA access because we choose to be based only on + * JPA. * - * @param <E> le type de l'entite + * @param <E> the entity's type * @author bpoussin <poussin(a)codelutin.com> * @version $Id$ */ +public class TopiaDAOImpl<E extends TopiaEntity> implements TopiaDAO<E> { -public class TopiaDAOImpl<E extends TopiaEntity> implements - TopiaDAO<E> { // TopiaDAOImpl + private static final Log log = LogFactory.getLog(TopiaDAOImpl.class); - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(TopiaDAOImpl.class); - protected Class<E> entityClass; protected TopiaContextImplementor context; @@ -95,12 +90,6 @@ "This method must be overided in generated DAO"); } - /** - * When TopiaContextImpl create the TopiaDAOHibernate, it must call this - * method just after. - * - * @param entityClass - */ @Override public void init(TopiaContextImplementor context, Class<E> entityClass) throws TopiaException { @@ -129,7 +118,7 @@ } catch (Exception e) { throw new TopiaException( "Impossible de trouver ou d'instancier la classe " - + implementation); + + implementation); } } @@ -148,7 +137,7 @@ } @Override - public List<Permission> getRequestPermission(String topiaId, int actions) + public List<Permission> getRequestPermission(String entityId, int actions) throws TopiaException { return null; } @@ -175,23 +164,7 @@ @Override public E create(E entity) throws TopiaException { - return create0(entity); -// // TODO EC-20100322 this code may be merged with other create() methods -// try { -// // first set topiaId -// String topiaId = TopiaId.create(entityClass); -// TopiaEntityAbstract entityAbstract = (TopiaEntityAbstract) entity; -// entityAbstract.setTopiaId(topiaId); -// entityAbstract.setTopiaContext(getContext()); -// -// // save entity -// getEntityManager().persist(entity); -// getContext().getFiresSupport().warnOnUpdateEntity(entity); -// return entity; -// } catch (PersistenceException eee) { -// throw new TopiaException(eee); -// } } @Override @@ -200,20 +173,20 @@ Object propertyName = null; Object value; try { - for (int i = 0; i < properties.length;) { + for (int i = 0; i < properties.length; ) { propertyName = properties[i++]; value = properties[i++]; map.put((String) propertyName, value); } } catch (ArrayIndexOutOfBoundsException eee) { throw new IllegalArgumentException("Wrong number of argument " - + properties.length - + ", you must have even number. Last property name read: " - + propertyName); + + properties.length + + ", you must have even number. Last property name read: " + + propertyName); } catch (ClassCastException eee) { throw new IllegalArgumentException( "Wrong argument type, wait property name as String and " + - "have " + propertyName.getClass().getName()); + "have " + propertyName.getClass().getName()); } E result = create(map); @@ -229,15 +202,9 @@ public E create(Map<String, Object> properties) throws TopiaException { E result = newInstance(); - // TODO reflechir s'il ne faudrait pas creer l'id avant l'event precedent - // reflechir toujours dans un context on les E pourrait ne pas - // etre des TopiaEntity (ce qui n'arrivera jamais vu la signature (TC)...) -// if (result instanceof TopiaEntity) { -// String topiaId = TopiaId.create(entityClass); TopiaEntityAbstract entity = (TopiaEntityAbstract) result; -// entity.setTopiaId(topiaId); entity.setTopiaContext(getContext()); -// } + try { for (Map.Entry<String, Object> e : properties.entrySet()) { String propertyName = e.getKey(); @@ -255,16 +222,10 @@ "Can't put properties on new Object", eee); } return create0(result); -// // on fait un save maintenant, car puisqu'on a creer l'entity au -// // travers du DAO, on s'attend a l'avoir a disposition tout de -// // suite pour les requetes sans avoir a faire un update dessus -// getEntityManager().persist(result); -// getContext().getFiresSupport().warnOnCreateEntity(result); -// return result; } protected E create0(E result) throws TopiaException { - // XXX AThimel 22/05/2012 Add it back here because it does not work in PrePersist event + String topiaId = TopiaIdUtil.create(entityClass); result.setTopiaId(topiaId); @@ -345,7 +306,6 @@ } @Override - @Deprecated public E findByQuery(TopiaQuery query) throws TopiaException { E result = query.executeToEntity(getContext(), getEntityClass()); return result; @@ -391,14 +351,12 @@ } @Override - @Deprecated public List<E> findAllByQuery(TopiaQuery query) throws TopiaException { List<E> results = query.executeToEntityList(getContext(), getEntityClass()); return results; } @Override - @Deprecated public Map<String, E> findAllMappedByQuery(TopiaQuery query) throws TopiaException { Map<String, E> results = @@ -407,13 +365,13 @@ } @Override - @Deprecated public <K> Map<K, E> findAllMappedByQuery(TopiaQuery query, String keyName, Class<K> keyClass) throws TopiaException { - Map<K, E> results = - query.executeToEntityMap(getContext(), getEntityClass(), - keyName, keyClass); + TopiaContextImplementor context = getContext(); + Class<E> entityClass = getEntityClass(); + Map<K, E> results = query.executeToEntityMap(context, entityClass, + keyName, keyClass); return results; } @@ -474,7 +432,6 @@ } @Override - @Deprecated public int countByQuery(TopiaQuery query) throws TopiaException { int result = query.executeCount(getContext()); return result; @@ -499,7 +456,7 @@ Map<String, Object> properties = new HashMap<String, Object>(); properties.put(propertyName, propertyValue); Object name = null; - for (int i = 0; i < others.length;) { + for (int i = 0; i < others.length; ) { try { name = others[i++]; propertyValue = others[i++]; @@ -507,13 +464,13 @@ } catch (ClassCastException eee) { throw new IllegalArgumentException( "Les noms des propriétés doivent être des chaines et " + - "non pas " + propertyName.getClass().getName(), + "non pas " + propertyName.getClass().getName(), eee); } catch (ArrayIndexOutOfBoundsException eee) { throw new IllegalArgumentException( "Le nombre d'argument n'est pas un nombre pair: " - + (others.length + 2) - + " La dernière propriété était: " + name, eee); + + (others.length + 2) + + " La dernière propriété était: " + name, eee); } } return properties; @@ -528,8 +485,8 @@ EntityType<E> meta = getClassMetadata(); // TODO AThimel 07/05/2012 See if it is possible to do it with EntityType // if (meta.hasNaturalIdentifier()) { - E result = findByProperties(keys); - return result; + E result = findByProperties(keys); + return result; // } } catch (PersistenceException eee) { throw new TopiaException(eee); @@ -551,13 +508,13 @@ // int[] ikeys = meta.getNaturalIdentifierProperties(); // String[] pnames = meta.getPropertyNames(); - Map<String, Object> keys = new HashMap<String, Object>(); + Map<String, Object> keys = new HashMap<String, Object>(); // for (int ikey : ikeys) { // keys.put(pnames[ikey], k[ikey]); // } - E result = findByProperties(keys); - return result; + E result = findByProperties(keys); + return result; // } } catch (PersistenceException eee) { throw new TopiaException(eee); @@ -568,24 +525,26 @@ } @Override - public Multimap<Class<? extends TopiaEntity>, TopiaEntity> getComposite(E entity) throws TopiaException { + public Multimap<Class<? extends TopiaEntity>, TopiaEntity> getComposite( + E entity) throws TopiaException { throw new UnsupportedOperationException( "This method must be overided in generated DAO"); } @Override - public Multimap<Class<? extends TopiaEntity>, TopiaEntity> getAggregate(E entity) throws TopiaException { + public Multimap<Class<? extends TopiaEntity>, TopiaEntity> getAggregate( + E entity) throws TopiaException { throw new UnsupportedOperationException( "This method must be overided in generated DAO"); } /** - * Renvoie l'EntityManager fournit par le context + * Returns the EntityManager provided by the context * * @return jpa session * @throws TopiaException if any pb */ - EntityManager getEntityManager() throws TopiaException { + protected EntityManager getEntityManager() throws TopiaException { return getContext().getEntityManager(); } @@ -608,7 +567,9 @@ return meta; } - protected Multimap<Class<? extends TopiaEntity>, TopiaEntity> fillComposite(Multimap<Class<? extends TopiaEntity>, TopiaEntity> tmp2) throws TopiaException { + protected Multimap<Class<? extends TopiaEntity>, TopiaEntity> fillComposite( + Multimap<Class<? extends TopiaEntity>, TopiaEntity> tmp2) + throws TopiaException { Multimap<Class<? extends TopiaEntity>, TopiaEntity> result = ArrayListMultimap.create(); @@ -623,7 +584,9 @@ return result; } - protected Multimap<Class<? extends TopiaEntity>, TopiaEntity> fillAggregate(Multimap<Class<? extends TopiaEntity>, TopiaEntity> tmp2) throws TopiaException { + protected Multimap<Class<? extends TopiaEntity>, TopiaEntity> fillAggregate( + Multimap<Class<? extends TopiaEntity>, TopiaEntity> tmp2) + throws TopiaException { Multimap<Class<? extends TopiaEntity>, TopiaEntity> result = ArrayListMultimap.create(); @@ -637,4 +600,5 @@ } return result; } + } //TopiaDAOImpl Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2012-05-25 13:48:20 UTC (rev 2532) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2012-05-25 14:15:39 UTC (rev 2533) @@ -68,7 +68,6 @@ @Deprecated public class TopiaEntityHelper { - /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(TopiaEntityHelper.class); /** Le pattern d'une reference sur une association */

1 0

r2532 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 25 May '12

25 May '12

Author: tchemit Date: 2012-05-25 15:48:20 +0200 (Fri, 25 May 2012) New Revision: 2532 Url: http://nuiton.org/repositories/revision/topia/2532 Log: fix unique generation Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-05-25 13:38:43 UTC (rev 2531) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityJPAMappingGenerator.java 2012-05-25 13:48:20 UTC (rev 2532) @@ -243,11 +243,15 @@ /*{<%=flushTag(TAG_TABLE, uniqueContraints.isEmpty(), xmlAttributes)%> }*/ if (!uniqueContraints.isEmpty()) { - for (String uniqueContraint : uniqueContraints) { + for (String[] uniqueContraint : uniqueContraints) { /*{<%=flushTag(TAG_UNIQUE_CONTRAINT)%> -<%=flushTag(TAG_COLUMN_NAME, uniqueContraint)%><%=closeStrictTag(TAG_COLUMN_NAME)%> -<%=closeTag(TAG_UNIQUE_CONTRAINT)%> }*/ + for (String columnName : uniqueContraint) { +/*{<%=flushTag(TAG_COLUMN_NAME, columnName)%><%=closeStrictTag(TAG_COLUMN_NAME)%> +}*/ + } +/*{<%=closeTag(TAG_UNIQUE_CONTRAINT)%> +}*/ } /*{<%=closeTag(TAG_TABLE)%> }*/

1 0