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

r2221 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 07 Mar '11

07 Mar '11

Author: tchemit Date: 2011-03-07 10:54:50 +0100 (Mon, 07 Mar 2011) New Revision: 2221 Url: http://nuiton.org/repositories/revision/topia/2221 Log: Anomalie #1382: NPE in generation if DAO stereotype little clean in DAO transformers Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2011-03-04 08:57:47 UTC (rev 2220) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2011-03-07 09:54:50 UTC (rev 2221) @@ -43,7 +43,6 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.TopiaDAOImpl; import org.nuiton.topia.persistence.TopiaDAOLegacy; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.StringUtil; @@ -143,6 +142,16 @@ 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.hasEntityStereotype(classifier)) { @@ -185,11 +194,6 @@ } if (extendClass.length() == 0) { extendClass = daoImplementation.getName() + "<E>"; -// if (extendLegacyDAO) { -// extendClass = TopiaDAOLegacy.class.getName() + "<E>"; -// } else { -// extendClass = TopiaDAOImpl.class.getName() + "<E>"; -// } } if (log.isDebugEnabled()) { log.debug("super class = " + extendClass); @@ -490,7 +494,6 @@ List<<%=attrSimpleType%>> list = getContext() .getDAO(<%=attrSimpleType%>.class) .findAllByProperties(<%=attrSimpleType%>.<%=getConstantName(reverseAttrName)%>, entity); - // .findAllByProperties("<%=reverseAttrName%>", entity); for (<%=attrSimpleType%> item : list) { item.set<%=StringUtils.capitalize(reverseAttrName)%>(null); }*/ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2011-03-04 08:57:47 UTC (rev 2220) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2011-03-07 09:54:50 UTC (rev 2221) @@ -25,6 +25,8 @@ package org.nuiton.topia.generator; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; @@ -45,6 +47,9 @@ */ public class DAOImplTransformer extends ObjectModelTransformerToJava { + /** Logger. */ + static Log log = LogFactory.getLog(DAOImplTransformer.class); + /** * Collection used to identify entities full qualified name that have * a dependency for DAO extra operations. So no need to generate the @@ -67,6 +72,16 @@ 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.hasEntityStereotype(classifier)) { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java 2011-03-04 08:57:47 UTC (rev 2220) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java 2011-03-07 09:54:50 UTC (rev 2221) @@ -49,12 +49,12 @@ String clazzName = clazz.getName(); String clazzFQN = clazz.getQualifiedName(); ObjectModelClass result = createClass(clazzName + "DAO", clazz.getPackageName()); - setDocumentation(result,"/**\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(result,clazzFQN+"DAOImpl<"+clazzName+">"); + setDocumentation(result, "/**\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(result, clazzFQN + "DAOImpl<" + clazzName + ">"); }

1 0

r2220 - trunk/topia-persistence/src/main/java/org/nuiton/topia
by tchemit＠users.nuiton.org 04 Mar '11

04 Mar '11

Author: tchemit Date: 2011-03-04 09:57:47 +0100 (Fri, 04 Mar 2011) New Revision: 2220 Url: http://nuiton.org/repositories/revision/topia/2220 Log: the cache of context is based on TopiaContext and not TopiaContextImpl... Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2011-03-04 08:52:50 UTC (rev 2219) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2011-03-04 08:57:47 UTC (rev 2220) @@ -56,7 +56,7 @@ "TopiaContextImpl.properties"; /** Cache contenant tous les contexts deja créé. */ - protected static Map<Properties, TopiaContextImpl> contextCache = + protected static Map<Properties, TopiaContext> contextCache = new ReferenceMap(AbstractReferenceMap.HARD, AbstractReferenceMap.SOFT); @@ -68,7 +68,7 @@ */ public static List<String> getContextOpened() { List<String> result = new ArrayList<String>(); - for (Entry<Properties, TopiaContextImpl> e : contextCache.entrySet()) { + for (Entry<Properties, TopiaContext> e : contextCache.entrySet()) { // Useless test : will never happened that e.getValue() is null, // not allowed for {@link AbstractReferenceMap#SOFT}. // if (e.getValue() != null) { @@ -97,14 +97,13 @@ // Replaced by more powerful algorithm using iterator to remove context - Iterator<TopiaContextImpl> it = contextCache.values().iterator(); + Iterator<TopiaContext> it = contextCache.values().iterator(); - boolean removed = false; - while (it.hasNext() && !removed) { - TopiaContextImpl curr = it.next(); + while (it.hasNext()) { + TopiaContext curr = it.next(); if (curr == context) { it.remove(); - removed = true; + break; } } } @@ -135,13 +134,13 @@ public static TopiaContext getContext(Properties config) throws TopiaNotFoundException { // Put all properties from a hierarchy in the current properties object. - // Resolve problem with hibernate which used iterator to get properties + // Resolve problem with hibernate which used iterator to get properties // and so only values from the current properties object and not all // hierarchy for (String key : config.stringPropertyNames()) { config.setProperty(key, config.getProperty(key)); } - TopiaContextImpl result = contextCache.get(config); + TopiaContext result = contextCache.get(config); // useless test, context is automatically removed from Factory when closed if (result == null/* || result.isClosed()*/) { result = new TopiaContextImpl(config);

