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

r2814 - in branches: . topia-2.8.1.1
by tchemit＠users.nuiton.org 10 Oct '13

10 Oct '13

Author: tchemit Date: 2013-10-10 14:25:21 +0200 (Thu, 10 Oct 2013) New Revision: 2814 Url: http://nuiton.org/projects/topia/repository/revisions/2814 Log: to fix http://nuiton.org/issues/2869 Added: branches/topia-2.8.1.1/ Property changes on: branches/topia-2.8.1.1 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2813 - in branches: . topia-2.8.2
by tchemit＠users.nuiton.org 10 Oct '13

10 Oct '13

Author: tchemit Date: 2013-10-10 14:25:11 +0200 (Thu, 10 Oct 2013) New Revision: 2813 Url: http://nuiton.org/projects/topia/repository/revisions/2813 Log: to fix http://nuiton.org/issues/2869 Added: branches/topia-2.8.2/ Property changes on: branches/topia-2.8.2 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2812 - in trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence: . csv
by bleny＠users.nuiton.org 04 Oct '13

04 Oct '13

Author: bleny Date: 2013-10-04 18:32:01 +0200 (Fri, 04 Oct 2013) New Revision: 2812 Url: http://nuiton.org/projects/topia/repository/revisions/2812 Log: revert deprecation of TopiaEntities#getTopiaIdFunction() calling a method is more maintenable thant using a constant Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java 2013-10-04 12:26:57 UTC (rev 2811) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java 2013-10-04 16:32:01 UTC (rev 2812) @@ -32,7 +32,7 @@ public class TopiaEntities { - public static final Function<TopiaEntity, String> GET_TOPIA_ID = new Function<TopiaEntity, String>() { + protected static final Function<TopiaEntity, String> GET_TOPIA_ID = new Function<TopiaEntity, String>() { @Override public String apply(TopiaEntity input) { @@ -40,7 +40,7 @@ } }; - public static Predicate<TopiaEntity> entityHasId(String id) { + protected static Predicate<TopiaEntity> entityHasId(String id) { return Predicates.compose(Predicates.equalTo(id), GET_TOPIA_ID); } @@ -59,9 +59,7 @@ * Function to obtain {@link TopiaEntity#getTopiaId()} from any entity. * * @since 2.6.12 - * @deprecated use directly {@link #GET_TOPIA_ID} function */ - @Deprecated public static Function<TopiaEntity, String> getTopiaIdFunction() { return GET_TOPIA_ID; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java 2013-10-04 12:26:57 UTC (rev 2811) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java 2013-10-04 16:32:01 UTC (rev 2812) @@ -69,10 +69,10 @@ * Function to obtain {@link TopiaEntity#getTopiaId()} from any entity. * * @since 2.6.12 - * @deprecated since 3.0 use {@link org.nuiton.topia.persistence.TopiaEntities#GET_TOPIA_ID} + * @deprecated since 3.0 use {@link TopiaEntities#getTopiaIdFunction()} */ @Deprecated - public static final Function<TopiaEntity, String> GET_TOPIA_ID = TopiaEntities.GET_TOPIA_ID; + public static final Function<TopiaEntity, String> GET_TOPIA_ID = TopiaEntities.getTopiaIdFunction(); public String topiaId; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java 2013-10-04 12:26:57 UTC (rev 2811) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java 2013-10-04 16:32:01 UTC (rev 2812) @@ -131,7 +131,7 @@ Collection<E> entities) { Map<String, E> universe = Maps.uniqueIndex(entities, - TopiaEntities.GET_TOPIA_ID); + TopiaEntities.getTopiaIdFunction()); newMandatoryColumn(propertyName, TopiaCsvCommons.newForeignKeyValue(entityType,

1 0

r2811 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator test/java/org/nuiton/topiatest test/java/org/nuiton/topiatest/deletetest
by bleny＠users.nuiton.org 04 Oct '13

04 Oct '13

Author: bleny Date: 2013-10-04 14:26:57 +0200 (Fri, 04 Oct 2013) New Revision: 2811 Url: http://nuiton.org/projects/topia/repository/revisions/2811 Log: refs #2086 rename DAOs Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/AbstractExtraDAOEntityTopiaDao.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/AbstractContact2TopiaDao.java Removed: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/Contact2DAOImpl.java 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-10-03 16:30:27 UTC (rev 2810) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2013-10-04 12:26:57 UTC (rev 2811) @@ -213,30 +213,43 @@ String clazzName = clazz.getName(); String clazzFQN = clazz.getQualifiedName(); - if (isGenerateDAO(clazz)) { + if (isGenerateGeneratedDao(clazz)) { + generateGeneratedDao(clazz, clazzName, clazzFQN); + } - // generate DAO - generateDAOClass(clazz, clazzName, clazzFQN); + if (isGenerateAbstractDao(clazz)) { + generateAbstractDao(clazz, clazzName, clazzFQN); + } + if (isGenerateLegacyDao(clazz)) { + generateLegacyDao(clazz, clazzName, clazzFQN); } - if (isGenerateImpl(clazz)) { - // generate DAOImpl - generateDAOImpl(clazz, clazzName, clazzFQN); + if (isGenerateConcreteDao(clazz)) { + generateConcreteDao(clazz, clazzName, clazzFQN); } - if (isGenerateDAOAbstract(clazz)) { + } - // generate DAOAbstract - generateDAOAbstract(clazz, clazzName, clazzFQN); + protected boolean isGenerateLegacyDao(ObjectModelClass input) { + + String daoLegacyFqn = TopiaGeneratorUtil.getLegacyDaoFqn(input); + + if (isInClassPath(daoLegacyFqn)) { + + // already in class-path + return false; } + + // can safely generate the dao impl + return true; } - protected boolean isGenerateDAO(ObjectModelClass input) { + protected boolean isGenerateConcreteDao(ObjectModelClass input) { - String fqn = input.getQualifiedName() + "DAO"; + String daoConcreteFqn = TopiaGeneratorUtil.getConcreteDaoFqn(input); - if (isInClassPath(fqn)) { + if (isInClassPath(daoConcreteFqn)) { // already in class-path return false; @@ -246,11 +259,11 @@ return true; } - protected boolean isGenerateDAOAbstract(ObjectModelClass input) { + protected boolean isGenerateGeneratedDao(ObjectModelClass input) { - String fqn = input.getQualifiedName() + "DAOAbstract"; + String daoGeneratedFqn = TopiaGeneratorUtil.getGeneratedDaoFqn(input); - if (isInClassPath(fqn)) { + if (isInClassPath(daoGeneratedFqn)) { // already in class-path return false; @@ -258,11 +271,12 @@ // can safely generate the dao impl return true; + } - protected boolean isGenerateImpl(ObjectModelClass input) { + protected boolean isGenerateAbstractDao(ObjectModelClass input) { - String fqn = input.getQualifiedName() + "DAOImpl"; + String fqn = TopiaGeneratorUtil.getAbstractDaoFqn(input); if (isInClassPath(fqn)) { @@ -275,28 +289,43 @@ if (CollectionUtils.isNotEmpty(moreOperations)) { - // no user operations, can generate it + // no user operations, can not generate it return false; } // can safely generate the dao impl return true; + } - protected void generateDAOClass(ObjectModelClass clazz, String clazzName, String clazzFQN) { - ObjectModelClass daoClass = createClass(clazzName + "DAO", clazz.getPackageName()); + protected void generateLegacyDao(ObjectModelClass clazz, String clazzName, String clazzFQN) { + ObjectModelClass daoClass = createClass(TopiaGeneratorUtil.getLegacyDaoName(clazz), clazz.getPackageName()); + addAnnotation(daoClass, daoClass, Deprecated.class); setDocumentation(daoClass, "/**\n" + " * Cette classe etend le DAOImpl pour parametrer la classe avec le bon type\n" + " * Cette classe est marque finale car l'heritage entre les DAO se fait\n" + " * sur les DOAImpl, c-a-d que DAOAbstract peut etendre le DAOImpl\n" + " */"); - setSuperClass(daoClass, clazzFQN + "DAOImpl<" + clazzName + ">"); + setSuperClass(daoClass, TopiaGeneratorUtil.getAbstractDaoFqn(clazz) + "<" + clazzName + ">"); } - protected void generateDAOImpl(ObjectModelClass clazz, - String clazzName, - String clazzFQN) { + protected void generateConcreteDao(ObjectModelClass clazz, String clazzName, String clazzFQN) { + ObjectModelClass daoClass = createClass(TopiaGeneratorUtil.getConcreteDaoName(clazz), clazz.getPackageName()); + setDocumentation(daoClass, "/**\n" + + " * Cette classe etend le DAOImpl pour parametrer la classe avec le bon type\n" + + " * Cette classe est marque finale car l'heritage entre les DAO se fait\n" + + " * sur les DOAImpl, c-a-d que DAOAbstract peut etendre le DAOImpl\n" + + " */"); + // to support legacy dao + setSuperClass(daoClass, TopiaGeneratorUtil.getLegacyDaoFqn(clazz)); + // TODO brendan 04/10/13 above line should be replaced by + // setSuperClass(daoClass, TopiaGeneratorUtil.getAbstractDaoFqn(clazz) + "<" + clazzName + ">"); + } + protected void generateAbstractDao(ObjectModelClass clazz, + String clazzName, + String clazzFQN) { + Collection<ObjectModelOperation> moreOperations = extraOperations.get(clazz.getQualifiedName()); @@ -304,42 +333,40 @@ // no business dao found, can safely generate the daoImpl class - ObjectModelClass daoImplClass = createClass(clazzName + "DAOImpl<E extends " + clazzName + ">", clazz.getPackageName()); + ObjectModelClass daoImplClass = createClass(TopiaGeneratorUtil.getAbstractDaoName(clazz) + "<E extends " + clazzName + ">", clazz.getPackageName()); setDocumentation(daoImplClass, "/**\n" + " Implantation du DAO pour l'entité " + clazzName + ".\n" + " * L'utilisateur peut remplacer cette classe par la sienne en la mettant \n" + " * simplement dans ces sources. Cette classe générée sera alors simplement\n" + " * écrasée\n" + " */"); - setSuperClass(daoImplClass, clazzFQN + "DAOAbstract<E>"); + setSuperClass(daoImplClass, TopiaGeneratorUtil.getGeneratedDaoFqn(clazz) + "<E>"); } } - protected void generateDAOAbstract(ObjectModelClass clazz, + protected void generateGeneratedDao(ObjectModelClass clazz, String clazzName, String clazzFQN) { - ObjectModelClass daoAbstractClass = createAbstractClass( - clazzName + "DAOAbstract<E extends " + clazzName + '>', + ObjectModelClass daoAbstractClass = createAbstractClass(TopiaGeneratorUtil.getGeneratedDaoName(clazz) + "<E extends " + clazzName + '>', clazz.getPackageName()); // super class - String extendClass = ""; + String superClassName = null; for (ObjectModelClass parent : clazz.getSuperclasses()) { - extendClass = parent.getQualifiedName(); if (TopiaGeneratorUtil.isEntity(parent)) { - extendClass += "DAOImpl<E>"; + superClassName = TopiaGeneratorUtil.getAbstractDaoFqn(parent) + "<E>"; // in java no multi-inheritance break; } } - if (extendClass.length() == 0) { - extendClass = daoImplementation.getName() + "<E>"; + if (superClassName == null) { + superClassName = daoImplementation.getName() + "<E>"; } if (log.isDebugEnabled()) { - log.debug("super class = " + extendClass); + log.debug("super class = " + superClassName); } - setSuperClass(daoAbstractClass, extendClass); + setSuperClass(daoAbstractClass, superClassName); String prefix = getConstantPrefix(clazz, ""); setConstantPrefix(prefix); @@ -521,6 +548,8 @@ // THIMEL: J'ai remplacé reverse.getName() par reverseAttrName sans certitude addImport(result, attrType); String attrSimpleType = TopiaGeneratorUtil.getClassNameFromQualifiedName(attrType); + // XXX brendan 04/10/13 do not hard code concrete dao name + String attrConcreteDaoClassName = attrSimpleType + "TopiaDao"; String getName = getJavaBeanMethodName("get", reverseAttrName); String setName = getJavaBeanMethodName("set", reverseAttrName); @@ -528,7 +557,7 @@ /*{ { List<<%=attrSimpleType%>> list = topiaDAOSupplier - .getDAO(<%=attrSimpleType%>.class, <%=attrSimpleType%>DAO.class) + .getDAO(<%=attrSimpleType%>.class, <%=attrConcreteDaoClassName%>.class) .forProperties(<%=attrSimpleType%>.<%=getConstantName(reverseAttrName)%>, entity).findAll(); for (<%=attrSimpleType%> item : list) { 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-10-03 16:30:27 UTC (rev 2810) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2013-10-04 12:26:57 UTC (rev 2811) @@ -171,19 +171,39 @@ return input.getName(); } - public static String getDaoAbstractName(ObjectModelClass input) { + public static String getAbstractDaoName(ObjectModelClass input) { return "Abstract" + input.getName() + "TopiaDao"; } - public static String getDaoGeneratedName(ObjectModelClass input) { + public static String getGeneratedDaoName(ObjectModelClass input) { return "Generated" + input.getName() + "TopiaDao"; } - public static String getDaoConcreteName(ObjectModelClass input) { -// return input.getName() + "TopiaDao"; + public static String getConcreteDaoName(ObjectModelClass input) { + return input.getName() + "TopiaDao"; + } + + @Deprecated + public static String getLegacyDaoName(ObjectModelClass input) { return input.getName() + "DAO"; } + public static String getAbstractDaoFqn(ObjectModelClass input) { + return input.getPackageName() + "." + getAbstractDaoName(input); + } + + public static String getGeneratedDaoFqn(ObjectModelClass input) { + return input.getPackageName() + "." + getGeneratedDaoName(input); + } + + public static String getConcreteDaoFqn(ObjectModelClass input) { + return input.getPackageName() + "." + getConcreteDaoName(input); + } + + public static String getLegacyDaoFqn(ObjectModelClass input) { + return input.getPackageName() + "." + getLegacyDaoName(input); + } + public static String getEntityPackage(ObjectModelTransformerToJava transformer, ObjectModel model, ObjectModelClassifier input) { Copied: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/AbstractExtraDAOEntityTopiaDao.java (from rev 2809, trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java) =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/AbstractExtraDAOEntityTopiaDao.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/AbstractExtraDAOEntityTopiaDao.java 2013-10-04 12:26:57 UTC (rev 2811) @@ -0,0 +1,40 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.topiatest; + +import org.nuiton.topia.TopiaException; + +/** + * Created: 26 mai 2010 + * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ + */ +public class AbstractExtraDAOEntityTopiaDao<E extends ExtraDAOEntity> extends GeneratedExtraDAOEntityTopiaDao<E> { + + @Override + public void extra() throws TopiaException { + } +} Deleted: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java 2013-10-03 16:30:27 UTC (rev 2810) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java 2013-10-04 12:26:57 UTC (rev 2811) @@ -1,40 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.topiatest; - -import org.nuiton.topia.TopiaException; - -/** - * Created: 26 mai 2010 - * - * @author fdesbois <fdesbois(a)codelutin.com> - * @version $Id$ - */ -public class ExtraDAOEntityDAOImpl<E extends ExtraDAOEntity> extends ExtraDAOEntityDAOAbstract<E> { - - @Override - public void extra() throws TopiaException { - } -} Copied: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/AbstractContact2TopiaDao.java (from rev 2809, trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/Contact2DAOImpl.java) =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/AbstractContact2TopiaDao.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/AbstractContact2TopiaDao.java 2013-10-04 12:26:57 UTC (rev 2811) @@ -0,0 +1,51 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.topiatest.deletetest; + + +import org.nuiton.topia.TopiaException; +import org.nuiton.topiatest.Company; +import org.nuiton.topiatest.Employe; + +import java.util.Set; +import java.util.TreeSet; + +/** + * + * @author desbois + */ +public class AbstractContact2TopiaDao<E extends Contact2> extends GeneratedContact2TopiaDao<E> { + + @Override + public Set<Contact2> findAllByCompany(Company company) throws TopiaException { + Set<Contact2> contacts = new TreeSet<Contact2>(); + for (Employe e : company.getEmploye()) { + contacts.addAll(e.getContacts()); + } + return contacts; + } + +} Deleted: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/Contact2DAOImpl.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/Contact2DAOImpl.java 2013-10-03 16:30:27 UTC (rev 2810) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/Contact2DAOImpl.java 2013-10-04 12:26:57 UTC (rev 2811) @@ -1,50 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.topiatest.deletetest; - - -import java.util.Set; -import java.util.TreeSet; -import org.nuiton.topia.TopiaException; -import org.nuiton.topiatest.Company; -import org.nuiton.topiatest.Employe; - -/** - * - * @author desbois - */ -public class Contact2DAOImpl<E extends Contact2> extends Contact2DAOAbstract<E> { - - @Override - public Set<Contact2> findAllByCompany(Company company) throws TopiaException { - Set<Contact2> contacts = new TreeSet<Contact2>(); - for (Employe e : company.getEmploye()) { - contacts.addAll(e.getContacts()); - } - return contacts; - } - -}

