Author: athimel Date: 2013-07-10 10:54:40 +0200 (Wed, 10 Jul 2013) New Revision: 2746 Url: http://nuiton.org/projects/topia/repository/revisions/2746 Log: fixes #2741 EntityEnum generation : - fix PMD ArrayIsStoredDirectly rule - fix indentation in generated code Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2013-07-10 08:07:28 UTC (rev 2745) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2013-07-10 08:54:40 UTC (rev 2746) @@ -375,10 +375,10 @@ addParameter(op,"String...","naturalIds"); setOperationBody(op, "" /*{ - this.contract = contract; - this.notNulls = notNulls; - this.naturalIds = naturalIds; - implementationFQN = contract.getName() + "Impl"; + this.contract = contract; + this.notNulls = Arrays.copyOf(notNulls, notNulls.length); + this.naturalIds = naturalIds; + implementationFQN = contract.getName() + "Impl"; }*/ ); @@ -387,7 +387,7 @@ addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ - return contract; + return contract; }*/ ); @@ -396,7 +396,7 @@ addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ - return naturalIds; + return naturalIds; }*/ ); @@ -405,7 +405,7 @@ addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ - return naturalIds.length > 0; + return naturalIds.length > 0; }*/ ); @@ -414,7 +414,7 @@ addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ - return notNulls; + return notNulls; }*/ ); @@ -423,7 +423,7 @@ addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ - return notNulls.length > 0; + return notNulls.length > 0; }*/ ); @@ -432,7 +432,7 @@ addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ - return implementationFQN; + return implementationFQN; }*/ ); @@ -443,17 +443,17 @@ if (generateOperator) { setOperationBody(op, "" /*{ - this.implementationFQN = implementationFQN; - implementation = null; - // reinit the operators store - EntityOperatorStore.clear(); + this.implementationFQN = implementationFQN; + implementation = null; + // reinit the operators store + EntityOperatorStore.clear(); }*/ ); } else { setOperationBody(op, "" /*{ - this.implementationFQN = implementationFQN; - this.implementation = null; + this.implementationFQN = implementationFQN; + this.implementation = null; }*/ ); } @@ -464,7 +464,7 @@ addParameter(op,"Class<? extends TopiaEntity>","klass"); setOperationBody(op, "" /*{ - return <%=daoHelperClazzName%>.getContractClass(klass) == contract; + return <%=daoHelperClazzName%>.getContractClass(klass) == contract; }*/ ); @@ -473,14 +473,14 @@ addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ - if (implementation == null) { - try { - implementation = (Class<? extends TopiaEntity>) Class.forName(implementationFQN); - } catch (ClassNotFoundException e) { - throw new TopiaException("could not find class " + implementationFQN, e); + if (implementation == null) { + try { + implementation = (Class<? extends TopiaEntity>) Class.forName(implementationFQN); + } catch (ClassNotFoundException e) { + throw new TopiaException("could not find class " + implementationFQN, e); + } } - } - return implementation; + return implementation; }*/ ); @@ -489,7 +489,7 @@ addParameter(op,"TopiaEntity","entity"); setOperationBody(op, "" /*{ - return valueOf(entity.getClass()); + return valueOf(entity.getClass()); }*/ ); @@ -498,16 +498,16 @@ addParameter(op,"Class<?>","klass"); setOperationBody(op, "" /*{ - if (klass.isInterface()) { - return valueOf(klass.getSimpleName()); - } - for (<%=entityEnumName%> entityEnum : <%=entityEnumName%>.values()) { - if (entityEnum.getContract().isAssignableFrom(klass)) { - //todo check it works for inheritance - return entityEnum; + if (klass.isInterface()) { + return valueOf(klass.getSimpleName()); } - } - throw new IllegalArgumentException("no entity defined for the class " + klass + " in : " + Arrays.toString(<%=entityEnumName%>.values())); + for (<%=entityEnumName%> entityEnum : <%=entityEnumName%>.values()) { + if (entityEnum.getContract().isAssignableFrom(klass)) { + //todo check it works for inheritance + return entityEnum; + } + } + throw new IllegalArgumentException("no entity defined for the class " + klass + " in : " + Arrays.toString(<%=entityEnumName%>.values())); }*/ ); }