1 0

r2219 - trunk/topia-persistence/src/site
by tchemit＠users.nuiton.org 04 Mar '11

04 Mar '11

Author: tchemit Date: 2011-03-04 09:52:50 +0100 (Fri, 04 Mar 2011) New Revision: 2219 Url: http://nuiton.org/repositories/revision/topia/2219 Log: fix doc Modified: trunk/topia-persistence/src/site/site_fr.xml Modified: trunk/topia-persistence/src/site/site_fr.xml =================================================================== --- trunk/topia-persistence/src/site/site_fr.xml 2011-03-03 15:33:12 UTC (rev 2218) +++ trunk/topia-persistence/src/site/site_fr.xml 2011-03-04 08:52:50 UTC (rev 2219) @@ -40,9 +40,9 @@ <menu ref="parent"/> <menu name="Utilisateur" inherit="top"> - <menu name="Presentation" href="index.html" /> - <menu name="Utilisation" href="howto.html" /> - <menu name="Tag values" href="tagvalues.html" /> + <item name="Presentation" href="index.html" /> + <item name="Utilisation" href="howto.html" /> + <item name="Tag values" href="tagvalues.html" /> </menu> <menu name="Developpeur">

1 0

r2218 - trunk/topia-persistence/src/site/rst
by echatellier＠users.nuiton.org 04 Mar '11

04 Mar '11

Author: echatellier Date: 2011-03-03 16:33:12 +0100 (Thu, 03 Mar 2011) New Revision: 2218 Url: http://nuiton.org/repositories/revision/topia/2218 Log: Add tag values details page. Added: trunk/topia-persistence/src/site/rst/tagvalues.rst Added: trunk/topia-persistence/src/site/rst/tagvalues.rst =================================================================== --- trunk/topia-persistence/src/site/rst/tagvalues.rst (rev 0) +++ trunk/topia-persistence/src/site/rst/tagvalues.rst 2011-03-03 15:33:12 UTC (rev 2218) @@ -0,0 +1,54 @@ +Tag values +========== + +Topia templates are customizable using tag values. + +Here are current tag values defined in topia. They can be defined in source +model or model property file. + +Topia tag values +---------------- + ++--------------------------+-----------+----------------------------------------------------+ +| Name | Category | Description | ++==========================+===========+====================================================+ +| orderBy | Hibernate | Define order-by attribute in hibernate mapping for | +| | | a specific relation | ++--------------------------+-----------+----------------------------------------------------+ +| dbName | Hibernate | Database table name | ++--------------------------+-----------+----------------------------------------------------+ +| dbSchema | Hibernate | Database schema | ++--------------------------+-----------+----------------------------------------------------+ +| length | Hibernate | Attribute length in database | ++--------------------------+-----------+----------------------------------------------------+ +| annotation | all | Add annotation on attribute | ++--------------------------+-----------+----------------------------------------------------+ +| copyright | all | Generated files header copyright | ++--------------------------+-----------+----------------------------------------------------+ +| access | hibernate | Field access type | ++--------------------------+-----------+----------------------------------------------------+ +| i18n | entity | Generate i18n ??? | ++--------------------------+-----------+----------------------------------------------------+ +| naturalId | hibernate | Generate hibernate naturalId | ++--------------------------+-----------+----------------------------------------------------+ +| naturalIdMutable | hibernate | Tell hibernate if a natural id key is mutable | ++--------------------------+-----------+----------------------------------------------------+ +| inverse | hibernate | To configure with part of a N-N relation is inverse| ++--------------------------+-----------+----------------------------------------------------+ +| lazy | hibernate | Hibernate multiple attribute fetch property | +| | | (default to ''hibernate default value'') | ++--------------------------+-----------+----------------------------------------------------+ +| notNull | hibernate | Hibernate attribute not null property | +| | | (default to ''hibernate default value'') | ++--------------------------+-----------+----------------------------------------------------+ +| hibernateProxyInterface | hibernate | To not generate proxy information in | +| | | hibernate mappings. | ++--------------------------+-----------+----------------------------------------------------+ + + +Eugene tag values +----------------- + +Eugene contains also his tag values. See `eugene documentation`_ for more détails. + +.. _eugene documentation: http://maven-site.nuiton.org/eugene/