1 0

Build failed in Jenkins: topia #1521
by admin+hudson＠codelutin.com 04 Oct '13

04 Oct '13

See <http://ci.nuiton.org/jenkins/job/topia/1521/changes> Changes: [Brendan Le Ny] refs #2087 add some methods inhql builder [Brendan Le Ny] refs #2087 introduce AbstractTopiaDAO and a new query builder, use it to replace TopiaDAOImpl ------------------------------------------ [...truncated 3245 lines...] [INFO] Building ToPIA :: Service Security 3.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ topia-service-security --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ topia-service-security --- [INFO] [INFO] --- eugene-maven-plugin:2.7.1:generate (generate-sources) @ topia-service-security --- [INFO] Process phase [zargo] for one entry. [INFO] Expanding 1 xmi file(s) from <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…> [INFO] Will generate <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…> [INFO] Copy file <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…> to <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…> [INFO] Generate one file in 32.5ms. [INFO] Process phase [xmi] for one entry. [INFO] Processing XSL tranformation on <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…> for 1 file(s). [INFO] Will generate <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…> [INFO] Copy file <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…> to <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…> [INFO] Generate one file in 640.93ms. [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [pool-1-thread-1] (AbstractObjectModelReader.java:427) loadTagValue - Invalid tag value [doNotGenerateBooleanGetMethods] : syntax is not correct. WARN [pool-1-thread-1] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagvalue.java.lang.String] : the tagvalue 'java.lang.String' is unkown. WARN [pool-1-thread-1] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagvalue.java.util.Set] : the tagvalue 'java.util.Set' is unkown. INFO [pool-1-thread-1] (AbstractObjectModelReader.java:270) loadModelProperties - 4 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…> [INFO] No file generated. [INFO] Apply generator TopiaMetaTransformer WARN [pool-1-thread-1] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setActions([java.lang.String actions<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setActions is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setPrincipals([java.lang.String principals<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setPrincipals is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setActions([java.lang.String actions<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setActions is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setPrincipals([java.lang.String principals<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setPrincipals is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setPassword([java.lang.String oldPassword<<[]>> tagvalue: {}, java.lang.String newPassword<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setPassword is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TopiaAssociationAuthorization] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl], already found in class-path. WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TaasPrincipal] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TopiaEntityAuthorization] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl], already found in class-path. WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TaasUser] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TopiaUser] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [org.nuiton.topia.security.entities.user.TopiaUserImpl], already found in class-path. WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TaasAuthorization] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TopiaExpressionLink] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl], already found in class-path. WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TopiaGroup] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [org.nuiton.topia.security.entities.user.TopiaGroupImpl], already found in class-path. WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TopiaAuthorization] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl], already found in class-path. [INFO] Add compile source root : <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…> [INFO] Add resource root :Resource {targetPath: null, filtering: false, FileSet {directory: <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…,> PatternSet [includes: {}, excludes: {**/*.java}]}} [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ topia-service-security --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 9 resources [INFO] Copying 9 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ topia-service-security --- [INFO] Compiling 86 source files to <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[47,36] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[33,36] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[45,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[50,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[27,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[32,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[37,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[42,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[47,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[52,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[57,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[62,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[27,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[32,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[37,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[42,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[47,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[52,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[27,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[32,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[37,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[42,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[59,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[64,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[69,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[74,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[89,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[94,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[45,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[50,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[55,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[60,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[65,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[70,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[75,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[80,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[85,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[90,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[45,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[50,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[55,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[60,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[28,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[33,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[38,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[43,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[48,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[53,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[58,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[63,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[68,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[73,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[78,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[83,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[88,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[93,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[229,36] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[256,28] beginTransaction() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[40,49] org.nuiton.topia.framework.TopiaContextImplementor in org.nuiton.topia.framework has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[42,1] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[39,36] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[166,20] addTopiaEntityVetoable(org.nuiton.topia.event.TopiaEntityVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[167,20] addTopiaEntityListener(org.nuiton.topia.event.TopiaEntityListener) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[168,20] addTopiaTransactionVetoable(org.nuiton.topia.event.TopiaTransactionVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[184,16] addTopiaEntityVetoable(org.nuiton.topia.event.TopiaEntityVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[185,16] addTopiaEntityListener(org.nuiton.topia.event.TopiaEntityListener) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[186,16] addTopiaTransactionVetoable(org.nuiton.topia.event.TopiaTransactionVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[196,42] beginTransaction() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[300,28] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[312,29] commitTransaction() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[405,54] <E>findAll(java.lang.String,java.lang.Object...) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[408,33] commitTransaction() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[431,30] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[75,21] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[54,8] org.nuiton.topia.framework.TopiaContextImplementor in org.nuiton.topia.framework has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[65,43] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[208,20] addTopiaEntityVetoable(java.lang.Class<? extends org.nuiton.topia.persistence.TopiaEntity>,org.nuiton.topia.event.TopiaEntityVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[213,20] addTopiaEntityVetoable(java.lang.Class<? extends org.nuiton.topia.persistence.TopiaEntity>,org.nuiton.topia.event.TopiaEntityVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[216,16] addTopiaEntitiesVetoable(org.nuiton.topia.event.TopiaEntitiesVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[217,16] addTopiaTransactionVetoable(org.nuiton.topia.event.TopiaTransactionVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[455,21] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[464,17] org.nuiton.topia.framework.TopiaContextImplementor in org.nuiton.topia.framework has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[464,56] org.nuiton.topia.framework.TopiaContextImplementor in org.nuiton.topia.framework has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[465,46] <E>getDAO(java.lang.Class<E>) in org.nuiton.topia.framework.TopiaContextImplementor has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[466,34] getRequestPermission(java.lang.String,int) in org.nuiton.topia.persistence.TopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[151,83] <E>findAll(java.lang.String,java.lang.Object...) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[169,53] commitTransaction() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[142,42] beginTransaction() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[177,36] commitTransaction() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[178,36] closeContext() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[163,33] getAggregate() in org.nuiton.topia.persistence.TopiaEntity has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[181,37] getComposite() in org.nuiton.topia.persistence.TopiaEntity has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[71,23] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[75,35] <E>findAll(java.lang.String,java.lang.Object...) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>: Recompile with -Xlint:unchecked for details. [INFO] 97 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[463,77] cannot find symbol symbol: method getTopiaContext() location: interface org.nuiton.topia.persistence.TopiaEntityContextable [ERROR] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[48,5] method does not override or implement a method from a supertype [ERROR] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/targ…>:[58,5] method does not override or implement a method from a supertype [ERROR] <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/src/…>:[49,8] org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl is not abstract and does not override abstract method getTopiaDAO() in org.nuiton.topia.persistence.TopiaEntityContextable [INFO] 4 errors [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] ToPIA ............................................. SUCCESS [5.968s] [INFO] ToPIA :: Persistence .............................. SUCCESS [23.233s] [INFO] ToPIA :: Service Replication ...................... SUCCESS [7.699s] [INFO] ToPIA :: Service Migration ........................ SUCCESS [0.479s] [INFO] ToPIA :: Service Security ......................... FAILURE [1.745s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 40.131s [INFO] Finished at: Wed Oct 02 11:37:04 CEST 2013 [INFO] Final Memory: 38M/299M [INFO] ------------------------------------------------------------------------ [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-migration/pom…> to /var/local/jenkins/data/jobs/topia/modules/org.nuiton.topia$topia-service-migration/builds/2013-10-02_11-36-21/archive/org.nuiton.topia/topia-service-migration/3.0-SNAPSHOT/topia-service-migration-3.0-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-migration/tar…> to /var/local/jenkins/data/jobs/topia/modules/org.nuiton.topia$topia-service-migration/builds/2013-10-02_11-36-21/archive/org.nuiton.topia/topia-service-migration/3.0-SNAPSHOT/topia-service-migration-3.0-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/pom.xml> to /var/local/jenkins/data/jobs/topia/modules/org.nuiton$topia/builds/2013-10-02_11-36-21/archive/org.nuiton/topia/3.0-SNAPSHOT/topia-3.0-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/target/topia-3.0-SNAPSHOT-s…> to /var/local/jenkins/data/jobs/topia/modules/org.nuiton$topia/builds/2013-10-02_11-36-21/archive/org.nuiton/topia/3.0-SNAPSHOT/topia-3.0-SNAPSHOT-site_fr.xml [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-persistence/pom.xml> to /var/local/jenkins/data/jobs/topia/modules/org.nuiton.topia$topia-persistence/builds/2013-10-02_11-36-21/archive/org.nuiton.topia/topia-persistence/3.0-SNAPSHOT/topia-persistence-3.0-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-persistence/target/to…> to /var/local/jenkins/data/jobs/topia/modules/org.nuiton.topia$topia-persistence/builds/2013-10-02_11-36-21/archive/org.nuiton.topia/topia-persistence/3.0-SNAPSHOT/topia-persistence-3.0-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-persistence/target/to…> to /var/local/jenkins/data/jobs/topia/modules/org.nuiton.topia$topia-persistence/builds/2013-10-02_11-36-21/archive/org.nuiton.topia/topia-persistence/3.0-SNAPSHOT/topia-persistence-3.0-SNAPSHOT-tests.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-replication/p…> to /var/local/jenkins/data/jobs/topia/modules/org.nuiton.topia$topia-service-replication/builds/2013-10-02_11-36-21/archive/org.nuiton.topia/topia-service-replication/3.0-SNAPSHOT/topia-service-replication-3.0-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-replication/t…> to /var/local/jenkins/data/jobs/topia/modules/org.nuiton.topia$topia-service-replication/builds/2013-10-02_11-36-21/archive/org.nuiton.topia/topia-service-replication/3.0-SNAPSHOT/topia-service-replication-3.0-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-replication/t…> to /var/local/jenkins/data/jobs/topia/modules/org.nuiton.topia$topia-service-replication/builds/2013-10-02_11-36-21/archive/org.nuiton.topia/topia-service-replication/3.0-SNAPSHOT/topia-service-replication-3.0-SNAPSHOT-tests.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/topia/ws/trunk/topia-service-security/pom.…> to /var/local/jenkins/data/jobs/topia/modules/org.nuiton.topia$topia-service-security/builds/2013-10-02_11-36-21/archive/org.nuiton.topia/topia-service-security/3.0-SNAPSHOT/topia-service-security-3.0-SNAPSHOT.pom Waiting for Jenkins to finish collecting data mavenExecutionResult exceptions not empty message : Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project topia-service-security: Compilation failure cause : Compilation failure Stack trace : org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project topia-service-security: Compilation failure at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:79) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:329) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:174) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:724) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209) ... 26 more Maven failed with error. Sending e-mails to: topia-commits(a)list.nuiton.org Sending e-mails to: topia-commits(a)list.nuiton.org Sending e-mails to: topia-commits(a)list.nuiton.org channel stopped

1 2

Jenkins build became unstable: topia » ToPIA :: Persistence #1521
by admin+hudson＠codelutin.com 04 Oct '13

04 Oct '13

See <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-persistence/1…>

1 2

Build failed in Jenkins: topia » ToPIA :: Service Security #1521
by admin+hudson＠codelutin.com 04 Oct '13

04 Oct '13

