Author: echatellier Date: 2013-07-05 16:31:15 +0200 (Fri, 05 Jul 2013) New Revision: 2739 Url: http://nuiton.org/projects/topia/repository/revisions/2739 Log: refs #2736: Remove code deprecated before 3.0 Removed: 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/event/TopiaTransactionEvent.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -97,15 +97,6 @@ return (TopiaContext) super.getSource(); } - /** - * @return the source context that fires the event - * @deprecated since 2.3.4, prefer the overriden {@link #getSource()}. - */ - @Deprecated - public TopiaContext getTopiaContext() { - return getSource(); - } - @Override protected void finalize() throws Throwable { super.finalize(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -116,21 +116,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(TopiaContextImpl.class); - /** @deprecated since 2.5.4 use directly {@link TopiaContextFactory#CONFIG_PERSISTENCE_DIRECTORIES}*/ - @Deprecated - public static final String TOPIA_PERSISTENCE_DIRECTORIES = - TopiaContextFactory.CONFIG_PERSISTENCE_DIRECTORIES; - - /** @deprecated since 2.5.4 use directly {@link TopiaContextFactory#CONFIG_PERSISTENCE_CLASSES}*/ - @Deprecated - public static final String TOPIA_PERSISTENCE_CLASSES = - TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES; - - /** @deprecated since 2.5.4 use directly {@link TopiaContextFactory#CONFIG_PERSISTENCE_PROPERTIES_FILE}*/ - @Deprecated - public static final String TOPIA_PERSISTENCE_PROPERTIES_FILE = - TopiaContextFactory.CONFIG_PERSISTENCE_PROPERTIES_FILE; - /** Le pere de ce context, les contexts initaux n'ont pas de context pere */ protected TopiaContextImplementor parentContext; @@ -365,12 +350,6 @@ return result; } - @Override - public Collection<TopiaService> getAllServices() { - Collection<TopiaService> result = getServices().values(); - return result; - } - /* -------------------- CONTEXT HIERARCHY MANAGMENT ----------------------*/ /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -136,13 +136,6 @@ Map<String, TopiaService> getServices(); - /** - * @return a collection of {@link TopiaService} - * @deprecated since 2.3.4 : useless method, use {@link #getServices()} instead - */ - @Deprecated - Collection<TopiaService> getAllServices(); - List<Class<?>> getPersistenceClasses(); } //TopiaContextImplementor Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -62,15 +62,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(TopiaUtil.class); - /** @deprecated since 2.5.3, use now the constant {@link TopiaContextFactory#CONFIG_DEFAULT_SCHEMA}. */ - @Deprecated - public final static String HIBERNATE_DEFAULT_SCHEMA = - TopiaContextFactory.CONFIG_DEFAULT_SCHEMA; - - /** @deprecated since 2.5.3, use the already present {@link TopiaContextImpl#TOPIA_PERSISTENCE_CLASSES}. */ - @Deprecated - public final static String TOPIA_PERSISTENCE_CLASSES = TopiaContextImpl.TOPIA_PERSISTENCE_CLASSES; - /** * Permet de récupérer le fichier de propriété ayant le nom passé en * argument. @@ -319,7 +310,7 @@ try { connection = connectionProvider.getConnection(); - DatabaseMetadata meta = new DatabaseMetadata(connection, dialect); + DatabaseMetadata meta = new DatabaseMetadata(connection, dialect, configuration); Iterator<?> itr = configuration.getClassMappings(); while (itr.hasNext()) { Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -1,127 +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.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; -import org.nuiton.eugene.models.object.ObjectModelDependency; -import org.nuiton.eugene.models.object.ObjectModelInterface; -import org.nuiton.eugene.models.object.ObjectModelOperation; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created: 14 déc. 2009 - * - * @author tchemit <chemit@codelutin.com> - * @version $Id$ - * @since 2.3.0 - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DAOImplTransformer" - * @deprecated 2.5.4, prefer use the transformer {@link EntityDAOTransformer} - */ -@Deprecated -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 - * DAOImpl in this case, it will be created by the developper. - */ - List<String> noGenerationNeeded = new ArrayList<String>(); - - @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)) { - noGenerationNeeded.add(classifier.getQualifiedName()); - } - } - - @Override - public void transformFromClass(ObjectModelClass clazz) { - if (!TopiaGeneratorUtil.isEntity(clazz) || hasDAOOperations(clazz)) { - return; - } - String clazzName = clazz.getName(); - String clazzFQN = clazz.getQualifiedName(); - ObjectModelClass result = createClass(clazzName + "DAOImpl<E extends " + clazzName + ">", clazz.getPackageName()); - setDocumentation(result, "/**\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(result, clazzFQN + "DAOAbstract<E>"); - } - - /** - * Detect if the class has DAO operations identified with <<dao>> stereotype. - * - * @param clazz The ObjectModelClass with operations (Corresponding to the Entity) - * @return true if the class has some dao operations, false if not - */ - public boolean hasDAOOperations(ObjectModelClass clazz) { - // This code will be deprecated - for (ObjectModelOperation op : clazz.getOperations()) { - if (TopiaGeneratorUtil.hasDaoStereotype(op)) { - return true; - } - } - // New method : interface dependency - return noGenerationNeeded.contains(clazz.getQualifiedName()); - } -} Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -1,63 +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.topia.generator; - -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.ObjectModelClass; - -/*{generator option: parentheses = false}*/ - -/*{generator option: writeString = +}*/ -/** - * Created: 13 déc. 2009 - * - * @author tchemit <chemit@codelutin.com> - * @version $Id$ - * @since 2.3.0 - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DAOTransformer" - * @deprecated 2.5.4, prefer use the transformer {@link EntityDAOTransformer} - */ -@Deprecated -public class DAOTransformer extends ObjectModelTransformerToJava { - - @Override - public void transformFromClass(ObjectModelClass clazz) { - if (!TopiaGeneratorUtil.isEntity(clazz)) { - return; - } - 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 + ">"); - } - - -} Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -61,7 +61,6 @@ import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; /** - * FIXME-poussin-20060102 mettre les attributs node="..." sur tous les attributs * * @author poussin <poussin@codelutin.com> * @version $Id$ 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-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -152,23 +152,6 @@ } /** - * Renvoie le type de persistence pour l'élément donné. Si aucun n'est - * trouvé, le type par défaut est utilisé - * - * @param element l'élément à tester - * @return le type de persitence pour l'élément donné. - * @deprecated since 2.5, prefer use the method {@link #getPersistenceType(ObjectModelClassifier)} - */ - @Deprecated - public static String getPersistenceType(ObjectModelElement element) { - String tag = element.getTagValue(TopiaTagValues.TAG_PERSISTENCE_TYPE); - if (tag == null) { - tag = PERSISTENCE_TYPE_DEFAULT; - } - return tag; - } - - /** * Renvoie le type de persistence pour le classifier donné. Si aucun n'est * trouvé, le type par défaut est utilisé * @@ -218,20 +201,7 @@ * * @param element l'élément à tester * @return le nom de table - * @deprecated since 2.5, prefer use the method {@link #getDbName(ObjectModelElement)} */ - @Deprecated - public static String getDBName(ObjectModelElement element) { - return getDbName(element); - } - - /** - * Renvoie le nom BD de l'élement passé en paramètre. Elle se base sur le - * tag associé si il existe, sinon sur le nom de l'élément - * - * @param element l'élément à tester - * @return le nom de table - */ public static String getDbName(ObjectModelElement element) { if (element == null) { return null; @@ -244,60 +214,9 @@ } /** - * Cherche et renvoie le schema a utiliser sur cet element, sinon sur le - * model. - * - * @param element l'élément à tester - * @param model le modele utilisé - * @return le nom du schema ou null - * @deprecated since 2.5, prefer use the method {@link #getDbSchemaNameTagValue(ObjectModelClassifier, ObjectModel)} or {@link #getDbSchemaNameTagValue(ObjectModelAttribute, ObjectModel)} - */ - @Deprecated - public static String getSchemaName(ObjectModelElement element, - ObjectModel model) { - return findTagValue(TopiaTagValues.TAG_SCHEMA_NAME, element, model); - } - - /** - * Cherche et renvoie le prefixe i18n à utiliser sur cet element, sinon sur - * le model. - * - * @param element l'élément à tester - * @param model le modele utilisé - * @return le prefix i18n ou <code>null</code> si non spécifié - * @deprecated since 2.5, prefer use the {@link JavaGeneratorUtil#getI18nPrefixTagValue(ObjectModelElement, ObjectModel)} - */ - @Deprecated - public static String getI18nPrefix(ObjectModelElement element, - ObjectModel model) { - return JavaGeneratorUtil.getI18nPrefixTagValue(element, model); - } - - /** * Cherche si le tagvalue {@link TopiaTagValues#TAG_GENERATE_OPERATOR_FOR_DAO_HELPER} a été * activé dans le model. * - * @param element l'élément à tester - * @param model le modele utilisé - * @return {@code true} si le tag value trouvé dans le modèle, {@code false} - * sinon. - * @deprecated since 2.5, use now the method {@link #shouldGenerateOperatorForDAOHelper(ObjectModel)} - */ - @Deprecated - public static boolean shouldgenerateOperatorForDAOHelper( - ObjectModelElement element, ObjectModel model) { - return shouldGenerateOperatorForDAOHelper(model); -// String tagValue = GeneratorUtil.findTagValue( -// TopiaTagValues.TAG_GENERATE_OPERATOR_FOR_DAO_HELPER, element, model); -// boolean generate = StringUtils.isNotEmpty(tagValue) && -// Boolean.valueOf(tagValue); -// return generate; - } - - /** - * Cherche si le tagvalue {@link TopiaTagValues#TAG_GENERATE_OPERATOR_FOR_DAO_HELPER} a été - * activé dans le model. - * * @param model le modele utilisé * @return {@code true} si le tag value trouvé dans le modèle, {@code false} * sinon. @@ -1174,19 +1093,6 @@ /** * Check if the given classifier has the - * {@link TopiaStereoTypes#STEREOTYPE_FACADE} stereotype. - * - * @param classifier classifier to test - * @return {@code true} if stereotype was found, {@code false otherwise} - * @see TopiaStereoTypes#STEREOTYPE_FACADE - * @since 2.5 - */ - public static boolean hasFacadeStereotype(ObjectModelClassifier classifier) { - return classifier.hasStereotype(TopiaStereoTypes.STEREOTYPE_FACADE); - } - - /** - * Check if the given classifier has the * {@link TopiaStereoTypes#STEREOTYPE_ENTITY} stereotype. * * @param classifier classifier to test @@ -1326,21 +1232,6 @@ } /** - * Check if the given attribute has the - * {@link TopiaStereoTypes#STEREOTYPE_ARRAY} stereotype. - * - * @param attribute attribute to test - * @return {@code true} if stereotype was found, {@code false otherwise} - * @see TopiaStereoTypes#STEREOTYPE_ARRAY - * @since 2.5 - * @deprecated since 2.5 , only BeanTransformer use it and it is a deprecated transformer, will be remove in version 3.0 - */ - @Deprecated - public static boolean hasArrayStereotype(ObjectModelAttribute attribute) { - return attribute.hasStereotype(TopiaStereoTypes.STEREOTYPE_ARRAY); - } - - /** * Obtain the value of the {@link TopiaTagValues#TAG_PERSISTENCE_TYPE} * tag value on the given classifier. * <p/> @@ -1830,24 +1721,6 @@ } /** - * Obtain the value of the {@link TopiaTagValues#TAG_NO_LOG_IN_SERVICE} - * tag value on the given classifier. - * <p/> - * - * @param classifier classifier to seek - * @param model model to seek - * @return the none empty value of the found tag value or {@code null} if not found nor empty. - * @see TopiaTagValues#TAG_NO_LOG_IN_SERVICE - * @since 2.5 - * @deprecated since 2.5.4, no more use will be remove soon. - */ - @Deprecated - public static String getNoLogInServiceTagValue(ObjectModelClassifier classifier, ObjectModel model) { - String value = findTagValue(TopiaTagValues.TAG_NO_LOG_IN_SERVICE, classifier, model); - return value; - } - - /** * Obtains the value of the {@link TopiaTagValues#TAG_DAO_IMPLEMENTATION} * tag value on the given model. * <p/> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -40,25 +40,6 @@ public interface TopiaStereoTypes extends EugeneStereoTypes { /** - * Stéréotype pour les attributs considérés comme des tableaux. - * - * @see TopiaGeneratorUtil#hasArrayStereotype(ObjectModelAttribute) - * @deprecated since 2.5 : only BeanTransformer use it and it is a deprecated transformer, will be remove in version 3.0 - */ - @Deprecated - @StereotypeDefinition(target = ObjectModelAttribute.class, - documentation = "Deprecated! To specify that an attribute is an array") - String STEREOTYPE_ARRAY = "array"; - - /** - * Stéréotype pour les interfaces devant être générées sous forme de facades. - * - * @deprecated since 2.5 : nobydy use it, will be remove in version 3.0 - */ - @Deprecated - String STEREOTYPE_FACADE = "facade"; - - /** * Stéréotype pour les objets devant être générées sous forme d'entités * * @see TopiaGeneratorUtil#isEntity(ObjectModelClassifier) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2013-07-05 14:10:57 UTC (rev 2738) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2013-07-05 14:31:15 UTC (rev 2739) @@ -435,24 +435,6 @@ String TAG_ERROR_ARGS = "errorArgs"; /** - * Tag to specify if we want to add logs in any method of service - * generated by {@link ServiceTransformer}. - * <p/> - * <b>Note:</b> To have no log just use this tag on services or gloabaly - * on model (for all services). - * - * @see ServiceTransformer - * @see TopiaGeneratorUtil#getNoLogInServiceTagValue(ObjectModelClassifier, ObjectModel) - * @since 2.5 - * @deprecated since 2.5.4, will not be replaced (no log are any longer - * generated in {@link ServiceTransformer} - */ - @Deprecated - @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "This is deprecated since 2.5.4, no effect : no logs are generated in services.") - String TAG_NO_LOG_IN_SERVICE = "noLogInService"; - - /** * Stéréotype pour les attributs avec multiplicité nécessitant la création d'un index. * * @see TopiaGeneratorUtil#getIndexForeignKeys(ObjectModelAttribute, ObjectModel)