branch develop updated (8802d4c -> 0f3fb0a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository eugene. See http://git.nuiton.org/eugene.git from 8802d4c Add all possible sub packages in object model (iwth nex packageParent link filled). Closes #3750 new 8cbe464 Scan also sub packages while searching for a tag value or a stereotype. new 3a74743 Usage of new exception when tag value of stereotype is not found. new 9b6d124 Change log level new 26333ae Fix generation name for AbstractDefaults + use fqn of names new 0f3fb0a Improve package tag value and stereotype detection. Closes #3749 Merge branch 'feature/3749' into develop The 5 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 0f3fb0ae4d6fb8253c76469cac613e4618f7bf37 Merge: 8802d4c 26333ae Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 15 15:21:01 2015 +0200 Improve package tag value and stereotype detection. Closes #3749 Merge branch 'feature/3749' into develop commit 26333ae71fb573cae47e205838bc58f8e32ac938 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 15 15:19:59 2015 +0200 Fix generation name for AbstractDefaults + use fqn of names commit 9b6d124671f80d06d1a24c34cf9ec8f0a15074fe Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 15 13:47:19 2015 +0200 Change log level commit 3a7474376133d66636d8d8683a18fb9ea57e570e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 15 13:41:14 2015 +0200 Usage of new exception when tag value of stereotype is not found. See #3749 commit 8cbe464641f651a46e93dea69e98d5ee9de1ab8f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 15 13:39:24 2015 +0200 Scan also sub packages while searching for a tag value or a stereotype. See #3749 Summary of changes: .../eugene/java/AbstractJavaBeanTransformer.java | 35 ++++++------- .../SimpleJavaBeanWithNoInterfaceTransformer.java | 58 ++++++++++++++------- .../object/reader/AbstractObjectModelReader.java | 7 +-- .../stereotype/MissingStereoTypeException.java | 43 ++++++++++++++++ .../eugene/models/stereotype/Stereotypes.java | 58 +++++++++++++++++++-- .../models/tagvalue/MissingTagValueException.java | 46 +++++++++++++++++ .../nuiton/eugene/models/tagvalue/TagValues.java | 59 +++++++++++++++++++++- 7 files changed, 260 insertions(+), 46 deletions(-) create mode 100644 eugene/src/main/java/org/nuiton/eugene/models/stereotype/MissingStereoTypeException.java create mode 100644 eugene/src/main/java/org/nuiton/eugene/models/tagvalue/MissingTagValueException.java -- 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 eugene. See http://git.nuiton.org/eugene.git commit 8cbe464641f651a46e93dea69e98d5ee9de1ab8f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 15 13:39:24 2015 +0200 Scan also sub packages while searching for a tag value or a stereotype. See #3749 --- .../stereotype/MissingStereoTypeException.java | 43 ++++++++++++++++ .../eugene/models/stereotype/Stereotypes.java | 58 +++++++++++++++++++-- .../models/tagvalue/MissingTagValueException.java | 46 +++++++++++++++++ .../nuiton/eugene/models/tagvalue/TagValues.java | 59 +++++++++++++++++++++- 4 files changed, 201 insertions(+), 5 deletions(-) diff --git a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MissingStereoTypeException.java b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MissingStereoTypeException.java new file mode 100644 index 0000000..346b32e --- /dev/null +++ b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MissingStereoTypeException.java @@ -0,0 +1,43 @@ +package org.nuiton.eugene.models.stereotype; + +import com.google.common.base.Joiner; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelPackage; + +import java.util.Set; + +/** + * When a missing tag value is detected. + * + * Created on 15/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.0 + */ +public class MissingStereoTypeException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + protected final String stereoTypeName; + + protected final String prefixMessage; + + protected final Set<String> stack; + + public MissingStereoTypeException(String stereoTypeName, String prefixMessage, ObjectModelPackage aPackage, ObjectModelClass aClass) { + this.stereoTypeName = stereoTypeName; + this.prefixMessage = prefixMessage; + this.stack = Stereotypes.getUsageStack(stereoTypeName, aPackage, aClass); + } + + @Override + public String toString() { + + return "\n\n" + prefixMessage + + "\n==========================================================================================" + + "\n" + Joiner.on("\n").join(stack) + + "\n=========================================================================================="; + + } + +} diff --git a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/Stereotypes.java b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/Stereotypes.java index 95281ef..1d1f2ba 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/Stereotypes.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/Stereotypes.java @@ -23,8 +23,11 @@ package org.nuiton.eugene.models.stereotype; */ import com.google.common.collect.ImmutableSet; +import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelElement; +import org.nuiton.eugene.models.object.ObjectModelPackage; +import java.util.LinkedHashSet; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -121,14 +124,61 @@ public class Stereotypes { * @since 2.12 */ public static boolean findDirectStereotype(String stereotypeName, StereotypeAble... elements) { - + boolean value = false; for (StereotypeAble element : elements) { - if (element != null && element.hasStereotype(stereotypeName)) { - return true; + if (element != null) { + if (element instanceof ObjectModelPackage) { + value = findDirectStereotype(stereotypeName, (ObjectModelPackage) element); + } else { + value = element.hasStereotype(stereotypeName); + } + if (value) { + break; + } } } - return false; + return value; + + } + + /** + * Build the stack of usage of the given stereoType. + * + * Order of usage is : model, packages (from root to final package), then class. + * + * @param stereoTypeName + * @param aPackage + * @param aClass + * @return the orderer set of stack usage. + */ + public static LinkedHashSet<String> getUsageStack(String stereoTypeName, ObjectModelPackage aPackage, ObjectModelClass aClass) { + String suffix = ".stereotype." + stereoTypeName ; + LinkedHashSet<String> stack = new LinkedHashSet<>(); + + stack.add("model" + suffix); + + addPackageStereoTypes(aPackage, suffix, stack); + stack.add(aClass.getQualifiedName() + ".class" + suffix); + + return stack; + } + + protected static void addPackageStereoTypes(ObjectModelPackage aPackage, String suffix, Set<String> stack) { + + if (aPackage.getParentPackage() != null) { + addPackageStereoTypes(aPackage.getParentPackage(), suffix, stack); + } + stack.add("package." + aPackage.getName() + suffix); + + } + + protected static boolean findDirectStereotype(String stereotypeName, ObjectModelPackage element) { + boolean withStereotype = element.hasStereotype(stereotypeName); + if (!withStereotype && element.getParentPackage() != null) { + withStereotype = findDirectStereotype(stereotypeName, element.getParentPackage()); + } + return withStereotype; } } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/MissingTagValueException.java b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/MissingTagValueException.java new file mode 100644 index 0000000..b08f3c3 --- /dev/null +++ b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/MissingTagValueException.java @@ -0,0 +1,46 @@ +package org.nuiton.eugene.models.tagvalue; + +import com.google.common.base.Joiner; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelPackage; + +import java.util.Set; + +/** + * When a missing tag value is detected. + * + * Created on 15/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.0 + */ +public class MissingTagValueException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + protected final String tagValueName; + + protected final String tagValueValue; + + protected final String prefixMessage; + + protected final Set<String> stack; + + public MissingTagValueException(String tagValueName, String tagValueValue, String prefixMessage, ObjectModelPackage aPackage, ObjectModelClass aClass) { + this.tagValueName = tagValueName; + this.tagValueValue = tagValueValue; + this.prefixMessage = prefixMessage; + this.stack = TagValues.getUsageStack(tagValueName, tagValueValue, aPackage, aClass); + } + + @Override + public String toString() { + + return "\n\n" + prefixMessage + + "\n==========================================================================================" + + "\n" + Joiner.on("\n").join(stack) + + "\n=========================================================================================="; + + } + +} diff --git a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValues.java b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValues.java index fb49d77..dde2457 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValues.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValues.java @@ -23,8 +23,12 @@ package org.nuiton.eugene.models.tagvalue; */ import org.apache.commons.lang3.StringUtils; +import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelElement; +import org.nuiton.eugene.models.object.ObjectModelPackage; +import java.util.LinkedHashSet; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -282,10 +286,63 @@ public class TagValues { } public static String findNotEmptyTagValue(String tagName, TagValueAble element) { - String value = element == null ? null : element.getTagValue(tagName); + + String value = null; + if (element != null) { + if (element instanceof ObjectModelPackage) { + value = findNotEmptyTagValue(tagName, (ObjectModelPackage) element); + } else { + value = element.getTagValue(tagName); + if (StringUtils.isEmpty(value)) { + value = null; + } + } + } + return value; + + } + + /** + * Build the stack of usage of the given tag value. + * + * Order of usage is : model, packages (from root to final package), then class. + * + * @param tagValueName + * @param tagValueValue + * @param aPackage + * @param aClass + * @return the orderer set of stack usage. + */ + public static LinkedHashSet<String> getUsageStack(String tagValueName, String tagValueValue, ObjectModelPackage aPackage, ObjectModelClass aClass) { + String suffix = ".tagvalue." + tagValueName + "=" + tagValueValue; + LinkedHashSet<String> stack = new LinkedHashSet<>(); + + stack.add("model" + suffix); + + addPackageTagValue(aPackage, suffix, stack); + stack.add(aClass.getQualifiedName() + ".class" + suffix); + + return stack; + } + + protected static void addPackageTagValue(ObjectModelPackage aPackage, String suffix, Set<String> stack) { + + if (aPackage.getParentPackage() != null) { + addPackageTagValue(aPackage.getParentPackage(), suffix, stack); + } + stack.add("package." + aPackage.getName() + suffix); + + } + + protected static String findNotEmptyTagValue(String tagName, ObjectModelPackage element) { + + String value = element.getTagValue(tagName); if (StringUtils.isEmpty(value)) { value = null; } + if (value == null && element.getParentPackage() != null) { + value = findNotEmptyTagValue(tagName, element.getParentPackage()); + } 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 eugene. See http://git.nuiton.org/eugene.git commit 3a7474376133d66636d8d8683a18fb9ea57e570e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 15 13:41:14 2015 +0200 Usage of new exception when tag value of stereotype is not found. See #3749 --- .../eugene/java/AbstractJavaBeanTransformer.java | 35 ++++++++++------------ 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java index c5ffe48..bf282fc 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java @@ -38,6 +38,7 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; 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.tagvalue.MissingTagValueException; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -843,18 +844,15 @@ public abstract class AbstractJavaBeanTransformer extends ObjectModelTransformer if (!notInClassPath) { boolean canOverride = getJavaTemplatesTagValues().isOverrideAbstractClasses(aclass, aPackage, model); - String packageName = aclass.getPackageName(); - String fqn = packageName + "." + abstractClassName; + String fqn = aclass.getPackageName() + "." + abstractClassName; if (!canOverride) { - String message = "\n=========================================================================================="; - message += "\nCan not override abstract class " + fqn + ", already found in classpath"; + String message = "Can not override abstract class " + fqn + ", already found in classpath"; message += "\n\nTo remove this check, add a tag value *overrideAbstractClasses* on model, package or class."; - message += "\n\nmodel.tagvalue.overrideAbstractClasses=true"; - message += "\npackage." + packageName + ".tagvalue.overrideAbstractClasses=true"; - message += "\n" + packageName + "." + aclass.getName() + ".class.tagvalue.overrideAbstractClasses=true"; - message += "\n=========================================================================================="; - - throw new IllegalStateException(message); + MissingTagValueException exception = new MissingTagValueException("overrideAbstractClasses", "true", message, aPackage, aclass); + if (log.isErrorEnabled()) { + log.error(exception.toString()); + } + throw exception; } if (log.isWarnEnabled()) { log.warn("Will not generate abstract class: " + fqn); @@ -872,18 +870,17 @@ public abstract class AbstractJavaBeanTransformer extends ObjectModelTransformer if (!noMethods) { boolean canOverride = getJavaTemplatesTagValues().isAcceptBeanWithMethods(aclass, aPackage, model); - String packageName = aclass.getPackageName(); - String fqn = packageName + "." + className; + String fqn = aclass.getPackageName() + "." + className; if (!canOverride) { - String message = "\n=========================================================================================="; - message += "\nConcrete class " + fqn + " contains some methods, the current generator does not accept it."; + String message = "Concrete class " + fqn + " contains some methods, the current generator does not accept it."; message += "\n\nSuch methods are not made to be designed, you should directly write them in the concrete class."; message += "\n\nTo remove this check, add a tag value *acceptBeanWithMethods* on model, package or class:"; - message += "\n\nmodel.tagvalue.acceptBeanWithMethods=true"; - message += "\npackage." + packageName + ".tagvalue.acceptBeanWithMethods=true"; - message += "\n" + packageName + "." + aclass.getName() + ".class.tagvalue.acceptBeanWithMethods=true"; - message += "\n=========================================================================================="; - throw new IllegalStateException(message); + MissingTagValueException exception = new MissingTagValueException("acceptBeanWithMethods", "true", message, aPackage, aclass); + if (log.isErrorEnabled()) { + log.error(exception.toString()); + } + throw exception; + } if (log.isWarnEnabled()) { log.warn("Will generate class (but designed methods won't be generated): " + fqn); -- 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 eugene. See http://git.nuiton.org/eugene.git commit 9b6d124671f80d06d1a24c34cf9ec8f0a15074fe Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 15 13:47:19 2015 +0200 Change log level --- .../eugene/models/object/reader/AbstractObjectModelReader.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java index 83860f2..b3bee55 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java @@ -368,7 +368,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> for (ObjectModelPackage aPackage : Sets.newHashSet(model.getPackages())) { String aPackageName = aPackage.getName(); - if (log.isInfoEnabled()) { + if (verbose) { log.info("Treate package: " + aPackageName); } @@ -402,7 +402,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> subPackage = new ObjectModelPackageImpl(); subPackage.setName(subPackageName); model.addPackage(subPackage); - if (log.isInfoEnabled()) { + if (verbose) { log.info("Add sub package: " + subPackageName); } @@ -410,7 +410,8 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> if (subPackage.getParentPackage() == null &&parentPackage != null) { - if (log.isInfoEnabled()) { + + if (verbose) { log.info("Set parent package " + parentPackage.getName() + " to " + part); } subPackage.setParentPackage(parentPackage); -- 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 eugene. See http://git.nuiton.org/eugene.git commit 26333ae71fb573cae47e205838bc58f8e32ac938 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 15 15:19:59 2015 +0200 Fix generation name for AbstractDefaults + use fqn of names --- .../SimpleJavaBeanWithNoInterfaceTransformer.java | 58 +++++++++++++++------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java index cf83f8d..c0af983 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java @@ -160,7 +160,7 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr generateBeanDefaults(input, abstractDefaultClassName, defaultClassName); } - if (notFoundInClassPath(input, defaultClassName)) { + if (canGenerateAbstractClass(aPackage, input, abstractDefaultClassName)) { generateAbstractBeanDefaults(aPackage, input, className, abstractDefaultClassName); } @@ -207,7 +207,7 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr for (ObjectModelClass superclass : superclasses) { superClassIsBean = beanClasses.contains(superclass); if (superClassIsBean) { - superClass = beanNameTranslation.get(superclass); + superClass = superclass.getPackageName() + "." + beanNameTranslation.get(superclass); break; } superClass = superclass.getQualifiedName(); @@ -507,13 +507,44 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr String simpleType = JavaGeneratorUtil.getSimpleName(attrType); simpleType = wrapPrimitiveType(simpleType); String capitalizeAttrName = JavaGeneratorUtil.capitalizeJavaBeanPropertyName(attrName); + String newFunctionMethodName = "new" + capitalizeAttrName + "Function"; - String newFunctionTypeName = "Function<BeanType, " + simpleType + ">"; + String getFunctionMethodName = "get" + capitalizeAttrName + "Function"; + String functionTypeName = "Function<BeanType, " + simpleType + ">"; + + String functionFieldName = JavaGeneratorUtil.convertVariableNameToConstantName(capitalizeAttrName + "Function"); + addAttribute( + output, + functionFieldName, + "Function<" + typeName + ", " + simpleType + ">", + newFunctionMethodName + "()", + ObjectModelJavaModifier.FINAL, + ObjectModelJavaModifier.STATIC, + ObjectModelJavaModifier.PROTECTED + ); + + ObjectModelOperation operation = addOperation( output, + getFunctionMethodName, + "<BeanType extends " + typeName + "> " + functionTypeName, + ObjectModelJavaModifier.STATIC, + ObjectModelJavaModifier.PUBLIC + ); + + + setOperationBody(operation, "" + /*{ + return (<%=functionTypeName%>) <%=functionFieldName%>; + + }*/ + ); + + operation = addOperation( + output, newFunctionMethodName, - "<BeanType extends " + typeName + "> " + newFunctionTypeName, + "<BeanType extends " + typeName + "> " + functionTypeName, ObjectModelJavaModifier.STATIC, ObjectModelJavaModifier.PUBLIC ); @@ -521,7 +552,7 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr String getterName = getGetterName(attribute, attrName); setOperationBody(operation, "" /*{ - return new <%=newFunctionTypeName%>() { + return new <%=functionTypeName%>() { @Override public <%=simpleType%> apply(BeanType input) { @@ -532,17 +563,6 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr }*/ ); - String getFunctionFieldName = JavaGeneratorUtil.convertVariableNameToConstantName("get" + capitalizeAttrName); - addAttribute( - output, - getFunctionFieldName, - "Function<" + typeName + ", " + simpleType + ">", - newFunctionMethodName + "()", - ObjectModelJavaModifier.FINAL, - ObjectModelJavaModifier.STATIC, - ObjectModelJavaModifier.PROTECTED - ); - operation = addOperation( output, "uniqueIndexBy" + capitalizeAttrName, @@ -553,7 +573,7 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr addParameter(operation, "Iterable<BeanType>", "source"); setOperationBody(operation, "" /*{ - return Maps.uniqueIndex(source, <%=getFunctionFieldName%>); + return Maps.uniqueIndex(source, <%=functionFieldName%>); }*/ ); } @@ -578,7 +598,7 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr for (ObjectModelClass superclass : superclasses) { superClassIsBean = beanDefaultClasses.contains(superclass); if (superClassIsBean) { - superClassName = beanDefaultsNameTranslation.get(superclass); + superClassName = superclass.getPackageName() + "." + beanDefaultsNameTranslation.get(superclass); break; } superClassName = superclass.getQualifiedName(); @@ -603,7 +623,7 @@ public class SimpleJavaBeanWithNoInterfaceTransformer extends AbstractJavaBeanTr ObjectModelClass attributeClass = model.getClass(attrType); String attributeType = beanNameTranslation.get(attributeClass); if (attributeType != null) { - attrType = attributeType; + attrType = attributeClass.getPackageName() + "." + attributeType; } } } -- 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 eugene. See http://git.nuiton.org/eugene.git commit 0f3fb0ae4d6fb8253c76469cac613e4618f7bf37 Merge: 8802d4c 26333ae Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 15 15:21:01 2015 +0200 Improve package tag value and stereotype detection. Closes #3749 Merge branch 'feature/3749' into develop .../eugene/java/AbstractJavaBeanTransformer.java | 35 ++++++------- .../SimpleJavaBeanWithNoInterfaceTransformer.java | 58 ++++++++++++++------- .../object/reader/AbstractObjectModelReader.java | 7 +-- .../stereotype/MissingStereoTypeException.java | 43 ++++++++++++++++ .../eugene/models/stereotype/Stereotypes.java | 58 +++++++++++++++++++-- .../models/tagvalue/MissingTagValueException.java | 46 +++++++++++++++++ .../nuiton/eugene/models/tagvalue/TagValues.java | 59 +++++++++++++++++++++- 7 files changed, 260 insertions(+), 46 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm