branch develop updated (6c21935 -> c1112cb)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See http://git.nuiton.org/topia.git from 6c21935 Override toString() in JdbcConfiguration and TopiaConfiguration new b108556 Use package while seeking for dbschema tag value (See #3766) new c1112cb Db schema name is not generated if tag value is set on a package close #3766 Merge branch 'feature/3766' into develop The 2 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 c1112cbd760aff66e97747129e911c0797c4e722 Merge: 6c21935 b108556 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 23 02:51:33 2015 +0200 Db schema name is not generated if tag value is set on a package close #3766 Merge branch 'feature/3766' into develop commit b108556ba625e87472398e1b65af1fe48c5e48b8 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) Summary of changes: .../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(-) -- 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. See http://git.nuiton.org/topia.git commit b108556ba625e87472398e1b65af1fe48c5e48b8 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 573f270..9861cf4 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; } @@ -482,7 +483,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)) { @@ -854,7 +855,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 3e94b2c..09307fa 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}, @@ -492,13 +492,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>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit c1112cbd760aff66e97747129e911c0797c4e722 Merge: 6c21935 b108556 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 23 02:51:33 2015 +0200 Db schema name is not generated if tag value is set on a package close #3766 Merge branch 'feature/3766' into develop .../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(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm