This is an automated email from the git hooks/post-receive script. New commit to branch feature/3761 in repository topia. See http://git.nuiton.org/topia.git commit 1e0cb5c10b10613c85456aecd06a11ea99e5ee13 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 23 02:51:29 2015 +0200 Use package while seeking for dbschema tag value (See #3766) --- .../org/nuiton/topia/templates/EntityEnumTransformer.java | 4 +++- .../topia/templates/EntityHibernateMappingGenerator.java | 11 ++++++----- .../main/java/org/nuiton/topia/templates/TopiaTagValues.java | 10 +++++----- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityEnumTransformer.java b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityEnumTransformer.java index 549d415..54c62c7 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityEnumTransformer.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityEnumTransformer.java @@ -37,6 +37,7 @@ import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelEnumeration; import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelPackage; import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; @@ -161,7 +162,8 @@ public class EntityEnumTransformer extends ObjectModelTransformerToJava { StringBuilder params = new StringBuilder(clazzName + ".class"); - String dbSchema = topiaTagValues.getDbSchemaNameTagValue(clazz, model); + ObjectModelPackage aPackage = model.getPackage(clazz); + String dbSchema = topiaTagValues.getDbSchemaNameTagValue(clazz, aPackage, model); if (dbSchema == null) { params.append(", null"); } else { diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java index 207fb68..9a37a83 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java @@ -146,11 +146,12 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { Map<String,String> optionalAttributesMap = new HashMap<String, String>(); - String schema = topiaTagValues.getDbSchemaNameTagValue(input, model); + ObjectModelPackage aPackage = model.getPackage(input); + String schema = topiaTagValues.getDbSchemaNameTagValue(input, aPackage, model); generateFromTagValue(optionalAttributesMap,HIBERNATE_ATTRIBUTE_SCHEMA, schema); //On précise au proxy de quelle interface hérite l'objet - ObjectModelPackage aPackage = model.getPackage(input); + String proxyTagValue = topiaTagValues.getProxyInterfaceTagValue(input, aPackage, model); if (StringUtils.isEmpty(proxyTagValue) || !proxyTagValue.equals("none")) { generateFromTagValue(optionalAttributesMap,HIBERNATE_ATTRIBUTE_PROXY, clazzFQN); @@ -286,7 +287,7 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { } // add schema if exist (http://nuiton.org/issues/2052) - String schema = topiaTagValues.getDbSchemaNameTagValue(clazz, model); + String schema = topiaTagValues.getDbSchemaNameTagValue(clazz, aPackage, model); if (StringUtils.isNotEmpty(schema)) { tableName = schema + "." + tableName; } @@ -489,7 +490,7 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { Map<String,String> optionalAttributesMap = new HashMap<String, String>(); - String schema = topiaTagValues.getDbSchemaNameTagValue(clazz, model); + String schema = topiaTagValues.getDbSchemaNameTagValue(clazz, aPackage, model); generateFromTagValue(optionalAttributesMap, HIBERNATE_ATTRIBUTE_SCHEMA, schema); if (JavaGeneratorUtil.isOrdered(attr)) { @@ -861,7 +862,7 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { } String reverseAttrDBName = templateHelper.getReverseDbName(attr); Map<String,String> optionalAttributesMap = new HashMap<String, String>(); - String schema = topiaTagValues.getDbSchemaNameTagValue(clazz, model); + String schema = topiaTagValues.getDbSchemaNameTagValue(clazz, aPackage, model); generateFromTagValue(optionalAttributesMap, HIBERNATE_ATTRIBUTE_SCHEMA, schema); String optionalAttributes=attributesToString(optionalAttributesMap); diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java index ab11f36..eda2348 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java @@ -117,7 +117,7 @@ public class TopiaTagValues extends TagValueDefinitionProvider { /** * Tag pour le nom du schema en BD. * - * @see #getDbSchemaNameTagValue(ObjectModelClassifier, ObjectModel) + * @see #getDbSchemaNameTagValue(ObjectModelClassifier, ObjectModelPackage, ObjectModel) * @since 2.5 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelPackage.class, ObjectModelClassifier.class, ObjectModelAttribute.class}, @@ -516,13 +516,13 @@ public class TopiaTagValues extends TagValueDefinitionProvider { * Obtain the value of the {@link #TAG_SCHEMA_NAME} tag value on the given classifier. * * @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. + * @param aPackage package 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 #TAG_SCHEMA_NAME * @since 2.5 */ - public String getDbSchemaNameTagValue(ObjectModelClassifier classifier, ObjectModel model) { - String value = findTagValue(TAG_SCHEMA_NAME, classifier, model); + public String getDbSchemaNameTagValue(ObjectModelClassifier classifier, ObjectModelPackage aPackage, ObjectModel model) { + String value = findTagValue(TAG_SCHEMA_NAME, classifier, aPackage, model); return value; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.