Author: tchemit Date: 2010-07-11 09:45:36 +0200 (Sun, 11 Jul 2010) New Revision: 2071 Url: http://nuiton.org/repositories/revision/topia/2071 Log: - remove deprecated generator - add headers - fix javadoc since 2.4 instead of 2.3.5 Removed: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java 2010-07-11 07:37:25 UTC (rev 2070) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java 2010-07-11 07:45:36 UTC (rev 2071) @@ -57,7 +57,7 @@ * @author tchemit <tchemit@codelutin.com> * @version $Id$ * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.BeanTransformer" - * @deprecated since 2.3.5 use {@link JavaBeanTransformer} instead + * @deprecated since 2.4 use {@link JavaBeanTransformer} instead */ @Deprecated public class BeanTransformer extends ObjectModelTransformerToJava { 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 2010-07-11 07:37:25 UTC (rev 2070) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-07-11 07:45:36 UTC (rev 2071) @@ -821,7 +821,7 @@ String attrName = attr.getName(); String attrType = attr.getType(); ObjectModelOperation op; - // Since 2.3.5 do nothing, findContains and findAllContains are not generated anymore + // Since 2.4 do nothing, findContains and findAllContains are not generated anymore } private boolean isCollectionNeeded( Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java 2010-07-11 07:37:25 UTC (rev 2070) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java 2010-07-11 07:45:36 UTC (rev 2071) @@ -53,7 +53,7 @@ * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityAbstractTransformer" - * @deprecated since 2.3.5 : all transformations needed for Entity is in {@link EntityTransformer} included in {@link TopiaMetaTransformer} + * @deprecated since 2.4 : all transformations needed for Entity is in {@link EntityTransformer} included in {@link TopiaMetaTransformer} */ @Deprecated public class EntityAbstractTransformer extends ObjectModelTransformerToJava { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplTransformer.java 2010-07-11 07:37:25 UTC (rev 2070) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplTransformer.java 2010-07-11 07:45:36 UTC (rev 2071) @@ -40,7 +40,7 @@ * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityImplTransformer" - * @deprecated since 2.3.5 : all transformations needed for Entity is in {@link EntityTransformer} included in {@link TopiaMetaTransformer} + * @deprecated since 2.4 : all transformations needed for Entity is in {@link EntityTransformer} included in {@link TopiaMetaTransformer} */ @Deprecated public class EntityImplTransformer extends ObjectModelTransformerToJava { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java 2010-07-11 07:37:25 UTC (rev 2070) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java 2010-07-11 07:45:36 UTC (rev 2071) @@ -48,7 +48,7 @@ * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityInterfaceTransformer" - * @deprecated since 2.3.5 : all transformations needed for Entity is in {@link EntityTransformer} included in {@link TopiaMetaTransformer} + * @deprecated since 2.4 : all transformations needed for Entity is in {@link EntityTransformer} included in {@link TopiaMetaTransformer} */ @Deprecated public class EntityInterfaceTransformer extends ObjectModelTransformerToJava { Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java 2010-07-11 07:37:25 UTC (rev 2070) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java 2010-07-11 07:45:36 UTC (rev 2071) @@ -1,93 +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 java.util.Iterator; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelInterface; -import org.nuiton.eugene.models.object.ObjectModelModifier; -import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.eugene.models.object.ObjectModelParameter; - -/** - * InterfaceTransformer - * - * Created: 7 nov. 2009 - * - * @author fdesbois <fdesbois@codelutin.com> - * @version $Id$ - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.InterfaceTransformer" - * @deprecated since 2.3.4 use {@link org.nuiton.eugene.java.JavaInterfaceTransformer} instead - */ -@Deprecated -public class InterfaceTransformer extends ObjectModelTransformerToJava { - - private static final Log log = LogFactory.getLog(InterfaceTransformer.class); - - @Override - public void transformFromInterface(ObjectModelInterface interfacez) { - if (!interfacez.getStereotypes().isEmpty()) { - // can only generate an interface with there is no other stereotypes - return; - } - - ObjectModelInterface resultInterface = createInterface(interfacez.getName(), interfacez.getPackageName()); - - if (log.isDebugEnabled()) { - log.debug("will create model for "+resultInterface.getQualifiedName()); - } - - - // extend interface - Iterator<ObjectModelInterface> it = interfacez.getInterfaces().iterator(); - if (it.hasNext()) { - ObjectModelInterface extend = it.next(); - addInterface(resultInterface, extend.getQualifiedName()); - } - - // constant attributes - for (ObjectModelAttribute attr : interfacez.getAttributes()) { - if (!attr.isStatic() && StringUtils.isNotEmpty(attr.getDefaultValue())) { // only static attribut with value - addConstant(resultInterface, attr.getName(), attr.getType(), attr.getDefaultValue(), ObjectModelModifier.PUBLIC); - } - } - - // interface operations - for (ObjectModelOperation op : interfacez.getOperations()) { - ObjectModelOperation resultOp = addOperation(resultInterface, op.getName(), op.getReturnType()); - for (ObjectModelParameter param : op.getParameters()) { - addParameter(resultOp, param.getType(), param.getName()); - } - for (String exception : op.getExceptions()) { - addException(resultOp, exception); - } - } - } -} Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2010-07-11 07:37:25 UTC (rev 2070) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2010-07-11 07:45:36 UTC (rev 2071) @@ -1,3 +1,27 @@ +/* + * #%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.lang.RandomStringUtils; @@ -2,3 +26,2 @@ import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.RandomUtils; import org.apache.commons.logging.Log; @@ -27,7 +50,7 @@ * * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ - * @since 2.3.5 + * @since 2.4 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.QueryHelperTransformer" */ public class QueryHelperTransformer extends ObjectModelTransformerToJava { Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java 2010-07-11 07:37:25 UTC (rev 2070) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java 2010-07-11 07:45:36 UTC (rev 2071) @@ -1,3 +1,27 @@ +/* + * #%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.junit.Assert;