See <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…> ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building ToPIA :: Service Security 3.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ topia-service-security --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ topia-service-security --- [INFO] [INFO] --- eugene-maven-plugin:2.7.1:generate (generate-sources) @ topia-service-security --- [INFO] Process phase [zargo] for one entry. [INFO] Expanding 1 xmi file(s) from <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…> [INFO] Will generate <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…> [INFO] Copy file <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…> to <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…> [INFO] Generate one file in 32.5ms. [INFO] Process phase [xmi] for one entry. [INFO] Processing XSL tranformation on <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…> for 1 file(s). [INFO] Will generate <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…> [INFO] Copy file <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…> to <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…> [INFO] Generate one file in 640.93ms. [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [pool-1-thread-1] (AbstractObjectModelReader.java:427) loadTagValue - Invalid tag value [doNotGenerateBooleanGetMethods] : syntax is not correct. WARN [pool-1-thread-1] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagvalue.java.lang.String] : the tagvalue 'java.lang.String' is unkown. WARN [pool-1-thread-1] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagvalue.java.util.Set] : the tagvalue 'java.util.Set' is unkown. INFO [pool-1-thread-1] (AbstractObjectModelReader.java:270) loadModelProperties - 4 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…> [INFO] No file generated. [INFO] Apply generator TopiaMetaTransformer WARN [pool-1-thread-1] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setActions([java.lang.String actions<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setActions is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setPrincipals([java.lang.String principals<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setPrincipals is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setActions([java.lang.String actions<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setActions is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setPrincipals([java.lang.String principals<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setPrincipals is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setPassword([java.lang.String oldPassword<<[]>> tagvalue: {}, java.lang.String newPassword<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setPassword is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TopiaAssociationAuthorization] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl], already found in class-path. WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TaasPrincipal] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TopiaEntityAuthorization] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl], already found in class-path. WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TaasUser] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TopiaUser] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [org.nuiton.topia.security.entities.user.TopiaUserImpl], already found in class-path. WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TaasAuthorization] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TopiaExpressionLink] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl], already found in class-path. WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TopiaGroup] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [org.nuiton.topia.security.entities.user.TopiaGroupImpl], already found in class-path. WARN [pool-1-thread-1] (EntityTransformer.java:131) transformFromClass - [TopiaAuthorization] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl], already found in class-path. [INFO] Add compile source root : <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…> [INFO] Add resource root :Resource {targetPath: null, filtering: false, FileSet {directory: <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…,> PatternSet [includes: {}, excludes: {**/*.java}]}} [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ topia-service-security --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 9 resources [INFO] Copying 9 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ topia-service-security --- [INFO] Compiling 86 source files to <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[47,36] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[33,36] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[45,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[50,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[27,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[32,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[37,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[42,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[47,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[52,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[57,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[62,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[27,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[32,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[37,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[42,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[47,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[52,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[27,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[32,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[37,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[42,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[59,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[64,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[69,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[74,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[89,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[94,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[45,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[50,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[55,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[60,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[65,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[70,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[75,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[80,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[85,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[90,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[45,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[50,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[55,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[60,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[28,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[33,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[38,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[43,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[48,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[53,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[58,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[63,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[68,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[73,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[78,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[83,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[88,20] findByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[93,26] findAllByProperty(java.lang.String,java.lang.Object) in org.nuiton.topia.persistence.AbstractTopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[229,36] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[256,28] beginTransaction() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[40,49] org.nuiton.topia.framework.TopiaContextImplementor in org.nuiton.topia.framework has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[42,1] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[39,36] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[166,20] addTopiaEntityVetoable(org.nuiton.topia.event.TopiaEntityVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[167,20] addTopiaEntityListener(org.nuiton.topia.event.TopiaEntityListener) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[168,20] addTopiaTransactionVetoable(org.nuiton.topia.event.TopiaTransactionVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[184,16] addTopiaEntityVetoable(org.nuiton.topia.event.TopiaEntityVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[185,16] addTopiaEntityListener(org.nuiton.topia.event.TopiaEntityListener) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[186,16] addTopiaTransactionVetoable(org.nuiton.topia.event.TopiaTransactionVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[196,42] beginTransaction() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[300,28] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[312,29] commitTransaction() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[405,54] <E>findAll(java.lang.String,java.lang.Object...) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[408,33] commitTransaction() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[431,30] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[75,21] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[54,8] org.nuiton.topia.framework.TopiaContextImplementor in org.nuiton.topia.framework has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[65,43] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[208,20] addTopiaEntityVetoable(java.lang.Class<? extends org.nuiton.topia.persistence.TopiaEntity>,org.nuiton.topia.event.TopiaEntityVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[213,20] addTopiaEntityVetoable(java.lang.Class<? extends org.nuiton.topia.persistence.TopiaEntity>,org.nuiton.topia.event.TopiaEntityVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[216,16] addTopiaEntitiesVetoable(org.nuiton.topia.event.TopiaEntitiesVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[217,16] addTopiaTransactionVetoable(org.nuiton.topia.event.TopiaTransactionVetoable) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[455,21] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[464,17] org.nuiton.topia.framework.TopiaContextImplementor in org.nuiton.topia.framework has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[464,56] org.nuiton.topia.framework.TopiaContextImplementor in org.nuiton.topia.framework has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[465,46] <E>getDAO(java.lang.Class<E>) in org.nuiton.topia.framework.TopiaContextImplementor has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[466,34] getRequestPermission(java.lang.String,int) in org.nuiton.topia.persistence.TopiaDAO has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[151,83] <E>findAll(java.lang.String,java.lang.Object...) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[169,53] commitTransaction() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[142,42] beginTransaction() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[177,36] commitTransaction() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[178,36] closeContext() in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[163,33] getAggregate() in org.nuiton.topia.persistence.TopiaEntity has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[181,37] getComposite() in org.nuiton.topia.persistence.TopiaEntity has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[71,23] org.nuiton.topia.persistence.TopiaId in org.nuiton.topia.persistence has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[75,35] <E>findAll(java.lang.String,java.lang.Object...) in org.nuiton.topia.TopiaContext has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>: Recompile with -Xlint:unchecked for details. [INFO] 97 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[463,77] cannot find symbol symbol: method getTopiaContext() location: interface org.nuiton.topia.persistence.TopiaEntityContextable [ERROR] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[48,5] method does not override or implement a method from a supertype [ERROR] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[58,5] method does not override or implement a method from a supertype [ERROR] <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>:[49,8] org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl is not abstract and does not override abstract method getTopiaDAO() in org.nuiton.topia.persistence.TopiaEntityContextable [INFO] 4 errors [INFO] -------------------------------------------------------------

1 2

r2810 - in trunk: . topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence/src/main/java/org/nuiton/topia/persistence topia-service-security/src/test/java/org/nuiton/topia/security
by bleny＠users.nuiton.org 03 Oct '13

03 Oct '13

Author: bleny Date: 2013-10-03 18:30:27 +0200 (Thu, 03 Oct 2013) New Revision: 2810 Url: http://nuiton.org/projects/topia/repository/revisions/2810 Log: refs #2087 review code generated in generated AbstractDAOs Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/LegacyEntityDAOTransformer.java Modified: trunk/pom.xml trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.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 trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-02 16:24:51 UTC (rev 2809) +++ trunk/pom.xml 2013-10-03 16:30:27 UTC (rev 2810) @@ -228,7 +228,7 @@ <relativizeDecorationLinks>false</relativizeDecorationLinks>  - <eugeneVersion>2.7.1</eugeneVersion> + <eugeneVersion>2.7.3-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>2.7</nuitonUtilsVersion> <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion> <nuitonDecoratorVersion>3.0-alpha-1</nuitonDecoratorVersion> 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-10-02 16:24:51 UTC (rev 2809) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2013-10-03 16:30:27 UTC (rev 2810) @@ -27,11 +27,13 @@ /*{generator option: parentheses = false}*/ /*{generator option: writeString = +}*/ +import com.google.common.collect.Sets; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; @@ -43,21 +45,16 @@ import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.StringUtil; -import java.security.Permission; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * To generate all <code>DAO</code> related classes for a given entity. @@ -361,23 +358,6 @@ addImport(daoAbstractClass, List.class); addImport(daoAbstractClass, TopiaException.class); - boolean enableSecurity = TopiaGeneratorUtil.isClassWithSecurity(clazz); - - if (enableSecurity) { - addImport(daoAbstractClass, ArrayList.class); - addImport(daoAbstractClass, Permission.class); - addImport(daoAbstractClass, "org.nuiton.topia.taas.entities.TaasAuthorizationImpl"); - addImport(daoAbstractClass, "org.nuiton.topia.taas.jaas.TaasPermission"); - addImport(daoAbstractClass, "org.nuiton.topia.taas.TaasUtil"); - addImport(daoAbstractClass, TopiaDAO.class); - - //FIXME : how to do static imports ? -//import static org.nuiton.topia.taas.TaasUtil.CREATE; -//import static org.nuiton.topia.taas.TaasUtil.DELETE; -//import static org.nuiton.topia.taas.TaasUtil.LOAD; -//import static org.nuiton.topia.taas.TaasUtil.UPDATE; - } - ObjectModelOperation op; // getEntityClass @@ -389,7 +369,7 @@ addAnnotation(daoAbstractClass, op,Override.class); setOperationBody(op, "" /*{ - return (Class<E>)<%=clazzName%>.class; + return (Class<E>) <%=clazzName%>.class; }*/ ); @@ -440,97 +420,6 @@ } } - if (enableSecurity) { - - // getRequestPermission - - op = addOperation(daoAbstractClass, - "getRequestPermission", - "List<Permission>", - ObjectModelJavaModifier.PUBLIC); -// setDocumentation(op, "Retourne les permissions a verifier pour " + -// "l'acces a l'entite pour le service Taas"); - addException(op, TopiaException.class); - addParameter(op, String.class, "topiaId"); - addParameter(op, int.class, "actions"); - StringBuilder buffer = new StringBuilder(); - buffer.append("" -/*{ - List<Permission> resultPermissions = new ArrayList<Permission>(); - if ((actions & TaasUtil.CREATE) == TaasUtil.CREATE) { -}*/ - ); - buffer.append(generateSecurity(daoAbstractClass, clazz, - TopiaGeneratorUtil.getSecurityCreateTagValue(clazz))); - buffer.append("" -/*{ - } - if ((actions & TaasUtil.LOAD) == TaasUtil.LOAD) { -}*/ - ); - buffer.append(generateSecurity(daoAbstractClass, clazz, - TopiaGeneratorUtil.getSecurityLoadTagValue(clazz))); - buffer.append("" -/*{ - } - if ((actions & TaasUtil.UPDATE) == TaasUtil.UPDATE) { -}*/ - ); - buffer.append(generateSecurity(daoAbstractClass, clazz, - TopiaGeneratorUtil.getSecurityUpdateTagValue(clazz))); - buffer.append("" -/*{ - } - if ((actions & TaasUtil.DELETE) == TaasUtil.DELETE) { -}*/ - ); - buffer.append(generateSecurity(daoAbstractClass, clazz, - TopiaGeneratorUtil.getSecurityDeleteTagValue(clazz))); - buffer.append("" -/*{ - } - return resultPermissions; - }*/ - ); - - setOperationBody(op, buffer.toString()); - - // THIMEL : Le code suivant doit pouvoir être déplacé dans DAODelegator ? - - // getRequestPermission - - - op = addOperation(daoAbstractClass, - "getRequestPermission", - "List<Permission>", - ObjectModelJavaModifier.PROTECTED); - addParameter(op, String.class, "topiaId"); - addParameter(op, int.class, "actions"); - addParameter(op, String.class, "query"); - addParameter(op, Class.class, "daoClass"); - addException(op, TopiaException.class); -// setDocumentation(op, "Retourne les permissions a verifier pour " + -// "l'acces a l'entite pour le service Taas"); - setOperationBody(op, "" -/*{ TopiaContext context = getTopiaContext(); - List<String> result = context.findAll(query, "id", topiaId); - - List<Permission> resultPermissions = new ArrayList<Permission>(); - for (String topiaIdPermission : result) { - TopiaDAO dao = context.getDAO(daoClass); - List<Permission> permissions = dao.getRequestPermission(topiaIdPermission, actions); - if(permissions != null) { - resultPermissions.addAll(permissions); - } else { - TaasPermission permission = new TaasPermission(topiaIdPermission, actions); - resultPermissions.add(permission); - } - } - return resultPermissions; - }*/ - ); - } - Set<ObjectModelClass> usagesForclass = usages.get(clazz); generateFindUsages(clazz, daoAbstractClass, usagesForclass); } @@ -612,7 +501,7 @@ body.append("" /*{ { - List<<%=attrType%>> list = getTopiaContext().getHibernateSession().createSQLQuery( + List<<%=attrType%>> list = topiaHibernateSupport.getHibernateSession().createSQLQuery( "SELECT main.topiaid " + "from <%=attrClassifierDBName%> main, <%=attrJoinTableName%> secondary " + "where main.topiaid=secondary.<%=attrDBName%>" + @@ -639,8 +528,8 @@ /*{ { List<<%=attrSimpleType%>> list = topiaDAOSupplier - .getDAO(<%=attrSimpleType%>.class) - .findAllByProperties(<%=attrSimpleType%>.<%=getConstantName(reverseAttrName)%>, entity); + .getDAO(<%=attrSimpleType%>.class, <%=attrSimpleType%>DAO.class) + .forProperties(<%=attrSimpleType%>.<%=getConstantName(reverseAttrName)%>, entity).findAll(); for (<%=attrSimpleType%> item : list) { // sletellier : Set null only if target is concerned by deletion @@ -688,7 +577,7 @@ ObjectModelClass result, Set<ObjectModelClass> usagesForclass) { - builder.addImport(result, ArrayList.class.getName()); + builder.addImport(result, LinkedList.class.getName()); builder.addImport(result, Map.class.getName()); builder.addImport(result, HashMap.class.getName()); builder.addImport(result, TopiaEntity.class.getName()); @@ -708,7 +597,7 @@ addAnnotation(result, operation, Override.class); setOperationBody(operation, "" /*{ - return new ArrayList(); + return new LinkedList(); }*/ ); @@ -750,7 +639,7 @@ StringBuilder buffer = new StringBuilder(300); buffer.append("" /*{ - List<?> result = new ArrayList(); + List<?> result = new LinkedList(); List tmp; }*/ ); @@ -868,16 +757,18 @@ * * @param result clazz where to add operations * @param operations operations to generate + * @deprecated will be removed ASAP in topia 3.0 */ - private void generateDAOOperations(ObjectModelClass result, - Collection<ObjectModelOperation> - operations) { + @Deprecated + protected void generateDAOOperations(ObjectModelClass result, + Collection<ObjectModelOperation> + operations) { if (CollectionUtils.isEmpty(operations)) { // no extra operations to generate return; } - + for (ObjectModelOperation op : operations) { Set<String> exceptions = op.getExceptions(); @@ -891,57 +782,6 @@ } - - - private String generateSecurity(ObjectModelClass result, - ObjectModelClass clazz, - String tagValue) { - StringBuilder buffer = new StringBuilder(); - - if (StringUtils.isNotEmpty(tagValue)) { - String security = tagValue; - Pattern propertiesPattern = Pattern - .compile("((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)attribute\\.(?:([_a-z0-9][_a-zA-Z0-9]*))#(?:(create|load|update|delete))"); - String[] valuesSecurity = security.split(":"); - - for (String valueSecurity : valuesSecurity) { - Matcher matcher = propertiesPattern.matcher(valueSecurity); - matcher.find(); - // className is fully qualified name of class - String className = matcher.group(1); - className = StringUtil.substring(className, 0, -1); // remove ended - // . - // target is class, attribute or operation - String attributeName = matcher.group(2); - String actions = matcher.group(3).toUpperCase(); - - String query = ""; - String daoClass = ""; - if (className.equals(clazz.getQualifiedName())) { - query = "select " + attributeName + ".topiaId from " + clazz.getQualifiedName() + " where topiaId = :id"; - daoClass = clazz.getAttribute(attributeName).getClassifier().getQualifiedName(); - } else { - query = "select at.topiaId from " + className + " at inner join at." + attributeName + " cl where cl.topiaId = :id"; - daoClass = className; - } - buffer.append("" -/*{ - resultPermissions.addAll(getRequestPermission(topiaId, - <%=actions%>, - "<%=query%>", - <%=daoClass%>.class)); -}*/ - ); - } - } else { - buffer.append("" -/*{ return null; - }*/ - ); - } - return buffer.toString(); - } - protected void generateNoNMultiplicity(String clazzName, ObjectModelClass result, ObjectModelAttribute attr, @@ -949,6 +789,14 @@ String attrName = attr.getName(); String attrType = attr.getType(); String propertyName = clazzName + "." + getConstantName(attrName); + + String attrTypeForGeneric; + if (JavaGeneratorUtil.isPrimitiveType(attrType)) { + attrTypeForGeneric = TopiaGeneratorUtil.getClassForPrimitiveType(attr); + } else { + attrTypeForGeneric = attrType; + } + if (!isAssoc && attr.hasAssociationClass()) { String assocClassName = attr.getAssociationClass().getName(); String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); @@ -964,17 +812,45 @@ ObjectModelOperation op; op = addOperation(result, + getJavaBeanMethodName("for", attrName, "In"), + "TopiaQueryBuilderRunQueryStep<E>", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, "Iterable<" + attrTypeForGeneric + ">", "v"); + setOperationBody(op, "" +/*{ + TopiaQueryBuilderRunQueryStep<E> result = forIn(<%=propertyName%>, (Iterable) v); + return result; + }*/ + ); + + op = addOperation(result, + getJavaBeanMethodName("for", attrName, "Equals"), + "TopiaQueryBuilderRunQueryStep<E>", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, attrType, "v"); + setOperationBody(op, "" +/*{ + TopiaQueryBuilderRunQueryStep<E> result = forEquals(<%=propertyName%>, v); + return result; + }*/ + ); + + String methodToDelegateName = op.getName(); + + op = addOperation(result, getJavaBeanMethodName("findBy", attrName), "E", ObjectModelJavaModifier.PUBLIC); addParameter(op, attrType, "v"); setOperationBody(op, "" /*{ - E result = findByProperty(<%=propertyName%>, v); + E result = <%=methodToDelegateName%>(v).findAnyOrNull(); return result; }*/ ); + addAnnotation(result, op, Deprecated.class); + op = addOperation(result, getJavaBeanMethodName("findAllBy", attrName), "List<E>", @@ -982,11 +858,13 @@ addParameter(op, attrType, "v"); setOperationBody(op, "" /*{ - List<E> result = findAllByProperty(<%=propertyName%>, v); + List<E> result = <%=methodToDelegateName%>(v).findAll(); return result; }*/ ); + addAnnotation(result, op, Deprecated.class); + if (!isAssoc && attr.hasAssociationClass()) { String assocClassName = attr.getAssociationClass().getName(); String assocClassFQN = attr.getAssociationClass().getQualifiedName(); @@ -1028,19 +906,34 @@ return; } ObjectModelOperation op; - // Since 2.4 do nothing, findContains and findAllContains are not generated anymore + op = addOperation(result, + getJavaBeanMethodName("for", attrName, "Contains"), + "TopiaQueryBuilderRunQueryStep<E>", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, attrType, "v"); + setOperationBody(op, "" +/*{ + return forContains(<%=clazzName + "." + getConstantName(attrName)%>, v); + }*/ + ); + + String methodToDelegateName = op.getName(); + + op = addOperation(result, getJavaBeanMethodName("findContains", attrName), "E", ObjectModelJavaModifier.PUBLIC); addParameter(op, attrType, "v"); setOperationBody(op, "" /*{ - E result = findContains(<%=clazzName + "." + getConstantName(attrName)%>, v); + E result = <%=methodToDelegateName%>(v).findAnyOrNull(); return result; }*/ ); + addAnnotation(result, op, Deprecated.class); + op = addOperation(result, getJavaBeanMethodName("findAllContains", attrName), "List<E>", @@ -1048,10 +941,13 @@ addParameter(op, attrType, "v"); setOperationBody(op, "" /*{ - List<E> result = findAllContains(<%=clazzName + "." + getConstantName(attrName)%>, v); + List<E> result = <%=methodToDelegateName%>(v).findAll(); return result; }*/ ); + + addAnnotation(result, op, Deprecated.class); + } @@ -1077,6 +973,10 @@ // results.add(op); // } // } + + if (log.isWarnEnabled()) { + log.warn("dao contract in model will not be supported in topia 3.0"); + } Collection<ObjectModelOperation> extra = extraOperations.get(clazz.getQualifiedName()); return extra; @@ -1105,66 +1005,50 @@ ObjectModelOperation existByNaturalId = addOperation(result, "existByNaturalId", "boolean", ObjectModelJavaModifier.PUBLIC); - // TODO sletellier 20120406 : remove method on 3.0 - ObjectModelOperation create = addOperation(result, - "create", "E", ObjectModelJavaModifier.PUBLIC); - - // sletellier : mark as Deprecated (http://nuiton.org/issues/2051) - setDocumentation(create, "@deprecated since 2.6.10, prefer use {@link #createByNaturalId}\n"); - addAnnotation(result, create, "Deprecated"); - ObjectModelOperation createByNaturalId = addOperation(result, "createByNaturalId", "E", ObjectModelJavaModifier.PUBLIC); - // used for calling findByProperties in findByNaturalId - String searchProperties = ""; - // used for calling findByNaturalId in existByNaturalId -// String params = ""; + Set<String> properties = Sets.newLinkedHashSet(); String clazzName = clazz.getName(); + for (ObjectModelAttribute attr : props) { + String propName = attr.getName(); - // add property as param in both methods - addParameter(findByNaturalId, attr.getType(), propName); - addParameter(existByNaturalId, attr.getType(), propName); - addParameter(create, attr.getType(), propName); - addParameter(createByNaturalId, attr.getType(), propName); + String type = attr.getType(); - searchProperties += - ", " + clazzName + '.' + getConstantName(propName) + - ", " + propName; - //params += ", " + propName; + addParameter(findByNaturalId, type, propName); + addParameter(existByNaturalId, type, propName); + addParameter(createByNaturalId, type, propName); + + String property = clazzName + '.' + getConstantName(propName) + ", " + propName; + properties.add(property); + } - searchProperties = searchProperties.substring(2); - //params = params.substring(2); + String arguments = StringUtils.join(properties, ", "); + setOperationBody(findByNaturalId, "" /*{ - return findByProperties(<%=searchProperties%>); + return forProperties(<%=arguments%>).findUnique(); }*/ ); setOperationBody(existByNaturalId, "" /*{ - return existByProperties(<%=searchProperties%>); + return forProperties(<%=arguments%>).exists(); }*/ ); - setOperationBody(create, "" -/*{ - return create(<%=searchProperties%>); - }*/ - ); - setOperationBody(createByNaturalId, "" /*{ - return create(<%=searchProperties%>); + return create(<%=arguments%>); }*/ ); } } - private void generateNotNull(ObjectModelClass result, - ObjectModelClass clazz) { + protected void generateNotNull(ObjectModelClass result, + ObjectModelClass clazz) { Set<ObjectModelAttribute> props = TopiaGeneratorUtil.getNotNullAttributes(clazz); 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 2013-10-02 16:24:51 UTC (rev 2809) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2013-10-03 16:30:27 UTC (rev 2810) @@ -39,12 +39,9 @@ import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDAOSupplier; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.AbstractTopiaDAO; import org.nuiton.topia.persistence.EntityVisitor; -import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityAbstract; import org.nuiton.topia.persistence.TopiaEntityContextable; @@ -143,11 +140,7 @@ generateAbstract = isGenerateAbstract(input); generateImpl = isGenerateImpl(input); - String noGenerateBooleanGetMethods = - TopiaGeneratorUtil.getDoNotGenerateBooleanGetMethods(model, input); - generateBooleanGetMethods = - StringUtils.isEmpty(noGenerateBooleanGetMethods) || - !"true".equals(noGenerateBooleanGetMethods.trim()); + generateBooleanGetMethods = TopiaGeneratorUtil.isDoNotGenerateBooleanGetMethods(model, input); if (generateInterface) { Copied: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/LegacyEntityDAOTransformer.java (from rev 2809, trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java) =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/LegacyEntityDAOTransformer.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/LegacyEntityDAOTransformer.java 2013-10-03 16:30:27 UTC (rev 2810) @@ -0,0 +1,1204 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.topia.generator; + +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelDependency; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.StringUtil; + +import java.security.Permission; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * To generate all <code>DAO</code> related classes for a given entity. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.4 + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityDAOTransformer" + */ +public class LegacyEntityDAOTransformer extends ObjectModelTransformerToJava { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(EntityDAOTransformer.class); + + /** + * map of direct usages (values) for each entity (key). + * + * This map is used to generate the findUsages methods for DAOAbstract. + */ + protected Map<ObjectModelClass, Set<ObjectModelClass>> usages; + + /** + * All entities fqn of the model (used to detect if an attribute is not + * an entity). + */ + protected Set<String> allEntitiesFqn; + + /** + * The class of abstract dao to use. + * @since 2.5 + */ + protected Class<?> daoImplementation; + + protected String entityEnumName; + + protected String entityEnumPackage; + + /** + * Map of extra operations for DAO. The key of the map is the qualified + * name of the entity relative to the DAO. + */ + protected Map<String, Collection<ObjectModelOperation>> extraOperations = + new HashMap<String, Collection<ObjectModelOperation>>(); + + @Override + public void transformFromModel(ObjectModel model) { + + boolean generateStandaloneEnum = + TopiaGeneratorUtil.shouldGenerateStandaloneEnumForDAOHelper(model); + String modelName = model.getName(); + + entityEnumName = modelName + "EntityEnum"; + + String packageName = + getOutputProperties().getProperty(PROP_DEFAULT_PACKAGE); + + if (generateStandaloneEnum) { + entityEnumPackage = packageName + "." + entityEnumName; + } else { + String daoHelperClazzName = modelName + "DAOHelper"; + entityEnumPackage = packageName + "." + daoHelperClazzName + "." + entityEnumName; + } + + usages = TopiaGeneratorUtil.searchDirectUsages(model); + + daoImplementation = TopiaGeneratorUtil.getDAOImplementation(model); + + + // keep all classifiers on the model which are entities + List<ObjectModelClass> allEntities = + TopiaGeneratorUtil.getEntityClasses(model, true); + allEntitiesFqn = new HashSet<String>(allEntities.size()); + for (ObjectModelClass entity : allEntities) { + String fqn = entity.getQualifiedName(); + allEntitiesFqn.add(fqn); + Collection<ObjectModelOperation> daoOperations = + new HashSet<ObjectModelOperation>(); + for (ObjectModelOperation op : entity.getOperations()) { + if (TopiaGeneratorUtil.hasDaoStereotype(op)) { + daoOperations.add(op); + } + } + + if (daoOperations.isEmpty()) { + + // found some dao operations + extraOperations.put(fqn, daoOperations); + } + } + } + + @Override + public void transformFromInterface(ObjectModelInterface interfacez) { + if (!TopiaGeneratorUtil.hasDaoStereotype(interfacez)) { + return; + } + + /** + * EVO #636 : Manage extra operations for DAO from "dao" dependency + * between an interface with stereotype <<dao>> (dependency client) and + * a class with stereotype <<entity>> (dependency supplier). + */ + + ObjectModelDependency dependency = + interfacez.getDependency(TopiaGeneratorUtil.DEPENDENCIES_DAO); + + if (dependency == null) { + if (log.isWarnEnabled()) { + log.warn("Could not find dependency " + + TopiaGeneratorUtil.DEPENDENCIES_DAO + + " but DAO stereotype was placed on the interface " + + interfacez.getName()); + } + return; + } + + ObjectModelClassifier classifier = dependency.getSupplier(); + + if (!TopiaGeneratorUtil.isEntity(classifier)) { + + // dependency supplier is not an entity... + if (log.isWarnEnabled()) { + log.warn("Dependency supplier " + + classifier.getQualifiedName() + + " is not an entity."); + } + return; + } + + // keep only direct operations + Collection<ObjectModelOperation> operations = + interfacez.getOperations(); + + if (CollectionUtils.isEmpty(operations)) { + + // no operations on interface, this is not normal + if (log.isWarnEnabled()) { + log.warn("No operation found on interface with DAO " + + "stereotype "+classifier.getQualifiedName()); + } + return; + } + if (log.isDebugEnabled()) { + log.debug("add "+operations.size()+" extra operation(s) for DAO"); + } + + extraOperations.put(classifier.getQualifiedName(), operations); + } + + @Override + public void transformFromClass(ObjectModelClass clazz) { + if (!TopiaGeneratorUtil.isEntity(clazz)) { + // not an entity + return; + } + String clazzName = clazz.getName(); + String clazzFQN = clazz.getQualifiedName(); + + if (isGenerateDAO(clazz)) { + + // generate DAO + generateDAOClass(clazz, clazzName, clazzFQN); + + } + if (isGenerateImpl(clazz)) { + + // generate DAOImpl + generateDAOImpl(clazz, clazzName, clazzFQN); + } + + if (isGenerateDAOAbstract(clazz)) { + + // generate DAOAbstract + generateDAOAbstract(clazz, clazzName, clazzFQN); + } + } + + protected boolean isGenerateDAO(ObjectModelClass input) { + + String fqn = input.getQualifiedName() + "DAO"; + + if (isInClassPath(fqn)) { + + // already in class-path + return false; + } + + // can safely generate the dao impl + return true; + } + + protected boolean isGenerateDAOAbstract(ObjectModelClass input) { + + String fqn = input.getQualifiedName() + "DAOAbstract"; + + if (isInClassPath(fqn)) { + + // already in class-path + return false; + } + + // can safely generate the dao impl + return true; + } + + protected boolean isGenerateImpl(ObjectModelClass input) { + + String fqn = input.getQualifiedName() + "DAOImpl"; + + if (isInClassPath(fqn)) { + + // already in class-path + return false; + } + + Collection<ObjectModelOperation> moreOperations = + extraOperations.get(input.getQualifiedName()); + + if (CollectionUtils.isNotEmpty(moreOperations)) { + + // no user operations, can generate it + return false; + } + + // can safely generate the dao impl + return true; + } + + protected void generateDAOClass(ObjectModelClass clazz, String clazzName, String clazzFQN) { + ObjectModelClass daoClass = createClass(clazzName + "DAO", clazz.getPackageName()); + setDocumentation(daoClass, "/**\n" + + " * Cette classe etend le DAOImpl pour parametrer la classe avec le bon type\n" + + " * Cette classe est marque finale car l'heritage entre les DAO se fait\n" + + " * sur les DOAImpl, c-a-d que DAOAbstract peut etendre le DAOImpl\n" + + " */"); + setSuperClass(daoClass, clazzFQN + "DAOImpl<" + clazzName + ">"); + } + + protected void generateDAOImpl(ObjectModelClass clazz, + String clazzName, + String clazzFQN) { + + Collection<ObjectModelOperation> moreOperations = + extraOperations.get(clazz.getQualifiedName()); + + if (CollectionUtils.isEmpty(moreOperations)) { + + // no business dao found, can safely generate the daoImpl class + + ObjectModelClass daoImplClass = createClass(clazzName + "DAOImpl<E extends " + clazzName + ">", clazz.getPackageName()); + setDocumentation(daoImplClass, "/**\n" + + " Implantation du DAO pour l'entité " + clazzName + ".\n" + + " * L'utilisateur peut remplacer cette classe par la sienne en la mettant \n" + + " * simplement dans ces sources. Cette classe générée sera alors simplement\n" + + " * écrasée\n" + + " */"); + setSuperClass(daoImplClass, clazzFQN + "DAOAbstract<E>"); + } + } + + protected void generateDAOAbstract(ObjectModelClass clazz, + String clazzName, + String clazzFQN) { + ObjectModelClass daoAbstractClass = createAbstractClass( + clazzName + "DAOAbstract<E extends " + clazzName + '>', + clazz.getPackageName()); + + // super class + + String extendClass = ""; + for (ObjectModelClass parent : clazz.getSuperclasses()) { + extendClass = parent.getQualifiedName(); + if (TopiaGeneratorUtil.isEntity(parent)) { + extendClass += "DAOImpl<E>"; + // in java no multi-inheritance + break; + } + } + if (extendClass.length() == 0) { + extendClass = daoImplementation.getName() + "<E>"; + } + if (log.isDebugEnabled()) { + log.debug("super class = " + extendClass); + } + setSuperClass(daoAbstractClass, extendClass); + + String prefix = getConstantPrefix(clazz, ""); + setConstantPrefix(prefix); + + // imports + + Collection<ObjectModelOperation> DAOoperations = + getDAOOperations(clazz); + + if (TopiaGeneratorUtil.isCollectionNeeded(DAOoperations)) { + addImport(daoAbstractClass, Collection.class); + } + if (TopiaGeneratorUtil.isSetNeeded(DAOoperations)) { + addImport(daoAbstractClass, Set.class); + } + addImport(daoAbstractClass, List.class); + addImport(daoAbstractClass, TopiaException.class); + + boolean enableSecurity = TopiaGeneratorUtil.isClassWithSecurity(clazz); + + if (enableSecurity) { + addImport(daoAbstractClass, ArrayList.class); + addImport(daoAbstractClass, Permission.class); + addImport(daoAbstractClass, "org.nuiton.topia.taas.entities.TaasAuthorizationImpl"); + addImport(daoAbstractClass, "org.nuiton.topia.taas.jaas.TaasPermission"); + addImport(daoAbstractClass, "org.nuiton.topia.taas.TaasUtil"); + addImport(daoAbstractClass, TopiaDAO.class); + + //FIXME : how to do static imports ? +//import static org.nuiton.topia.taas.TaasUtil.CREATE; +//import static org.nuiton.topia.taas.TaasUtil.DELETE; +//import static org.nuiton.topia.taas.TaasUtil.LOAD; +//import static org.nuiton.topia.taas.TaasUtil.UPDATE; + } + + ObjectModelOperation op; + + // getEntityClass + + op = addOperation(daoAbstractClass, + "getEntityClass", + "Class<E>", + ObjectModelJavaModifier.PUBLIC); + addAnnotation(daoAbstractClass, op,Override.class); + setOperationBody(op, "" +/*{ + return (Class<E>)<%=clazzName%>.class; + }*/ + ); + + // getTopiaEntityEnum + addImport(daoAbstractClass, entityEnumPackage); + op = addOperation(daoAbstractClass, + "getTopiaEntityEnum", + entityEnumName, + ObjectModelJavaModifier.PUBLIC); + addAnnotation(daoAbstractClass, op,Override.class); + setOperationBody(op, "" +/*{ + return <%=entityEnumName%>.<%=clazzName%>; + }*/ + ); + + generateDAOOperations(daoAbstractClass, DAOoperations); + + generateDelete(clazz, daoAbstractClass); + + generateNaturalId(daoAbstractClass, clazz); + + generateNotNull(daoAbstractClass, clazz); + + for (ObjectModelAttribute attr : clazz.getAttributes()) { + if (!attr.isNavigable()) { + continue; + } + + if (!GeneratorUtil.isNMultiplicity(attr)) { + generateNoNMultiplicity(clazzName, daoAbstractClass, attr, false); + } else { + generateNMultiplicity(clazzName, daoAbstractClass, attr); + } + } + + if (clazz instanceof ObjectModelAssociationClass) { + ObjectModelAssociationClass assocClass = + (ObjectModelAssociationClass) clazz; + for (ObjectModelAttribute attr : assocClass.getParticipantsAttributes()) { + if (attr != null) { + if (!GeneratorUtil.isNMultiplicity(attr)) { + generateNoNMultiplicity(clazzName, daoAbstractClass, attr, true); + } else { + generateNMultiplicity(clazzName, daoAbstractClass, attr); + } + } + } + } + + if (enableSecurity) { + + // getRequestPermission + + op = addOperation(daoAbstractClass, + "getRequestPermission", + "List<Permission>", + ObjectModelJavaModifier.PUBLIC); +// setDocumentation(op, "Retourne les permissions a verifier pour " + +// "l'acces a l'entite pour le service Taas"); + addException(op, TopiaException.class); + addParameter(op, String.class, "topiaId"); + addParameter(op, int.class, "actions"); + StringBuilder buffer = new StringBuilder(); + buffer.append("" +/*{ + List<Permission> resultPermissions = new ArrayList<Permission>(); + if ((actions & TaasUtil.CREATE) == TaasUtil.CREATE) { +}*/ + ); + buffer.append(generateSecurity(daoAbstractClass, clazz, + TopiaGeneratorUtil.getSecurityCreateTagValue(clazz))); + buffer.append("" +/*{ + } + if ((actions & TaasUtil.LOAD) == TaasUtil.LOAD) { +}*/ + ); + buffer.append(generateSecurity(daoAbstractClass, clazz, + TopiaGeneratorUtil.getSecurityLoadTagValue(clazz))); + buffer.append("" +/*{ + } + if ((actions & TaasUtil.UPDATE) == TaasUtil.UPDATE) { +}*/ + ); + buffer.append(generateSecurity(daoAbstractClass, clazz, + TopiaGeneratorUtil.getSecurityUpdateTagValue(clazz))); + buffer.append("" +/*{ + } + if ((actions & TaasUtil.DELETE) == TaasUtil.DELETE) { +}*/ + ); + buffer.append(generateSecurity(daoAbstractClass, clazz, + TopiaGeneratorUtil.getSecurityDeleteTagValue(clazz))); + buffer.append("" +/*{ + } + return resultPermissions; + }*/ + ); + + setOperationBody(op, buffer.toString()); + + // THIMEL : Le code suivant doit pouvoir être déplacé dans DAODelegator ? + + // getRequestPermission + + + op = addOperation(daoAbstractClass, + "getRequestPermission", + "List<Permission>", + ObjectModelJavaModifier.PROTECTED); + addParameter(op, String.class, "topiaId"); + addParameter(op, int.class, "actions"); + addParameter(op, String.class, "query"); + addParameter(op, Class.class, "daoClass"); + addException(op, TopiaException.class); +// setDocumentation(op, "Retourne les permissions a verifier pour " + +// "l'acces a l'entite pour le service Taas"); + setOperationBody(op, "" +/*{ TopiaContext context = getTopiaContext(); + List<String> result = context.findAll(query, "id", topiaId); + + List<Permission> resultPermissions = new ArrayList<Permission>(); + for (String topiaIdPermission : result) { + TopiaDAO dao = context.getDAO(daoClass); + List<Permission> permissions = dao.getRequestPermission(topiaIdPermission, actions); + if(permissions != null) { + resultPermissions.addAll(permissions); + } else { + TaasPermission permission = new TaasPermission(topiaIdPermission, actions); + resultPermissions.add(permission); + } + } + return resultPermissions; + }*/ + ); + } + + Set<ObjectModelClass> usagesForclass = usages.get(clazz); + generateFindUsages(clazz, daoAbstractClass, usagesForclass); + } + + protected void generateDelete(ObjectModelClass clazz, + ObjectModelClass result) { + + StringBuilder body = new StringBuilder(); + String modelName = StringUtils.capitalize(model.getName()); + String providerFQN = getOutputProperties().getProperty( + PROP_DEFAULT_PACKAGE) + '.' + modelName + + "DAOHelper.getImplementationClass"; + + for (ObjectModelAttribute attr : clazz.getAttributes()) { + + String attrType = GeneratorUtil.getSimpleName(attr.getType()); + + String reverseAttrName = attr.getReverseAttributeName(); + ObjectModelAttribute reverse = attr.getReverseAttribute(); + if (attr.hasAssociationClass() || + reverse == null || !reverse.isNavigable()) { + + // never treate a non reverse and navigable attribute + // never treate an association class attribute + continue; + } + + // at this point we are sure to have a attribute which is + // - reverse + // - navigable + // - not from an association class + if (!allEntitiesFqn.contains(attr.getType())) { + + // this attribute is not from an entity, don't treate it + if (log.isDebugEnabled()) { + log.debug("[" + result.getName() + "] Skip attribute [" + + attr.getName() + "] with type " + attr.getType()); + } + continue; + } + + // At this point, the attribute type is a entity + if (GeneratorUtil.isNMultiplicity(attr) && + GeneratorUtil.isNMultiplicity(reverse)) { + // On doit absolument supprimer pour les relations many-to-many + // le this de la collection de l'autre cote + + String attrDBName = TopiaGeneratorUtil.getDbName(attr); + String attrClassifierDBName = TopiaGeneratorUtil.getDbName(attr.getClassifier()); + String attrJoinTableName = TopiaGeneratorUtil.getManyToManyTableName(attr); + String attrReverseDBName = TopiaGeneratorUtil.getReverseDbName(attr); + + //FIXME_-FC-20100413 Use a TopiaQuery (use HQLin elements) +// // Add DAOHelper +// String daoHelper = modelName + "DAOHelper"; +// String daoHelperFQN = getOutputProperties(). +// getProperty(PROP_DEFAULT_PACKAGE) + '.' + daoHelper; +// addImport(result, daoHelperFQN); +// +// // Add import for TopiaQuery +// addImport(result, TopiaQuery.class); +// +// // Entity DAO and reversePropertyName +// String entityDAO = attrType + "DAO"; +// String reverseAttrNameProperty = +// attrType + "." + getConstantName(reverseAttrName); +// +// +// <%=entityDAO%> dao = <%=daoHelper%>.get<%=entityDAO%>(getTopiaContext()); +// TopiaQuery query = dao.createQuery("B"). +// addFrom(entity.getClass(), "A"). +// add("A", entity). +// addInElements("A", "B." + <%=reverseAttrNameProperty%>); +// +// System.out.println("Query : " + query); +// List<<%=attrType%>> list = dao.findAllByQuery(query); + + String removeName = getJavaBeanMethodName("remove", reverseAttrName); + body.append("" +/*{ + { + List<<%=attrType%>> list = getTopiaContext().getHibernateSession().createSQLQuery( + "SELECT main.topiaid " + + "from <%=attrClassifierDBName%> main, <%=attrJoinTableName%> secondary " + + "where main.topiaid=secondary.<%=attrDBName%>" + + " and secondary.<%=attrReverseDBName%>='" + entity.getTopiaId() + "'") + .addEntity("main", <%=providerFQN%>(<%=attrType%>.class)).list(); + + for (<%=attrType%> item : list) { + item.<%=removeName%>(entity); + } + } +}*/ + ); + } else if (!GeneratorUtil.isNMultiplicity(reverse)) { + // On doit mettre a null les attributs qui ont cet objet sur les + // autres entites en one-to-* + // TODO peut-etre qu'hibernate est capable de faire ca tout seul ? + // THIMEL: J'ai remplacé reverse.getName() par reverseAttrName sans certitude + addImport(result, attrType); + String attrSimpleType = TopiaGeneratorUtil.getClassNameFromQualifiedName(attrType); + String getName = getJavaBeanMethodName("get", reverseAttrName); + String setName = getJavaBeanMethodName("set", reverseAttrName); + + body.append("" + /*{ + { + List<<%=attrSimpleType%>> list = topiaDAOSupplier + .getDAO(<%=attrSimpleType%>.class) + .findAllByProperties(<%=attrSimpleType%>.<%=getConstantName(reverseAttrName)%>, entity); + for (<%=attrSimpleType%> item : list) { + + // sletellier : Set null only if target is concerned by deletion + if (entity.equals(item.<%=getName%>())) { + item.<%=setName%>(null); + } + }*/ + ); + if (attr.isAggregate()) { + body.append("" +/*{ + topiaDAOSupplier.getDAO(<%=attrSimpleType%>.class).delete(item); +}*/ + ); + } + body.append("" +/*{ + } + } +}*/ + ); + + } + } + + if (body.length()>0) { + // something specific was done, need to generate the method + ObjectModelOperation op; + op = addOperation(result, "delete", "void", ObjectModelJavaModifier.PUBLIC); + addAnnotation(result, op,Override.class); + addParameter(op, "E", "entity"); + body.append("" +/*{ + super.delete(entity); + }*/ + ); + setOperationBody(op, body.toString()); + } + + + + } + + protected void generateFindUsages(ObjectModelClass clazz, + ObjectModelClass result, + Set<ObjectModelClass> usagesForclass) { + + builder.addImport(result, ArrayList.class.getName()); + builder.addImport(result, Map.class.getName()); + builder.addImport(result, HashMap.class.getName()); + builder.addImport(result, TopiaEntity.class.getName()); + + if (clazz instanceof ObjectModelAssociationClass || + usagesForclass.isEmpty()) { + // not for an association class + // just let a null method + ObjectModelOperation operation; + operation = addOperation(result, + "findUsages", + " List", + ObjectModelJavaModifier.PUBLIC); + + addParameter(operation, "Class", "type"); + addParameter(operation, "E", "entity"); + addAnnotation(result, operation, Override.class); + setOperationBody(operation, "" +/*{ + return new ArrayList(); + }*/ + ); + + operation = addOperation(result, + "findAllUsages", + "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", + ObjectModelJavaModifier.PUBLIC); + + addParameter(operation, "E", "entity"); + addAnnotation(result, operation, Override.class); + setOperationBody(operation, "" +/*{ + return new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(); + }*/ + ); + + return; + } + List<ObjectModelClass> allEntities; + Map<String, ObjectModelClass> allEntitiesByFQN; + + allEntities = TopiaGeneratorUtil.getEntityClasses(model, true); + allEntitiesByFQN = new TreeMap<String, ObjectModelClass>(); + + // prepare usages map and fill allEntitiesByFQN map + for (ObjectModelClass klass : allEntities) { + allEntitiesByFQN.put(klass.getQualifiedName(), klass); + } + + ObjectModelOperation operation; + operation = addOperation(result, + "findUsages", + " List", + ObjectModelJavaModifier.PUBLIC); + + addParameter(operation, "Class", "type"); + addParameter(operation, "E", "entity"); + addAnnotation(result, operation, Override.class); + StringBuilder buffer = new StringBuilder(300); + buffer.append("" +/*{ + List<?> result = new ArrayList(); + List tmp; +}*/ + ); + + for (ObjectModelClass usageClass : usagesForclass) { + String usageType = usageClass.getQualifiedName(); + builder.addImport(result, usageType); + String usageSimpleType = + TopiaGeneratorUtil.getClassNameFromQualifiedName(usageType); + String usageSimplePropertyMethod = "findAllBy" + usageSimpleType; + String usageCollectionPropertyMethod = "findAllContaining" + usageSimpleType; + for (ObjectModelAttribute attr : usageClass.getAttributes()) { + if (!attr.isNavigable()) { + // skip this case + continue; + } + String type; + String attrName = attr.getName(); + if (attr.hasAssociationClass()) { + //FIXME-TC20100224 dont known how to do this ? + continue; +// type = attr.getAssociationClass().getQualifiedName(); +// //FIXME-TC20100224 : this is crazy ??? must find the good name +// // Perhaps need to make different cases? +// attrName = attrName + "_" + TopiaGeneratorUtil.toLowerCaseFirstLetter(attr.getAssociationClass().getName()); + } else { + type = attr.getType(); + } + if (!allEntitiesByFQN.containsKey(type)) { + // not a entity, can skip for this attribute + continue; + } + ObjectModelClass targetEntity = allEntitiesByFQN.get(type); +// if (!type.equals(clazz.getQualifiedName())) { + if (!targetEntity.equals(clazz)) { + // not a good attribute reference + continue; + } + // found something to seek + + String methodName; + if (TopiaGeneratorUtil.isNMultiplicity(attr)) { + methodName = getJavaBeanMethodName("findAllContains", attrName); + } else { + methodName = getJavaBeanMethodName("findAllBy", attrName); + } + String daoName = StringUtils.capitalize(usageSimpleType) + "DAO"; + + builder.addImport(result, usageClass.getPackageName() + '.' + daoName); + + buffer.append("" +/*{ + if (type == <%=usageSimpleType%>.class) { + <%=daoName%> dao = (<%=daoName%>) + topiaDAOSupplier.getDAO(<%=usageSimpleType%>.class); + tmp = dao.<%=methodName%>(entity); + result.addAll(tmp); + } +}*/ + ); + } + } + + buffer.append("" +/*{ + return (List) result; + }*/ + ); + setOperationBody(operation, buffer.toString()); + + operation = addOperation(result, + "findAllUsages", + "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", + ObjectModelJavaModifier.PUBLIC); + + addParameter(operation, "E", "entity"); + addAnnotation(result, operation, Override.class); + + buffer = new StringBuilder(300); + buffer.append("" +/*{ + Map<Class<? extends TopiaEntity>,List<? extends TopiaEntity>> result; + result = new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(<%=usagesForclass.size()%>); + + List<? extends TopiaEntity> list; +}*/ + ); + for (ObjectModelClass usageClass : usagesForclass) { + + String fqn = usageClass.getName(); + buffer.append("" +/*{ + list = findUsages(<%=fqn%>.class, entity); + if (!list.isEmpty()) { + result.put(<%=fqn%>.class, list); + } +}*/ + ); + + } + buffer.append("" +/*{ + return result; + }*/ + ); + + setOperationBody(operation, buffer.toString()); + } + + /** + * Generation of DAO operations signatures from class. These operations are + * abstract and identified by <<dao>> stereotype in the model. The + * developper must defined these methods in the DAOImpl associated to this + * DAOAbstract. + * + * @param result clazz where to add operations + * @param operations operations to generate + */ + private void generateDAOOperations(ObjectModelClass result, + Collection<ObjectModelOperation> + operations) { + if (CollectionUtils.isEmpty(operations)) { + + // no extra operations to generate + return; + } + + for (ObjectModelOperation op : operations) { + + Set<String> exceptions = op.getExceptions(); + cloneOperation(op, + result, + true, + ObjectModelJavaModifier.ABSTRACT, + ObjectModelJavaModifier.fromVisibility(op.getVisibility()) + ); + } + } + + + + + private String generateSecurity(ObjectModelClass result, + ObjectModelClass clazz, + String tagValue) { + StringBuilder buffer = new StringBuilder(); + + if (StringUtils.isNotEmpty(tagValue)) { + String security = tagValue; + Pattern propertiesPattern = Pattern + .compile("((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)attribute\\.(?:([_a-z0-9][_a-zA-Z0-9]*))#(?:(create|load|update|delete))"); + String[] valuesSecurity = security.split(":"); + + for (String valueSecurity : valuesSecurity) { + Matcher matcher = propertiesPattern.matcher(valueSecurity); + matcher.find(); + // className is fully qualified name of class + String className = matcher.group(1); + className = StringUtil.substring(className, 0, -1); // remove ended + // . + // target is class, attribute or operation + String attributeName = matcher.group(2); + String actions = matcher.group(3).toUpperCase(); + + String query = ""; + String daoClass = ""; + if (className.equals(clazz.getQualifiedName())) { + query = "select " + attributeName + ".topiaId from " + clazz.getQualifiedName() + " where topiaId = :id"; + daoClass = clazz.getAttribute(attributeName).getClassifier().getQualifiedName(); + } else { + query = "select at.topiaId from " + className + " at inner join at." + attributeName + " cl where cl.topiaId = :id"; + daoClass = className; + } + buffer.append("" +/*{ + resultPermissions.addAll(getRequestPermission(topiaId, + <%=actions%>, + "<%=query%>", + <%=daoClass%>.class)); +}*/ + ); + } + } else { + buffer.append("" +/*{ return null; + }*/ + ); + } + return buffer.toString(); + } + + protected void generateNoNMultiplicity(String clazzName, + ObjectModelClass result, + ObjectModelAttribute attr, + boolean isAssoc) { + String attrName = attr.getName(); + String attrType = attr.getType(); + String propertyName = clazzName + "." + getConstantName(attrName); + if (!isAssoc && attr.hasAssociationClass()) { + String assocClassName = attr.getAssociationClass().getName(); + String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + // It is about transitivity : use the property to access the + // associationClass + '.' + the property to access the expected + // attribute + // <class>.<attrAssoc> + '.' + <assocClass>.<attr> + propertyName = + clazzName + '.' + getConstantName(assocAttrName) + + " + '.' + " + + assocClassName + '.' + getConstantName(attrName); + } + + ObjectModelOperation op; + op = addOperation(result, + getJavaBeanMethodName("findBy", attrName), + "E", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, attrType, "v"); + setOperationBody(op, "" +/*{ + E result = findByProperty(<%=propertyName%>, v); + return result; + }*/ + ); + + op = addOperation(result, + getJavaBeanMethodName("findAllBy", attrName), + "List<E>", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, attrType, "v"); + setOperationBody(op, "" +/*{ + List<E> result = findAllByProperty(<%=propertyName%>, v); + return result; + }*/ + ); + + if (!isAssoc && attr.hasAssociationClass()) { + String assocClassName = attr.getAssociationClass().getName(); + String assocClassFQN = attr.getAssociationClass().getQualifiedName(); + String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + String assocPropertyConstantName = getConstantName(assocAttrName); + op = addOperation(result, + getJavaBeanMethodName("findBy", assocClassName), + "E", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, assocClassFQN, "value"); + setOperationBody(op, "" +/*{ + E result = findByProperty(<%=clazzName + "." + assocPropertyConstantName%>, value); + return result; + }*/ + ); + + op = addOperation(result, + getJavaBeanMethodName("findAllBy", assocClassName), + "List<E>", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, assocClassFQN, "value"); + setOperationBody(op, "" +/*{ + List<E> result = findAllByProperty(<%=clazzName + "." + assocPropertyConstantName%>, value); + return result; + }*/ + ); + } + } + + protected void generateNMultiplicity(String clazzName, + ObjectModelClass result, + ObjectModelAttribute attr) { + String attrName = attr.getName(); + String attrType = attr.getType(); + if (attr.hasAssociationClass()) { + // do nothing for association class, too complex... + return; + } + ObjectModelOperation op; + // Since 2.4 do nothing, findContains and findAllContains are not generated anymore + op = addOperation(result, + getJavaBeanMethodName("findContains", attrName), + "E", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, attrType, "v"); + setOperationBody(op, "" +/*{ + E result = findContains(<%=clazzName + "." + getConstantName(attrName)%>, v); + return result; + }*/ + ); + + op = addOperation(result, + getJavaBeanMethodName("findAllContains", attrName), + "List<E>", + ObjectModelJavaModifier.PUBLIC); + addParameter(op, attrType, "v"); + setOperationBody(op, "" +/*{ + List<E> result = findAllContains(<%=clazzName + "." + getConstantName(attrName)%>, v); + return result; + }*/ + ); + } + + + /** + * Obtain business operations of the DAO. + * + * This operations can not be generated, but must be written by developper. + * + * @param clazz the clazz to test. + * @return collections of extra operations, or empty collection if none found. + */ + public Collection<ObjectModelOperation> getDAOOperations( + ObjectModelClass clazz) { + +// // Note : this collection will contains extra operations for DAO. +// // Overriding existing generated methods is not managed yet +// Collection<ObjectModelOperation> results = +// new ArrayList<ObjectModelOperation>(); + +// // This code will be deprecated +// for (ObjectModelOperation op : clazz.getOperations()) { +// if (TopiaGeneratorUtil.hasDaoStereotype(op)) { +// results.add(op); +// } +// } + Collection<ObjectModelOperation> extra = + extraOperations.get(clazz.getQualifiedName()); + return extra; +// if (extra != null) { +// for (ObjectModelOperation op : extra) { +// results.add(op); +// } +// } + +// return results; + } + + private void generateNaturalId(ObjectModelClass result, + ObjectModelClass clazz) { + Set<ObjectModelAttribute> props = + TopiaGeneratorUtil.getNaturalIdAttributes(clazz); + + if (!props.isEmpty()) { + + if (log.isDebugEnabled()) { + log.debug("generateNaturalId for " + props); + } + ObjectModelOperation findByNaturalId = addOperation(result, + "findByNaturalId", "E", ObjectModelJavaModifier.PUBLIC); + + ObjectModelOperation existByNaturalId = addOperation(result, + "existByNaturalId", "boolean", ObjectModelJavaModifier.PUBLIC); + + // TODO sletellier 20120406 : remove method on 3.0 + ObjectModelOperation create = addOperation(result, + "create", "E", ObjectModelJavaModifier.PUBLIC); + + // sletellier : mark as Deprecated (http://nuiton.org/issues/2051) + setDocumentation(create, "@deprecated since 2.6.10, prefer use {@link #createByNaturalId}\n"); + addAnnotation(result, create, "Deprecated"); + + ObjectModelOperation createByNaturalId = addOperation(result, + "createByNaturalId", "E", ObjectModelJavaModifier.PUBLIC); + + // used for calling findByProperties in findByNaturalId + String searchProperties = ""; + // used for calling findByNaturalId in existByNaturalId +// String params = ""; + String clazzName = clazz.getName(); + for (ObjectModelAttribute attr : props) { + String propName = attr.getName(); + // add property as param in both methods + addParameter(findByNaturalId, attr.getType(), propName); + addParameter(existByNaturalId, attr.getType(), propName); + addParameter(create, attr.getType(), propName); + addParameter(createByNaturalId, attr.getType(), propName); + + searchProperties += + ", " + clazzName + '.' + getConstantName(propName) + + ", " + propName; + //params += ", " + propName; + } + searchProperties = searchProperties.substring(2); + //params = params.substring(2); + + setOperationBody(findByNaturalId, "" +/*{ + return findByProperties(<%=searchProperties%>); + }*/ + ); + + setOperationBody(existByNaturalId, "" +/*{ + return existByProperties(<%=searchProperties%>); + }*/ + ); + + setOperationBody(create, "" +/*{ + return create(<%=searchProperties%>); + }*/ + ); + + setOperationBody(createByNaturalId, "" +/*{ + return create(<%=searchProperties%>); + }*/ + ); + } + } + + private void generateNotNull(ObjectModelClass result, + ObjectModelClass clazz) { + + Set<ObjectModelAttribute> props = + TopiaGeneratorUtil.getNotNullAttributes(clazz); + + if (!props.isEmpty()) { + + if (log.isDebugEnabled()) { + log.debug("generateNotNull for " + props); + } + + ObjectModelOperation createByNotNull = addOperation(result, + "createByNotNull", "E", ObjectModelJavaModifier.PUBLIC); + + String createProperties = ""; +// String params = ""; + String clazzName = clazz.getName(); + for (ObjectModelAttribute attr : props) { + String propName = attr.getName(); + // add property as param in both methods + addParameter(createByNotNull, attr.getType(), propName); + + createProperties += + ", " + clazzName + '.' + getConstantName(propName) + + ", " + propName; + //params += ", " + propName; + } + createProperties = createProperties.substring(2); + //params = params.substring(2); + + setOperationBody(createByNotNull, "" +/*{ + 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-10-02 16:24:51 UTC (rev 2809) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2013-10-03 16:30:27 UTC (rev 2810) @@ -52,6 +52,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; @@ -516,9 +517,21 @@ private static final Set<String> primitiveTypes = new HashSet<String>(); + private static final Map<String, String> primitiveTypeToClass = new HashMap<String, String>(); + private static final String VOID_TYPE = "void"; static { + + primitiveTypeToClass.put("byte", "java.lang.Byte"); + primitiveTypeToClass.put("short", "java.lang.Short"); + primitiveTypeToClass.put("int", "java.lang.Integer"); + primitiveTypeToClass.put("long", "java.lang.Long"); + primitiveTypeToClass.put("float", "java.lang.Float"); + primitiveTypeToClass.put("double", "java.lang.Double"); + primitiveTypeToClass.put("char", "java.lang.Char"); + primitiveTypeToClass.put("boolean", "java.lang.Boolean"); + numberTypes.add("byte"); numberTypes.add("java.lang.Byte"); numberTypes.add("Byte"); @@ -573,6 +586,13 @@ return primitiveTypes.contains(attr.getType()); } + public static String getClassForPrimitiveType(ObjectModelAttribute attr) { + Preconditions.checkState(isPrimitiveType(attr)); + String className = primitiveTypeToClass.get(attr.getType()); + Preconditions.checkNotNull(className); + return className; + } + /** * Indique si la classe specifiee n'a aucune ou que des methodes abstraites * Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java 2013-10-02 16:24:51 UTC (rev 2809) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java 2013-10-03 16:30:27 UTC (rev 2810) @@ -205,10 +205,10 @@ } protected String createSimpleQuery() { - return createSimpleQuery0(null); + return newFromClause(null); } - protected String createSimpleQuery0(String alias) { + protected String newFromClause(String alias) { String hql = "from " + getTopiaEntityEnum().getImplementationFQN(); if (StringUtils.isNotBlank(alias)) { hql += " " + alias; @@ -218,7 +218,7 @@ @Deprecated public String createSimpleQuery(String alias) { - return createSimpleQuery0(alias); + return newFromClause(alias); } public E newInstance() { @@ -356,6 +356,10 @@ } } + protected HqlAndParametersBuilder<E> newHqlAndParametersBuilder() { + return new HqlAndParametersBuilder<E>(getEntityClass()); + } + protected HqlAndParametersBuilder<E> getHqlForProperties(String propertyName, Object propertyValue, Object... otherPropertyNamesAndValues) { @@ -370,7 +374,7 @@ } protected HqlAndParametersBuilder<E> getHqlForProperties(Map<String, Object> properties) { - HqlAndParametersBuilder<E> hqlAndParametersBuilder = new HqlAndParametersBuilder<E>(getEntityClass()); + HqlAndParametersBuilder<E> hqlAndParametersBuilder = newHqlAndParametersBuilder(); for (Map.Entry<String, Object> property : properties.entrySet()) { hqlAndParametersBuilder.addEquals(property.getKey(), property.getValue()); } @@ -414,6 +418,18 @@ return newQueryBuilder().forAll(); } + public TopiaQueryBuilderRunQueryStep<E> forContains(String propertyName, Object propertyValue) { + return forAll().addContains(propertyName, propertyValue).getNextStep(); + } + + public TopiaQueryBuilderRunQueryStep<E> forEquals(String propertyName, Object propertyValue) { + return forAll().addEquals(propertyName, propertyValue).getNextStep(); + } + + public TopiaQueryBuilderRunQueryStep<E> forIn(String propertyName, Iterable<Object> propertyValues) { + return forAll().addIn(propertyName, propertyValues).getNextStep(); + } + public static class TopiaQueryBuilderCreateQueryStep<E extends TopiaEntity> { protected AbstractTopiaDAO<E> topiaDAO; @@ -849,14 +865,19 @@ return result; } - public TopiaQueryBuilderRunQueryStep<E> byTopiaId(String topiaId) { + public TopiaQueryBuilderRunQueryStep<E> forTopiaId(String topiaId) { Preconditions.checkNotNull(topiaId, "given topiaId is null"); - return newQueryBuilder().forProperties(TopiaEntity.PROPERTY_TOPIA_ID, topiaId).getNextStep(); + return forEquals(TopiaEntity.PROPERTY_TOPIA_ID, topiaId); } + public TopiaQueryBuilderRunQueryStep<E> forTopiaIds(Iterable<String> topiaIds) { + Preconditions.checkNotNull(topiaIds, "given topiaIds is null"); + return forIn(TopiaEntity.PROPERTY_TOPIA_ID, (Iterable) topiaIds); + } + @Deprecated public E findByTopiaId(String id) { - return byTopiaId(id).findUniqueOrNull(); + return forTopiaId(id).findUniqueOrNull(); } @Deprecated @@ -948,7 +969,7 @@ @Deprecated public boolean existByTopiaId(String topiaId) { - boolean exists = byTopiaId(topiaId).exists(); + boolean exists = forTopiaId(topiaId).exists(); return exists; } @@ -1167,7 +1188,7 @@ // get the count (removing the order-by) long count2 = dao.count("SELECT COUNT(*) " + - hql.substring(0, i), params); + hql.substring(0, i), params); pager = new TopiaPagerBean(); pager.setRecords(count2); pager.setPageSize(batchSize); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2013-10-02 16:24:51 UTC (rev 2809) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2013-10-03 16:30:27 UTC (rev 2810) @@ -61,7 +61,9 @@ } public void addEquals(String property, Object value) { + Preconditions.checkNotNull(property); // TODO brendan 02/10/13 do not use HQL parameters of Object are primitive types + // TODO brendan 02/10/13 if value is intanceof TopiaEntity, we can check type if (value == null) { addNull(property); } else { @@ -71,7 +73,10 @@ } public void addIn(String property, Iterable<Object> values) { - // TODO brendan 02/10/13 do not use HQL parameters of Object are primitive types + Preconditions.checkNotNull(property); + Preconditions.checkNotNull(values); + // TODO brendan 02/10/13 if value is intanceof TopiaEntity, we can check type + // TODO brendan 02/10/13 do not use HQL parameters of Object are primitive Preconditions.checkArgument(!Iterables.isEmpty(values)); if (Iterables.size(values) == 1) { addEquals(property, Iterables.getOnlyElement(values)); @@ -86,7 +91,7 @@ hqlParameterNames.add(hqlParameterName); } } - String inClause = property + " in (" + StringUtils.join(hqlParameterNames, ", ")+ ")"; + String inClause = property + " in (:" + StringUtils.join(hqlParameterNames, ", :")+ ")"; String whereClause = inClause; if (propertyMayBeNull) { whereClause = property + " is null or " + inClause; @@ -108,6 +113,16 @@ whereClauses.add(":" + hqlParameterName + " in elements(" + property + ")"); } + public void addWhereClause(String whereClause) { + whereClauses.add(whereClause); + } + + public void addWhereClause(String whereClause, Map<String, Object> hqlParameters) { + whereClauses.add(whereClause); + // TODO brendan 02/10/13 check parameters names are not already used + parameters.putAll(hqlParameters); + } + public String getHql() { StringBuilder hqlStringBuilder = new StringBuilder(); hqlStringBuilder.append("from ").append(entityClass.getCanonicalName()); Modified: trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java =================================================================== --- trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2013-10-02 16:24:51 UTC (rev 2809) +++ trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2013-10-03 16:30:27 UTC (rev 2810) @@ -78,6 +78,7 @@ * * @author ruchaud */ +@Ignore public class TopiaSecurityTest { private static final Log log = LogFactory.getLog(TopiaSecurityTest.class);

1 0

Jenkins build became unstable: topia » ToPIA :: Service Replication #1521
by admin+hudson＠codelutin.com 03 Oct '13

03 Oct '13

See <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-repli…>

1 1

r2809 - in trunk: topia-persistence/src/main/java/org/nuiton/topia topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence/src/main/java/org/nuiton/topia/persistence topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization topia-service-security/src/main/java/org/nuiton/topia/taas
by athimel＠users.nuiton.org 02 Oct '13

02 Oct '13

Author: athimel Date: 2013-10-02 18:24:51 +0200 (Wed, 02 Oct 2013) New Revision: 2809 Url: http://nuiton.org/projects/topia/repository/revisions/2809 Log: refs #2087 Fix AbstractTopiaContext implementation Fix TopiaEntityContextable generation Apply changes in topia-services-security (deprecated) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaJpaSupport.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaJpaSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaJpaSupport.java 2013-10-02 09:02:12 UTC (rev 2808) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaJpaSupport.java 2013-10-02 16:24:51 UTC (rev 2809) @@ -157,12 +157,8 @@ checkClosed(); try { - Query query = hibernateSupport.getHibernateSession().createQuery(jpaql); - for (Map.Entry<String, Object> entry : parameters.entrySet()) { - String name = entry.getKey(); - Object value = entry.getValue(); - query.setParameter(name, value); - } + Query query = prepareQuery(jpaql, parameters); + int result = query.executeUpdate(); return result; } catch (HibernateException eee) { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java 2013-10-02 09:02:12 UTC (rev 2808) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/AbstractTopiaContext.java 2013-10-02 16:24:51 UTC (rev 2809) @@ -730,7 +730,7 @@ entityClass.getName())); } - TopiaDAOImpl<E> result = (TopiaDAOImpl<E>) daoCache.get(entityClass); + TopiaDAO<E> result = (TopiaDAO<E>) daoCache.get(entityClass); if (result == null) { // looking for specialized DAO @@ -738,9 +738,9 @@ // si on utilise la génération String daoClassname = entityClass.getName() + "DAO"; try { - Class<TopiaDAOImpl<E>> daoClass = - (Class<TopiaDAOImpl<E>>) Class.forName(daoClassname); - TopiaDAOImpl<E> spe = daoClass.getConstructor().newInstance(); + Class<TopiaDAO<E>> daoClass = + (Class<TopiaDAO<E>>) Class.forName(daoClassname); + TopiaDAO<E> spe = daoClass.getConstructor().newInstance(); result = spe; } catch (Exception eee) { log.warn("specialized DAO " + daoClassname + @@ -748,7 +748,11 @@ result = new TopiaDAOImpl<E>(); } - result.init(this, entityClass, getFiresSupport()); + if (result instanceof TopiaDAOImpl) { // backward compatibility + ((TopiaDAOImpl)result).init(this, entityClass, getFiresSupport()); + } else if (result instanceof AbstractTopiaDAO) { + ((AbstractTopiaDAO)result).init(this, this, this, this, getTopiaIdFactory(), getFiresSupport(), this); + } daoCache.put(entityClass, result); } return result; @@ -979,30 +983,9 @@ checkClosed(String.format("This context is closed, it is not possible to release the operation '%1$s'", "findAll")); - try { - Query query = getHibernate().createQuery(jpaql); - for (int j = 0; j < propertyNamesAndValues.length; j += 2) { - String name = (String) propertyNamesAndValues[j]; - Object value = propertyNamesAndValues[j + 1]; - if (value.getClass().isArray()) { - query.setParameterList(name, (Object[]) value); - } else if (value instanceof Collection<?>) { - query.setParameterList(name, (Collection<?>) value); - } else { - query.setParameter(name, value); - } - } - // tchemit 2010-11-30 reproduce the same behaviour than before with the dao legacy - if (useFlushMode) { - query.setFlushMode(FlushMode.AUTO); - } - List result = query.list(); - result = firesSupport.fireEntitiesLoad(this, result); - return result; - } catch (HibernateException eee) { - throw new TopiaException(String.format("An error occurs while query operation: %1$s : %2$s", - jpaql, eee.getMessage()), eee); - } + Map<String, Object> parameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + List<E> result = findAll(jpaql, parameters); + return result; } @Override @@ -1011,32 +994,9 @@ checkClosed(String.format("This context is closed, it is not possible to release the operation '%1$s'", "find")); - try { - Query query = getHibernate().createQuery(jpaql); - for (int j = 0; j < propertyNamesAndValues.length; j += 2) { - String name = (String) propertyNamesAndValues[j]; - Object value = propertyNamesAndValues[j + 1]; - if (value.getClass().isArray()) { - query.setParameterList(name, (Object[]) value); - } else if (value instanceof Collection<?>) { - query.setParameterList(name, (Collection<?>) value); - } else { - query.setParameter(name, value); - } - } - query.setFirstResult(startIndex); - query.setMaxResults(endIndex - startIndex + 1); - // tchemit 2010-11-30 reproduce the same behaviour than before with the dao legacy - if (useFlushMode) { - query.setFlushMode(FlushMode.AUTO); - } - List result = query.list(); - result = firesSupport.fireEntitiesLoad(this, result); - return result; - } catch (HibernateException eee) { - throw new TopiaException(String.format("An error occurs while query operation: %1$s : %2$s", - jpaql, eee.getMessage()), eee); - } + Map<String, Object> parameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + List<E> result = find(jpaql, startIndex, endIndex, parameters); + return result; } @Override @@ -1075,12 +1035,42 @@ checkClosed(String.format("This context is closed, it is not possible to release the operation '%1$s'", "find")); + Map<String, Object> parameters = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); + int result = execute(jpaql, parameters); + return result; + } + + + protected Query prepareQuery(String jpaql, Map<String, Object> parameters) { + Query query = getHibernate().createQuery(jpaql); + for (Map.Entry<String, Object> entry : parameters.entrySet()) { + String name = entry.getKey(); + Object value = entry.getValue(); + if (value.getClass().isArray()) { + query.setParameterList(name, (Object[]) value); + } else if (value instanceof Collection<?>) { + query.setParameterList(name, (Collection<?>) value); + } else { + query.setParameter(name, value); + } + } + // tchemit 2010-11-30 reproduce the same behaviour than before with the dao legacy + if (useFlushMode) { + query.setFlushMode(FlushMode.AUTO); + } + return query; + } + + @Override + public <T> List<T> findAll(String jpaql, Map<String, Object> parameters) { + checkClosed(String.format("This context is closed, it is not possible to release the operation '%1$s'", + "findAll")); + try { - Query query = getHibernate().createQuery(jpaql); - for (int j = 0; j < propertyNamesAndValues.length; j += 2) { - query.setParameter((String) propertyNamesAndValues[j], propertyNamesAndValues[j + 1]); - } - int result = query.executeUpdate(); + Query query = prepareQuery(jpaql, parameters); + + List result = query.list(); + result = firesSupport.fireEntitiesLoad(this, result); return result; } catch (HibernateException eee) { throw new TopiaException(String.format("An error occurs while query operation: %1$s : %2$s", @@ -1088,20 +1078,41 @@ } } - @Override - public <T> List<T> findAll(String jpaql, Map<String, Object> parameters) { - throw new UnsupportedOperationException("This method is not available on TopiaContext, please use TopiaJpaSupport"); - } + public <T> List<T> find(String jpaql, int startIndex, int endIndex, Map<String, Object> parameters) { + checkClosed(String.format("This context is closed, it is not possible to release the operation '%1$s'", + "find")); - @Override - public <T> List<T> find(String jpaql, int startIndex, int endIndex, Map<String, Object> parameters) { - throw new UnsupportedOperationException("This method is not available on TopiaContext, please use TopiaJpaSupport"); + try { + Query query = prepareQuery(jpaql, parameters); + + query.setFirstResult(startIndex); + query.setMaxResults(endIndex - startIndex + 1); + + List result = query.list(); + result = firesSupport.fireEntitiesLoad(this, result); + return result; + } catch (HibernateException eee) { + throw new TopiaException(String.format("An error occurs while query operation: %1$s : %2$s", + jpaql, eee.getMessage()), eee); + } } @Override public int execute(String jpaql, Map<String, Object> parameters) { - throw new UnsupportedOperationException("This method is not available on TopiaContext, please use TopiaJpaSupport"); + checkClosed(String.format("This context is closed, it is not possible to release the operation '%1$s'", + "find")); + + try { + Query query = prepareQuery(jpaql, parameters); + + int result = query.executeUpdate(); + return result; + } catch (HibernateException eee) { + throw new TopiaException(String.format("An error occurs while query operation: %1$s : %2$s", + jpaql, eee.getMessage()), eee); + } + } @Override Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2013-10-02 09:02:12 UTC (rev 2808) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2013-10-02 16:24:51 UTC (rev 2809) @@ -25,6 +25,16 @@ package org.nuiton.topia.framework; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.beans.VetoableChangeSupport; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.commons.collections.map.IdentityMap; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -50,6 +60,7 @@ import org.hibernate.event.spi.SaveOrUpdateEvent; import org.hibernate.event.spi.SaveOrUpdateEventListener; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaDAOSupplier; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaJpaSupport; import org.nuiton.topia.TopiaPersistenceContext; @@ -71,16 +82,6 @@ import org.nuiton.util.CategorisedListenerSet; import org.nuiton.util.ListenerSet; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.beans.VetoableChangeSupport; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * TODO-fdesbois-20100507 : Need translation of javadoc. * @@ -605,12 +606,12 @@ } private void attachContext(Object entity, - AbstractTopiaDAO dao) { + TopiaDAOSupplier daoSupplier) { if (entity instanceof TopiaEntityContextable) { TopiaEntityContextable topiaEntityContextable = (TopiaEntityContextable) entity; - if (topiaEntityContextable.getTopiaDAO() == null) { + if (topiaEntityContextable.getTopiaDAOSupplier() == null) { try { - topiaEntityContextable.setTopiaDAO(dao); + topiaEntityContextable.setTopiaDAOSupplier(daoSupplier); } catch (TopiaException eee) { if (log.isWarnEnabled()) { log.warn("Impossible d'initialiser le TopiaContext" @@ -676,9 +677,11 @@ public void onPostLoad(PostLoadEvent event) { // TopiaContextImplementor context = getContext(rootContext, event // .getSession()); - AbstractTopiaDAO dao = null; // TODO brendan 30/09/13 Implment - if (dao != null && event.getEntity() instanceof TopiaEntity) { - attachContext(event.getEntity(), dao); + TopiaDAOSupplier daoSupplier = null; // TODO brendan 30/09/13 Implment + if (daoSupplier != null && event.getEntity() instanceof TopiaEntity) { + attachContext(event.getEntity(), daoSupplier); + TopiaEntity entity = (TopiaEntity)event.getEntity(); + AbstractTopiaDAO<? extends TopiaEntity> dao = (AbstractTopiaDAO)daoSupplier.getDAO(entity.getClass()); dao.getTopiaFiresSupport().fireOnPostLoad(dao, (TopiaEntity) event.getEntity(), new Object[]{}); } 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 2013-10-02 09:02:12 UTC (rev 2808) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2013-10-02 16:24:51 UTC (rev 2809) @@ -40,8 +40,11 @@ import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaDAOSupplier; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.AbstractTopiaDAO; import org.nuiton.topia.persistence.EntityVisitor; +import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityAbstract; import org.nuiton.topia.persistence.TopiaEntityContextable; @@ -342,32 +345,32 @@ if (TopiaGeneratorUtil.isContextable(input)) { - addImport(outputAbstract, TopiaContext.class); + addImport(outputAbstract, TopiaDAOSupplier.class); // topiaContext attribute ObjectModelAttribute topiaContextAttribute = addAttribute( - outputAbstract, "topiaContext", TopiaContext.class, null, + outputAbstract, "topiaDAOSupplier", TopiaDAOSupplier.class, null, ObjectModelJavaModifier.PROTECTED, ObjectModelJavaModifier.TRANSIENT); setDocumentation(topiaContextAttribute, - "TopiaContext instance associated with the current \n" + + "TopiaDAO instance associated with the current \n" + "instance. For internal usage only"); ObjectModelOperation op = addOperation(outputAbstract, - "getTopiaContext", TopiaContext.class, + "getTopiaDAOSupplier", TopiaDAOSupplier.class, ObjectModelJavaModifier.PUBLIC); setDocumentation(op,"@since 3.0"); addAnnotation(outputAbstract, op, Override.class); setOperationBody(op, "" /*{ - return topiaContext; + return topiaDAOSupplier; }*/ ); op = addOperation(outputAbstract, - "setTopiaContext", "void", + "setTopiaDAOSupplier", "void", ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); - addParameter(op, TopiaContext.class, "context"); + addParameter(op, TopiaDAOSupplier.class, "topiaDAOSupplier"); setDocumentation(op, // "@param context The context to set.\n" + // "@throws TopiaException if trying to replace a context\n" + @@ -375,8 +378,8 @@ addAnnotation(outputAbstract, op, Override.class); setOperationBody(op, "" /*{ - if (topiaContext == null) { - topiaContext = context; + if (this.topiaDAOSupplier == null) { + this.topiaDAOSupplier = topiaDAOSupplier; // } else { // throw new TopiaException("TopiaContext replacement is forbidden"); } @@ -390,7 +393,7 @@ addAnnotation(outputAbstract, op, Override.class); setOperationBody(op, "" /*{ - getTopiaContext().getDAO(<%=input.getName()%>.class).update(this); + getTopiaDAOSupplier().getDAO(<%=input.getName()%>.class).update(this); }*/ ); @@ -400,7 +403,7 @@ addAnnotation(outputAbstract, op, Override.class); setOperationBody(op, "" /*{ - getTopiaContext().getDAO(<%=input.getName()%>.class).delete(this); + getTopiaDAOSupplier().getDAO(<%=input.getName()%>.class).delete(this); }*/ ); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java 2013-10-02 09:02:12 UTC (rev 2808) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDAO.java 2013-10-02 16:24:51 UTC (rev 2809) @@ -269,7 +269,7 @@ if (entity instanceof TopiaEntityContextable) { TopiaEntityContextable contextable = (TopiaEntityContextable) entity; - contextable.setTopiaDAO(this); + contextable.setTopiaDAOSupplier(this.topiaDAOSupplier); } // save entity @@ -861,18 +861,18 @@ @Deprecated public E findByProperty(String propertyName, Object value) { - return newQueryBuilder().forProperties(propertyName, value).findUniqueOrNull(); + return newQueryBuilder().forProperties(propertyName, value).findAnyOrNull(); } @Override - public <R> R findByQuery(Class<R> type, String hql, Object... propertyNamesAndValues) throws TopiaException { + public <R> R findByQuery(Class<R> type, String hql, Object... propertyNamesAndValues) { Map<String, Object> properties = TopiaUtil.convertPropertiesArrayToMap(propertyNamesAndValues); return findAny(hql, properties, type); } @Override - public E findByPrimaryKey(Map<String, Object> keys) throws TopiaException { - return newQueryBuilder().forProperties(keys).findAnyOrNull(); + public E findByPrimaryKey(Map<String, Object> keys) { + return newQueryBuilder().forProperties(keys).findUniqueOrNull(); } @Override @@ -1166,7 +1166,7 @@ } // get the count (removing the order-by) - long count2 = dao.countByQuery("SELECT COUNT(*) " + + long count2 = dao.count("SELECT COUNT(*) " + hql.substring(0, i), params); pager = new TopiaPagerBean(); pager.setRecords(count2); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2013-10-02 09:02:12 UTC (rev 2808) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2013-10-02 16:24:51 UTC (rev 2809) @@ -208,7 +208,7 @@ if (fireSupport == null) { if (this instanceof TopiaEntityContextable) { TopiaEntityContextable contextable = (TopiaEntityContextable) this; - AbstractTopiaDAO topiaDAO = contextable.getTopiaDAO(); + AbstractTopiaDAO topiaDAO = (AbstractTopiaDAO)contextable.getTopiaDAOSupplier().getDAO(getClass()); fireSupport = topiaDAO.getTopiaFiresSupport(); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2013-10-02 09:02:12 UTC (rev 2808) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2013-10-02 16:24:51 UTC (rev 2809) @@ -26,6 +26,7 @@ package org.nuiton.topia.persistence; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaDAOSupplier; /** * {@link TopiaEntity} with {@link TopiaContext} support (injected by @@ -49,8 +50,8 @@ */ void delete(); - void setTopiaDAO(AbstractTopiaDAO topiaDAO); + void setTopiaDAOSupplier(TopiaDAOSupplier topiaDAO); - AbstractTopiaDAO getTopiaDAO(); + TopiaDAOSupplier getTopiaDAOSupplier(); } Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java 2013-10-02 09:02:12 UTC (rev 2808) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java 2013-10-02 16:24:51 UTC (rev 2809) @@ -26,16 +26,15 @@ package org.nuiton.topia.security.entities.authorization; +import java.util.HashSet; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.AbstractTopiaDAO; +import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaId; -import org.nuiton.topia.security.entities.user.TopiaUserImpl; -import java.util.HashSet; -import java.util.List; - import static org.nuiton.topia.security.util.TopiaSecurityUtil.actionsString2Int; /** @@ -70,12 +69,12 @@ String select = "count(test)"; String from = TopiaId.getClassNameAsString(thisExpression) + " test join test." + nameAssociation + " as association"; String where = "test.topiaId=:test and association.topiaId=:association"; - TopiaContext context = getTopiaContext(); + TopiaDAO<? extends TopiaAssociationAuthorizationImpl> dao = getTopiaDAOSupplier().getDAO(getClass()); try { - List<?> find = context.findAll("select " + select + " from " + from + " where " + where, + Long count = dao.countByQuery("select " + select + " from " + from + " where " + where, "test", thisExpression, "association", thatExpression); - return (Long)find.get(0) >= 1; + return count >= 1; } catch (TopiaException e) { if (log.isDebugEnabled()) { log.debug("", e); Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2013-10-02 09:02:12 UTC (rev 2808) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2013-10-02 16:24:51 UTC (rev 2809) @@ -460,7 +460,8 @@ List<Permission> permissions; if (entity instanceof TopiaEntityContextable) { try { - TopiaContext topiaContext = ((TopiaEntityContextable)entity).getTopiaContext(); + TopiaContext topiaContext = null; // TODO AThimel 02/10/13 Find another why to get the TopiaContext +// TopiaContext topiaContext = ((TopiaEntityContextable)entity).getTopiaContext(); TopiaContextImplementor transaction = (TopiaContextImplementor)topiaContext; TopiaDAO<?> dao = transaction.getDAO(klass); permissions = dao.getRequestPermission(topiaId, actions);

1 0