branch develop updated (dd8585c8 -> 3d6da081)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia-2.x. See https://gitlab.nuiton.org/nuiton/topia-2.x.git from dd8585c8 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 3d6da081 fixes #4: Update libs Update eugene to last version (breaking changes) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3d6da081b507728373ff24b67d881bc2d9743de1 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Dec 10 10:00:03 2019 +0100 fixes #4: Update libs Update eugene to last version (breaking changes) Summary of changes: pom.xml | 26 +++---- topia-persistence/pom.xml | 3 +- .../nuiton/topia/generator/EntityTransformer.java | 12 ++-- .../nuiton/topia/generator/TopiaGeneratorUtil.java | 6 +- .../nuiton/topia/generator/TopiaStereoTypes.java | 20 +----- .../org/nuiton/topia/generator/TopiaTagValues.java | 83 +--------------------- .../org/nuiton/topiatest/beangen/RoueImpl.java | 12 ---- 7 files changed, 27 insertions(+), 135 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia-2.x. See https://gitlab.nuiton.org/nuiton/topia-2.x.git commit 3d6da081b507728373ff24b67d881bc2d9743de1 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Dec 10 10:00:03 2019 +0100 fixes #4: Update libs Update eugene to last version (breaking changes) --- pom.xml | 26 +++---- topia-persistence/pom.xml | 3 +- .../nuiton/topia/generator/EntityTransformer.java | 12 ++-- .../nuiton/topia/generator/TopiaGeneratorUtil.java | 6 +- .../nuiton/topia/generator/TopiaStereoTypes.java | 20 +----- .../org/nuiton/topia/generator/TopiaTagValues.java | 83 +--------------------- .../org/nuiton/topiatest/beangen/RoueImpl.java | 12 ---- 7 files changed, 27 insertions(+), 135 deletions(-) diff --git a/pom.xml b/pom.xml index 5917a06e..d4035b94 100644 --- a/pom.xml +++ b/pom.xml @@ -198,17 +198,17 @@ <projectId>topia</projectId> <!-- libs version --> - <eugeneVersion>3.0-alpha-5</eugeneVersion> - <nuitonCsvVersion>3.0-rc-6</nuitonCsvVersion> + <eugeneVersion>3.0-alpha-10</eugeneVersion> + <nuitonCsvVersion>3.0</nuitonCsvVersion> <nuitonDecoratorVersion>3.0</nuitonDecoratorVersion> <nuitonUtilsVersion>3.0</nuitonUtilsVersion> <processorPluginVersion>1.3</processorPluginVersion> - <nuitonI18nVersion>3.6.3</nuitonI18nVersion> + <nuitonI18nVersion>3.7</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> - <hibernateVersion>5.2.16.Final</hibernateVersion> - <sl4jVersion>1.7.25</sl4jVersion> - <h2Version>1.4.194</h2Version> - <hamcrestVersion>1.3</hamcrestVersion> + <hibernateVersion>5.2.18.Final</hibernateVersion> + <sl4jVersion>1.7.29</sl4jVersion> + <h2Version>1.4.200</h2Version> + <hamcrestVersion>2.1</hamcrestVersion> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -219,6 +219,8 @@ <signatureVersion>1.0</signatureVersion> <redmine.skipGenerateChanges>true</redmine.skipGenerateChanges> + + <jrstPluginVersion>2.3</jrstPluginVersion> </properties> <dependencyManagement> @@ -279,7 +281,7 @@ <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.1-api</artifactId> - <version>1.0.0.Final</version> + <version>1.0.2.Final</version> </dependency> <dependency> @@ -308,7 +310,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>23.2-jre</version> + <version>28.1-jre</version> </dependency> <!-- Commons libs --> @@ -316,13 +318,13 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.1</version> + <version>4.4</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.3</version> + <version>1.9.4</version> </dependency> <dependency> @@ -340,7 +342,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.7</version> + <version>3.9</version> </dependency> <!-- BD H2 for testing --> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index e0912033..c50d7402 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -233,7 +233,7 @@ <templates> org.nuiton.topia.generator.TopiaMetaTransformer, org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.eugene.java.JavaBeanTransformer, + org.nuiton.eugene.java.BeanTransformer, org.nuiton.topia.generator.EntityDTOTransformer, org.nuiton.topia.generator.BinderHelperTransformer, org.nuiton.topia.generator.QueryHelperTransformer @@ -241,6 +241,7 @@ <fullPackagePath>org.nuiton.topia</fullPackagePath> <defaultPackage>org.nuiton.topia</defaultPackage> <outputDirectory>${project.build.directory}/generated-test-sources</outputDirectory> + <failIfUnsafe>false</failIfUnsafe> </configuration> <goals> <goal>generate</goal> diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java index d39c6ada..fad384bf 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2019 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 @@ -27,7 +27,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.EugeneTagValues; +import org.nuiton.eugene.EugeneCoreTagValues; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; import org.nuiton.eugene.models.object.ObjectModelAttribute; @@ -126,9 +126,9 @@ public class EntityTransformer extends ObjectModelTransformerToJava { // no specific prefix, so no prefix if (log.isWarnEnabled()) { log.warn("[" + input.getName() + "] Will generate constants with NO prefix, not a good idea... \n" + - "Use '" + EugeneTagValues.TAG_CONSTANT_PREFIX + + "Use '" + EugeneCoreTagValues.Store.constantPrefix + "' tagvalue in your xmi properties. For example " + - "for all the model : model.tagvalue." + EugeneTagValues.TAG_CONSTANT_PREFIX + "=PROPERTY_"); + "for all the model : model.tagvalue." + EugeneCoreTagValues.Store.constantPrefix + "=PROPERTY_"); } } setConstantPrefix(prefix); @@ -137,7 +137,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { generateAbstract = isGenerateAbstract(input); generateImpl = isGenerateImpl(input); - generateBooleanGetMethods = getEugeneTagValues().isGenerateBooleanGetMethods(input, null, model); + generateBooleanGetMethods = eugeneTagValues.isGenerateBooleanGetMethods(input, null, model); if (generateInterface) { @@ -152,7 +152,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { } // Generate i18n block - String i18nPrefix = getEugeneTagValues().getI18nPrefixTagValue(input, null, model); + String i18nPrefix = eugeneTagValues.getI18nPrefixTagValue(input, null, model); if (!StringUtils.isEmpty(i18nPrefix)) { generateI18nBlock(input, outputAbstract, i18nPrefix); } diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java index 5840c951..66585d34 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2019 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 @@ -32,6 +32,7 @@ import org.nuiton.eugene.AbstractGenerator; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.models.Model; +import org.nuiton.eugene.models.extension.tagvalue.TagValueUtil; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; import org.nuiton.eugene.models.object.ObjectModelAttribute; @@ -42,7 +43,6 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelPackage; import org.nuiton.eugene.models.object.ObjectModelParameter; -import org.nuiton.eugene.models.tagvalue.TagValues; import org.nuiton.topia.persistence.TopiaDAOImpl; import java.util.ArrayList; @@ -1435,7 +1435,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { if (classifier!=null) { aPackage = model.getPackage(classifier); } - String value = TagValues.findTagValue(TopiaTagValues.TAG_SCHEMA_NAME, model, aPackage , classifier); + String value = TagValueUtil.findTagValue(TopiaTagValues.TAG_SCHEMA_NAME, null, model, aPackage , classifier); return value; } diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java index f195701f..63e73ea9 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java @@ -26,8 +26,6 @@ package org.nuiton.topia.generator; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.eugene.models.stereotype.StereotypeDefinition; -import org.nuiton.eugene.models.stereotype.StereotypeDefinitionProvider; /** * All extra stereotypes usable in topia generators. @@ -36,7 +34,7 @@ import org.nuiton.eugene.models.stereotype.StereotypeDefinitionProvider; * @since 2.5 * @plexus.component role="org.nuiton.eugene.models.stereotype.StereotypeDefinitionProvider" role-hint="topia-templates" */ -public class TopiaStereoTypes extends StereotypeDefinitionProvider { +public class TopiaStereoTypes { /** * Stéréotype pour les attributs considérés comme des tableaux. @@ -45,8 +43,6 @@ public class TopiaStereoTypes extends StereotypeDefinitionProvider { * @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") public static final String STEREOTYPE_ARRAY = "array"; /** @@ -63,8 +59,6 @@ public class TopiaStereoTypes extends StereotypeDefinitionProvider { * @see TopiaGeneratorUtil#isEntity(ObjectModelClassifier) * @see TopiaGeneratorUtil#hasEntityStereotype(ObjectModelAttribute) */ - @StereotypeDefinition(target = {ObjectModelClassifier.class, ObjectModelAttribute.class}, - documentation = "To specify that a class is an Entity") public static final String STEREOTYPE_ENTITY = "entity"; /** @@ -72,8 +66,6 @@ public class TopiaStereoTypes extends StereotypeDefinitionProvider { * * @see TopiaGeneratorUtil#hasDtoStereotype(ObjectModelClassifier) */ - @StereotypeDefinition(target = ObjectModelClassifier.class, - documentation = "to specify that a class is a DTO") public static final String STEREOTYPE_DTO = "dto"; /** @@ -83,8 +75,6 @@ public class TopiaStereoTypes extends StereotypeDefinitionProvider { * @see ServiceTransformer * @see TopiaGeneratorUtil#hasServiceStereotype(ObjectModelClassifier) */ - @StereotypeDefinition(target = ObjectModelClassifier.class, - documentation = "To specify that a class is a Service") public static final String STEREOTYPE_SERVICE = "service"; /** @@ -93,8 +83,6 @@ public class TopiaStereoTypes extends StereotypeDefinitionProvider { * @see TopiaGeneratorUtil#hasDaoStereotype(ObjectModelClassifier) * @see TopiaGeneratorUtil#hasDaoStereotype(ObjectModelOperation) */ - @StereotypeDefinition(target = {ObjectModelClassifier.class, ObjectModelOperation.class}, - documentation = "To Specify that a classifier or an operation should be generated as (or in) a DAO") public static final String STEREOTYPE_DAO = "dao"; /** @@ -102,8 +90,6 @@ public class TopiaStereoTypes extends StereotypeDefinitionProvider { * * @see TopiaGeneratorUtil#hasUniqueStereotype(ObjectModelAttribute) */ - @StereotypeDefinition(target = ObjectModelAttribute.class, - documentation = "To specify that an attribute is unique (Hibernate mapping)") public static final String STEREOTYPE_UNIQUE = "unique"; /** @@ -111,8 +97,6 @@ public class TopiaStereoTypes extends StereotypeDefinitionProvider { * * @see TopiaGeneratorUtil#hasPrimaryKeyStereotype(ObjectModelAttribute) */ - @StereotypeDefinition(target = ObjectModelAttribute.class, - documentation = "To specify that an attribute is part of a primary key (Hibernate mapping)") public static final String STEREOTYPE_PRIMARYKAY = "primaryKey"; /** @@ -121,7 +105,5 @@ public class TopiaStereoTypes extends StereotypeDefinitionProvider { * @see TopiaGeneratorUtil#hasIndexedCollectionStereotype(ObjectModelAttribute) * @since 2.10 */ - @StereotypeDefinition(target = ObjectModelAttribute.class, - documentation = "To specify that the attribute is an indexed collection (Hibernate mapping)") public static final String STEREOTYPE_INDEXED_COLLECTION = "indexedCollection"; } diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java index ef16c6a9..eca569a8 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java @@ -30,9 +30,6 @@ import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelElement; import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.eugene.models.object.ObjectModelPackage; -import org.nuiton.eugene.models.tagvalue.TagValueDefinition; -import org.nuiton.eugene.models.tagvalue.TagValueDefinitionProvider; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaEntityContextable; import org.nuiton.topia.persistence.TopiaEntityEnum; @@ -42,9 +39,8 @@ import org.nuiton.topia.persistence.TopiaEntityEnum; * * @author tchemit <chemit@codelutin.com> * @since 2.5 - * @plexus.component role="org.nuiton.eugene.models.tagvalue.TagValueDefinitionProvider" role-hint="topia-templates" */ -public class TopiaTagValues extends TagValueDefinitionProvider { +public class TopiaTagValues { /** * Tag pour ajouter specifier le copyright d'un fichier. @@ -62,8 +58,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getPersistenceTypeTagValue(ObjectModelClassifier) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelClassifier.class}, - documentation = "") public static final String TAG_PERSISTENCE_TYPE = "persistenceType"; /** @@ -73,7 +67,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * * @since 2.5.3 */ - @TagValueDefinition(target = {ObjectModelClassifier.class}, documentation = "") public static final String TAG_CONTEXTABLE = "contextable"; /** @@ -83,8 +76,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getDbName(ObjectModelElement) * @see TopiaGeneratorUtil#getReverseDbName(ObjectModelAttribute) */ - @TagValueDefinition(target = {ObjectModelElement.class}, - documentation = "Sets the database name of an element of the model (a table or a column)") public static final String TAG_DB_NAME = "dbName"; /** @@ -93,8 +84,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getReverseDbNameTagValue(ObjectModelAttribute) * @see TopiaGeneratorUtil#getReverseDbName(ObjectModelAttribute) */ - @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets the database name of the reverse db name attribute of the model (a column)") public static final String TAG_REVERSE_DB_NAME = "reverseDbName"; /** @@ -104,8 +93,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getManyToManyTableName(ObjectModelAttribute) * @since 2.9.2 */ - @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets the database table name of a many to many relation for a attribute of the model") public static final String TAG_MANY_TO_MANY_TABLE_NAME = "manyToManyTableName"; /** @@ -114,8 +101,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getDbSchemaNameTagValue(ObjectModelClassifier, ObjectModel) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelPackage.class, ObjectModelClassifier.class}, - documentation = "Sets the database schema name") public static final String TAG_SCHEMA_NAME = "dbSchema"; /** @@ -133,8 +118,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getLengthTagValue(ObjectModelAttribute) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets the length of an attribute in database") public static final String TAG_LENGTH = "length"; /** @@ -143,8 +126,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getAnnotationTagValue(ObjectModelAttribute) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets an annotation of an attribute") public static final String TAG_ANNOTATION = "annotation"; /** @@ -153,8 +134,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getAccessTagValue(ObjectModelAttribute) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets the access type of an attribute (Hibernate mapping)") public static final String TAG_ACCESS = "access"; /** @@ -164,8 +143,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#isNaturalId(ObjectModelAttribute) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets an attribute as part of a natural id (Hibernate Mapping)") public static final String TAG_NATURAL_ID = "naturalId"; /** @@ -175,8 +152,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#isNaturalIdMutable(ObjectModelClass) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelClassifier.class}, - documentation = "Sets if natural id of a entity is mutable (hibernate mapping)") public static final String TAG_NATURAL_ID_MUTABLE = "naturalIdMutable"; /** @@ -189,8 +164,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getInverseTagValue(ObjectModelAttribute) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets which part of a N-N relation is master (inverse=true) and slave (inverse=false) (must be put on each side on a such relation) (Hibernate mapping)") public static final String TAG_INVERSE = "inverse"; /** @@ -199,8 +172,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getLazyTagValue(ObjectModelAttribute) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets if an association should be lazy (Hibernate mapping)") public static final String TAG_LAZY = "lazy"; /** @@ -209,8 +180,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getFetchTagValue(ObjectModelAttribute) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets the fetch caracteristic of an attribute (Hibernate mapping)") public static final String TAG_FETCH = "fetch"; /** @@ -219,8 +188,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getOrderByTagValue(ObjectModelAttribute) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets the order by propertie of an multiple association (Hibernate mapping)") public static final String TAG_ORDER_BY = "orderBy"; /** @@ -229,8 +196,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getNotNullTagValue(ObjectModelAttribute) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets if an attribute must be not null (Hibernate mapping)") public static final String TAG_NOT_NULL = "notNull"; /** @@ -239,8 +204,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * {@code name} de l'énumération et non l'ordinal pour stocker la valeur en * base */ - @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "'true' if the value of this attribute of type Enumeration should be stored with its name (instead of using ordinal)") public static final String TAG_USE_ENUMERATION_NAME = "useEnumerationName"; /** @@ -254,8 +217,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getPersistenceTypeTagValue(ObjectModelClassifier) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "Configure the proxy interface on something else than the default implementation (null to use our default implementation, none to let hibernate deal it) (Hibernate mapping)") public static final String TAG_PROXY_INTERFACE = "hibernateProxyInterface"; /** @@ -264,8 +225,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getSecurityCreateTagValue(ObjectModelClassifier) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelClassifier.class}, - documentation = "Sets the create permission on an entity") public static final String TAG_SECURITY_CREATE = "securityCreate"; /** @@ -274,8 +233,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getSecurityLoadTagValue(ObjectModelClassifier) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelClassifier.class}, - documentation = "Sets the load permission on an entity") public static final String TAG_SECURITY_LOAD = "securityLoad"; /** @@ -284,8 +241,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getSecurityUpdateTagValue(ObjectModelClassifier) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelClassifier.class}, - documentation = "Sets the update permission on an entity") public static final String TAG_SECURITY_UPDATE = "securityUpdate"; /** @@ -294,8 +249,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getSecurityDeleteTagValue(ObjectModelClassifier) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelClassifier.class}, - documentation = "sets the delete permission on an entity") public static final String TAG_SECURITY_DELETE = "securityDelete"; /** @@ -305,8 +258,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#generateToString(ObjectModelClass, ObjectModel) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "To not generate the toString method on entities") public static final String TAG_NOT_GENERATE_TO_STRING = "notGenerateToString"; /** @@ -316,8 +267,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#sortAttribute(ObjectModelClass, ObjectModel) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "To sort attribute while generation") public static final String TAG_SORT_ATTRIBUTE = "sortAttribute"; /** @@ -327,8 +276,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#shouldGenerateOperatorForDAOHelper(ObjectModel) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModel.class}, - documentation = "To generate EntityOperation on generated DAOHelper") public static final String TAG_GENERATE_OPERATOR_FOR_DAO_HELPER = "generateOperatorForDAOHelper"; /** @@ -341,8 +288,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#shouldGenerateStandaloneEnumForDAOHelper(ObjectModel) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModel.class}, - documentation = "To generate a standalon EntityEnum outside the DAOHelper") public static final String TAG_GENERATE_STANDALONE_ENUM_FOR_DAO_HELPER = "generateStandaloneEnumForDAOHelper"; /** @@ -351,8 +296,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getTypeTagValue(ObjectModelAttribute) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets the hibernate type of an attribute (Hibernate mapping)") public static final String TAG_TYPE = "type"; /** @@ -361,8 +304,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getSqlTypeTagValue(ObjectModelAttribute) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets the sql type of an attribute (Hibernate mapping)") public static final String TAG_SQL_TYPE = "sqlType"; /** @@ -373,8 +314,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @deprecated since 2.5, prefer use the tag value */ @Deprecated - @TagValueDefinition(target = {ObjectModel.class}, - documentation = "Deprecated! To use the previous DAO implementation in generated DAO (use Criteria api)") public static final String TAG_USE_LEGACY_DAO = "useLegacyDAO"; /** @@ -387,8 +326,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getDaoImplementationTagValue(ObjectModel) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModel.class}, - documentation = "Sets the fully qualified name of the DAO implementation to use in generated DAO (default is DAOImpl (base on TopiaQuery))") public static final String TAG_DAO_IMPLEMENTATION = "daoImplementation"; @@ -403,8 +340,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getExceptionClassTagValue(ObjectModel) * @since 2.3.2 */ - @TagValueDefinition(target = {ObjectModel.class}, - documentation = "Sets the fully qualified name of the exception to generate in Services and QueryHelper") public static final String TAG_EXCEPTION_CLASS = "exceptionClass"; // ------------------------------------------------------------------------- @@ -420,8 +355,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getTransactionTagValue(ObjectModelOperation) * @since 2.3.1 */ - @TagValueDefinition(target = {ObjectModelClassifier.class, ObjectModelOperation.class}, - documentation = "Sets if an operation or a complete service required transaction (if set to true then a TopiaContext parameter will be added to methods)") public static final String TAG_TRANSACTION = "transaction"; /** @@ -432,8 +365,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getDoCommitTagValue(ObjectModelOperation, ObjectModel) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModelOperation.class}, - documentation = "Sets if an operation needs a commit") public static final String TAG_DO_COMMIT = "doCommit"; /** @@ -444,8 +375,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getErrorArgsTagValue(ObjectModelOperation) * @since 2.3.1 */ - @TagValueDefinition(target = {ObjectModelOperation.class}, - documentation = "Sets if an operation required errors arguments ?") public static final String TAG_ERROR_ARGS = "errorArgs"; /** @@ -462,8 +391,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * 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.") public static final String TAG_NO_LOG_IN_SERVICE = "noLogInService"; /** @@ -472,8 +399,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#getIndexForeignKeys(ObjectModelAttribute, ObjectModel) * @since 2.6.5 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelAttribute.class}, - documentation = "Specifies if an nm-multiplicity attribute (or all nm-multiplicity attributes of a given model) needs an index in db (Hibernate mapping)") public static final String TAG_INDEX_FOREIGN_KEYS = "indexForeignKeys"; /** @@ -483,8 +408,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#isGenerateForeignKeyNames(ObjectModelClassifier, ObjectModel) * @since 2.10 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "To generate deterministic foreign keys names in hibernate mappings.") public static final String TAG_GENERATE_FOREIGN_KEY_NAMES = "generateForeignKeyNames"; @@ -497,8 +420,6 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#shouldGenerateDTOTopiaIdTagValue(ObjectModelClassifier, ObjectModel) * @since 2.6.7 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "Add a \"id\" property with its getter/setter on a DTO.") public static final String TAG_GENERATE_TOPIA_ID_IN_DTO = "generateDTOTopiaId"; /** @@ -507,7 +428,5 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * @see TopiaGeneratorUtil#isDoNotGenerateReadListeners(ObjectModelAttribute, ObjectModel) * @since 2.9 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "Add a \"id\" property with its getter/setter on a DTO.") public static final String TAG_DO_NOT_GENERATE_READ_LISTENERS = "notGenerateReadListeners"; } diff --git a/topia-persistence/src/test/java/org/nuiton/topiatest/beangen/RoueImpl.java b/topia-persistence/src/test/java/org/nuiton/topiatest/beangen/RoueImpl.java index 681cc312..eb76f5a1 100644 --- a/topia-persistence/src/test/java/org/nuiton/topiatest/beangen/RoueImpl.java +++ b/topia-persistence/src/test/java/org/nuiton/topiatest/beangen/RoueImpl.java @@ -24,8 +24,6 @@ package org.nuiton.topiatest.beangen; -import org.nuiton.topiatest.Product; - /** * RoueImpl * @@ -39,14 +37,4 @@ import org.nuiton.topiatest.Product; */ public class RoueImpl extends Roue { - @Override - public void mount() { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Product getModel(String id) { - throw new UnsupportedOperationException("Not supported yet."); - } - } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm