Author: tchemit Date: 2013-05-24 18:51:57 +0200 (Fri, 24 May 2013) New Revision: 623 Url: http://nuiton.org/projects/sandbox/repository/revisions/623 Log: nuiton-api Added: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaDaoTransformer.java nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaDaoTransformer.java =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaDaoTransformer.java 2013-05-24 16:42:23 UTC (rev 622) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaDaoTransformer.java 2013-05-24 16:51:57 UTC (rev 623) @@ -128,10 +128,16 @@ addConstructor(output); + // Add getEntityClass if (log.isDebugEnabled()) { log.debug("will generate " + output.getQualifiedName()); } + //TODO + ObjectModelOperation operation = addOperation(output, "getEntityClass", "Class<" + input.getName() + ">"); + setOperationBody(operation,"return "); + + return output; } Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java 2013-05-24 16:42:23 UTC (rev 622) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java 2013-05-24 16:51:57 UTC (rev 623) @@ -32,8 +32,11 @@ import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; import org.nuiton.jpa.api.AbstractJpaEntity; +import javax.persistence.Entity; +import javax.persistence.MappedSuperclass; import java.util.Collection; import java.util.List; import java.util.Set; @@ -134,6 +137,9 @@ setSuperClass(output, superClass); + // Add annotation MappedSuperclass + addAnnotation(output, output, MappedSuperclass.class.getName()); + if (log.isDebugEnabled()) { log.debug("will generate " + output.getQualifiedName()); } @@ -155,8 +161,13 @@ // Get available properties List<ObjectModelAttribute> properties = getProperties(input); + ObjectModelAttributeImpl idAttr = new ObjectModelAttributeImpl(); + idAttr.setDeclaringElement(input); + idAttr.setName("id"); + idAttr.setType(String.class.getName()); + properties.add(idAttr); + //TODO Add attribute id (+ @Id) - //TODO Add @MappedSuperClass sur output) //TODO 1 -> 1 @OnetoOne (uniquement navigeable sans bidi) si composition (Cascade = ALL) si aggregeation Cascade = (tout sauf ALL TODO A check) + orphanRemoval = true) //TODO * -> 1 @ManyToOne (uniquement navigeable sans bidi) si composition (Cascade = ALL) si aggregeation Cascade = (tout sauf ALL TODO A check) + orphanRemoval = true) //TODO 1 -> * @OneToMany (uniquement navigeable sans bidi) si composition (Cascade = ALL) si aggregeation Cascade = (tout sauf ALL TODO A check) + orphanRemoval = true) @@ -168,7 +179,7 @@ //TODO Generate Persistence annotations Multimap<ObjectModelAttribute, String> annotationsForAttributes = - ArrayListMultimap.create(); + generateAnnotationsForProperties(); // Add properties constant @@ -197,25 +208,32 @@ return output; } + protected Multimap<ObjectModelAttribute, String> generateAnnotationsForProperties() { + return ArrayListMultimap.create(); + } + protected ObjectModelClass generateImpl(ObjectModelClass input, String entityConcreteName) { - ObjectModelClass resultClassImpl = createClass( + ObjectModelClass output = createClass( entityConcreteName, input.getPackageName() ); // set the abstract resulClass as the resultClassImpl super class - setSuperClass(resultClassImpl, input.getQualifiedName()); + setSuperClass(output, input.getQualifiedName()); + // add Entity annotation + addAnnotation(output, output, Entity.class.getName()); + // add a fix serialVersionUID, since the class has no field nor method - addConstant(resultClassImpl, + addConstant(output, JpaTemplatesGeneratorUtil.SERIAL_VERSION_UID, "long", "1L", ObjectModelJavaModifier.PRIVATE ); - return resultClassImpl; + return output; } protected void createProperty(ObjectModelClass output, Added: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java (rev 0) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java 2013-05-24 16:51:57 UTC (rev 623) @@ -0,0 +1,12 @@ +package org.nuiton.jpa.templates; + +/** + * TODO + * + * @author tchemit <chemit@codelutin.com> + * @since 0.1 + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.jpa.JpaPersistenceContextTransformer" + */ +public class JpaPersistenceContextTransformer { + +} Property changes on: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native