Author: tchemit Date: 2013-05-29 15:23:18 +0200 (Wed, 29 May 2013) New Revision: 637 Url: http://nuiton.org/projects/sandbox/repository/revisions/637 Log: - use last snapshot of eugene - remove generic from dao Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaDaoTransformer.java nuiton-jpa/pom.xml 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-29 09:21:09 UTC (rev 636) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaDaoTransformer.java 2013-05-29 13:23:18 UTC (rev 637) @@ -58,26 +58,19 @@ String packageName = JpaTemplatesGeneratorUtil.getDaoPackage(this, model, input); - String generatedDaoName = JpaTemplatesGeneratorUtil.getDaoGeneratedName(input); String abstractDaoName = JpaTemplatesGeneratorUtil.getDaoAbstractName(input); String concreteDaoName = JpaTemplatesGeneratorUtil.getDaoConcreteName(input); - String concreteEntityQualifiedName= + String concreteEntityQualifiedName = JpaTemplatesGeneratorUtil.getConcreteEntityQualifiedName(this, model, input); - boolean generateGenerated= !isInClassPath(packageName, generatedDaoName); boolean generateAbstract = !isInClassPath(packageName, abstractDaoName); boolean generateConcrete = !isInClassPath(packageName, concreteDaoName); - if (generateGenerated) { - - generateGenerated(input, packageName, generatedDaoName, concreteEntityQualifiedName); - } - if (generateAbstract) { - generateAbstract(input, packageName, generatedDaoName, abstractDaoName, concreteEntityQualifiedName); + generateAbstract(input, packageName, abstractDaoName, concreteEntityQualifiedName); } if (generateConcrete) { @@ -86,13 +79,15 @@ } } - protected ObjectModelClass generateGenerated(ObjectModelClass input, + protected ObjectModelClass generateAbstract(ObjectModelClass input, String packageName, String abstractDaoName, String concreteEntityQualifiedName) { + String entityName = input.getName(); + ObjectModelClass output = - createAbstractClass(abstractDaoName + "<E extends " + input.getName() + ">", packageName); + createAbstractClass(abstractDaoName, packageName); addImport(output, concreteEntityQualifiedName); // test if a super class is in same package (so is yet another entity) @@ -117,7 +112,7 @@ if (superClass == null) { // no super-class, use default one - superClass = AbstractJpaDao.class.getName() + "<E>"; + superClass = AbstractJpaDao.class.getName() + "<" + entityName + ">"; addImport(output, superClass); } } @@ -126,7 +121,7 @@ addConstructorWithEntityManager(output); // detect if there is a contract to set on abstract - String daoContractName = packageName + "." + input.getName() + "Dao"; + String daoContractName = packageName + "." + entityName + "Dao"; boolean addUserDaoContract = isInClassPath(daoContractName); @@ -136,11 +131,11 @@ // Add getEntityClass - ObjectModelOperation operation = addOperation(output, "getEntityClass", "Class<E>", ObjectModelJavaModifier.PROTECTED); + ObjectModelOperation operation = addOperation(output, "getEntityClass", "Class<" + entityName + ">", ObjectModelJavaModifier.PROTECTED); addAnnotation(output, operation, Override.class); setOperationBody(operation, "" /*{ - return (Class<E>) <%=input.getName()%>.class; + return <%=entityName%>.class; }*/ ); @@ -150,33 +145,15 @@ return output; } - protected ObjectModelClass generateAbstract(ObjectModelClass input, + protected ObjectModelClass generateImpl(ObjectModelClass input, String packageName, - String generatedDaoName, String abstractDaoName, + String concreteDaoName, String concreteEntityQualifiedName) { - ObjectModelClass output = createAbstractClass(abstractDaoName+ "<E extends " + input.getName() + ">", packageName); - - setSuperClass(output, packageName + '.' + generatedDaoName + "<E>"); - addImport(output, concreteEntityQualifiedName); - addConstructorWithEntityManager(output); - - if (isVerbose()) { - log.info("will generate " + output.getQualifiedName()); - } - return output; - } - - protected ObjectModelClass generateImpl(ObjectModelClass input, - String packageName, - String abstractDaoName, - String concreteDaoName, - String concreteEntityQualifiedName) { - ObjectModelClass output = createClass(concreteDaoName, packageName); - setSuperClass(output, packageName + '.' + abstractDaoName + "<" + input.getName() + ">"); + setSuperClass(output, packageName + '.' + abstractDaoName); addImport(output, concreteEntityQualifiedName); addConstructorWithEntityManager(output); Modified: nuiton-jpa/pom.xml =================================================================== --- nuiton-jpa/pom.xml 2013-05-29 09:21:09 UTC (rev 636) +++ nuiton-jpa/pom.xml 2013-05-29 13:23:18 UTC (rev 637) @@ -31,7 +31,7 @@ <redmine.skipGenerateChanges>true</redmine.skipGenerateChanges> <!-- libs version --> - <eugeneVersion>2.6.3-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.6.4-SNAPSHOT</eugeneVersion> <processorPluginVersion>1.3</processorPluginVersion> <h2Version>1.3.170</h2Version> <hibernateVersion>4.1.11.Final</hibernateVersion>