This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository topia. See http://git.nuiton.org/topia.git commit b3eb9392c82165c9507df078b9a8e51011f37789 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 24 16:06:51 2014 +0200 fixes #3472: Remove TopiaGeneratorUtil#getDbSchemaNameTagValue(ObjectModelAttribute, ObjectModel) method fixes #3473: Can specifiy dbSchema tag value at package level --- .../generator/EntityHibernateMappingGenerator.java | 4 ++-- .../nuiton/topia/generator/TopiaGeneratorUtil.java | 27 ++++++---------------- .../org/nuiton/topia/generator/TopiaTagValues.java | 4 ++-- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java index de0de1e..0b7feea 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java @@ -409,7 +409,7 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { attrType = attrType.trim().substring(0, attrType.trim().length()-2); String optionalAttributes = ""; - String schema = TopiaGeneratorUtil.getDbSchemaNameTagValue(attr, model); + String schema = TopiaGeneratorUtil.getDbSchemaNameTagValue(attr.getClassifier(), model); if (schema != null) { optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_SCHEMA, schema); } @@ -736,7 +736,7 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { } String reverseAttrDBName = TopiaGeneratorUtil.getReverseDbName(attr); String optionalAttributes=""; - String schema = TopiaGeneratorUtil.getDbSchemaNameTagValue(attr, model); + String schema = TopiaGeneratorUtil.getDbSchemaNameTagValue(attr.getClassifier(), model); if (schema != null) { optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_SCHEMA, schema); } 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 9a27742..4a75ea2 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 @@ -32,9 +32,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.AbstractGenerator; import org.nuiton.eugene.EugeneStereoTypes; -import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.ModelPropertiesUtil; import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.models.Model; import org.nuiton.eugene.models.object.ObjectModel; @@ -47,6 +45,7 @@ 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; @@ -241,7 +240,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { * @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 since 2.5, prefer use the method {@link #getDbSchemaNameTagValue(ObjectModelClassifier, ObjectModel)} */ @Deprecated public static String getSchemaName(ObjectModelElement element, @@ -1421,23 +1420,11 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { * @since 2.5 */ public static String getDbSchemaNameTagValue(ObjectModelClassifier classifier, ObjectModel model) { - String value = findTagValue(TopiaTagValues.TAG_SCHEMA_NAME, classifier, model); - return value; - } - - /** - * Obtain the value of the {@link TopiaTagValues#TAG_SCHEMA_NAME} - * tag value on the given attribute. - * <p/> - * - * @param attribute attribute 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_SCHEMA_NAME - * @since 2.5 - */ - public static String getDbSchemaNameTagValue(ObjectModelAttribute attribute, ObjectModel model) { - String value = findTagValue(TopiaTagValues.TAG_SCHEMA_NAME, attribute, model); + ObjectModelPackage aPackage = null; + if (classifier!=null) { + aPackage = model.getPackage(classifier); + } + String value = TagValues.findTagValue(TopiaTagValues.TAG_SCHEMA_NAME, model, aPackage , classifier); return value; } 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 f754bc0..e3ebc6c 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,6 +30,7 @@ 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; @@ -111,10 +112,9 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * Tag pour le nom du schema en BD. * * @see TopiaGeneratorUtil#getDbSchemaNameTagValue(ObjectModelClassifier, ObjectModel) - * @see TopiaGeneratorUtil#getDbSchemaNameTagValue(ObjectModelAttribute, ObjectModel) * @since 2.5 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class, ObjectModelAttribute.class}, + @TagValueDefinition(target = {ObjectModel.class, ObjectModelPackage.class, ObjectModelClassifier.class}, documentation = "Sets the database schema name") public static final String TAG_SCHEMA_NAME = "dbSchema"; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.