2 1

r2217 - trunk/topia-persistence/src/site
by echatellier＠users.nuiton.org 03 Mar '11

03 Mar '11

Author: echatellier Date: 2011-03-03 16:21:19 +0100 (Thu, 03 Mar 2011) New Revision: 2217 Url: http://nuiton.org/repositories/revision/topia/2217 Log: Link index in menu Modified: trunk/topia-persistence/src/site/site_fr.xml Modified: trunk/topia-persistence/src/site/site_fr.xml =================================================================== --- trunk/topia-persistence/src/site/site_fr.xml 2011-03-03 15:20:42 UTC (rev 2216) +++ trunk/topia-persistence/src/site/site_fr.xml 2011-03-03 15:21:19 UTC (rev 2217) @@ -40,6 +40,7 @@ <menu ref="parent"/> <menu name="Utilisateur" inherit="top"> + <menu name="Presentation" href="index.html" /> <menu name="Utilisation" href="howto.html" /> <menu name="Tag values" href="tagvalues.html" /> </menu>

1 0

r2216 - trunk/topia-persistence/src/site/rst
by echatellier＠users.nuiton.org 03 Mar '11

03 Mar '11

Author: echatellier Date: 2011-03-03 16:20:42 +0100 (Thu, 03 Mar 2011) New Revision: 2216 Url: http://nuiton.org/repositories/revision/topia/2216 Log: Update index Modified: trunk/topia-persistence/src/site/rst/index.rst Modified: trunk/topia-persistence/src/site/rst/index.rst =================================================================== (Binary files differ)

1 0

r2215 - in trunk/topia-persistence/src/site: . rst
by echatellier＠users.nuiton.org 03 Mar '11

03 Mar '11

