[Topia-commits] 01/01: Fixes #3928 Bad text in warning when using deprecated tag value

1 May 2016

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository topia.

See https://gitlab.nuiton.org/nuiton/topia.git

commit e4651aa4245fdd47c3aa7184211e9b6cb7a869d0
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Sun May 1 16:36:18 2016 +0200

    Fixes #3928 Bad text in warning when using deprecated tag value
    
    Review how to get attribute type in strict mode (not using attribute type as default value).
    
    Permits to grab back the legacy hibernate type tag value.
---
 .../templates/EntityHibernateMappingGenerator.java | 19 ++++-----------
 .../nuiton/topia/templates/EntityTransformer.java  | 15 +++++++-----
 .../org/nuiton/topia/templates/TopiaTagValues.java | 27 +++++++++++++++++++++-
 3 files changed, 39 insertions(+), 22 deletions(-)

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 acdfee1..a644b87 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
@@ -500,15 +500,8 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator {
 
                     // tag value detected of the attribute
                     if (log.isWarnEnabled()) {
-                        String deprecatedTagName = clazz.getQualifiedName() + ".attribute." +
-                                                   attr.getName() + ".tagValue." + TopiaTagValues.TAG_HIBERNATE_ATTRIBUTE_TYPE +
-                                                   "." + type;
-                        String tagName = clazz.getQualifiedName() + ".attribute." +
-                                         attr.getName() + ".tagValue." + TopiaTagValues.TAG_HIBERNATE_ATTRIBUTE_TYPE +
-                                         "." + type;
-                        log.warn("---------");
-                        log.warn("You are using a deprecated tagValue (" + deprecatedTagName + "), replace it by");
-                        log.warn(tagName + "=" + attrType);
+                        String message = topiaTagValues.getDeprecatedAttributeTagValueMessage(clazz, attr, TopiaTagValues.TAG_TYPE, TopiaTagValues.TAG_HIBERNATE_ATTRIBUTE_TYPE , attrType);
+                        log.warn(message);
                     }
                     type = attrType;
                 } else {
@@ -517,12 +510,8 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator {
                     if (StringUtils.isNotEmpty(modelType)) {
 
                         // tag value detected of the model
-                        String deprecatedTagName = "model.tagValue." + type;
-                        String tagName = "model.tagValue." + TopiaTagValues.TAG_HIBERNATE_ATTRIBUTE_TYPE +
-                                         "." + type;
-                        log.warn("---------");
-                        log.warn("You are using a deprecated tagValue ("+deprecatedTagName+"), replace it by");
-                        log.warn(tagName + "=" + modelType);
+                        String message = topiaTagValues.getDeprecatedModelTagValueMessage(model, type, TopiaTagValues.TAG_HIBERNATE_ATTRIBUTE_TYPE + "." + type , modelType);
+                        log.warn(message);
                         //TODO tchemit 20100507 Explain What todes it do ? Dont understand the story of columnNamesMap
                         int bracketIndex = modelType.indexOf('(');
                         if (bracketIndex != -1) {
diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java
index 996da47..8928d28 100644
--- a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java
+++ b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java
@@ -33,8 +33,6 @@ import org.nuiton.eugene.EugeneTagValues;
 import org.nuiton.eugene.GeneratorUtil;
 import org.nuiton.eugene.java.JavaGeneratorUtil;
 import org.nuiton.eugene.java.ObjectModelTransformerToJava;
-import org.nuiton.eugene.models.object.ObjectModelPackage;
-import org.nuiton.eugene.models.tagvalue.TagValues;
 import org.nuiton.eugene.models.object.ObjectModelAssociationClass;
 import org.nuiton.eugene.models.object.ObjectModelAttribute;
 import org.nuiton.eugene.models.object.ObjectModelClass;
@@ -43,16 +41,18 @@ import org.nuiton.eugene.models.object.ObjectModelInterface;
 import org.nuiton.eugene.models.object.ObjectModelJavaModifier;
 import org.nuiton.eugene.models.object.ObjectModelModifier;
 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.object.xml.ObjectModelInterfaceImpl;
+import org.nuiton.eugene.models.tagvalue.TagValues;
 import org.nuiton.topia.persistence.TopiaDao;
-import org.nuiton.topia.persistence.TopiaEntityVisitor;
-import org.nuiton.topia.persistence.event.ListenableTopiaEntity;
-import org.nuiton.topia.persistence.internal.AbstractTopiaEntity;
 import org.nuiton.topia.persistence.TopiaDaoSupplier;
-import org.nuiton.topia.persistence.TopiaException;
 import org.nuiton.topia.persistence.TopiaEntity;
 import org.nuiton.topia.persistence.TopiaEntityContextable;
+import org.nuiton.topia.persistence.TopiaEntityVisitor;
+import org.nuiton.topia.persistence.TopiaException;
+import org.nuiton.topia.persistence.event.ListenableTopiaEntity;
+import org.nuiton.topia.persistence.internal.AbstractTopiaEntity;
 import org.nuiton.topia.persistence.util.TopiaEntityHelper;
 
 import java.util.Collection;
@@ -1868,6 +1868,9 @@ public class EntityTransformer extends ObjectModelTransformerToJava {
 
     protected String getPropertyType(ObjectModelAttribute attribute, ObjectModelClassifier aClass, ObjectModelPackage aPackage) {
         String propertyType = topiaTagValues.getAttributeType(attribute, aClass, aPackage ,model);
+        if (propertyType == null) {
+            propertyType = attribute.getType();
+        }
         if (!associationClass && attribute.hasAssociationClass()) {
             propertyType = attribute.getAssociationClass().getQualifiedName();
         }
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 0622c75..ede4f42 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
@@ -822,7 +822,7 @@ public class TopiaTagValues extends TagValueDefinitionProvider {
         String value = TagValues.findDirectTagValue(TAG_ATTRIBUTE_TYPE, null, attribute);
         if (value == null) {
             String tagValueName = TAG_ATTRIBUTE_TYPE + "." + attribute.getType();
-            value = TagValues.findTagValue(tagValueName, attribute.getType(), attribute, classifier, aPackage, model);
+            value = TagValues.findTagValue(tagValueName, (String)null, attribute, classifier, aPackage, model);
         }
         return value;
 
@@ -978,4 +978,29 @@ public class TopiaTagValues extends TagValueDefinitionProvider {
         return value;
     }
 
+    public String getDeprecatedAttributeTagValueMessage(ObjectModelClass clazz,
+                                                        ObjectModelAttribute attr,
+                                                        String deprecatedTagValue,
+                                                        String newTagValue,
+                                                        String value) {
+        String tagValuePrefix = clazz.getQualifiedName() + ".attribute." + attr.getName() + ".tagValue.";
+
+        String deprecatedTagName = tagValuePrefix + deprecatedTagValue + "=" + value;
+        String tagName = tagValuePrefix + newTagValue + "=" + value;
+        return "\n---------\nYou are using a deprecated tagValue (" + deprecatedTagName + "), replace it by\n" + tagName + "\n---------\n";
+
+    }
+
+    public String getDeprecatedModelTagValueMessage(ObjectModel model,
+                                                    String deprecatedTagValue,
+                                                    String newTagValue,
+                                                    String value) {
+        String tagValuePrefix = "model.tagValue.";
+
+        String deprecatedTagName = tagValuePrefix + deprecatedTagValue + "=" + value;
+        String tagName = tagValuePrefix + newTagValue + "=" + value;
+        return "\n---------\nYou are using a deprecated tagValue (" + deprecatedTagName + "), replace it by\n" + tagName + "\n---------\n";
+
+    }
+
 }

-- 
To stop receiving notification emails like this one, please contact
nuiton.org SCM administrator <admin+scm@nuiton.org>.

    

[Topia-commits] 01/01: Fixes #3928 Bad text in warning when using deprecated tag value

nuiton.org scm