Author: echatellier Date: 2011-03-03 16:19:13 +0100 (Thu, 03 Mar 2011) New Revision: 2215 Url: http://nuiton.org/repositories/revision/topia/2215 Log: Update howto, move it to "user" section Modified: trunk/topia-persistence/src/site/rst/howto.rst trunk/topia-persistence/src/site/site_fr.xml Modified: trunk/topia-persistence/src/site/rst/howto.rst =================================================================== --- trunk/topia-persistence/src/site/rst/howto.rst 2011-03-03 15:09:03 UTC (rev 2214) +++ trunk/topia-persistence/src/site/rst/howto.rst 2011-03-03 15:19:13 UTC (rev 2215) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2004 - 2010 CodeLutin +.. * Copyright (C) 2004 - 2011 CodeLutin, Chatellier Eric .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU Lesser General Public License as @@ -57,7 +57,7 @@ # Précise l'entête de l'ensemble des fichiers générés # model.tagvalue.copyright=<valeur> - model.tagvalue.copyright=/* *##%\n Copyright (C) 2009 Code Lutin\n *##% */ + model.tagvalue.copyright=/* *##%\n Copyright (C) 2011 Code Lutin\n *##% */ # Force le chargement d'un attribut # <nom paquetage>.<nom entité>.attribute.<nom attribut>.tagvalue.lazy=false @@ -66,38 +66,32 @@ Génération ---------- -La génération des fichiers Topia se font par l'utilisation d'un plugin maven. -Le plugin est disponnible sur le repository maven de Code Lutin à l'adresse -suivante http://lutinbuilder.labs.libre-entreprise.org/maven2. +La génération des fichiers Topia se font par l'utilisation du plugin maven +Eugene_. Ce plugin est disponible sur le repository central. Configuration du plugin maven : :: <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> - <version>0.64</version> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>2.3.2</version> <executions> <execution> <phase>process-sources</phase>  <configuration> - <addCompileDirectory>true</addCompileDirectory> - <srcDirZuml>${maven.src.dir}/main/xmi</srcDirZuml> - <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> - <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> - <includes>**/*.objectmodel</includes> - <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>${maven.gen.dir}/java</destDirGen> - <defaultPackage>org.codelutin</defaultPackage> - <extractedPackages>org.codelutin</extractedPackages> - <fullPackagePath>org.codelutin</fullPackagePath> + <inputs>zargo</inputs> + <fullPackagePath>org.nuiton.topiatest</fullPackagePath> + <defaultPackage>org.nuiton.topiatest</defaultPackage> + <extractedPackages>org.nuiton.topiatest</extractedPackages> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer + </templates> </configuration> <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> + <goal>smart-generate</goal> </goals> </execution> </executions> @@ -105,17 +99,17 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.1.3</version> + <version>2.5.2</version> <scope>compile</scope> </dependency> </dependencies> </plugin> -Le plugin utilise lutin generator avec les templates de génération de Topia, le +Le plugin utilise Eugene_ avec les templates de génération de Topia, le fichier argouml ou poséidon doit se trouver dans le répertoire -${maven.src.dir}/main/xmi. Les fichiers sont générés dans le répertoire -${maven.gen.dir}/java. Il faut préciser au plugin les paquetages à traiter avec -le defaultPackage et extractedPackages. +``src/main/xmi``. Les fichiers sont générés dans le répertoire +``target/generated-sources/java``. Il faut préciser au plugin les paquetages +à traiter avec le ``defaultPackage`` et ``extractedPackages``. Ajout dans des dépendances de Topia pour la compilation des fichiers générés : @@ -124,7 +118,7 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.1.3</version> + <version>2.5.2</version> <scope>compile</scope> </dependency> @@ -143,6 +137,7 @@ Un fichier contenant les informations de connexion à la base de données et de configuration de Topia doit être créé au niveau des ressources du projet. +Par convention, ce fichier est nommé ``TopiaContextImpl.properties``. Exemple : @@ -282,3 +277,5 @@ transaction.closeContext(); rootContext.closeContext(); + +.. _Eugene: http://maven-site.nuiton.org/eugene/ Modified: trunk/topia-persistence/src/site/site_fr.xml =================================================================== --- trunk/topia-persistence/src/site/site_fr.xml 2011-03-03 15:09:03 UTC (rev 2214) +++ trunk/topia-persistence/src/site/site_fr.xml 2011-03-03 15:19:13 UTC (rev 2215) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2004 - 2010 CodeLutin + Copyright (C) 2004 - 2011 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -39,8 +39,26 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherit="top"/> + <menu name="Utilisateur" inherit="top"> + <menu name="Utilisation" href="howto.html" /> + <menu name="Tag values" href="tagvalues.html" /> + </menu> + <menu name="Developpeur"> + <item name="Todo" href="Todo.html"/> + <item name="Mapping hibernate" href="HibernateMapping.html"/> + <item name="Gestion des evenements" href="event.html"/> + <item name="Isolation" href="Isolation.html"/> + <item name="Schema migration" href="SchemaMigration.html"/> + <item name="Securité" href="security.html"/> + <item name="Génération des modèles" href="ModelGeneration.html"/> + <item name="TopiaContextFactory" href="Devel.html"/> + <item name="TopiaQuery" href="TopiaQuery.html"/> + <item name="FAQ" href="FAQ.html"/> + <item name="Projets similaires" href="project.html"/> + <item name="Tag values" href="tagvalues.html"/> + </menu> + <menu name="Téléchargement"> <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" name="Librairie (jar)"/> @@ -56,21 +74,6 @@ name="Test Sources (jar)"/> </menu> - <menu name="Developpeur"> - <item name="Todo" href="Todo.html"/> - <item name="Mapping hibernate" href="HibernateMapping.html"/> - <item name="Gestion des evenements" href="event.html"/> - <item name="Isolation" href="Isolation.html"/> - <item name="Schema migration" href="SchemaMigration.html"/> - <item name="Securité" href="security.html"/> - <item name="How-to" href="howto.html"/> - <item name="Génération des modèles" href="ModelGeneration.html"/> - <item name="TopiaContextFactory" href="Devel.html"/> - <item name="TopiaQuery" href="TopiaQuery.html"/> - <item name="FAQ" href="FAQ.html"/> - <item name="Projets similaires" href="project.html"/> - </menu> - <menu ref="reports"/> </body>

1 0

r2214 - trunk/topia-persistence/src/site/rst
by echatellier＠users.nuiton.org 03 Mar '11

03 Mar '11

Author: echatellier Date: 2011-03-03 16:09:03 +0100 (Thu, 03 Mar 2011) New Revision: 2214 Url: http://nuiton.org/repositories/revision/topia/2214 Log: Update rst code Modified: trunk/topia-persistence/src/site/rst/project.rst Modified: trunk/topia-persistence/src/site/rst/project.rst =================================================================== --- trunk/topia-persistence/src/site/rst/project.rst 2011-03-02 18:08:55 UTC (rev 2213) +++ trunk/topia-persistence/src/site/rst/project.rst 2011-03-03 15:09:03 UTC (rev 2214) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2004 - 2010 CodeLutin +.. * Copyright (C) 2004 - 2011 CodeLutin, Chatellier Eric .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU Lesser General Public License as @@ -25,13 +25,10 @@ Liste de projets similaires ou se rapprochant ============================================= - subPersistence -------------- -:update:20060102 +http://subpersistence.sourceforge.net/ -:url: http://subpersistence.sourceforge.net/ - Librairie d'abstraction de libraire de mapping O/R Supporte Hibernate pour l'instant. Semble vouloir supporter aussi Castor.

1 0

r2213 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by echatellier＠users.nuiton.org 02 Mar '11

02 Mar '11

Author: echatellier Date: 2011-03-02 19:08:55 +0100 (Wed, 02 Mar 2011) New Revision: 2213 Url: http://nuiton.org/repositories/revision/topia/2213 Log: #1379 : Topia generate non compilable code Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 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 2011-02-27 18:20:17 UTC (rev 2212) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-03-02 18:08:55 UTC (rev 2213) @@ -1022,10 +1022,10 @@ setOperationBody(implOperation, "" /*{ - if (<%=referenceName%> == null || <%=attrName%> == null) { + if (<%=referenceName%> == null || this.<%=attrName%> == null) { return null; } - for (<%=attrType%> item : <%=attrName%>) { + for (<%=attrType%> item : this.<%=attrName%>) { if (<%=referenceName%>.equals(item.get<%=StringUtils.capitalize(referenceName)%>())) { return item; }

1 0

r2212 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org 27 Feb '11

27 Feb '11

Author: tchemit Date: 2011-02-27 19:20:17 +0100 (Sun, 27 Feb 2011) New Revision: 2212 Url: http://nuiton.org/repositories/revision/topia/2212 Log: Evolution #1371: Introduce TopiaEntityMap Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java 2011-02-27 18:20:17 UTC (rev 2212) @@ -0,0 +1,108 @@ +/* + * #%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.persistence.util; + +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityEnum; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * A dictionnary of {@link TopiaEntity} associated to a {@link TopiaEntityEnum}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.3 + */ +public abstract class TopiaEntityMap<K extends TopiaEntityEnum, V extends TopiaEntity> extends HashMap<K, List<? extends V>> { + + private static final long serialVersionUID = 1L; + + public TopiaEntityMap(int initialCapacity, float loadFactor) { + super(initialCapacity, loadFactor); + } + + public TopiaEntityMap(int initialCapacity) { + super(initialCapacity); + } + + public TopiaEntityMap() { + } + + public TopiaEntityMap(Map<? extends K, ? extends List<? extends V>> m) { + super(m); + } + + /** + * Obtains from a entity his key. + * + * @param e the entity on which to find the key. + * @return the key of the given entity. + */ + protected abstract K getType(TopiaEntity e); + + + /** + * Adds the given entity to the dictonary only if it does not exists. + * <p/> + * Will return {@code true} if entity was added, {@code false} otherwise. + * + * @param entity the entity to add + * @param <T> the type of entity to add + * @return {@code true} if entity was added, {@code false} otherwise. + */ + public <T extends V> boolean addUniqueEntity(T entity) { + List<T> list = getList(entity); + if (!list.contains(entity)) { + list.add(entity); + return true; + } + return false; + } + + /** + * Adds the given entity to the dictonary (even if it does already exists). + * + * @param entity the entity to add + * @param <T> the type of entity to add + */ + public <T extends V> void addEntity(T entity) { + List<T> list = getList(entity); + list.add(entity); + } + + @SuppressWarnings({"unchecked"}) + protected <T extends V> List<T> getList(T entity) { + K type = getType(entity); + List<T> list = (List<T>) get(type); + if (list == null) { + list = new ArrayList<T>(); + put(type, list); + } + return list; + } +} Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0