This is an automated email from the git hooks/post-receive script. New commit to branch feature/3705 in repository eugene. See http://git.nuiton.org/eugene.git commit 8148c8701225f7b59c05c8aff4f1dbf5dde78700 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue May 26 09:45:13 2015 +0200 - use some Jdk7 API - make javadoc 8 works (remove also obsolete javadoc annotation (version, ...) - reformat code --- .../eugene/java/JavaInterfaceTransformer.java | 4 +- .../nuiton/eugene/java/JavaTemplatesTagValues.java | 84 +++++++------- .../eugene/java/SimpleJavaBeanTransformer.java | 5 +- .../eugene/test/generator/BeanTransformer.java | 5 +- .../org/nuiton/eugene/test/generator/Megatron.java | 3 +- .../nuiton/eugene/test/generator/TestBuilder.java | 2 +- .../nuiton/eugene/test/generator/TestReader.java | 2 +- .../eugene/test/generator/TestBuilderTest.java | 2 +- .../nuiton/eugene/plugin/AbstractEugeneReport.java | 8 +- .../nuiton/eugene/plugin/AvailableDataMojo.java | 13 +-- .../org/nuiton/eugene/plugin/GenerateMojo.java | 38 +++--- .../nuiton/eugene/plugin/StereotypesReport.java | 6 +- .../org/nuiton/eugene/plugin/TagValuesReport.java | 6 +- .../eugene/plugin/writer/XmiChainedFileWriter.java | 5 +- .../plugin/writer/ZargoChainedFileWriter.java | 6 +- .../plantuml/PlantumlTemplatesGenerator.java | 27 +++-- .../eugene/yaml/PureYamlTemplatesGenerator.java | 2 +- .../yaml/UserFriendlyTemplatesGenerator.java | 2 +- .../java/org/nuiton/eugene/AbstractGenerator.java | 12 +- .../org/nuiton/eugene/AbstractMetaTransformer.java | 34 +++--- .../java/org/nuiton/eugene/EugeneStereoTypes.java | 15 +-- .../java/org/nuiton/eugene/EugeneTagValues.java | 29 +++-- .../java/org/nuiton/eugene/GeneratorException.java | 8 +- .../main/java/org/nuiton/eugene/GeneratorUtil.java | 36 +++--- .../main/java/org/nuiton/eugene/ModelHelper.java | 8 +- .../main/java/org/nuiton/eugene/ModelReader.java | 7 +- .../main/java/org/nuiton/eugene/MonitorWriter.java | 14 +-- .../java/org/nuiton/eugene/PackageValidator.java | 23 ++-- .../src/main/java/org/nuiton/eugene/Template.java | 11 +- .../org/nuiton/eugene/TemplateConfiguration.java | 6 +- .../main/java/org/nuiton/eugene/Transformer.java | 22 ++-- .../java/org/nuiton/eugene/java/JavaBuilder.java | 29 +++-- .../java/org/nuiton/eugene/java/JavaGenerator.java | 91 ++++++++------- .../org/nuiton/eugene/java/JavaGeneratorUtil.java | 16 +-- .../eugene/java/ObjectModelTransformerToJava.java | 31 +++-- .../eugene/java/extension/AnnotationsManager.java | 7 +- .../extension/AnnotationsManagerExtension.java | 7 +- .../nuiton/eugene/java/extension/CodesManager.java | 2 +- .../java/extension/CodesManagerExtension.java | 6 +- .../eugene/java/extension/ConstantsManager.java | 13 ++- .../eugene/java/extension/ImportsManager.java | 11 +- .../java/extension/ImportsManagerExtension.java | 13 +-- .../java/extension/ObjectModelAnnotation.java | 2 +- .../nuiton/eugene/java/extension/package-info.java | 1 + .../java/org/nuiton/eugene/java/package-info.java | 6 +- .../main/java/org/nuiton/eugene/models/Model.java | 15 +-- .../nuiton/eugene/models/object/ObjectModel.java | 102 ++++++++-------- .../models/object/ObjectModelAssociationClass.java | 28 ++--- .../eugene/models/object/ObjectModelAttribute.java | 65 ++++++----- .../eugene/models/object/ObjectModelBuilder.java | 11 +- .../eugene/models/object/ObjectModelClass.java | 20 ++-- .../models/object/ObjectModelClassifier.java | 128 ++++++++++----------- .../models/object/ObjectModelDependency.java | 13 +-- .../eugene/models/object/ObjectModelElement.java | 9 +- .../models/object/ObjectModelEnumeration.java | 4 +- .../eugene/models/object/ObjectModelGenerator.java | 20 ++-- .../eugene/models/object/ObjectModelInterface.java | 19 ++- .../eugene/models/object/ObjectModelModifier.java | 57 ++++++--- .../eugene/models/object/ObjectModelOperation.java | 57 +++++---- .../eugene/models/object/ObjectModelPackage.java | 3 +- .../eugene/models/object/ObjectModelParameter.java | 9 +- .../models/object/ObjectModelTransformer.java | 13 +-- .../eugene/models/object/ObjectModelType.java | 5 +- .../models/object/ObjectModelUMLModifier.java | 5 +- .../models/object/SerialVersionUIDBuilder.java | 6 +- .../object/reader/AbstractObjectModelReader.java | 9 +- .../reader/InvalidModelPropertiesException.java | 1 + .../object/reader/YamlObjectModelReader.java | 1 + .../models/object/reader/yaml/DefaultValues.java | 5 +- .../eugene/models/object/reader/yaml/KeyWords.java | 53 +++++++++ .../models/object/reader/yaml/LoadObjectModel.java | 18 ++- .../models/object/reader/yaml/LoadYamlFile.java | 1 + .../object/reader/yaml/ParserUserFriendly.java | 35 +++--- .../models/object/reader/yaml/YamlObject.java | 15 +-- .../eugene/models/object/reader/yaml/YamlUtil.java | 13 ++- .../object/validator/AttributeNamesValidator.java | 16 +-- .../object/validator/ClassNamesValidator.java | 16 +-- .../object/validator/NameBasedValidator.java | 18 ++- .../object/validator/ObjectModelValidator.java | 5 +- .../object/xml/DigesterObjectModelRuleSet.java | 47 +++----- .../models/object/xml/ExternalCacheExtension.java | 12 +- .../ObjectModeImplAssociationClassParticipant.java | 13 +-- .../xml/ObjectModelAssociationClassImpl.java | 37 +++--- .../object/xml/ObjectModelAttributeImpl.java | 58 +++++----- .../models/object/xml/ObjectModelClassImpl.java | 56 +++++---- .../object/xml/ObjectModelClassifierImpl.java | 57 +++++---- .../object/xml/ObjectModelDependencyImpl.java | 9 +- .../models/object/xml/ObjectModelElementImpl.java | 16 +-- .../object/xml/ObjectModelEnumerationImpl.java | 13 +-- .../eugene/models/object/xml/ObjectModelImpl.java | 127 ++++++++++---------- .../models/object/xml/ObjectModelImplRef.java | 17 +-- .../object/xml/ObjectModelImplSuperClassRef.java | 13 +-- .../models/object/xml/ObjectModelImplTagValue.java | 6 +- .../object/xml/ObjectModelInterfaceImpl.java | 12 +- .../object/xml/ObjectModelOperationImpl.java | 34 +++--- .../models/object/xml/ObjectModelPackageImpl.java | 6 +- .../object/xml/ObjectModelParameterImpl.java | 23 ++-- .../org/nuiton/eugene/models/state/StateModel.java | 10 +- .../models/state/StateModelComplexState.java | 22 ++-- .../eugene/models/state/StateModelGenerator.java | 40 +++---- .../eugene/models/state/StateModelReader.java | 35 ++---- .../eugene/models/state/StateModelSimpleState.java | 9 +- .../eugene/models/state/StateModelState.java | 13 +-- .../eugene/models/state/StateModelStateChart.java | 8 +- .../eugene/models/state/StateModelTransition.java | 9 +- .../state/xml/DigesterStateModelRuleSet.java | 30 +++-- .../state/xml/StateModelComplexeStateImpl.java | 11 +- .../eugene/models/state/xml/StateModelImpl.java | 30 +++-- .../state/xml/StateModelSimpleStateImpl.java | 5 +- .../models/state/xml/StateModelStateChartImpl.java | 7 +- .../models/state/xml/StateModelStateImpl.java | 19 +-- .../models/state/xml/StateModelTransitionImpl.java | 14 +-- .../InvalidStereotypeSyntaxException.java | 1 + .../MismatchStereotypeTargetException.java | 1 + .../stereotype/MyStereotypeDefinitionProvider.java | 2 +- .../models/stereotype/StereotypeDefinition.java | 7 +- .../stereotype/StereotypeDefinitionProvider.java | 9 +- .../stereotype/StereotypeNotFoundException.java | 1 + .../eugene/models/stereotype/Stereotypes.java | 2 - .../tagvalue/InvalidTagValueSyntaxException.java | 1 + .../tagvalue/MismatchTagValueTargetException.java | 1 + .../eugene/models/tagvalue/TagValueAble.java | 2 +- .../eugene/models/tagvalue/TagValueDefinition.java | 6 +- .../tagvalue/TagValueDefinitionProvider.java | 10 +- .../models/tagvalue/TagValueNotFoundException.java | 1 + .../nuiton/eugene/models/tagvalue/TagValues.java | 31 +++-- .../matcher/TagValueDefinitionMatcher.java | 2 +- .../eugene/writer/AbstractChainedFileWriter.java | 6 +- .../nuiton/eugene/writer/ChainedFileWriter.java | 40 +++---- .../writer/ChainedFileWriterConfiguration.java | 6 +- .../eugene/writer/ChainedFileWriterData.java | 2 +- .../eugene/writer/ChainedFileWriterEntry.java | 5 +- .../writer/ChainedFileWriterToMemoryModel.java | 9 +- .../nuiton/eugene/writer/ChainedWriterEngine.java | 22 ++-- .../eugene/writer/DefaultChainedWriterEngine.java | 19 ++- .../eugene/writer/FileGrabberFromClassPath.java | 9 +- .../eugene/writer/FileGrabberFromDirectory.java | 6 +- .../org/nuiton/eugene/writer/WriterReport.java | 10 +- .../org/nuiton/eugene/EugeneStereotypesTest.java | 4 +- .../org/nuiton/eugene/EugeneTagValuesTest.java | 6 +- .../java/org/nuiton/eugene/GeneratorUtilTest.java | 4 +- .../org/nuiton/eugene/java/JavaBuilderTest.java | 32 +++--- .../nuiton/eugene/java/JavaGeneratorUtilTest.java | 9 +- .../extension/ImportsManagerExtensionTest.java | 5 +- .../eugene/models/object/ModelMergeTest.java | 3 +- .../models/object/ObjectModelGeneratorTest.java | 4 - .../models/object/XMI12ToObjectModelTest.java | 19 +-- .../models/object/XMI21ToObjectModelTest.java | 15 +-- .../object/xml/ExternalCacheExtensionTest.java | 4 +- .../models/object/xml/ObjectModelBuilderTest.java | 24 ++-- .../models/object/xml/ObjectModelImplTest.java | 4 +- .../eugene/models/state/StateModelDTDTest.java | 10 +- .../nuiton/eugene/models/state/StateModelTest.java | 4 - 153 files changed, 1249 insertions(+), 1402 deletions(-) diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java index 3d852cd..d2dc31e 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java @@ -36,10 +36,10 @@ import java.util.Set; /** * JavaInterfaceTransformer generates simple interfaces for Java language. - * <p/> + * * Created: 7 nov. 2009 * - * @author fdesbois <fdesbois@codelutin.com> + * @author Florian Desbois - desbois@codelutin.com * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.JavaInterfaceTransformer" * @since 2.0.2 */ diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java index 37a638e..ab8f679 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java @@ -40,7 +40,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Tag value to generate property change support on generated beans. - * <p/> + * * You can globaly use it on the complete model, on packages, or to a specific classifier. * * @see #isGeneratePropertyChangeSupport(ObjectModelClassifier, ObjectModelPackage, ObjectModel) @@ -54,7 +54,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Tag value to generate lazy instanciation of any collection to avoid NPEs. - * <p/> + * * You can globaly use it on the complete model or a package, or to a specific classifier. * * @see #isGenerateNotEmptyCollections(ObjectModelClassifier, ObjectModelPackage, ObjectModel) @@ -68,14 +68,14 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Tag value to use a super class for generated bean. - * <p/> + * * If the bean needs Property change support (says you use the {@link #TAG_GENERATE_PROPERTY_CHANGE_SUPPORT}), * then your class must provide everything for it. - * <p/> + * * More over, if you use some collections in your bean you must also define * two method named {@code getChild(Collection list, int index)} and * {@code getChild(List list, int index)} - * <p/> + * * See new code to know minimum stuff to add in your class for this purpose. * <pre> * public abstract class AbstractBean implements Serializable { @@ -108,16 +108,16 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { * firePropertyChange(propertyName, null, newValue); * } * - * protected <T> T getChild(Collection<T> list, int index) { + * protected <T> T getChild(Collection<T> list, int index) { * return CollectionUtil.getOrNull(list, index); * } * - * protected <T> T getChild(List<T> list, int index) { + * protected <T> T getChild(List<T> list, int index) { * return CollectionUtil.getOrNull(list, index); * } * } * </pre> - * <p/> + * * You can globaly use it on the complete model or to a specific classifier. * * @see #getBeanSuperClassTagValue(ObjectModelClassifier, ObjectModelPackage, ObjectModel) @@ -132,14 +132,14 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Tag value to use a super class for generated bean. - * <p/> + * * If the bean needs Property change support (says you use the tag-value {@link #TAG_GENERATE_PROPERTY_CHANGE_SUPPORT}, * then your class must provide evrything for it. - * <p/> + * * More over, if you use some collections in your bean you must also define * two method named {@code getChild(Collection list, int index)} and * {@code getChild(List list, int index)} - * <p/> + * * See new code to know minimum stuff to add in your class for this purpose. * <pre> * public abstract class AbstractBean implements Serializable { @@ -172,16 +172,16 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { * firePropertyChange(propertyName, null, newValue); * } * - * protected <T> T getChild(Collection<T> list, int index) { + * protected <T> T getChild(Collection<T> list, int index) { * return CollectionUtil.getOrNull(list, index); * } * - * protected <T> T getChild(List<T> list, int index) { + * protected <T> T getChild(List<T> list, int index) { * return CollectionUtil.getOrNull(list, index); * } * } * </pre> - * <p/> + * * You can globaly use it on the complete model or to a specific classifier. * * @see #getSimpleBeanSuperClassTagValue(ObjectModelClassifier, ObjectModelPackage, ObjectModel) @@ -196,7 +196,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * To add a prefix on the name of each generated bean class. - * <p/> + * * You can globaly use it on the complete model or to a specific classifier. * * @see #getSimpleBeanClassNamePrefixTagValue(ObjectModelClassifier, ObjectModelPackage, ObjectModel) @@ -211,7 +211,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * To add a prefix on the name of each generated bean class. - * <p/> + * * You can globaly use it on the complete model or to a specific classifier. * * @see #getSimpleBeanClassNameSuffixTagValue(ObjectModelClassifier, ObjectModelPackage, ObjectModel) @@ -227,7 +227,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * To generate an interface of each simple bean. - * <p/> + * * You can globaly use it on the complete model or to a specific classifier. * * @see #isSimpleBeanGenerateInterface(ObjectModelClassifier, ObjectModelPackage, ObjectModel) @@ -243,7 +243,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Tag value to use a super interface for generated interfaces on simple bean. - * <p/> + * * You can globaly use it on the complete model or to a specific classifier. * * @see #getSimpleBeanInterfaceSuperClassTagValue(ObjectModelClassifier, ObjectModelPackage, ObjectModel) @@ -258,7 +258,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * To add a prefix on the name of each generated interface of a simple bean. - * <p/> + * * You can globaly use it on the complete model or to a specific classifier. * * @see #getSimpleBeanInterfaceNamePrefixTagValue(ObjectModelClassifier, ObjectModelPackage, ObjectModel) @@ -273,7 +273,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * To add a prefix on the name of each generated interface of a simple bean. - * <p/> + * * You can globaly use it on the complete model or to a specific classifier. * * @see #getSimpleBeanInterfaceNameSuffixTagValue(ObjectModelClassifier, ObjectModelPackage, ObjectModel) @@ -288,7 +288,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * To generate a factory of generated simple beans. - * <p/> + * * You must use it on the complete model. * * @see #isSimpleBeanGenerateFactory(ObjectModel) @@ -302,7 +302,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * To generate a factory of generated simple beans. - * <p/> + * * You must use it on the complete model. * * @see #isSimpleBeanGenerateDefaults(ObjectModelClassifier, ObjectModelPackage, ObjectModel) @@ -318,7 +318,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Tag value to use a super super-class for generated defaults class of a * simple bean. - * <p/> + * * You can globaly use it on the complete model or to a specific classifier. * * @see #getSimpleBeanDefaultsSuperClassTagValue(ObjectModelClassifier, ObjectModelPackage, ObjectModel) @@ -333,7 +333,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * To add a prefix on the name of each generated bean class. - * <p/> + * * You can globaly use it on the complete model or to a specific classifier. * * @see #getSimpleBeanDefaultsClassNamePrefixTagValue(ObjectModelClassifier, ObjectModelPackage, ObjectModel) @@ -348,7 +348,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * To add a suffix on the name of each generated bean class. - * <p/> + * * You can globaly use it on the complete model or to a specific classifier. * * @see #getSimpleBeanDefaultsClassNameSuffixTagValue(ObjectModelClassifier, ObjectModelPackage, ObjectModel) @@ -363,9 +363,9 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_GENERATE_PROPERTY_CHANGE_SUPPORT} tag value on the given model, package or classifier. - * <p/> + * * It will first look on the model, then and package and then in the given classifier. - * <p/> + * * If no value found, then will use the default value of the tag value. * * @param classifier classifier to seek @@ -382,9 +382,9 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_GENERATE_NOT_EMPTY_COLLECTIONS} tag value on the given model, package or classifier. - * <p/> + * * It will first look on the model, then and package and then in the given classifier. - * <p/> + * * If no value found, then will use the default value of the tag value. * * @param classifier classifier to seek @@ -401,7 +401,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_BEAN_SUPER_CLASS} tag value on the given model or classifier. - * <p/> + * * It will first look on the model, and then in the given classifier. * * @param classifier classifier to seek @@ -417,7 +417,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_SIMPLE_BEAN_SUPER_CLASS} tag value on the given model or classifier. - * <p/> + * * It will first look on the model, and then in the given classifier. * * @param classifier classifier to seek @@ -433,7 +433,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_SIMPLE_BEAN_GENERATE_INTERFACE} tag value on the given model or classifier. - * <p/> + * * It will first look on the model, and then in the given classifier. * * @param classifier classifier to seek @@ -462,7 +462,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_SIMPLE_BEAN_INTERFACE_SUPER_CLASS} tag value on the given model or classifier. - * <p/> + * * It will first look on the model, and then in the given classifier. * * @param classifier classifier to seek @@ -478,7 +478,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_SIMPLE_BEAN_CLASS_NAME_PREFIX} tag value on the given model or classifier. - * <p/> + * * It will first look on the model, and then in the given classifier. * * @param classifier classifier to seek @@ -494,7 +494,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_SIMPLE_BEAN_CLASS_NAME_SUFFIX} tag value on the given model or classifier. - * <p/> + * * It will first look on the model, and then in the given classifier. * * @param classifier classifier to seek @@ -510,7 +510,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_SIMPLE_BEAN_INTERFACE_NAME_PREFIX} tag value on the given model or classifier. - * <p/> + * * It will first look on the model, and then in the given classifier. * * @param classifier classifier to seek @@ -526,7 +526,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_SIMPLE_BEAN_INTERFACE_NAME_SUFFIX} tag value on the given model or classifier. - * <p/> + * * It will first look on the model, and then in the given classifier. * * @param classifier classifier to seek @@ -542,7 +542,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_SIMPLE_BEAN_GENERATE_DEFAULTS} tag value on the given model or classifier. - * <p/> + * * It will first look on the model, and then in the given classifier. * * @param classifier classifier to seek @@ -558,7 +558,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_SIMPLE_BEAN_DEFAULTS_SUPER_CLASS} tag value on the given model or classifier. - * <p/> + * * It will first look on the model, and then in the given classifier. * * @param classifier classifier to seek @@ -574,7 +574,7 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_SIMPLE_BEAN_DEFAULTS_CLASS_NAME_PREFIX} tag value on the given model or classifier. - * <p/> + * * It will first look on the model, and then in the given classifier. * * @param classifier classifier to seek @@ -590,9 +590,9 @@ public class JavaTemplatesTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_SIMPLE_BEAN_DEFAULTS_CLASS_NAME_SUFFIX} tag value on the given model or classifier. - * <p/> + * * It will first look on the model, and then in the given classifier. - * <p/> + * * <strong>If not filled, then use default {@code s} value.</strong> * * @param classifier classifier to seek diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java index c5f13a2..bca0931 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java @@ -29,7 +29,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.GeneratorException; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; @@ -48,7 +47,7 @@ import java.util.List; /** * SimpleJavaBeanTransformer generates simple bean with pcs support * (and nothing else) according to the JavaBeans 1.1 norm with no Impl generation mecanism. - * <p/> + * * So if there is so operation described on model, you should use the * {@link JavaBeanTransformer} instead. * @@ -430,7 +429,7 @@ public class SimpleJavaBeanTransformer extends AbstractJavaBeanTransformer { boolean usePCS = getJavaTemplatesTagValues().isGeneratePropertyChangeSupport(input, aPackage, model); boolean generateBooleanGetMethods = getEugeneTagValues().isGenerateBooleanGetMethods(input, aPackage, model); - boolean generateNotEmptyCollections = getJavaTemplatesTagValues().isGenerateNotEmptyCollections(input, aPackage, model) ; + boolean generateNotEmptyCollections = getJavaTemplatesTagValues().isGenerateNotEmptyCollections(input, aPackage, model); // Add properties field + javabean methods for (ObjectModelAttribute attr : properties) { diff --git a/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java b/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java index cd410dd..1397e91 100644 --- a/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java +++ b/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java @@ -54,11 +54,10 @@ import java.util.Iterator; /*{generator option: writeString = +}*/ /** * BeanTransformer - * <p/> + * * Created: 28 oct. 2009 * - * @author fdesbois - * @version $Id$ + * @author Florian Desbois - desbois@codelutin.com * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.BeanTransformer" */ public class BeanTransformer extends ObjectModelTransformerToJava { diff --git a/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java b/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java index d6bf524..6d3908c 100644 --- a/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java +++ b/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java @@ -31,8 +31,7 @@ import org.nuiton.eugene.models.object.ObjectModelClass; * * Created: 12 nov. 2009 * - * @author fdesbois - * @version $Id$ + * @author Florian Desbois - desbois@codelutin.com * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.Megatron" */ public class Megatron extends ObjectModelTransformerToJava { diff --git a/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java b/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java index cbe068a..078d857 100644 --- a/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java +++ b/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java @@ -54,7 +54,7 @@ import org.nuiton.eugene.models.object.ObjectModelOperation; * * Created: 25 oct. 2009 * - * @author fdesbois + * @author Florian Desbois - desbois@codelutin.com * @version $Revision$ * * Mise a jour: $Date$ diff --git a/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java b/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java index 6f2ff4c..9644b32 100644 --- a/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java +++ b/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java @@ -51,7 +51,7 @@ import org.nuiton.eugene.models.object.ObjectModel; * * Created: 27 oct. 2009 * - * @author fdesbois + * @author Florian Desbois - desbois@codelutin.com * @version $Revision$ * * Mise a jour: $Date$ diff --git a/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java b/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java index 9872585..ce3c1d7 100644 --- a/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java +++ b/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java @@ -56,7 +56,7 @@ import org.nuiton.eugene.models.object.ObjectModelOperation; /** * - * @author fdesbois + * @author Florian Desbois - desbois@codelutin.com */ public class TestBuilderTest { diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AbstractEugeneReport.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AbstractEugeneReport.java index 96658c3..870233b 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AbstractEugeneReport.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AbstractEugeneReport.java @@ -48,8 +48,8 @@ public abstract class AbstractEugeneReport<D> extends AbstractMavenReport { * directory configured in the Maven Site Plugin is used instead. */ @Parameter(property = "config.outputDirectory", - defaultValue = "${project.reporting.outputDirectory}", - required = true) + defaultValue = "${project.reporting.outputDirectory}", + required = true) protected File outputDirectory; /** @@ -58,8 +58,8 @@ public abstract class AbstractEugeneReport<D> extends AbstractMavenReport { * encoding configured in the Maven Site Plugin is used instead. */ @Parameter(property = "config.outputEncoding", - defaultValue = "${project.reporting.outputEncoding}", - required = true) + defaultValue = "${project.reporting.outputEncoding}", + required = true) protected String outputEncoding; /** diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java index 1677ff1..8157f4c 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java @@ -50,24 +50,23 @@ import java.util.Set; /** * Obtain the list of some known data informations. - * <p/> + * * Use the {@code dataTypes} property to specify a specific data type to use * (otherwise will display all known data types). - * <p/> * * @author Tony Chemit - chemit@codelutin.com * @since 2.0.0 */ @Mojo(name = "available-data", - requiresProject = true, - requiresDirectInvocation = true, - requiresDependencyResolution = ResolutionScope.TEST) + requiresProject = true, + requiresDirectInvocation = true, + requiresDependencyResolution = ResolutionScope.TEST) public class AvailableDataMojo extends AbstractMojo { /** * Data type to display (let empty to see all datas). * Can specify more than one separated by comma. - * <p/> + * * Available types are : * <pre> * modeltype, @@ -77,7 +76,7 @@ public class AvailableDataMojo extends AbstractMojo { * stereotype, * tagvalue * </pre> - * <p/> + * * <b>Note:</b> Let empty to display all data types. * * @since 2.0.0 diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java index 4ede1e0..3e0e6d2 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java @@ -75,38 +75,37 @@ import java.util.Set; /** * Eugene generator plugin (a.k.a generate mojo) - * <p/> + * * Fill inputs and mojo will chained needed writer. - * <p/> * * @author Tony Chemit - chemit@codelutin.com * @since 2.5 */ @Mojo(name = "generate", - requiresProject = true, - requiresDirectInvocation = false, - requiresDependencyResolution = ResolutionScope.COMPILE) + requiresProject = true, + requiresDirectInvocation = false, + requiresDependencyResolution = ResolutionScope.COMPILE) public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterConfiguration, PluginWithEncoding { /** * Inputs files to used to generate the required model files. - * </p> + * * An include has the following pattern : * <pre> * writer: * </pre> * when you want to use a specific writer with his default io values. - * <p/> + * * Can also write : * <pre> * [writer:]directory:includes * </pre> * where {@code includes} is the pattern to find files from the directory * given and must be terminated by the extension of files. - * <p/> + * * Specifying the {@code writer} can be usefull when you want to use a * writer for an unknown extension by any writer. - * <p/> + * * Example : * <pre> * <inputs> @@ -115,7 +114,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon * <input>zargo:src/main/xmi:**\/*.zargo2</input> * </inputs> * </pre> - * <p/> + * * <b>Note:</b> If your using a single input, you can just write : * <pre> * <inputs>zargo</inputs> @@ -128,7 +127,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon /** * List of input (protocol) not to treate separated by comma. - * <p/> + * * Example : * <pre> * <skipInputs>xmi</skipInputs> @@ -174,7 +173,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon /** * Encoding to be used for generation of files. - * <p/> + * * <b>Note:</b> If nothing is filled here, we will use the system * property {@code file.encoding}. * @@ -194,7 +193,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon /** * The type of model to be used. - * <p/> + * * By default, use an {@code objectmodel}. * * @required @@ -265,7 +264,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon /** * List of packages to generate (comma separated). (model input specific). - * <p/> + * * If the parameter is not filled, will generate all packages. * * @since 1.0.0-rc-8 @@ -275,7 +274,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon /** * List of package to extract from xmi to models. (model input specific). - * <p/> + * * If the parameter is not filled, will extract all packages. * * @since 1.0.0-rc-8 @@ -287,6 +286,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon * A flag to fail if model properties is not safe (means some tagValues or stereotypes are not correct). * * <strong>Note:</strong> since version 3.0, the default value is {@code true}. + * * @since 2.9 */ @Parameter(property = "eugene.failIfUnsafe", defaultValue = "true") @@ -356,6 +356,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon protected WriterReport newWriterReport() { WriterReport writerReport = new WriterReport() { + @Override public void addFile(String entry, File file, boolean b) { super.addFile(entry, file, b); @@ -366,6 +367,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon getLog().debug(String.format("[%1$s] Will generate %2$s", entry, file)); } } + @Override public void addResource(String entry, File file, boolean b) { super.addResource(entry, file, b); @@ -629,7 +631,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon /** * Add a single input to the {@link #inputs} property. - * <p/> + * * <b>Note:</b> This is a convinient way to allow in pom to write * <pre> * <inputs>zargo</inputs> @@ -753,10 +755,10 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon /** * Prepare le classLoader a utiliser dans le generateur. - * <p/> + * * Si le mojo est en phase de test {@link #testPhase} a été renseigné, * target/classes est rajouté. - * <p/> + * * Si des références à des sibling modules, ils seront rajoutés aussi. * * @return le class loader modifie diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/StereotypesReport.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/StereotypesReport.java index 32fc073..351a3a7 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/StereotypesReport.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/StereotypesReport.java @@ -36,19 +36,19 @@ import java.util.Map; /** * To report a {@link TagValueDefinitionProvider}. - * <p/> + * * Created on 5/31/14. * * @author Tony Chemit - chemit@codelutin.com * @since 2.10 */ @Mojo(name = "stereotypes-report", requiresProject = true, requiresReports = true, - requiresDependencyResolution = ResolutionScope.COMPILE) + requiresDependencyResolution = ResolutionScope.COMPILE) public class StereotypesReport extends AbstractEugeneReport<StereotypeDefinitionProvider> { /** * Name of the stereotypes provider. - * <p/> + * * This is the role-hint given to the tag value provider to describe. */ @Parameter(property = "eugene.providerName", defaultValue = "${project.artifactId}", required = true) diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/TagValuesReport.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/TagValuesReport.java index cf341d2..87d3c0e 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/TagValuesReport.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/TagValuesReport.java @@ -35,19 +35,19 @@ import java.util.Map; /** * To report a {@link TagValueDefinitionProvider}. - * <p/> + * * Created on 5/31/14. * * @author Tony Chemit - chemit@codelutin.com * @since 2.10 */ @Mojo(name = "tag-values-report", requiresProject = true, requiresReports = true, - requiresDependencyResolution = ResolutionScope.COMPILE) + requiresDependencyResolution = ResolutionScope.COMPILE) public class TagValuesReport extends AbstractEugeneReport<TagValueDefinitionProvider> { /** * Name of the tagValue provider. - * <p/> + * * This is the role-hint given to the tag value provider to describe. */ @Parameter(property = "eugene.providerName", defaultValue = "${project.artifactId}", required = true) diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java index 7102fa1..a8523c7 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java @@ -251,12 +251,9 @@ public class XmiChainedFileWriter extends BaseChainedFileWriter { ); transformer.setURIResolver(fileResolver); - FileOutputStream output = new FileOutputStream(result); - try { + try (FileOutputStream output = new FileOutputStream(result)) { transformer.transform(new StreamSource(file), new StreamResult(output)); - } finally { - output.close(); } return true; } catch (IOException e) { diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java index 79b04a2..c4475a8 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java @@ -166,12 +166,8 @@ public class ZargoChainedFileWriter extends BaseChainedFileWriter { PluginHelper.createDirectoryIfNecessary(dst); InputStream inputStream = zipFile.getInputStream(nextElement); - FileOutputStream outStream = - new FileOutputStream(dstFile); - try { + try (FileOutputStream outStream = new FileOutputStream(dstFile)) { IOUtil.copy(inputStream, outStream, 2048); - } finally { - outStream.close(); } } diff --git a/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml/PlantumlTemplatesGenerator.java b/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml/PlantumlTemplatesGenerator.java index 9a1f5f7..2b9c446 100644 --- a/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml/PlantumlTemplatesGenerator.java +++ b/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml/PlantumlTemplatesGenerator.java @@ -24,17 +24,30 @@ package org.nuiton.eugene.plantuml; import net.sourceforge.plantuml.GeneratedImage; import net.sourceforge.plantuml.SourceFileReader; -import org.nuiton.eugene.models.object.*; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelEnumeration; +import org.nuiton.eugene.models.object.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; import org.nuiton.eugene.models.object.reader.yaml.KeyWords; import org.nuiton.eugene.models.object.reader.yaml.YamlUtil; import java.io.File; import java.io.IOException; import java.io.Writer; -import java.util.*; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; /** - * @author agiraudet <giraudet@codelutin.com> + * @author agiraudet - giraudet@codelutin.com * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.plantuml.PlantumlTemplatesGenerator" * @since 2.6.4 */ @@ -282,8 +295,8 @@ public class PlantumlTemplatesGenerator extends ObjectModelGenerator implements } public void generateFromLinks(Writer output, ObjectModel input, String indent) throws IOException { - Map<ObjectModelAttribute, ObjectModelClassifier> attributesM = new LinkedHashMap<ObjectModelAttribute, ObjectModelClassifier>(); - List<ObjectModelAttribute> bin = new LinkedList<ObjectModelAttribute>();//bin au sens poubelle + Map<ObjectModelAttribute, ObjectModelClassifier> attributesM = new LinkedHashMap<>(); + List<ObjectModelAttribute> bin = new LinkedList<>();//bin au sens poubelle for (ObjectModelClassifier classifier : input.getClassifiers()) { if (classifier.getAttributes() != null) { @@ -381,14 +394,14 @@ public class PlantumlTemplatesGenerator extends ObjectModelGenerator implements } public static String reduceType(String type) { - List<Character> ignore = new LinkedList<Character>(); + List<Character> ignore = new LinkedList<>(); ignore.add(' '); String typePARSE = YamlUtil.removeMultiChar(type, ignore); return browseType(typePARSE); } public String findPackage(ObjectModel input) { - Map<String, Integer> packages = new LinkedHashMap<String, Integer>(); + Map<String, Integer> packages = new LinkedHashMap<>(); for (ObjectModelClassifier classifier : input.getClassifiers()) { String packageTMP = classifier.getPackageName(); if (packageTMP != null) { diff --git a/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/PureYamlTemplatesGenerator.java b/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/PureYamlTemplatesGenerator.java index 20b0833..1009577 100644 --- a/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/PureYamlTemplatesGenerator.java +++ b/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/PureYamlTemplatesGenerator.java @@ -30,7 +30,7 @@ import java.io.Writer; import java.util.Map; /** - * @author agiraudet <giraudet@codelutin.com> + * @author agiraudet - giraudet@codelutin.com * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.yaml.PureYamlTemplatesGenerator" * @since 2.6.4 */ diff --git a/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java b/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java index e6c72b1..431af62 100644 --- a/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java +++ b/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java @@ -30,7 +30,7 @@ import java.io.IOException; import java.io.Writer; /** - * @author agiraudet <giraudet@codelutin.com> + * @author agiraudet - giraudet@codelutin.com * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.yaml.UserFriendlyTemplatesGenerator" * @since 2.6.4 */ diff --git a/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java b/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java index 5d24e42..9f927b0 100644 --- a/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java +++ b/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java @@ -36,11 +36,11 @@ import java.util.List; /** * AbstractGenerator - * <p/> + * * Created: 28 oct. 2009 * - * @author fdesbois <fdesbois@codelutin.com> * @param <M> type of Model + * @author Florian Desbois - desbois@codelutin.com */ public abstract class AbstractGenerator<M extends Model> extends Template<M> { @@ -102,7 +102,7 @@ public abstract class AbstractGenerator<M extends Model> extends Template<M> { /** * @param file fichier a tester * @return vrai si le fichier passé en parametre est plus recent que - * les sources sur generateur. + * les sources sur generateur. */ protected boolean isNewerThanSource(File file) { if (log.isDebugEnabled()) { @@ -118,7 +118,6 @@ public abstract class AbstractGenerator<M extends Model> extends Template<M> { /** * Test if given package is allowed for generation. - * <p/> * An element can be generated if his package is in the * {@link #generatedPackages} list or if {@link #generatedPackages} is null * or empty. @@ -190,14 +189,11 @@ public abstract class AbstractGenerator<M extends Model> extends Template<M> { writerReport.addFile(getClass().getName(), outputFile, false); } - Writer output = getWriter(outputFile); - try { + try (Writer output = getWriter(outputFile)) { if (log.isDebugEnabled()) { log.debug("Will generate file " + outputFile); } output.write(out.getBuffer().toString()); - } finally { - output.close(); } } catch (IOException eee) { if (log.isWarnEnabled()) { diff --git a/eugene/src/main/java/org/nuiton/eugene/AbstractMetaTransformer.java b/eugene/src/main/java/org/nuiton/eugene/AbstractMetaTransformer.java index 456c935..5677e5e 100644 --- a/eugene/src/main/java/org/nuiton/eugene/AbstractMetaTransformer.java +++ b/eugene/src/main/java/org/nuiton/eugene/AbstractMetaTransformer.java @@ -34,23 +34,22 @@ import java.util.List; /** * Abstract meta transformer which contains some templates to apply to an * incoming model. - * <p/> + * * Using the {@link #getExcludeTemplates()} to restrict use of some templates. - * <p/> + * * Created: 20 déc. 2009 * - * @author Tony Chemit - chemit@codelutin.com * @param <M> type of Model + * @author Tony Chemit - chemit@codelutin.com * @since 2.0.0 */ public abstract class AbstractMetaTransformer<M extends Model> extends AbstractGenerator<M> { - private static final Log log = - LogFactory.getLog(AbstractMetaTransformer.class); + private static final Log log = LogFactory.getLog(AbstractMetaTransformer.class); /** * Transformers to apply before using templates. - * <p/> + * * It will replace each time the input model by the generated output model. * * @since 2.3 @@ -70,8 +69,8 @@ public abstract class AbstractMetaTransformer<M extends Model> extends AbstractG /** * @param templateTypes templates to apply on model * @deprecated since 2.3, prefer use the default constructor, the invoke - * setters {@link #setTemplateTypes(Class[])} and - * {@link #setTransformerTypes(Class[])}. + * setters {@link #setTemplateTypes(Class[])} and + * {@link #setTransformerTypes(Class[])}. */ @Deprecated public AbstractMetaTransformer( @@ -84,7 +83,7 @@ public abstract class AbstractMetaTransformer<M extends Model> extends AbstractG * * <b>Note :</b> If model is not valid, then nothing will be apply on the model * (no transformer nor templates) in the {@link #applyTemplate(Model, File)}. - * + * * @param model the incoming model to validate * @return {@code true} if model is valid, {@code false} otherwise. */ @@ -138,13 +137,12 @@ public abstract class AbstractMetaTransformer<M extends Model> extends AbstractG * incoming model to a transformer the last (or incoming for the first transformer) * model. * - * @param model incoming model to transform + * @param model incoming model to transform * @param transformers list of transformers to apply to the model * @return the final transformed model * @since 2.3 */ - protected M applyTransformers(M model, - List<? extends Transformer<M, M>> transformers) { + protected M applyTransformers(M model, List<? extends Transformer<M, M>> transformers) { M currentModel = model; for (Transformer<M, M> template : transformers) { if (log.isDebugEnabled()) { @@ -164,15 +162,13 @@ public abstract class AbstractMetaTransformer<M extends Model> extends AbstractG * Generates to the given {@code destination directory} using the given * templates on the incoming given {@code model}. * - * @param model the incoming model to be used by templates + * @param model the incoming model to be used by templates * @param templates templates to apply the incoming model - * @param destDir the destination directory where to generate + * @param destDir the destination directory where to generate * @throws IOException if any IO errors while generating files * @since 2.3 */ - protected void applyTemplates(M model, - List<? extends Template<M>> templates, - File destDir) throws IOException { + protected void applyTemplates(M model, List<? extends Template<M>> templates, File destDir) throws IOException { for (Template<M> template : templates) { if (log.isDebugEnabled()) { log.debug("call template : " + @@ -183,7 +179,7 @@ public abstract class AbstractMetaTransformer<M extends Model> extends AbstractG } protected <T extends Template<M>> List<T> getInstances(Class<? extends T>[] types) { - List<T> result = new ArrayList<T>(); + List<T> result = new ArrayList<>(); if (types != null) { for (Class<? extends T> generatorClass : types) { T generator; @@ -231,7 +227,7 @@ public abstract class AbstractMetaTransformer<M extends Model> extends AbstractG */ @Deprecated protected List<Template<M>> getTemplates() { - List<Template<M>> result = new ArrayList<Template<M>>(); + List<Template<M>> result = new ArrayList<>(); for (Class<? extends Template<M>> generatorClass : templateTypes) { Template<M> generator; if (getExcludeTemplates().contains(generatorClass.getName())) { diff --git a/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java b/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java index eeee11d..2a124e3 100644 --- a/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java +++ b/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java @@ -30,7 +30,7 @@ import org.nuiton.eugene.models.stereotype.Stereotypes; /** * Defines all stereotypes managed by Eugene. - * <p/> + * * In another library using eugene, please extends this contract to put your * own stereotypes, to get a unique place where to find stereotypes. * @@ -42,7 +42,7 @@ public class EugeneStereoTypes extends StereotypeDefinitionProvider { /** * Stereotype to mark an attribute with multiplicity as ordered. - * <p/> + * * It means that order of insertion is maintained: in Java, it will lead * to a collection typed with {@link java.util.List} or {@link java.util.LinkedHashSet} * or {@link java.util.LinkedHashMap}. @@ -51,19 +51,19 @@ public class EugeneStereoTypes extends StereotypeDefinitionProvider { * @since 2.8 */ @StereotypeDefinition(target = ObjectModelAttribute.class, - documentation = "To specify that a attribute is ordered") + documentation = "To specify that a attribute is ordered") public static final String STEREOTYPE_ORDERED = "ordered"; /** * Stereotype to mark an attribute with multiplicity as unique. - * <p/> + * * It means that uniqueness of elements is maintained in the collection: in Java, it * will lead to a collection typed with {@link java.util.Set}. * * @see #hasUniqueStereotype(ObjectModelAttribute) */ @StereotypeDefinition(target = ObjectModelAttribute.class, - documentation = "To specify that an attribute is unique") + documentation = "To specify that an attribute is unique") public static final String STEREOTYPE_UNIQUE = "unique"; /** @@ -73,7 +73,7 @@ public class EugeneStereoTypes extends StereotypeDefinitionProvider { * @see #hasSkipStereotype(ObjectModelPackage) */ @StereotypeDefinition(target = {ObjectModelClassifier.class, ObjectModelPackage.class}, - documentation = "To specify that a classifier should not been generated.") + documentation = "To specify that a classifier should not been generated.") public static final String STEREOTYPE_SKIP = "skip"; /** @@ -104,6 +104,7 @@ public class EugeneStereoTypes extends StereotypeDefinitionProvider { * Check if the given classifier has the {@link #STEREOTYPE_SKIP} stereotype. * * @param classifier classifier to test + * @param aPackage package to test * @return {@code true} if stereotype was found, {@code false otherwise} * @see #STEREOTYPE_SKIP * @since 2.9 @@ -115,7 +116,7 @@ public class EugeneStereoTypes extends StereotypeDefinitionProvider { /** * Check if the given aPackage has the {@link #STEREOTYPE_SKIP} stereotype. * - * @param aPackage classifier to test + * @param aPackage package to test * @return {@code true} if stereotype was found, {@code false otherwise} * @see #STEREOTYPE_SKIP */ diff --git a/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java b/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java index 5c55536..36385b2 100644 --- a/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java +++ b/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java @@ -27,11 +27,10 @@ import org.nuiton.eugene.models.object.ObjectModelElement; import org.nuiton.eugene.models.object.ObjectModelPackage; import org.nuiton.eugene.models.tagvalue.TagValueDefinition; import org.nuiton.eugene.models.tagvalue.TagValueDefinitionProvider; -import org.nuiton.eugene.models.tagvalue.TagValues; /** * Defines all tag values managed by Eugene. - * <p/> + * * In another library using eugene, please extends this contract to put your * own tag values, to get a unique place where to find tag values. * @@ -44,7 +43,7 @@ public class EugeneTagValues extends TagValueDefinitionProvider { /** * Tag value to add the version of the model from outside (says in the * properties file associated to the model).. - * <p/> + * * Actually, the eugene api does not use to modify the model. ItaTa is only * used while reading the properties associated with a model and if found is * directly set to the {@code version} field of the model. @@ -52,13 +51,13 @@ public class EugeneTagValues extends TagValueDefinitionProvider { * @since 2.3 */ @TagValueDefinition(target = {ObjectModel.class}, - documentation = "To set the version of the model.") + documentation = "To set the version of the model.") public static final String TAG_VERSION = "version"; /** * Tag value to add on constants enumeration (or other incoming dev) * a prefix to constant to generate. - * <p/> + * * You can globaly use it on the complete model or to a specific classifier. * * @see #getDocumentationTagValue(ObjectModel) @@ -67,33 +66,33 @@ public class EugeneTagValues extends TagValueDefinitionProvider { * @since 2.5 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelPackage.class, ObjectModelElement.class}, - documentation = "Sets the documentation of a model or any of his elements") + documentation = "Sets the documentation of a model or any of his elements") public static final String TAG_DOCUMENTATION = "documentation"; /** * Tag value to add on constants enumeration (or other incoming dev) * a prefix to constant to generate. - * <p/> + * * You can globaly use it on the complete model or to a specific classifier. * * @see #getConstantPrefixTagValue(ObjectModelClassifier, ObjectModelPackage, ObjectModel) * @since 2.3 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelPackage.class, ObjectModelClassifier.class}, - defaultValue = "PROPERTY_", - documentation = "Sets the prefix of any constant to be generated for the given class") + defaultValue = "PROPERTY_", + documentation = "Sets the prefix of any constant to be generated for the given class") public static final String TAG_CONSTANT_PREFIX = "constantPrefix"; /** * Tag value to specify the i18n prefix to use whene generating i18n keys. - * <p/> + * * You can globaly use it on the complete model or to a specific classifier. * * @see #getI18nPrefixTagValue(ObjectModelElement, ObjectModelPackage, ObjectModel) * @since 2.3 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelPackage.class, ObjectModelClassifier.class}, - documentation = "Sets the i18n prefix to use on I18n keys generated") + documentation = "Sets the i18n prefix to use on I18n keys generated") public static final String TAG_I18N_PREFIX = "i18n"; /** @@ -103,8 +102,8 @@ public class EugeneTagValues extends TagValueDefinitionProvider { * @since 2.12 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelPackage.class, ObjectModelClassifier.class}, - defaultValue = "false", - documentation = "To specify to generate getXXX methods for boolean properties") + defaultValue = "false", + documentation = "To specify to generate getXXX methods for boolean properties") public static final String TAG_GENERATE_BOOLEAN_GET_METHODS = "generateBooleanGetMethods"; /** @@ -165,7 +164,7 @@ public class EugeneTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_GENERATE_BOOLEAN_GET_METHODS} * tag value on the given model, package or classifier. - * <p/> + * * It will first look on the model, then on package and then in the given classifier. * * @param classifier classifier to seek @@ -184,7 +183,7 @@ public class EugeneTagValues extends TagValueDefinitionProvider { /** * Obtain the value of the {@link #TAG_CONSTANT_PREFIX} tag value on the given model or classifier. - * <p/> + * * It will first look on the model, and then in the given classifier. * * @param classifier classifier to seek diff --git a/eugene/src/main/java/org/nuiton/eugene/GeneratorException.java b/eugene/src/main/java/org/nuiton/eugene/GeneratorException.java index e2ae373..e246d57 100644 --- a/eugene/src/main/java/org/nuiton/eugene/GeneratorException.java +++ b/eugene/src/main/java/org/nuiton/eugene/GeneratorException.java @@ -27,12 +27,8 @@ package org.nuiton.eugene; * * Created: 21 juin 2004 * - * @author Benjamin Poussin <poussin@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ + * @author Benjamin Poussin - poussin@codelutin.com + */ public class GeneratorException extends RuntimeException { // GeneratorException /** serialVersionUID */ diff --git a/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java b/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java index c19328c..bb3afdf 100644 --- a/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java +++ b/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java @@ -46,11 +46,10 @@ import java.util.Set; /** * GeneratorUtil. - * <p/> + * * Created: 25 aout 2003 * - * @author Benjamin Poussin <poussin@codelutin.com> - * @version $Revision$ + * @author Benjamin Poussin - poussin@codelutin.com */ public class GeneratorUtil { @@ -68,9 +67,9 @@ public class GeneratorUtil { /** * return parent package of given package (return given package if it is a root package) - * eg : org.nuiton.eugene.models -> org.nuiton.eugene - * eg : org -> org - * warning : org.nuiton.eugene. -> org.nuiton.eugene + * eg : org.nuiton.eugene.models -> org.nuiton.eugene + * eg : org -> org + * warning : org.nuiton.eugene. -> org.nuiton.eugene * * @param packageName package * @return parent package of given package @@ -87,8 +86,8 @@ public class GeneratorUtil { /** * @param qualifiedName the fully qualified name to test * @return class name fr given fully qualified name (return given name if it is not fully qualified) - * eg : org.nuiton.eugene.models.ObjectClass -> ObjectClass - * eg : ObjectClass-> ObjectClass + * eg : org.nuiton.eugene.models.ObjectClass -> ObjectClass + * eg : ObjectClass-> ObjectClass */ public static String getClassNameFromQualifiedName(String qualifiedName) { String className = qualifiedName; @@ -117,7 +116,7 @@ public class GeneratorUtil { */ public static Collection<ObjectModelClassifier> getClassifiers( ObjectModel model, String packageName) { - List<ObjectModelClassifier> classifiers = new ArrayList<ObjectModelClassifier>(); + List<ObjectModelClassifier> classifiers = new ArrayList<>(); for (ObjectModelClassifier classifier : model.getClassifiers()) { if (classifier.getPackageName().startsWith(packageName)) { classifiers.add(classifier); @@ -269,7 +268,7 @@ public class GeneratorUtil { /** * @param attribute the attribute to test * @return vrai si la cardinalite de l'attribut est superieur a 1, c-a-d - * si MaxMultiplicity == -1 ou > 1 + * si MaxMultiplicity == -1 ou > 1 */ public static boolean isNMultiplicity(ObjectModelAttribute attribute) { return isNMultiplicity(attribute.getMaxMultiplicity()); @@ -534,7 +533,7 @@ public class GeneratorUtil { /** * Suppress packageName from a fullQualifiedName, even if it contains * List, Map or other generics. - * <p/> + * * See JUnit test for matching expressions. * * @param str FullQualifiedName for an attribute type (for exemple) @@ -548,7 +547,7 @@ public class GeneratorUtil { /** * Suppress packageName from a fullQualifiedName, even if it contains List, * Map or other generics. - * <p/> + * * See JUnit test for matching expressions. * * @param str fullQualifiedName for an attribute type (for exemple) @@ -579,10 +578,10 @@ public class GeneratorUtil { /** * Remove any generics definition at the beginning of a string. - * <p/> + * * For example : * <pre> - * <T> T -> T + * <T> T -> T * </pre> * * @param str the string to parse @@ -626,10 +625,10 @@ public class GeneratorUtil { /** * Remove any generics definition at the beginning of a string. - * <p/> + * * For example : * <pre> - * <T> T -> T + * <T> T -> T * </pre> * * @param str the string to parse @@ -692,15 +691,14 @@ public class GeneratorUtil { } /** - * Parse a fully qualified generic java type, and extract each - * imbricated types. + * Parse a fully qualified generic java type, and extract each imbricated types. * * @param str string to parse * @return set of found types */ public static Set<String> getTypesList(String str) { - Set<String> results = new HashSet<String>(); + Set<String> results = new HashSet<>(); // remove extends, super String localStr = str.replaceAll("([\\w\\?]+ extends|[\\w\\?]+ super|new)", ""); diff --git a/eugene/src/main/java/org/nuiton/eugene/ModelHelper.java b/eugene/src/main/java/org/nuiton/eugene/ModelHelper.java index bda689b..b3bac9a 100644 --- a/eugene/src/main/java/org/nuiton/eugene/ModelHelper.java +++ b/eugene/src/main/java/org/nuiton/eugene/ModelHelper.java @@ -80,7 +80,7 @@ public class ModelHelper { * @author Tony Chemit - chemit@codelutin.com * @since 2.6.3 */ - public static enum ModelType { + public enum ModelType { /** * Object model. @@ -98,7 +98,7 @@ public class ModelHelper { private final String alias; - private ModelType(String alias) { + ModelType(String alias) { this.alias = alias; } @@ -113,7 +113,7 @@ public class ModelHelper { * @author Tony Chemit - chemit@codelutin.com * @since 2.6.3 */ - public static enum ModelInputType { + public enum ModelInputType { /** * Read object model from xml files. @@ -132,7 +132,7 @@ public class ModelHelper { private final String alias; - private ModelInputType(String alias) { + ModelInputType(String alias) { this.alias = alias; } diff --git a/eugene/src/main/java/org/nuiton/eugene/ModelReader.java b/eugene/src/main/java/org/nuiton/eugene/ModelReader.java index 0cb92f9..77f8c8f 100644 --- a/eugene/src/main/java/org/nuiton/eugene/ModelReader.java +++ b/eugene/src/main/java/org/nuiton/eugene/ModelReader.java @@ -31,12 +31,11 @@ import java.io.IOException; /** * ModelReader TODO real doc :) - * <p/> + * * Created: 26 oct. 2009 * * @param <M> Model to create from reading input files - * @author fdesbois <fdesbois@codelutin.com> - * @version $Id$ + * @author Florian Desbois - desbois@codelutin.com */ public abstract class ModelReader<M extends Model> { @@ -49,7 +48,7 @@ public abstract class ModelReader<M extends Model> { /** * A flag to load only safe things. - * <p/> + * * Usefull to have a safe loading of a model and his properties file. * * @since 2.3 diff --git a/eugene/src/main/java/org/nuiton/eugene/MonitorWriter.java b/eugene/src/main/java/org/nuiton/eugene/MonitorWriter.java index d84b2b3..3ae580d 100644 --- a/eugene/src/main/java/org/nuiton/eugene/MonitorWriter.java +++ b/eugene/src/main/java/org/nuiton/eugene/MonitorWriter.java @@ -31,15 +31,11 @@ import java.io.Writer; * Permet de savoir si on a ecrit dans le flux ou non. L'ecriture d'une chaine * vide a le meme comportement que l'ecriture d'une vrai chaine. * De cette façon meme les fichiers peuvent être créer. - * - * Created: Jun 8, 2004 * - * @author Benjamin Poussin <poussin@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ + * Created: Jun 8, 2004 * - * Mise a jour: $Date$ - * par : */ + * @author Benjamin Poussin - poussin@codelutin.com + */ public class MonitorWriter extends FilterWriter { // MonitorWriter boolean modified; @@ -49,7 +45,7 @@ public class MonitorWriter extends FilterWriter { // MonitorWriter } public StringBuffer getBuffer() { - return ((StringWriter)out).getBuffer(); + return ((StringWriter) out).getBuffer(); } public boolean isModified() { @@ -81,7 +77,7 @@ public class MonitorWriter extends FilterWriter { // MonitorWriter } @Override - public void write(char[] cbuf) throws IOException { + public void write(char... cbuf) throws IOException { super.write(cbuf); modified = true; } diff --git a/eugene/src/main/java/org/nuiton/eugene/PackageValidator.java b/eugene/src/main/java/org/nuiton/eugene/PackageValidator.java index 6121b71..6b1c836 100644 --- a/eugene/src/main/java/org/nuiton/eugene/PackageValidator.java +++ b/eugene/src/main/java/org/nuiton/eugene/PackageValidator.java @@ -27,24 +27,23 @@ package org.nuiton.eugene; * stylesheet and Xalan-Java to extend the stylesheet functionnalities. * Allows to include external classes and interfaces to the generated * ObjectModel. - * + * * Created: 21 avr. 2005 * * @author Arnaud Thimel (Code Lutin) - * @version $Revision$ */ public class PackageValidator { /** * The <code>toContinue</code> method indicates if the package * <code>localPackageNameDot</code> has to be iterated by the stylesheet. - * @param fullPackagePath the full package path + * + * @param fullPackagePath the full package path * @param localPackageNameDot the current package to evaluate - * @param extraPackages the list of extra packages + * @param extraPackages the list of extra packages * @return true if there is to iterate on <code>localPackageNameDot</code> */ - public static boolean toContinue(String fullPackagePath, - String localPackageNameDot, String extraPackages) { + public static boolean toContinue(String fullPackagePath, String localPackageNameDot, String extraPackages) { if (fullPackagePath.startsWith(localPackageNameDot)) { return true; } @@ -53,7 +52,7 @@ public class PackageValidator { packages[i] = packages[i].trim(); if (packages[i].startsWith(localPackageNameDot)) { return localPackageNameDot.length() < packages[i] - .lastIndexOf(".") + 1; + .lastIndexOf(".") + 1; } } return false; @@ -63,13 +62,13 @@ public class PackageValidator { * <code>isValid</code> indicates if the current package * (<code>localPackageNameDot</code>) is valid according to the extra * packages list (<code>extraPackages</code>). - * @param fullPackagePath + * + * @param fullPackagePath the full package path * @param localPackageName the current package to evaluate - * @param extraPackages the list of extra packages + * @param extraPackages the list of extra packages * @return true is the current package is valid */ - public static boolean isValid(String fullPackagePath, - String localPackageName, String extraPackages) { + public static boolean isValid(String fullPackagePath, String localPackageName, String extraPackages) { if (localPackageName.startsWith(fullPackagePath)) { return true; } @@ -80,7 +79,7 @@ public class PackageValidator { for (int i = 0; i < packages.length; i++) { packages[i] = packages[i].trim(); if (localPackageName.matches(packages[i]) - || packages[i].startsWith(localPackageName)) { + || packages[i].startsWith(localPackageName)) { return true; } } diff --git a/eugene/src/main/java/org/nuiton/eugene/Template.java b/eugene/src/main/java/org/nuiton/eugene/Template.java index d2c5fe2..950ecbb 100644 --- a/eugene/src/main/java/org/nuiton/eugene/Template.java +++ b/eugene/src/main/java/org/nuiton/eugene/Template.java @@ -35,11 +35,11 @@ import java.util.Properties; /** * Template. TODO javadoc - * <p/> + * * Created: 5 août 2004 * - * @author Cedric Pineau <pineau@codelutin.com> * @param <M> Model associated to the generator (input model) + * @author Cédric Pineau - pineau@codelutin.com */ public abstract class Template<M extends Model> implements TemplateConfiguration { @@ -49,7 +49,7 @@ public abstract class Template<M extends Model> implements TemplateConfiguration /** * List of package to allow generation. - * <p/> + * * If {@code null} or empty, generate all packages. */ protected List<String> generatedPackages; @@ -58,7 +58,6 @@ public abstract class Template<M extends Model> implements TemplateConfiguration protected M model; - public abstract void applyTemplate(M model, File destDir) throws IOException; public TemplateConfiguration getConfiguration() { @@ -139,7 +138,7 @@ public abstract class Template<M extends Model> implements TemplateConfiguration protected List<String> getGeneratedPackages() { if (generatedPackages == null) { - generatedPackages = new ArrayList<String>(); + generatedPackages = new ArrayList<>(); String genPackages = getProperty(PROP_GENERATED_PACKAGES); if (!StringUtils.isEmpty(genPackages)) { //TC-20091125 avoid manual array copy @@ -151,7 +150,7 @@ public abstract class Template<M extends Model> implements TemplateConfiguration public List<String> getExcludeTemplates() { if (excludeTemplates == null) { - excludeTemplates = new ArrayList<String>(); + excludeTemplates = new ArrayList<>(); String excludes = getProperty(PROP_EXCLUDE_TEMPLATES); if (!StringUtils.isEmpty(excludes)) { //TC-20091125 avoid manual array copy diff --git a/eugene/src/main/java/org/nuiton/eugene/TemplateConfiguration.java b/eugene/src/main/java/org/nuiton/eugene/TemplateConfiguration.java index 3158d90..6daed95 100644 --- a/eugene/src/main/java/org/nuiton/eugene/TemplateConfiguration.java +++ b/eugene/src/main/java/org/nuiton/eugene/TemplateConfiguration.java @@ -52,8 +52,7 @@ public interface TemplateConfiguration { String PROP_WRITER_REPORT = "writerReport"; /** - * @return {@code true} if must regenerate files even if they are up to - * date + * @return {@code true} if must regenerate files even if they are up to date */ boolean isOverwrite(); @@ -67,7 +66,7 @@ public interface TemplateConfiguration { ClassLoader getClassLoader(); WriterReport getWriterReport(); - + long getLastModifiedSource(); Properties getProperties(); @@ -78,5 +77,4 @@ public interface TemplateConfiguration { void setProperty(String key, Object value); - } diff --git a/eugene/src/main/java/org/nuiton/eugene/Transformer.java b/eugene/src/main/java/org/nuiton/eugene/Transformer.java index aaae16e..af55ef1 100644 --- a/eugene/src/main/java/org/nuiton/eugene/Transformer.java +++ b/eugene/src/main/java/org/nuiton/eugene/Transformer.java @@ -37,7 +37,7 @@ import java.util.Properties; * * @param <I> input model to transform * @param <O> output model transformed - * @author fdesbois + * @author Florian Desbois - desbois@codelutin.com */ public abstract class Transformer<I extends Model, O extends Model> extends Template<I> { @@ -173,11 +173,11 @@ public abstract class Transformer<I extends Model, O extends Model> * input model into an output model. You must override * {@link #initOutputModel} and {@link #initOutputTemplate } methods * to initialize output model and output template to apply (generally a - * generator). + * generator). * - * @param model input model to transform and generate + * @param model input model to transform and generate * @param destDir destination directory to put generated files - * @throws IOException + * @throws IOException if any IO problems while applying template * @since 2.0.0 */ @Override @@ -192,18 +192,18 @@ public abstract class Transformer<I extends Model, O extends Model> if (isVerbose()) { log.info("Use previousTransformer " + previousTransformer); } - // transformation only, no application of next template + // transformation only, no application of next template previousTransformer.transform(model); - // current transformation from the ouput model of previous transformer + // current transformation from the ouput model of previous transformer transform(previousTransformer.getOutputModel()); } else { - // current transformation directly from the incoming model + // current transformation directly from the incoming model transform(model); } - - // after template application + + // after template application getOutputTemplate().applyTemplate(getOutputModel(), destDir); } @@ -225,9 +225,9 @@ public abstract class Transformer<I extends Model, O extends Model> * (PreviousTransformer, OutputModel, OutputGenerator) is made before * transformation call. This method only transform an input model into an * output model. - * + * * No generation is done neither outputGenerator call. - * + * * @since 2.0.0 */ protected abstract void transform(); diff --git a/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java b/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java index deee410..d11822d 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java @@ -26,8 +26,6 @@ import com.google.common.base.Preconditions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.java.extension.ObjectModelAnnotation; -import org.nuiton.eugene.java.extension.ObjectModelAnnotationParameter; import org.nuiton.eugene.java.extension.AnnotationsManager; import org.nuiton.eugene.java.extension.AnnotationsManagerExtension; import org.nuiton.eugene.java.extension.CodesManager; @@ -35,6 +33,8 @@ import org.nuiton.eugene.java.extension.CodesManagerExtension; import org.nuiton.eugene.java.extension.ConstantsManagerExtension; import org.nuiton.eugene.java.extension.ImportsManager; import org.nuiton.eugene.java.extension.ImportsManagerExtension; +import org.nuiton.eugene.java.extension.ObjectModelAnnotation; +import org.nuiton.eugene.java.extension.ObjectModelAnnotationParameter; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelBuilder; import org.nuiton.eugene.models.object.ObjectModelClass; @@ -55,21 +55,20 @@ import java.util.Set; /** * JavaBuilder - * <p/> + * * Created: 29 oct. 2009 - * <p/> + * * Builder to fill an empty ObjectModel with java specificities * (imports, only one inheritance, constructor, ...). - * <p/> + * * JavaBuilder uses some extensions to manage imports , constants, annotations, * ...in the model. - * <p/> + * * JavaBuilder is also based on ObjectModelBuilder for the simple filling of * the model. * - * @author fdesbois <fdesbois@codelutin.com> - * @author tchemit <tchemit@codelutin.com> - * @version $Id$ + * @author Florian Desbois - desbois@codelutin.com + * @author Tony Chemit - chemit@codelutin.com */ public class JavaBuilder extends ObjectModelBuilder { @@ -262,10 +261,10 @@ public class JavaBuilder extends ObjectModelBuilder { * JavaBuilder's methods except body code of operations. * <pre> * You can have some complex imports like : - * - new java.util.List<org.chorem.bonzoms.Role>() - * --> two imports 'java.util.List' and 'org.chorem.bonzoms.Role' - * - java.util.Collection<T extends org.nuiton.topia.TopiaEntity> - * --> two imports 'java.util.Collection' and 'org.nuiton.topia.TopiaEntity' + * - new java.util.List<org.chorem.bonzoms.Role>() + * --> two imports 'java.util.List' and 'org.chorem.bonzoms.Role' + * - java.util.Collection<T extends org.nuiton.topia.TopiaEntity> + * --> two imports 'java.util.Collection' and 'org.nuiton.topia.TopiaEntity' * </pre> * * @param classifier where the imports will be added. @@ -404,7 +403,7 @@ public class JavaBuilder extends ObjectModelBuilder { /** * Converts the given {@code propertyName} to a constant name. - * <p/> + * * For example : * <pre> * "CONSTANT_A" = getConstantName("constantA"); @@ -433,7 +432,7 @@ public class JavaBuilder extends ObjectModelBuilder { public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, ObjectModelAttribute attribute) { - Set<ObjectModelModifier> modifiers = new HashSet<ObjectModelModifier>(); + Set<ObjectModelModifier> modifiers = new HashSet<>(); if (attribute.isStatic()) { modifiers.add(ObjectModelJavaModifier.STATIC); diff --git a/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java b/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java index fd7b79e..cc46b1e 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java @@ -59,17 +59,15 @@ import java.util.Set; /** * JavaGenerator * - * Created: 22 oct. 2009 - * - * @author fdesbois - * @version $Id$ - * * Stupid generation of an ObjectModel with Java classes and interfaces. * Use of ImportsManager to get imports for a classifier (added in model in the JavaBuilder which construct * the ObjectModel). * * The JavaGenerator is based on a ObjectModelGenerator : Java classes are represented by ObjectModelClass, ... + * Created: 22 oct. 200 + * 9 * + * @author Florian Desbois - desbois@codelutin.com * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.JavaGenerator" */ public class JavaGenerator extends ObjectModelGenerator { @@ -77,6 +75,7 @@ public class JavaGenerator extends ObjectModelGenerator { private static final Log log = LogFactory.getLog(JavaGenerator.class); protected int innerLevel; + protected String prefix; @Override @@ -90,8 +89,7 @@ public class JavaGenerator extends ObjectModelGenerator { } @Override - public String getFilenameForEnumeration(ObjectModelEnumeration enumeration) - { + public String getFilenameForEnumeration(ObjectModelEnumeration enumeration) { return getFilenameForClassifier(enumeration); } @@ -107,9 +105,9 @@ public class JavaGenerator extends ObjectModelGenerator { /** * Generate from all classes. - * + * * @param output Writer for generating the java file - * @param input Class to manage for creating an output file + * @param input Class to manage for creating an output file * @throws IOException if any pb while writing file */ @Override @@ -117,7 +115,7 @@ public class JavaGenerator extends ObjectModelGenerator { throws IOException { if (isVerbose()) { - log.info("Will generate class "+ input.getQualifiedName()); + log.info("Will generate class " + input.getQualifiedName()); } preparePrefix(input); @@ -137,7 +135,7 @@ public class JavaGenerator extends ObjectModelGenerator { String implement = ""; for (Iterator<ObjectModelInterface> i = - input.getInterfaces().iterator(); i.hasNext();) { + input.getInterfaces().iterator(); i.hasNext(); ) { ObjectModelClassifier parentInterface = i.next(); String interfaceName = GeneratorUtil.getSimpleName( parentInterface.getQualifiedName()); @@ -147,8 +145,8 @@ public class JavaGenerator extends ObjectModelGenerator { } } if (log.isDebugEnabled()) { - log.debug(className+" : super : "+extend+", interfaces : " - + implement); + log.debug(className + " : super : " + extend + ", interfaces : " + + implement); } generateAnnotations(output, input, input); @@ -181,7 +179,7 @@ public class JavaGenerator extends ObjectModelGenerator { ObjectModelInterface input) throws IOException { if (isVerbose()) { - log.info("Will generate interface "+ input.getQualifiedName()); + log.info("Will generate interface " + input.getQualifiedName()); } preparePrefix(input); @@ -230,23 +228,22 @@ public class JavaGenerator extends ObjectModelGenerator { // // add @ prefix // annotation = "@" + annotation.trim(); // } - StringBuilder annotationBuilder= new StringBuilder("@"+annotation.getType()); + StringBuilder annotationBuilder = new StringBuilder("@" + annotation.getType()); List<ObjectModelAnnotationParameter> annotationParameters = annotation.getParameters(); if (CollectionUtils.isNotEmpty(annotationParameters)) { annotationBuilder.append('('); List<String> params = Lists.newArrayList(); for (ObjectModelAnnotationParameter annotationParameter : annotationParameters) { - String paramStr = annotationParameter.getName()+" = "; + String paramStr = annotationParameter.getName() + " = "; Object value = annotationParameter.getValue(); if (value instanceof String) { - paramStr+="\""+value+"\""; + paramStr += "\"" + value + "\""; } else if (value instanceof Enum) { Enum anEnum = (Enum) value; paramStr += anEnum.getClass().getSimpleName() + "." + value; - } - else { - paramStr+= value.toString(); + } else { + paramStr += value.toString(); } params.add(paramStr); } @@ -254,11 +251,11 @@ public class JavaGenerator extends ObjectModelGenerator { annotationBuilder.append(')'); } - String annotationStr =annotationBuilder.toString(); + String annotationStr = annotationBuilder.toString(); if (element instanceof ObjectModelOperation || element instanceof ObjectModelAttribute) { /*{<%=prefix%>}*/ - annotationStr = " "+annotationStr; + annotationStr = " " + annotationStr; } /*{<%=annotationStr%>}*/ if (element instanceof ObjectModelClassifier || element instanceof ObjectModelOperation || element instanceof ObjectModelAttribute) { @@ -268,16 +265,18 @@ public class JavaGenerator extends ObjectModelGenerator { } } + @Override public void generateFromEnumeration(Writer output, ObjectModelEnumeration input) throws IOException { //FIXME tchemit 20100718 I don't understand why having two methods FromEnum and FromEnumeration ? generateFromEnum(output, input); } + @Override public void generateFromEnum(Writer output, ObjectModelEnumeration input) throws IOException { if (isVerbose()) { - log.info("Will generate enumeration "+ input.getQualifiedName()); + log.info("Will generate enumeration " + input.getQualifiedName()); } preparePrefix(input); generateHeader(output, input); // Imports, package et documentation @@ -297,9 +296,8 @@ public class JavaGenerator extends ObjectModelGenerator { if (extend.length() > 0) { /*{ implements <%=extend%> { }*/ - } - else { - /*{ { + } else { + /*{ { }*/ } // generation of literal @@ -328,7 +326,7 @@ public class JavaGenerator extends ObjectModelGenerator { } for (ObjectModelClassifier innerClassifier : innerClassifiers) { if (innerClassifier.isClass()) { - generateFromClass(output, (ObjectModelClass) innerClassifier); + generateFromClass(output, (ObjectModelClass) innerClassifier); innerLevel--; continue; } @@ -358,7 +356,7 @@ public class JavaGenerator extends ObjectModelGenerator { } if (log.isDebugEnabled()) { log.debug("prefix to use for classifier " + - clazz.getName() + " : [" + prefix + "]"); + clazz.getName() + " : [" + prefix + "]"); } } @@ -366,7 +364,7 @@ public class JavaGenerator extends ObjectModelGenerator { /** * Generate Header for a classifier : Package, Documentation, Imports and Classifier signature. * - * @param output Writer for generating the java file + * @param output Writer for generating the java file * @param classifier Classifier for generate header * @throws IOException if any pb while writing file */ @@ -399,12 +397,12 @@ public class JavaGenerator extends ObjectModelGenerator { /** * Generate attributes from a collection of ObjectModelAttribute. * - * @param output Writer for generating the java file - * @param clazz classifier in generation + * @param output Writer for generating the java file + * @param clazz classifier in generation * @param attributes Collection of ObjectModelAttribute to generate * @throws IOException if any pb while writing file */ - protected void generateAttributes(Writer output,ObjectModelClassifier clazz, + protected void generateAttributes(Writer output, ObjectModelClassifier clazz, Collection<ObjectModelAttribute> attributes) throws IOException { @@ -447,10 +445,10 @@ public class JavaGenerator extends ObjectModelGenerator { } String attrValue = StringUtils.isNotEmpty(attr.getDefaultValue()) ? - // ANO#474 FD-20100408 : Don't do any simplification for - // defaultValue, must be managed when the attribute is added - // to the class in the Transformer. - " = " + attr.getDefaultValue() : ""; + // ANO#474 FD-20100408 : Don't do any simplification for + // defaultValue, must be managed when the attribute is added + // to the class in the Transformer. + " = " + attr.getDefaultValue() : ""; // " = " + GeneratorUtil.getSimpleName(attr.getDefaultValue()) : ""; /*{<%=prefix%> <%=attrVisibility%><%=attrStatic%><%=attrFinal%><%=attrTransient%><%=attrType%> <%=attrName%><%=attrValue%>; @@ -461,12 +459,12 @@ public class JavaGenerator extends ObjectModelGenerator { /** * Generate operations from a collection of ObjectModelOperation * - * @param output Writer for generating the java file - * @param clazz classifier in generation + * @param output Writer for generating the java file + * @param clazz classifier in generation * @param operations Collection of ObjectModelOperation to generate * @throws IOException if any pb while writing file */ - protected void generateOperations(Writer output,ObjectModelClassifier clazz, + protected void generateOperations(Writer output, ObjectModelClassifier clazz, Collection<ObjectModelOperation> operations) throws IOException { if (!operations.isEmpty()) { @@ -477,17 +475,17 @@ public class JavaGenerator extends ObjectModelGenerator { // Ano #493 : FD-20100412 // Use a boolean to know if the classifier is an interface // Used to avoid generating visibility not needed for interface - boolean interfacez = + boolean interfacez = ObjectModelInterface.class.isAssignableFrom(clazz.getClass()); - + for (ObjectModelOperation op : operations) { - String opName = op.getName(); + String opName = op.getName(); if (opName == null) { generateBlock(output, clazz, op); continue; } generateOperationDocumentation(output, op); - + generateAnnotations(output, clazz, op); String opVisibility = !interfacez ? op.getVisibility() : ""; @@ -508,8 +506,8 @@ public class JavaGenerator extends ObjectModelGenerator { String comma = ""; Collection<ObjectModelParameter> params = op.getParameters(); for (ObjectModelParameter param : params) { - String paramName = param.getName(); - String paramType = GeneratorUtil.getSimpleName(param.getType()); + String paramName = param.getName(); + String paramType = GeneratorUtil.getSimpleName(param.getType()); /*{<%=comma%><%=paramType%> <%=paramName%>}*/ comma = ", "; } @@ -586,8 +584,9 @@ public class JavaGenerator extends ObjectModelGenerator { } /*{<%=prefix%> *) }*/ - + } + protected void generateBlock(Writer output, ObjectModelClassifier clazz, ObjectModelOperation op) throws IOException { diff --git a/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java b/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java index c2015e8..0561632 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java @@ -55,8 +55,8 @@ public class JavaGeneratorUtil extends GeneratorUtil { public static final String OPERATION_GETTER_BOOLEAN_PREFIX = "is"; /** - * dependency to add constants in interfaces via an enumeration. - * <p/> + * Dependency to add constants in interfaces via an enumeration. + * * The literals of enumeration will be the value, and constant names will * be generated by transformers. * @@ -156,7 +156,7 @@ public class JavaGeneratorUtil extends GeneratorUtil { /** * Split the given fqn which contains a generic declaration into his parts. - * <p/> + * * Example : * <pre> * java.util.List<Integer> : [java.util.List, Integer] @@ -184,7 +184,7 @@ public class JavaGeneratorUtil extends GeneratorUtil { return new String[]{fqn}; } - List<String> parts = new ArrayList<String>(); + List<String> parts = new ArrayList<>(); parts.add(fqn.substring(0, firstPartIndex)); String rest = fqn.substring(firstPartIndex + 1, fqn.lastIndexOf('>')); @@ -236,7 +236,7 @@ public class JavaGeneratorUtil extends GeneratorUtil { /** * Join generics parts of a fqn into aparts. - * <p/> + * * Example : * <pre> * [java.util.List, Integer] : java.util.List<Integer> @@ -289,14 +289,14 @@ public class JavaGeneratorUtil extends GeneratorUtil { /** * Split the given fqns gieven the list separator. - * <p/> + * * Example : * <pre> * Boolean, File : [Boolean, File] * Boolean , java.util.List<Integer> : [Boolean, java.util.List<Integer>] * * </pre> - * <p/> + * * <strong>Note:</strong> You can NOT use as separator {@code '<'} nor * {@code '>'} nor {@code ' '}. * @@ -314,7 +314,7 @@ public class JavaGeneratorUtil extends GeneratorUtil { return null; } - List<String> parts = new ArrayList<String>(); + List<String> parts = new ArrayList<>(); // there is others generics in generics, worse case... int begin = 0; diff --git a/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java b/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java index e48afb2..08a4ab4 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java @@ -23,7 +23,6 @@ package org.nuiton.eugene.java; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.EugeneTagValues; @@ -63,7 +62,7 @@ import java.util.Set; /** * Created: 28 oct. 2009 * - * @author fdesbois <fdesbois@codelutin.com> + * @author Florian Desbois - desbois@codelutin.com */ public abstract class ObjectModelTransformerToJava extends ObjectModelTransformer<ObjectModel> { @@ -435,7 +434,7 @@ public abstract class ObjectModelTransformerToJava extends ObjectModelTransforme /** * Add an annotation of the given {@code element} of the given {@code classifier}. - * <p/> + * * <strong>Important note:</strong> * <pre> * Since 2.6.4, the behaviour of this method has changed, we only allowed @@ -475,7 +474,7 @@ public abstract class ObjectModelTransformerToJava extends ObjectModelTransforme /** * Add a parameter to an annotation. * - * @param classifier + * @param classifier holder of element to treat * @param annotation where to add the parameter * @param annotationName parameter name * @param annotationValue paramter value @@ -498,7 +497,7 @@ public abstract class ObjectModelTransformerToJava extends ObjectModelTransforme /** * add an operation to the classifier with the form of a simple block * of code. - * <p/> + * * use it to add a "static {}" block into an classifier, then use * setOperationBody with the returned value of this method to complete * the creation of the static block @@ -656,8 +655,8 @@ public abstract class ObjectModelTransformerToJava extends ObjectModelTransforme } /** - * @param source - * @param destination + * @param source the source element + * @param destination the source element * @since 2.3 */ protected void cloneStereotypes(ObjectModelClassifier source, @@ -672,15 +671,14 @@ public abstract class ObjectModelTransformerToJava extends ObjectModelTransforme /** * copy attributes, interfaces declartion and operation of a given classifier * into another classifier. - * <p/> + * * class-specific, enumeration-specific and interface-specific features * of the given classifier <strong>will not</strong> be present in the clone. * To copy those specific elements, use * * @param source the classifier to clone from the source model * @param destination where to clone the given source one - * @param copyDocumentation flag to add documentation if some found in model - * @link {@link #cloneClassifier(ObjectModelClassifier, boolean)} + * @param copyDocumentation flag to add documentation if some found in model {@link #cloneClassifier(ObjectModelClassifier, boolean)} * @since 2.1.2 * @deprecated since 2.3, prefer use the {@link #cloneClass(ObjectModelClass, boolean)} method */ @@ -695,15 +693,14 @@ public abstract class ObjectModelTransformerToJava extends ObjectModelTransforme /** * copy attributes, interfaces declartion and operation of a given classifier * into another classifier. - * <p/> + * * class-specific, enumeration-specific and interface-specific features * of the given classifier <strong>will not</strong> be present in the clone. * To copy those specific elements, use * * @param source the classifier to clone from the source model * @param destination where to clone the given source one - * @param copyDocumentation flag to add documentation if some found in model - * @link {@link #cloneClassifier(ObjectModelClassifier, boolean)} + * @param copyDocumentation flag to add documentation if some found in model {@link #cloneClassifier(ObjectModelClassifier, boolean)} * @since 2.3 */ protected void cloneClassifier(ObjectModelClassifier source, @@ -815,7 +812,7 @@ public abstract class ObjectModelTransformerToJava extends ObjectModelTransforme /** * creates a clone of the given {@code source} classifier in the output * model and clones attributes, inheritence declaration and operations - * <p/> + * * class-specific, enumeration-specific and interface-specific features * of the given classifier <strong>will</strong> be present in the clone * @@ -843,9 +840,9 @@ public abstract class ObjectModelTransformerToJava extends ObjectModelTransforme /** * Search in {@code input} model, for a enumeration dependency named * {@link JavaGeneratorUtil#DEPENDENCIES_CONSTANTS}. - * <p/> + * * If found, add all literals on {@code output} model as constants. - * <p/> + * * You can add a {@link EugeneTagValues#TAG_CONSTANT_PREFIX} to your * enumeration to prefix constant names. * @@ -875,7 +872,7 @@ public abstract class ObjectModelTransformerToJava extends ObjectModelTransforme return Collections.emptySet(); } - Set<String> constantNames = new HashSet<String>(); + Set<String> constantNames = new HashSet<>(); ObjectModelEnumeration constants = (ObjectModelEnumeration) classifier; diff --git a/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManager.java b/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManager.java index 85e0c40..58d2c0e 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManager.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManager.java @@ -32,11 +32,10 @@ import java.util.Map; /** * To manage annotations for any {@link ObjectModelElement} of a classifier. - * <p/> + * * Created: 17 déc. 2009 * * @author Tony Chemit - chemit@codelutin.com - * @version $Revision$ * @since 2.0.0 */ public class AnnotationsManager { @@ -57,7 +56,7 @@ public class AnnotationsManager { Map<ObjectModelElement, List<ObjectModelAnnotation>> map = getAnnotations(); List<ObjectModelAnnotation> list = map.get(element); if (list == null) { - list = new ArrayList<ObjectModelAnnotation>(); + list = new ArrayList<>(); map.put(element, list); } list.add(annotation); @@ -78,7 +77,7 @@ public class AnnotationsManager { protected Map<ObjectModelElement, List<ObjectModelAnnotation>> getAnnotations() { if (annotations == null) { - annotations = new HashMap<ObjectModelElement, List<ObjectModelAnnotation>>(); + annotations = new HashMap<>(); } return annotations; } diff --git a/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManagerExtension.java b/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManagerExtension.java index 8e4c0d2..c1a7677 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManagerExtension.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/extension/AnnotationsManagerExtension.java @@ -36,7 +36,6 @@ import java.util.Map; * Created: 17 déc. 2009 * * @author Tony Chemit - chemit@codelutin.com - * @version $Revision$ */ public class AnnotationsManagerExtension { @@ -59,7 +58,7 @@ public class AnnotationsManagerExtension { /** * Get the registred annotations for the given {@code element} in the * given {@code classifier}. - * <p/> + * * <b>Note:</b> The method always returns a {@code none null} value, but * an empty array when no annotation when no annotation found for the * element. @@ -69,7 +68,7 @@ public class AnnotationsManagerExtension { * @return the list of annotations registred or an empty list if none. */ public List<ObjectModelAnnotation> getAnnotations(ObjectModelClassifier classifier, - ObjectModelElement element) { + ObjectModelElement element) { AnnotationsManager annotationsManager = getManager(classifier); List<ObjectModelAnnotation> result = null; if (annotationsManager != null) { @@ -101,7 +100,7 @@ public class AnnotationsManagerExtension { protected Map<String, AnnotationsManager> getManagers() { if (managers == null) { - managers = new HashMap<String, AnnotationsManager>(); + managers = new HashMap<>(); } return managers; } diff --git a/eugene/src/main/java/org/nuiton/eugene/java/extension/CodesManager.java b/eugene/src/main/java/org/nuiton/eugene/java/extension/CodesManager.java index 16b0054..21c0a07 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/extension/CodesManager.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/extension/CodesManager.java @@ -71,7 +71,7 @@ public class CodesManager { protected Map<ObjectModelOperation, StringBuilder> getCodes() { if (codes == null) { - codes = new HashMap<ObjectModelOperation, StringBuilder>(); + codes = new HashMap<>(); } return codes; } diff --git a/eugene/src/main/java/org/nuiton/eugene/java/extension/CodesManagerExtension.java b/eugene/src/main/java/org/nuiton/eugene/java/extension/CodesManagerExtension.java index 623387f..0816480 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/extension/CodesManagerExtension.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/extension/CodesManagerExtension.java @@ -66,7 +66,7 @@ public class CodesManagerExtension { /** * Get body code for a operation of the given classifier. - * <p/> + * * The CodesManager must be defined in the model. * * @param classifier reference for the codes @@ -81,7 +81,7 @@ public class CodesManagerExtension { /** * Get the CodesManager associated to the classifier. - * <p/> + * * <b>Note:</b> If not exist, it will be created. * * @param classifier reference for the ImportsManager @@ -103,7 +103,7 @@ public class CodesManagerExtension { protected Map<String, CodesManager> getManagers() { if (managers == null) { - managers = new HashMap<String, CodesManager>(); + managers = new HashMap<>(); } return managers; } diff --git a/eugene/src/main/java/org/nuiton/eugene/java/extension/ConstantsManager.java b/eugene/src/main/java/org/nuiton/eugene/java/extension/ConstantsManager.java index 375b9f4..032a997 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/extension/ConstantsManager.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/extension/ConstantsManager.java @@ -29,11 +29,12 @@ import java.util.TreeMap; /** * Manager of constant names. - * + * * @author Tony Chemit - chemit@codelutin.com * @since ? */ public class ConstantsManager { + /** * cache of constant name (values) for property name (keys) */ @@ -42,7 +43,7 @@ public class ConstantsManager { /** * Obtain a constant nmae from a property name and store it in cache * the first time it had to build it. - * + * * @param propertyName the propertyName to convert * @return the equivalent constant name */ @@ -52,15 +53,15 @@ public class ConstantsManager { return map.get(propertyName); } // convert propertyName to constant name - String constantName = - GeneratorUtil.convertVariableNameToConstantName(propertyName); - map.put(propertyName,constantName); + String constantName = + GeneratorUtil.convertVariableNameToConstantName(propertyName); + map.put(propertyName, constantName); return constantName; } protected Map<String, String> getNameToConstant() { if (nameToConstant == null) { - nameToConstant = new TreeMap<String, String>(); + nameToConstant = new TreeMap<>(); } return nameToConstant; } diff --git a/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java b/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java index 443e6c4..187dede 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java @@ -39,9 +39,8 @@ import java.util.Set; * allow to register imports, and in a second-pass, returns the type to use in * generated code. * - * @author athimel <thimel@codelutin.com> + * @author athimel (Code Lutin) * @author Tony Chemit - chemit@codelutin.com - * @version $Id$ * @since 2.0.0 */ public class ImportsManager { @@ -55,11 +54,11 @@ public class ImportsManager { FILLING, READING } - + private static Set<String> primitiveTypes; static { - primitiveTypes = new HashSet<String>(); + primitiveTypes = new HashSet<>(); primitiveTypes.add("byte"); primitiveTypes.add("Byte"); @@ -85,7 +84,7 @@ public class ImportsManager { } - private Map<String, String> imports = new HashMap<String, String>(); + private Map<String, String> imports = new HashMap<>(); private State state = State.FILLING; @@ -260,7 +259,7 @@ public class ImportsManager { */ public List<String> getImports(String packageName) { state = State.READING; - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); int packageLength = packageName.length(); String packagePrefix = packageName + "."; for (String fqn : imports.values()) { diff --git a/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManagerExtension.java b/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManagerExtension.java index 3b1ea4e..c064001 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManagerExtension.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManagerExtension.java @@ -32,12 +32,11 @@ import java.util.Map; /** * Extension for ObjectModel to manage imports for all classifiers in the model. - * <p/> + * * Created: 2 nov. 2009 * - * @author fdesbois <desbois@codelutin.com> + * @author Florian Desbois - desbois@codelutin.com * @author Tony Chemit - chemit@codelutin.com - * @version $Id$ */ public class ImportsManagerExtension { @@ -58,7 +57,7 @@ public class ImportsManagerExtension { /** * Get the ImportsManager associated to the classifier. - * <p/> + * * <strong>Note:</strong> if not exist, it will be created. * * @param classifier reference for the ImportsManager @@ -72,7 +71,7 @@ public class ImportsManagerExtension { /** * Get the ImportsManager associated to the given {@code fqn}. - * <p/> + * * <strong>Note:</strong> if not exist, it will be created. * * @param fqn reference for the ImportsManager @@ -107,7 +106,7 @@ public class ImportsManagerExtension { /** * Get imports for a classifier. - * <p/> + * * The ImportsManager must be defined in the model. * * @param fqn reference for the imports @@ -122,7 +121,7 @@ public class ImportsManagerExtension { protected Map<String, ImportsManager> getManagers() { if (managers == null) { - managers = new HashMap<String, ImportsManager>(); + managers = new HashMap<>(); } return managers; } diff --git a/eugene/src/main/java/org/nuiton/eugene/java/extension/ObjectModelAnnotation.java b/eugene/src/main/java/org/nuiton/eugene/java/extension/ObjectModelAnnotation.java index 550b093..88a58c2 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/extension/ObjectModelAnnotation.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/extension/ObjectModelAnnotation.java @@ -51,7 +51,7 @@ public class ObjectModelAnnotation { public void addParameter(ObjectModelAnnotationParameter parameter) { if (parameters == null) { - parameters = new ArrayList<ObjectModelAnnotationParameter>(); + parameters = new ArrayList<>(); } parameters.add(parameter); } diff --git a/eugene/src/main/java/org/nuiton/eugene/java/extension/package-info.java b/eugene/src/main/java/org/nuiton/eugene/java/extension/package-info.java index 58bfec1..d31c288 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/extension/package-info.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/extension/package-info.java @@ -28,6 +28,7 @@ * <li>Constants extension : to deal with constants in java generators.</li> * <li>codes extension : to add smartly some codes to operations.</li> * </ul> + * * @see AnnotationsManager * @see ImportsManager * @see ConstantsManager diff --git a/eugene/src/main/java/org/nuiton/eugene/java/package-info.java b/eugene/src/main/java/org/nuiton/eugene/java/package-info.java index cfa859b..93de604 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/package-info.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/package-info.java @@ -24,9 +24,9 @@ * Eugene java package : all specific class for Java generation. * <pre> * - ObjectModel Extensions : which are in package extension - * - Builder : {@link JavaBuilder } used to fill an ObjectModel in a Java way - * - Transformer : {@link ObjectModelTransformerToJava } used to transform an xmi ObjectModel to a java one - * - Generator : {@link JavaGenerator } is a template used to write java files (processed by Nuiton-processor) + * - Builder : {@link org.nuiton.eugene.java.JavaBuilder} used to fill an ObjectModel in a Java way + * - Transformer : {@link org.nuiton.eugene.java.ObjectModelTransformerToJava} used to transform an xmi ObjectModel to a java one + * - Generator : {@link org.nuiton.eugene.java.JavaGenerator} is a template used to write java files (processed by Nuiton-processor) * </pre> */ package org.nuiton.eugene.java; diff --git a/eugene/src/main/java/org/nuiton/eugene/models/Model.java b/eugene/src/main/java/org/nuiton/eugene/models/Model.java index 2d71030..a713fc7 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/Model.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/Model.java @@ -27,11 +27,6 @@ import org.nuiton.eugene.models.tagvalue.TagValueAble; /** * Model. - * - * @version $Revision$ - * <p/> - * Mise a jour: $Date$ - * par : */ public interface Model extends TagValueAble { @@ -62,14 +57,14 @@ public interface Model extends TagValueAble { /** * Get the extension associated to the reference (unique) - * @param <O> object type returned - * @param reference unique corresponding to the extension to get + * + * @param <O> object type returned + * @param reference unique corresponding to the extension to get * @param extensionClass class of the extension * @return the object value for the extension - * @throws ClassCastException when extensionClass is not valid + * @throws ClassCastException when extensionClass is not valid * @throws IllegalArgumentException for non existing extension with reference */ - <O> O getExtension(String reference, Class<O> extensionClass) - throws ClassCastException, IllegalArgumentException; + <O> O getExtension(String reference, Class<O> extensionClass) throws ClassCastException, IllegalArgumentException; } //Model diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java index dc27577..227db4f 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java @@ -31,17 +31,14 @@ import java.util.List; /** * Abstraction for the root node of object model trees. * This an entry point for browsing a model tree. This object offers - * as well several facilities for a direct access to some of the object model elements. - * - * Created: 14 janv. 2004 + * as well several facilities for a direct access to some of the object model elements. * - * @author Cedric Pineau <pineau@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ + * Created: 14 janv. 2004 * - * Last update : $Date$ - * by : */ + * @author Cédric Pineau - pineau@codelutin.com + */ public interface ObjectModel extends Model { + /** * Plexus role-hint */ @@ -49,17 +46,17 @@ public interface ObjectModel extends Model { /** * Returns all packages defined in this model. - * @see ObjectModelPackage * * @return a Collection containing all ObjectModelPackage for this model. + * @see ObjectModelPackage * @since 2.12 */ Collection<ObjectModelPackage> getPackages(); /** * Returns the package corresponding to the given name, or null if the model contains no package for this name. - * @param qualifiedClassifierName - the name of the package to retrieve. * + * @param qualifiedClassifierName - the name of the package to retrieve. * @return the ObjectModelPackage of the found given name, or null if the model contains no package for this name. * @since 2.12 */ @@ -67,8 +64,8 @@ public interface ObjectModel extends Model { /** * Returns the package of the given classifier, or null if the model contains no package for this classifier. - * @param classifier the classifier of the package to retrieve. * + * @param classifier the classifier of the package to retrieve. * @return the ObjectModelPackage for the given classifier, or null if the model contains no package for this classifier. * @since 2.12 */ @@ -76,91 +73,92 @@ public interface ObjectModel extends Model { /** * Indicates whether the model contains the package associated to the given name - * @param name - the name of the package to retrieve. * + * @param name - the name of the package to retrieve. * @return true if the package has been found. * @since 2.12 */ boolean hasPackage(String name); /** - * Returns all classifiers defined in this model. (Except innerClasses) - * @see ObjectModelClassifier - * - * @return a Collection containing all ObjectModelClassifier for this model. - */ + * Returns all classifiers defined in this model. (Except innerClasses) + * + * @return a Collection containing all ObjectModelClassifier for this model. + * @see ObjectModelClassifier + */ Collection<ObjectModelClassifier> getClassifiers(); /** - * Returns the classifier corresponding to the given qualified name, or null if the model contains no classifier for this qualified name. - * @param qualifiedClassifierName - the qualified name of the classifier to retrieve. - * - * @return the ObjectModelClassifier of the found classifier, or null if the model contains no classifier for this qualified name. - */ + * Returns the classifier corresponding to the given qualified name, or null if the model contains no classifier for this qualified name. + * + * @param qualifiedClassifierName - the qualified name of the classifier to retrieve. + * @return the ObjectModelClassifier of the found classifier, or null if the model contains no classifier for this qualified name. + */ ObjectModelClassifier getClassifier(String qualifiedClassifierName); /** - * Returns all classes defined in this model. (Except innerClasses) - * @see ObjectModelClass - * - * @return a Collection containing all ObjectModelClass for this model. - */ + * Returns all classes defined in this model. (Except innerClasses) + * + * @return a Collection containing all ObjectModelClass for this model. + * @see ObjectModelClass + */ Collection<ObjectModelClass> getClasses(); /** - * Returns the class corresponding to the given qualified name, or null if the model contains no class for this qualified name. - * @param qualifiedClassName - the qualified name of the class to retrieve. - * - * @return the ObjectModelClass of the found class, or null if the model contains no class for this qualified name. - */ + * Returns the class corresponding to the given qualified name, or null if the model contains no class for this qualified name. + * + * @param qualifiedClassName - the qualified name of the class to retrieve. + * @return the ObjectModelClass of the found class, or null if the model contains no class for this qualified name. + */ ObjectModelClass getClass(String qualifiedClassName); /** - * Indicates whether the model contains the class associated to the given className - * @param qualifiedClassName - the qualified name of the class to retrieve. - * - * @return true if the class has been found. - */ + * Indicates whether the model contains the class associated to the given className + * + * @param qualifiedClassName - the qualified name of the class to retrieve. + * @return true if the class has been found. + */ boolean hasClass(String qualifiedClassName); /** - * Returns all interfaces defined in this model. - * @see ObjectModelInterface - * - * @return a Collection containing all ObjectModelInterface for this model. - */ + * Returns all interfaces defined in this model. + * + * @return a Collection containing all ObjectModelInterface for this model. + * @see ObjectModelInterface + */ Collection<ObjectModelInterface> getInterfaces(); /** - * Returns the interface corresponding to the given qualified name, or null if the model contains no interface for this qualified name. - * @param qualifiedInterfaceName the qualified name of the interface to retrieve. - * - * @return the ObjectModelInterface of the found interface, or null if the model contains no interface for this qualified name. - */ + * Returns the interface corresponding to the given qualified name, or null if the model contains no interface for this qualified name. + * + * @param qualifiedInterfaceName the qualified name of the interface to retrieve. + * @return the ObjectModelInterface of the found interface, or null if the model contains no interface for this qualified name. + */ ObjectModelInterface getInterface(String qualifiedInterfaceName); /** * Returns all enumerations defined in this model. - * @see ObjectModelEnumeration * * @return a Collection containing all ObjectModelEnumeration for this model. + * @see ObjectModelEnumeration */ Collection<ObjectModelEnumeration> getEnumerations(); /** * Return the enumeration corresponding to the given qualified name + * * @param qualifiedEnumerationName the fully qualified name of the enumeration to retrieve. * @return the ObjectModelEnumeration of the found enumeration or null if the model contains no enumeration for this qualified name. */ ObjectModelEnumeration getEnumeration(String qualifiedEnumerationName); /** - * Returns all comments not lied to a particular model element - * - * @return a List containing all comments for this model as Strings. - */ + * Returns all comments not lied to a particular model element + * + * @return a List containing all comments for this model as Strings. + */ List<String> getComments(); // /** diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAssociationClass.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAssociationClass.java index 58c80e7..e79c5a0 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAssociationClass.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAssociationClass.java @@ -26,29 +26,25 @@ import java.util.List; /** * ObjectModelAssociationClass. - * - * @author Cédric Pineau <pineau@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ * - * Last update : $Date$ - * by : */ + * @author Cédric Pineau - pineau@codelutin.com + */ public interface ObjectModelAssociationClass extends ObjectModelClass { /** - * Returns all participants (that is association ends) attributes for this association class. - * @see ObjectModelAttribute - * - * @return a List containing all participants attributes for this association class. - */ + * Returns all participants (that is association ends) attributes for this association class. + * + * @return a List containing all participants attributes for this association class. + * @see ObjectModelAttribute + */ List<ObjectModelAttribute> getParticipantsAttributes(); /** - * Returns all participants (that is association ends) classifiers for this association class. - * @see ObjectModelClassifier - * - * @return a List containing all participants classifiers for this association class. - */ + * Returns all participants (that is association ends) classifiers for this association class. + * + * @return a List containing all participants classifiers for this association class. + * @see ObjectModelClassifier + */ List<ObjectModelClassifier> getParticipantsClassifiers(); } //ObjectModelAssociationClass diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java index 0e0239d..a4767d3 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java @@ -23,107 +23,116 @@ package org.nuiton.eugene.models.object; /** -* Abstraction for the attribute node of object model trees. -* This object presents all information concerning the given attribute. -* -* Created: 14 janv. 2004 -* -* @author Cédric Pineau <pineau@codelutin.com> -* Copyright Code Lutin -* @version $Revision$ -* -* Last update : $Date$ -* by : $Author$ -*/ + * Abstraction for the attribute node of object model trees. + * This object presents all information concerning the given attribute. + * + * Created: 14 janv. 2004 + * + * @author Cédric Pineau - pineau@codelutin.com + */ public interface ObjectModelAttribute extends ObjectModelParameter { + /** * Returns the type of this attribute. * * @return the type of this attribute. */ String getType(); + /** * Returns whether this attribute is an aggregate or not. * * @return {@code true} if this attribute is an aggregate or not. */ boolean isAggregate(); + /** * Returns whether this attribute is a composite or not. * * @return {@code true} if this attribute is a composite or not. */ boolean isComposite(); + /** * Returns the visibility of this attribute. * - * Possible values includes <tt>public</tt>, <tt>protected</tt> + * Possible values includes <tt>public</tt>, <tt>protected</tt> * and <tt>private</tt>. * * @return the visibility of this attribute. */ String getVisibility(); + /** - * Returns whether this attribute reference a model classifier or not. - * - * @return a boolean indicating whether this attribute reference a model - * classifier or not. - */ + * Returns whether this attribute reference a model classifier or not. + * + * @return a boolean indicating whether this attribute reference a model + * classifier or not. + */ boolean referenceClassifier(); + /** * Returns the classifier referenced by this attribute or null if it does * not reference a model classifier. * * @return the ObjectModelClassfifier referenced by this attribute or null - * if it does not reference a model classifier. + * if it does not reference a model classifier. */ ObjectModelClassifier getClassifier(); + /** * Returns the attribute used to reference this class at the other end of - * the association or null if this is not an association, or if it is not - * bi-directionnal. - * - * @see #getClassifier() + * the association or null if this is not an association, or if it is not + * bi-directionnal. * * @return the ObjectModelAttribute used to reference this class at the - * other end of the association or null if this is not an - * association, or if it is not bi-directionnal. + * other end of the association or null if this is not an + * association, or if it is not bi-directionnal. + * @see #getClassifier() */ ObjectModelAttribute getReverseAttribute(); + /** * Return attribute reserver attribute name. - * + * * @return reverse attribute name or null */ String getReverseAttributeName(); + /** * max multiplicity of the reverse attribute * * @return max multiplicity of the reverse attribute */ int getReverseMaxMultiplicity(); + /** * @return a ObjectModelClass corresponding to the association class - * associated with this association, or null if there is none. + * associated with this association, or null if there is none. */ ObjectModelClass getAssociationClass(); + /** * @return {@code true} if this association has an associated association - * class, ot not. + * class, ot not. */ boolean hasAssociationClass(); + /** * @return {@code true} if this attribute is static or not. */ boolean isStatic(); + /** * @return {@code true} if this attribute is final or not. */ boolean isFinal(); + /** * @return {@code true} if this attribute is transient. */ boolean isTransient(); + /** * @return {@code true} if this attribute is navigable. */ diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java index d9b61d6..f9e3f5e 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java @@ -43,11 +43,10 @@ import org.nuiton.eugene.models.object.xml.ObjectModelParameterImpl; /** * Builder to fill an empty ObjectModel. The object model name is important if * you want to use the model in generators. - * <p/> + * * Created: 3 nov. 2009 * - * @author fdesbois <fdesbois@codelutin.com> - * @version $Id$ + * @author Florian Desbois - desbois@codelutin.com */ public class ObjectModelBuilder { @@ -486,7 +485,7 @@ public class ObjectModelBuilder { * The last visibility set will be keeped. * * @param classifier where the operation will be added - * @param operation operation to add + * @param operation operation to add * @return the added operation (says the given parameter) * @since 2.1.2 */ @@ -497,7 +496,7 @@ public class ObjectModelBuilder { (ObjectModelOperationImpl) operation); return operation; } - + /** * Set the body code for an Operation. * @@ -694,7 +693,7 @@ public class ObjectModelBuilder { /** * Set the navigable flag of an attribute in the model. * - * @param attribute where the navigable flag will be setted + * @param attribute where the navigable flag will be setted * @param navigable navigable flag value to set * @since 2.3 */ diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClass.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClass.java index 2a719bf..e1d321e 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClass.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClass.java @@ -27,26 +27,23 @@ import java.util.Collection; /** * Abstraction for the class node of object model trees. * This object presents all information concerning the given class. - * - * Created: 14 janv. 2004 * - * @author Cédric Pineau <pineau@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ + * Created: 14 janv. 2004 * - * Last update : $Date$ - * by : $Author$ + * @author Cédric Pineau - pineau@codelutin.com */ public interface ObjectModelClass extends ObjectModelClassifier { /** * Returns all parent classes for this class. + * * @return a Collection containing all parent ObjectModelClass for this class. */ Collection<ObjectModelClass> getSuperclasses(); /** * Returns all inner classes for this class. + * * @return a Collection containing all inner ObjectModelClass for this class. */ Collection<ObjectModelClassifier> getInnerClassifiers(); @@ -54,7 +51,7 @@ public interface ObjectModelClass extends ObjectModelClassifier { /** * Returns the discriminator for the given superclass. * (name of the inheritance relation). - * + * * @param superclass super class to get discriminator * @return the discriminator for the given superclass as a String if it exists, null otherwise. */ @@ -62,6 +59,7 @@ public interface ObjectModelClass extends ObjectModelClassifier { /** * Returns all known direct specialized classes for this class. + * * @return a Collection containing all known direct specialized ObjectModelClass for this class. */ Collection<ObjectModelClass> getSpecialisations(); @@ -69,9 +67,10 @@ public interface ObjectModelClass extends ObjectModelClassifier { /** * Returns all known direct specialized classes for this class for the * specified discriminator. + * * @param discriminator discriminator to get specialisations * @return a Collection containing all known direct specialized - * ObjectModelClass for this class for the specified discriminator. + * ObjectModelClass for this class for the specified discriminator. */ Collection<ObjectModelClass> getSpecialisations(String discriminator); @@ -93,8 +92,9 @@ public interface ObjectModelClass extends ObjectModelClassifier { * Returns all operations defined on all Super class extended by this * classifier, directly or indirectly. and all interface implemented by the * super class. + * * @param distinct if this boolean is true only distinct operation - * are add to list. + * are add to list. * @return a Collection of ObjectModelOperation */ Collection<ObjectModelOperation> getAllSuperclassOperations(boolean distinct); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClassifier.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClassifier.java index 5815185..3a1957c 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClassifier.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClassifier.java @@ -27,104 +27,103 @@ import java.util.Collection; /** * ObjectModelClassifier. * - * @author Cédric Pineau <pineau@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * - * Last update : $Date$ - * by : */ + * @author Cédric Pineau - pineau@codelutin.com + */ public interface ObjectModelClassifier extends ObjectModelElement { /** - * Returns the package name of this classifier. - * - * @return the package name of this classifier. - */ + * Returns the package name of this classifier. + * + * @return the package name of this classifier. + */ String getPackageName(); /** - * Returns the qualified name of this classifier. - * Class qualified name is composed of the package name and the classifier name. - * - * @return the qualified name of this classifier. - */ + * Returns the qualified name of this classifier. + * Class qualified name is composed of the package name and the classifier name. + * + * @return the qualified name of this classifier. + */ String getQualifiedName(); /** - * Returns all parent interfaces for this classifier. - * - * @return a Collection containing all parent ObjectModelInterface for this classifier. - */ + * Returns all parent interfaces for this classifier. + * + * @return a Collection containing all parent ObjectModelInterface for this classifier. + */ Collection<ObjectModelInterface> getInterfaces(); /** * Returns all operations defined on this classifier. - * - * @param name name of operation should be returned + * + * @param name name of operation should be returned * @return a Collection containing all ObjectModelOperation for this classifier. - * * @see ObjectModelOperation */ Collection<ObjectModelOperation> getOperations(String name); /** * Returns all operations defined on this classifier. - * @see ObjectModelOperation * * @return a Collection containing all ObjectModelOperation for this classifier. + * @see ObjectModelOperation */ Collection<ObjectModelOperation> getOperations(); /** - * Returns all operations defined on all interfaces implemented by this - * classifier, directly or indirectly. - * @param distinct if this boolean is true only distinct operation - * are add to list. - * @return a Collection of ObjectModelOperation - */ + * Returns all operations defined on all interfaces implemented by this + * classifier, directly or indirectly. + * + * @param distinct if this boolean is true only distinct operation + * are add to list. + * @return a Collection of ObjectModelOperation + */ Collection<ObjectModelOperation> getAllInterfaceOperations( boolean distinct); /** - * Returns all operations defined on all implemented by this - * classifier, directly or indirectly. For interface this methode return - * the same result as getAllInterfaceOperations, for Class this - * method add all operation of SuperClass. - * @param distinct if this boolean is true only distinct operation - * are add to list. - * @return a Collection of ObjectModelOperation - */ + * Returns all operations defined on all implemented by this + * classifier, directly or indirectly. For interface this methode return + * the same result as getAllInterfaceOperations, for Class this + * method add all operation of SuperClass. + * + * @param distinct if this boolean is true only distinct operation + * are add to list. + * @return a Collection of ObjectModelOperation + */ Collection<ObjectModelOperation> getAllOtherOperations( boolean distinct); /** - * Returns all attributes defined on this class. - * @see ObjectModelAttribute - * - * @return a Collection containing all ObjectModelAttribute for this class. - */ + * Returns all attributes defined on this class. + * + * @return a Collection containing all ObjectModelAttribute for this class. + * @see ObjectModelAttribute + */ Collection<ObjectModelAttribute> getAttributes(); /** - * Returns the attribute corresponding to the given name, or null if the class contains no attribute for this name. - * - * @param attributeName attribute name - * @return the ObjectModelAttribute of the found attribute, or null if the class contains no attribute for this name. - */ + * Returns the attribute corresponding to the given name, or null if the class contains no attribute for this name. + * + * @param attributeName attribute name + * @return the ObjectModelAttribute of the found attribute, or null if the class contains no attribute for this name. + */ ObjectModelAttribute getAttribute(String attributeName); /** - * Returns all attributes defined on all interfaces implemented by this - * classifier, directly or indirectly. - * @return a Collection of ObjectModelAttribute - */ + * Returns all attributes defined on all interfaces implemented by this + * classifier, directly or indirectly. + * + * @return a Collection of ObjectModelAttribute + */ Collection<ObjectModelAttribute> getAllInterfaceAttributes(); /** - * Returns all attributes defined on all super class extended by this - * classifier, directly or indirectly. - * @return a Collection of ObjectModelAttribute - */ + * Returns all attributes defined on all super class extended by this + * classifier, directly or indirectly. + * + * @return a Collection of ObjectModelAttribute + */ Collection<ObjectModelAttribute> getAllOtherAttributes(); /** @@ -136,6 +135,7 @@ public interface ObjectModelClassifier extends ObjectModelElement { /** * Return a dependency identifier by her name + * * @param name of the dependency * @return the dependency */ @@ -143,33 +143,33 @@ public interface ObjectModelClassifier extends ObjectModelElement { /** * Returns whether this classifier is a class or not - * @see ObjectModelClass - * + * * @return a boolean indicating whether this classifier is a class or not. + * @see ObjectModelClass */ boolean isClass(); /** * Returns whether this classifier is an interface or not - * @see ObjectModelInterface - * + * * @return a boolean indicating whether this classifier is an interface or not. + * @see ObjectModelInterface */ boolean isInterface(); /** * Returns whether this classifier is an enumeration or not - * @see ObjectModelEnumeration * * @return a boolean indicating whether this classifier is an enumeration or not. + * @see ObjectModelEnumeration */ boolean isEnum(); /** - * Returns whether this class is inner an other class or not. - * - * @return a boolean indicating whether this class is inner an other class or not. - */ + * Returns whether this class is inner an other class or not. + * + * @return a boolean indicating whether this class is inner an other class or not. + */ boolean isInner(); } //ObjectModelClassifier diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelDependency.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelDependency.java index 90c9b62..441e207 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelDependency.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelDependency.java @@ -29,16 +29,13 @@ package org.nuiton.eugene.models.object; * * Created: april 23th 2009 * - * @author Florian Desbois <desbois@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * - * Last update : $Date$ - * by : */ + * @author Florian Desbois - desbois@codelutin.com + */ public interface ObjectModelDependency { + /** * Dependency name - * + * * @return a String */ String getName(); @@ -52,7 +49,7 @@ public interface ObjectModelDependency { /** * Client classifier of the dependency - * + * * @return an ObjectModelClassifier */ ObjectModelClassifier getClient(); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java index 9bde15e..69b50ab 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java @@ -30,12 +30,7 @@ import java.util.List; /** * ObjectModelElement. * - * @author Cédric Pineau <pineau@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * <p/> - * Last update : $Date$ - * by : + * @author Cédric Pineau - pineau@codelutin.com */ public interface ObjectModelElement extends TagValueAble, StereotypeAble { @@ -63,7 +58,7 @@ public interface ObjectModelElement extends TagValueAble, StereotypeAble { /** * The description of this element is the upper part of the element's * documentation. - * <p/> + * * The other part of the document can be accessed with * {@link #getSourceDocumentation()} * diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelEnumeration.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelEnumeration.java index 51aeaf3..6356acb 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelEnumeration.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelEnumeration.java @@ -27,9 +27,7 @@ import java.util.Collection; /** * ObjectModelEnumeration. * - * @author Florian Desbois <fdesbois@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ + * @author Florian Desbois - desbois@codelutin.com */ public interface ObjectModelEnumeration extends ObjectModelClassifier { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java index d2b8691..092a31d 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java @@ -39,32 +39,31 @@ import java.util.Collection; * méthodes generateFrom... et le getFilenameFor... associé si l'on souhaite un * nom de fichier convenable. Si dans une méthode generateFrom... on utilise pas * le Writer alors aucun fichier n'est généré. - * <p/> + * * <pre> * public String getFilenameForClass(ObjectModelClass clazz){ * return super.getFilenameForClass(Clazz) + "Service.java"; * } - * <p/> + * * public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException{ * if(clazz.getType().equals("service")){ * / *{ * public class .... { - * <p/> + * * } * }* / * } * } * </pre> - * <p/> + * * Le nom de l'argument writer doit absolument etre output et pas autre chose si * vous souhaitez utiliser le processeur * org.codelutin.processor.filters.GeneratorTemplatesFilter pour vous * s'implifier l'écriture des templates. - * <p/> + * * Created: 14 mars 2004 * - * @author Benjamin Poussin <poussin@codelutin.com> Copyright Code Lutin - * @version $Id$ + * @author Benjamin Poussin - poussin@codelutin.com */ public class ObjectModelGenerator extends AbstractGenerator<ObjectModel> { @@ -203,8 +202,7 @@ public class ObjectModelGenerator extends AbstractGenerator<ObjectModel> { try { StringWriter out = new StringWriter(); - MonitorWriter monitorOut = new MonitorWriter(out); - try { + try (MonitorWriter monitorOut = new MonitorWriter(out)) { switch (type) { case OBJECT_MODEL: generateFromModel(monitorOut, (ObjectModel) element); @@ -225,8 +223,6 @@ public class ObjectModelGenerator extends AbstractGenerator<ObjectModel> { write(outputFile, monitorOut); - } finally { - monitorOut.close(); } } catch (Exception eee) { @@ -243,7 +239,7 @@ public class ObjectModelGenerator extends AbstractGenerator<ObjectModel> { /** * Test if given element can be generated. - * <p/> + * * An element can be generated if his package is in the * {@link #generatedPackages} list or if {@link #generatedPackages} is * null or empty. diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelInterface.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelInterface.java index 65a8473..77e1ac5 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelInterface.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelInterface.java @@ -23,18 +23,13 @@ package org.nuiton.eugene.models.object; /** -* Abstraction for the interface node of object model trees. -* This object presents all information concerning the given interface. -* -* Created: 14 janv. 2004 -* -* @author Cédric Pineau <pineau@codelutin.com> -* Copyright Code Lutin -* @version $Revision$ -* -* Last update : $Date$ -* by : $Author$ -*/ + * Abstraction for the interface node of object model trees. + * This object presents all information concerning the given interface. + * + * Created: 14 janv. 2004 + * + * @author Cédric Pineau - pineau@codelutin.com + */ public interface ObjectModelInterface extends ObjectModelClassifier { } //ObjectModelInterface diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelModifier.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelModifier.java index d48788a..b0f3ab6 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelModifier.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelModifier.java @@ -28,29 +28,50 @@ package org.nuiton.eugene.models.object; * * Created: 3 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ + * @author Florian Desbois - desbois@codelutin.com + */ public interface ObjectModelModifier { // Still present only for backward compatibility. Please use ObjectModelJavaModifier.* - @Deprecated public static final ObjectModelModifier STATIC = ObjectModelJavaModifier.STATIC; - @Deprecated public static final ObjectModelModifier FINAL = ObjectModelJavaModifier.FINAL; - @Deprecated public static final ObjectModelModifier ABSTRACT = ObjectModelJavaModifier.ABSTRACT; - @Deprecated public static final ObjectModelModifier TRANSIENT = ObjectModelJavaModifier.TRANSIENT; - @Deprecated public static final ObjectModelModifier PUBLIC = ObjectModelJavaModifier.PUBLIC; - @Deprecated public static final ObjectModelModifier PROTECTED = ObjectModelJavaModifier.PROTECTED; - @Deprecated public static final ObjectModelModifier PRIVATE = ObjectModelJavaModifier.PRIVATE; - @Deprecated public static final ObjectModelModifier PACKAGE = ObjectModelJavaModifier.PACKAGE; + @Deprecated + ObjectModelModifier STATIC = ObjectModelJavaModifier.STATIC; + + @Deprecated + ObjectModelModifier FINAL = ObjectModelJavaModifier.FINAL; + + @Deprecated + ObjectModelModifier ABSTRACT = ObjectModelJavaModifier.ABSTRACT; + + @Deprecated + ObjectModelModifier TRANSIENT = ObjectModelJavaModifier.TRANSIENT; + + @Deprecated + ObjectModelModifier PUBLIC = ObjectModelJavaModifier.PUBLIC; + + @Deprecated + ObjectModelModifier PROTECTED = ObjectModelJavaModifier.PROTECTED; + + @Deprecated + ObjectModelModifier PRIVATE = ObjectModelJavaModifier.PRIVATE; + + @Deprecated + ObjectModelModifier PACKAGE = ObjectModelJavaModifier.PACKAGE; // Still present only for backward compatibility. Please use ObjectModelUMLModifier.* - @Deprecated public static final ObjectModelModifier AGGREGATE = ObjectModelUMLModifier.AGGREGATE; - @Deprecated public static final ObjectModelModifier COMPOSITE = ObjectModelUMLModifier.COMPOSITE; - @Deprecated public static final ObjectModelModifier UNIQUE = ObjectModelUMLModifier.UNIQUE; - @Deprecated public static final ObjectModelModifier ORDERED = ObjectModelUMLModifier.ORDERED; - @Deprecated public static final ObjectModelModifier NAVIGABLE = ObjectModelUMLModifier.NAVIGABLE; + @Deprecated + ObjectModelModifier AGGREGATE = ObjectModelUMLModifier.AGGREGATE; + + @Deprecated + ObjectModelModifier COMPOSITE = ObjectModelUMLModifier.COMPOSITE; + + @Deprecated + ObjectModelModifier UNIQUE = ObjectModelUMLModifier.UNIQUE; + + @Deprecated + ObjectModelModifier ORDERED = ObjectModelUMLModifier.ORDERED; + + @Deprecated + ObjectModelModifier NAVIGABLE = ObjectModelUMLModifier.NAVIGABLE; /** * @return true is the current ObjectModelModifier is a Java visibility diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelOperation.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelOperation.java index c4042c0..f022e80 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelOperation.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelOperation.java @@ -26,52 +26,48 @@ import java.util.Collection; import java.util.Set; /** -* Abstraction for the operation node of object model trees. -* This object presents all information concerning the given operation. -* -* Created: 14 janv. 2004 -* -* @author Cédric Pineau <pineau@codelutin.com> -* Copyright Code Lutin -* @version $Revision$ -* -* Last update : $Date$ -* by : $Author$ -*/ + * Abstraction for the operation node of object model trees. + * This object presents all information concerning the given operation. + * + * Created: 14 janv. 2004 + * + * @author Cédric Pineau - pineau@codelutin.com + */ public interface ObjectModelOperation extends ObjectModelElement { /** - * Returns the return type of this operation. - * - * @return the return type of this operation. - */ + * Returns the return type of this operation. + * + * @return the return type of this operation. + */ String getReturnType(); /** - * Returns the visibility of this operation. - * Possible values includes <tt>public</tt>, <tt>protected</tt> and <tt>private</tt>. - * - * @return the visibility of this operation. - */ + * Returns the visibility of this operation. + * Possible values includes <tt>public</tt>, <tt>protected</tt> and <tt>private</tt>. + * + * @return the visibility of this operation. + */ String getVisibility(); /** - * Returns whether this operation is abstract or not. - * - * @return a boolean indicating whether this operation is abstract or not. - */ + * Returns whether this operation is abstract or not. + * + * @return a boolean indicating whether this operation is abstract or not. + */ boolean isAbstract(); /** - * Returns all parameters defined on this operation. - * @see ObjectModelParameter - * - * @return a Collection containing all parameters defined on this operation. - */ + * Returns all parameters defined on this operation. + * + * @return a Collection containing all parameters defined on this operation. + * @see ObjectModelParameter + */ Collection<ObjectModelParameter> getParameters(); /** * Return the return parameter of the operation + * * @return an ObjectModelParameter representing the return parameter */ ObjectModelParameter getReturnParameter(); @@ -91,6 +87,7 @@ public interface ObjectModelOperation extends ObjectModelElement { /** * Return body of the operation (source code) + * * @return body of the operation (source code) */ String getBodyCode(); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelPackage.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelPackage.java index 3e42940..c9a4c82 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelPackage.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelPackage.java @@ -25,7 +25,6 @@ package org.nuiton.eugene.models.object; import org.nuiton.eugene.models.stereotype.StereotypeAble; import org.nuiton.eugene.models.tagvalue.TagValueAble; -import java.util.Collection; import java.util.List; /** @@ -148,7 +147,7 @@ public interface ObjectModelPackage extends TagValueAble, StereotypeAble { /** * The description of this element is the upper part of the element's * documentation. - * <p/> + * * The other part of the document can be accessed with * {@link #getSourceDocumentation()} * diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java index c57d940..b8587e8 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java @@ -25,15 +25,10 @@ package org.nuiton.eugene.models.object; /** * Abstraction for the parameter node of object model trees. * This object presents all information concerning the given parameter. - * <p/> + * * Created: 14 janv. 2004 * - * @author Cédric Pineau <pineau@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * <p/> - * Last update : $Date$ - * by : $Author$ + * @author Cédric Pineau - pineau@codelutin.com */ public interface ObjectModelParameter extends ObjectModelElement { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java index 3fba1ac..6b5202e 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java @@ -31,14 +31,11 @@ import java.util.Collection; * L'initialisation du modèle de sortie et du générateur de sortie associée, * se fait dans la superclass grâce à la méthode init. * - * @param <O> - * - * Created: 28 oct. 2009 - * - * @author fdesbois <fdesbois@codelutin.com> + * @param <O> Created: 28 oct. 2009 + * @author Florian Desbois - desbois@codelutin.com */ public abstract class ObjectModelTransformer<O extends Model> extends Transformer<ObjectModel, O> { - + /** * Le model associé au transformer est le model d'entree. Le modele de sortie * peut etre initialiser via la methode {@link Transformer#initOutputModel()}. @@ -104,8 +101,8 @@ public abstract class ObjectModelTransformer<O extends Model> extends Transforme * ObjectModelInterface et ObjectModelEnumeration. * La méthode transformFromXXX dépend du type d'élément et peut être surchargée. * - * @param element element à généré - * @param type type d'ObjectModel + * @param element element à généré + * @param type type d'ObjectModel * @see ObjectModelType */ protected void transformFromElement(Object element, ObjectModelType type) { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelType.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelType.java index e1187ac..52dc018 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelType.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelType.java @@ -27,11 +27,10 @@ package org.nuiton.eugene.models.object; * Contains all types available for generating specific ObjectModelElement file. * Needed because of inheritance between class, interface and classifier. * Method instanceof (previously used) is inadequat so expliciting the ObjectModel type is much better. - * <p/> + * * Created: may 4th 2009 * - * @author Florian DESBOIS <fdesbois@codelutin.com> - * @version $Revision$ + * @author Florian Desbois - desbois@codelutin.com */ public enum ObjectModelType { /** diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelUMLModifier.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelUMLModifier.java index 46ea74b..bcefd5a 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelUMLModifier.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelUMLModifier.java @@ -31,7 +31,7 @@ import java.util.Set; * @author Arnaud Thimel (Code Lutin) * @since 2.4.3 */ -public enum ObjectModelUMLModifier implements ObjectModelModifier { +public enum ObjectModelUMLModifier implements ObjectModelModifier { AGGREGATE, COMPOSITE, @@ -40,8 +40,7 @@ public enum ObjectModelUMLModifier implements ObjectModelModifier { ORDERED, NAVIGABLE; - public static final Set<ObjectModelUMLModifier> associationTypes = - ImmutableSet.of(AGGREGATE, COMPOSITE); + public static final Set<ObjectModelUMLModifier> associationTypes = ImmutableSet.of(AGGREGATE, COMPOSITE); @Override public boolean isVisibility() { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/SerialVersionUIDBuilder.java b/eugene/src/main/java/org/nuiton/eugene/models/object/SerialVersionUIDBuilder.java index 6e30338..3cba492 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/SerialVersionUIDBuilder.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/SerialVersionUIDBuilder.java @@ -53,7 +53,7 @@ public class SerialVersionUIDBuilder { public SerialVersionUIDBuilder(ObjectModelClassifier clazz) { this.clazz = clazz; - interfaceSignatures = new ArrayList<String>(); + interfaceSignatures = new ArrayList<>(); for (ObjectModelInterface method : clazz.getInterfaces()) { interfaceSignatures.add(method.getQualifiedName()); } @@ -66,7 +66,7 @@ public class SerialVersionUIDBuilder { } } - methodSignatures = new ArrayList<String>(); + methodSignatures = new ArrayList<>(); for (ObjectModelOperation method : clazz.getAllInterfaceOperations(true)) { StringBuilder sb = new StringBuilder(); @@ -81,7 +81,7 @@ public class SerialVersionUIDBuilder { } Collections.sort(methodSignatures); - fieldSignatures = new ArrayList<String>(); + fieldSignatures = new ArrayList<>(); for (ObjectModelAttribute field : clazz.getAllInterfaceAttributes()) { StringBuilder sb = new StringBuilder(); sb.append(field.getType()).append(field.getName()); 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 3efcb10..474612c 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 @@ -189,11 +189,8 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> Properties prop = new RecursiveProperties(); - FileInputStream inStream = new FileInputStream(propFile); - try { + try (FileInputStream inStream = new FileInputStream(propFile)) { prop.load(inStream); - } finally { - inStream.close(); } // number of sucessfull imported tag values into model @@ -203,7 +200,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> int numberImportedStereotypes = 0; // get all the tagvalues keys and sort them - List<String> keys = new ArrayList<String>(); + List<String> keys = new ArrayList<>(); CollectionUtils.addAll(keys, prop.keys()); Collections.sort(keys); @@ -831,7 +828,7 @@ public abstract class AbstractObjectModelReader extends ModelReader<ObjectModel> } protected List<ObjectModelElement> getObjectElements(ObjectModelClassifier omc, String type, String key, String fqn, String target, String targetName) { - List<ObjectModelElement> elems = new ArrayList<ObjectModelElement>(); + List<ObjectModelElement> elems = new ArrayList<>(); if (CLASS.equals(target)) { elems.add(omc); } else if (ATTRIBUTE.equals(target)) { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/InvalidModelPropertiesException.java b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/InvalidModelPropertiesException.java index d87de9e..a060a3f 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/InvalidModelPropertiesException.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/InvalidModelPropertiesException.java @@ -29,6 +29,7 @@ package org.nuiton.eugene.models.object.reader; * @since 2.9 */ public class InvalidModelPropertiesException extends RuntimeException { + private static final long serialVersionUID = 1L; public InvalidModelPropertiesException(String message) { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/YamlObjectModelReader.java b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/YamlObjectModelReader.java index 46d8533..04425b6 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/YamlObjectModelReader.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/YamlObjectModelReader.java @@ -42,6 +42,7 @@ import java.io.IOException; public class YamlObjectModelReader extends AbstractObjectModelReader { private static final Log log = LogFactory.getLog(YamlObjectModelReader.class); + protected LoadYamlFile loaderYAML; @Override diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/DefaultValues.java b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/DefaultValues.java index 85b5813..53dd0c1 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/DefaultValues.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/DefaultValues.java @@ -37,6 +37,7 @@ import java.util.Map; * Time: 14:51 */ public class DefaultValues implements KeyWords { + Yaml yaml; public DefaultValues() { @@ -44,7 +45,7 @@ public class DefaultValues implements KeyWords { } public static Map<String, String> getDefaultValues(String version) { - Map<String, String> values = new LinkedHashMap<String, String>(); + Map<String, String> values = new LinkedHashMap<>(); //retourne les valeurs par defaut en fonction de la version dans une Map if (version.equals("0")) { @@ -66,7 +67,7 @@ public class DefaultValues implements KeyWords { Object valuesYAML = yaml.load(inputModel); inputModel.close(); - Map<String, String> values = new LinkedHashMap<String, String>(); + Map<String, String> values = new LinkedHashMap<>(); if (valuesYAML instanceof Map) { for (Object entry : ((Map) valuesYAML).entrySet()) { if (entry instanceof Map.Entry) { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/KeyWords.java b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/KeyWords.java index d8c575a..0803bff 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/KeyWords.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/KeyWords.java @@ -28,59 +28,112 @@ package org.nuiton.eugene.models.object.reader.yaml; * Time: 10:10 */ public interface KeyWords { + String SEPARATOR = "."; String ABSTRACT = "abstract"; + String AGGREGATE = "aggregate"; + String ASSOCIATION_CLASS = "associationclass"; + String ASSOCIATION_CLASS_NAME = "associationclassname"; + String ASSOCIATION_TYPE = "associationtype"; + String ATTRIBUTE = "attribute"; + String BODY_CODE = "bodeycode"; + String CLASS = "class"; + String CLASSIFIER = "classifier"; + String COMMENTS = "comments"; + String COMPOSITE = "composite"; + String DEFAULT_VALUE = "defaultvalue"; + String DESCRIPTION = "description"; + String DOCUMENTATION = "documentation"; + String ENUMERATION = "enumeration"; + String EXTERN = "extern"; + String FINAL = "final"; + String IMPORTS = "imports"; + String INNER = "inner"; + String INTERFACE = "interface"; + String LABEL = "label"; + String LITERALS = "literals"; + String MAX_MULTIPLICITY = "maxmultiplicity"; + String MIN_MULTIPLICITY = "minmultiplicity"; + String NAME = "name"; + String NAVIGABLE = "navigable"; + String OPERATION = "operation"; + String ORDERED = "ordered"; + String ORDERING = "ordering"; + String PACKAGE = "package"; + String PARAMETER = "parameter"; + String PARTICIPANT = "participant"; + String PRIVATE = "private"; + String PROTECTED = "protected"; + String PUBLIC = "public"; + String RETURN_PARAMETER = "returnparameter"; + String REVERSE_ATTRIBUTE_NAME = "reverseattributename"; + String REVERSE_MAX_MULTIPLICITY = "reversemaxmultiplicity"; + String REVERSE_MIN_MULTIPLICITY = "reverseminmultiplicity"; + String REVERSE_ORDERING = "reverseordering"; + String STATIC = "static"; + String STEREOTYPES = "stereotypes"; + String SUPER_CLASSES = "superclasses"; + String SUPER_INTERFACES = "superinterfaces"; + String SYNTAXE = "syntaxe"; + String TAG_VALUES = "tagvalues"; + String TRANSIENT = "transient"; + String TYPE = "type"; + String UNIQUE = "unique"; + String UNORDERED = "unordered"; + String VERSION = "version"; + String VISIBILITY = "visibility"; + String ELEMENT = "element"; } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadObjectModel.java b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadObjectModel.java index 567dd18..c836f3d 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadObjectModel.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadObjectModel.java @@ -22,7 +22,19 @@ package org.nuiton.eugene.models.object.reader.yaml; * #L% */ -import org.nuiton.eugene.models.object.xml.*; +import org.nuiton.eugene.models.object.xml.ObjectModeImplAssociationClassParticipant; +import org.nuiton.eugene.models.object.xml.ObjectModelAssociationClassImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelClassifierImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelElementImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelEnumerationImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelImplRef; +import org.nuiton.eugene.models.object.xml.ObjectModelImplSuperClassRef; +import org.nuiton.eugene.models.object.xml.ObjectModelInterfaceImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelOperationImpl; +import org.nuiton.eugene.models.object.xml.ObjectModelParameterImpl; import java.util.List; import java.util.Map; @@ -33,9 +45,13 @@ import java.util.Map; * Time: 10:37 */ public class LoadObjectModel implements KeyWords { + protected String packageL; + protected YamlObject modelYAMLO; + protected ObjectModelImpl modelOM; + protected Map<String, String> defaultValues; public LoadObjectModel(YamlObject modelYAMLO, ObjectModelImpl modelOM, Map<String, String> defaultValues) { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadYamlFile.java b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadYamlFile.java index 3f3fc67..7d175da 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadYamlFile.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/LoadYamlFile.java @@ -39,6 +39,7 @@ import java.util.Map; * Time: 16:11 */ public class LoadYamlFile implements KeyWords { + Yaml yaml; public LoadYamlFile() { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserUserFriendly.java b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserUserFriendly.java index 799f0a3..7c203dd 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserUserFriendly.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/ParserUserFriendly.java @@ -33,17 +33,23 @@ import java.util.Map; * Time: 16:48 */ public class ParserUserFriendly implements KeyWords { + protected Map<String, String> imports; + protected Map<String, String> importsI; + protected Map<String, String> importsE; + protected String packageM; + protected Object modelYAML; + protected YamlObject modelYAMLO; public ParserUserFriendly(Object modelYAML, YamlObject modelYAMLO) { - this.imports = new LinkedHashMap<String, String>(); - this.importsI = new LinkedHashMap<String, String>(); - this.importsE = new LinkedHashMap<String, String>(); + this.imports = new LinkedHashMap<>(); + this.importsI = new LinkedHashMap<>(); + this.importsE = new LinkedHashMap<>(); this.packageM = "default"; this.modelYAML = modelYAML; this.modelYAMLO = modelYAMLO; @@ -133,11 +139,11 @@ public class ParserUserFriendly implements KeyWords { for (String str1 : classPARSE) { if (str1.contains("<<") && str1.contains(">>")) { - List<Character> targets = new LinkedList<Character>(); + List<Character> targets = new LinkedList<>(); targets.add('<'); targets.add('>'); String str2 = YamlUtil.removeMultiChar(str1, targets); - targets = new LinkedList<Character>(); + targets = new LinkedList<>(); targets.add(' '); targets.add(','); List<String> list = YamlUtil.multiCharParse(str2, targets); @@ -221,11 +227,11 @@ public class ParserUserFriendly implements KeyWords { for (String str1 : interfacePARSE) { if (str1.contains("<<") && str1.contains(">>")) { - List<Character> targets = new LinkedList<Character>(); + List<Character> targets = new LinkedList<>(); targets.add('<'); targets.add('>'); String str2 = YamlUtil.removeMultiChar(str1, targets); - targets = new LinkedList<Character>(); + targets = new LinkedList<>(); targets.add(' '); targets.add(','); List<String> list = YamlUtil.multiCharParse(str2, targets); @@ -309,11 +315,11 @@ public class ParserUserFriendly implements KeyWords { for (String str1 : associationClassPARSE) { if (str1.contains("<<") && str1.contains(">>")) { - List<Character> targets = new LinkedList<Character>(); + List<Character> targets = new LinkedList<>(); targets.add('<'); targets.add('>'); String str2 = YamlUtil.removeMultiChar(str1, targets); - targets = new LinkedList<Character>(); + targets = new LinkedList<>(); targets.add(' '); targets.add(','); List<String> list = YamlUtil.multiCharParse(str2, targets); @@ -405,11 +411,11 @@ public class ParserUserFriendly implements KeyWords { for (String str1 : enumerationPARSE) { if (str1.contains("<<") && str1.contains(">>")) { - List<Character> targets = new LinkedList<Character>(); + List<Character> targets = new LinkedList<>(); targets.add('<'); targets.add('>'); String str2 = YamlUtil.removeMultiChar(str1, targets); - targets = new LinkedList<Character>(); + targets = new LinkedList<>(); targets.add(' '); targets.add(','); List<String> list = YamlUtil.multiCharParse(str2, targets); @@ -564,10 +570,10 @@ public class ParserUserFriendly implements KeyWords { } public void parseOperation(String key, Object value, YamlObject operationYAMLO) { - List<Character> ignoreStart = new LinkedList<Character>(); + List<Character> ignoreStart = new LinkedList<>(); ignoreStart.add('('); ignoreStart.add('<'); - List<Character> ignoreEnd = new LinkedList<Character>(); + List<Character> ignoreEnd = new LinkedList<>(); ignoreEnd.add(')'); ignoreEnd.add('>'); List<String> operationPARSE = YamlUtil.charParseMultiIgnore(key, ' ', ignoreStart, ignoreEnd); @@ -707,9 +713,10 @@ public class ParserUserFriendly implements KeyWords { } return res.toString(); } + // String -> java.lang.String public String resolveType(String type) { - List<Character> ignore = new LinkedList<Character>(); + List<Character> ignore = new LinkedList<>(); ignore.add(' '); String typePARSE = YamlUtil.removeMultiChar(type, ignore); return browseType(typePARSE); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlObject.java b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlObject.java index 71c030f..782436b 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlObject.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlObject.java @@ -34,23 +34,24 @@ import java.util.Map; * * le YamlObject est un objet intermédiaire et très laxiste, pouvant s'adapter à d'éventuelles évolutions * (en cas d'évolutions de la syntaxe YAML ou de l'ObjectModel, les modifications permettant de conserver les interactions seront légères) - * */ public class YamlObject { + protected Map<String, List<String>> mapStringListString; + protected Map<String, List<YamlObject>> mapStringListYamlObject; //TODO: améliorer noms méthodes public YamlObject() { - mapStringListString = new LinkedHashMap<String, List<String>>(); - mapStringListYamlObject = new LinkedHashMap<String, List<YamlObject>>(); + mapStringListString = new LinkedHashMap<>(); + mapStringListYamlObject = new LinkedHashMap<>(); } public void addYamlObjectToMap(String key, YamlObject value) { if (mapStringListYamlObject.containsKey(key)) { mapStringListYamlObject.get(key).add(value); } else { - List<YamlObject> tmp = new LinkedList<YamlObject>(); + List<YamlObject> tmp = new LinkedList<>(); tmp.add(value); mapStringListYamlObject.put(key, tmp); } @@ -60,7 +61,7 @@ public class YamlObject { if (mapStringListString.containsKey(key)) { mapStringListString.get(key).add(value); } else { - List<String> tmp = new LinkedList<String>(); + List<String> tmp = new LinkedList<>(); tmp.add(value); mapStringListString.put(key, tmp); } @@ -107,7 +108,7 @@ public class YamlObject { } } //return null;//permet parcours - return new LinkedList<YamlObject>(); + return new LinkedList<>(); } public List<String> getMapStringListString(String key) { @@ -117,7 +118,7 @@ public class YamlObject { } } //return null;//permet parcours - return new LinkedList<String>(); + return new LinkedList<>(); } public int sizeOfMapStringListYamlObject(String key) { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlUtil.java b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlUtil.java index 3f09f42..420c105 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlUtil.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/yaml/YamlUtil.java @@ -36,9 +36,10 @@ import java.util.Map; //TODO: faire classes dédiée au parser ? public class YamlUtil { + @Deprecated public static void keySetToLowerCase(Map<Object, Object> map) { - List<Object> keys = new ArrayList<Object>(map.keySet()); + List<Object> keys = new ArrayList<>(map.keySet()); for (Object obj : keys) { String key = String.valueOf(obj).toLowerCase(); Object value = map.get(obj); @@ -99,7 +100,7 @@ public class YamlUtil { } public static List<Object> collectAllElementsList(List data, Object key) { - List<Object> res = new LinkedList<Object>(); + List<Object> res = new LinkedList<>(); for (Object obj : data) { if (obj instanceof Map) { if (((Map) obj).containsKey(key)) { @@ -120,7 +121,7 @@ public class YamlUtil { //decoupe une chaine par le caractere passe en parametre public static List<String> charParse(String str, Character target) { - LinkedList<String> res = new LinkedList<String>(); + LinkedList<String> res = new LinkedList<>(); StringBuilder tmp = new StringBuilder(str.length() + 1);//+1 utile en Java ? != C boolean pre = false; for (Character c : str.toCharArray()) { @@ -142,7 +143,7 @@ public class YamlUtil { } public static List<String> multiCharParse(String str, List<Character> targets) { - LinkedList<String> res = new LinkedList<String>(); + LinkedList<String> res = new LinkedList<>(); StringBuilder tmp = new StringBuilder(str.length() + 1);//+1 utile en Java ? != C boolean pre = false; for (Character c : str.toCharArray()) { @@ -165,7 +166,7 @@ public class YamlUtil { //permet de parser une chaine en ignorant les parentheses par exemple public static List<String> charParseIgnore(String str, Character target, Character ignoreStart, Character ignoreEnd) { - LinkedList<String> res = new LinkedList<String>(); + LinkedList<String> res = new LinkedList<>(); StringBuilder tmp = new StringBuilder(str.length() + 1);//+1 utile en Java ? != C boolean pre = false; int ign = 0;//parentheses ouvertes @@ -194,7 +195,7 @@ public class YamlUtil { } public static List<String> charParseMultiIgnore(String str, Character target, List<Character> ignoreStart, List<Character> ignoreEnd) { - LinkedList<String> res = new LinkedList<String>(); + LinkedList<String> res = new LinkedList<>(); StringBuilder tmp = new StringBuilder(str.length() + 1);//+1 utile en Java ? != C boolean pre = false; int ign = 0;//parentheses ouvertes diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/validator/AttributeNamesValidator.java b/eugene/src/main/java/org/nuiton/eugene/models/object/validator/AttributeNamesValidator.java index 53dc9f7..b93d3b3 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/validator/AttributeNamesValidator.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/validator/AttributeNamesValidator.java @@ -26,16 +26,12 @@ import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; /** -* AttributeNamesValidator. -* -* Created: 7 mars 2006 -* -* @author Arnaud Thimel (Code Lutin) -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -*/ + * AttributeNamesValidator. + * + * Created: 7 mars 2006 + * + * @author Arnaud Thimel (Code Lutin) + */ public class AttributeNamesValidator extends NameBasedValidator { public AttributeNamesValidator(ObjectModel model) { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ClassNamesValidator.java b/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ClassNamesValidator.java index 021cbee..2905b55 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ClassNamesValidator.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ClassNamesValidator.java @@ -26,16 +26,12 @@ import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClass; /** -* ClassNamesValidator. -* -* Created: 9 mars 2006 -* -* @author Arnaud Thimel (Code Lutin) -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -*/ + * ClassNamesValidator. + * + * Created: 9 mars 2006 + * + * @author Arnaud Thimel (Code Lutin) + */ public class ClassNamesValidator extends NameBasedValidator { public ClassNamesValidator(ObjectModel model) { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/validator/NameBasedValidator.java b/eugene/src/main/java/org/nuiton/eugene/models/object/validator/NameBasedValidator.java index 12d52c9..ac53ab1 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/validator/NameBasedValidator.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/validator/NameBasedValidator.java @@ -28,16 +28,12 @@ import java.util.HashMap; import java.util.Map; /** -* NameBasedValidator. -* -* Created: 9 mars 2006 -* -* @author Arnaud Thimel (Code Lutin) -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -*/ + * NameBasedValidator. + * + * Created: 9 mars 2006 + * + * @author Arnaud Thimel (Code Lutin) + */ public abstract class NameBasedValidator extends ObjectModelValidator { private boolean caseSensitive; @@ -51,7 +47,7 @@ public abstract class NameBasedValidator extends ObjectModelValidator { private Map<String, String> getNameAndReasons() { if (namesAndReasons == null) { - namesAndReasons = new HashMap<String, String>(); + namesAndReasons = new HashMap<>(); } return namesAndReasons; } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java b/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java index 6250282..687665a 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java @@ -47,7 +47,6 @@ import java.util.List; * Created: 7 mars 2006 * * @author Arnaud Thimel (Code Lutin) - * @version $Revision$ */ public class ObjectModelValidator { @@ -57,7 +56,7 @@ public class ObjectModelValidator { public ObjectModelValidator(ObjectModel model) { this.model = model; - errors = new ArrayList<String>(); + errors = new ArrayList<>(); } /** @@ -79,7 +78,7 @@ public class ObjectModelValidator { public boolean validate() { if (errors.size() > 0) { //On recréé une nouvelle liste - errors = new ArrayList<String>(); + errors = new ArrayList<>(); } boolean isValid = validateModel(model); for (ObjectModelClassifier classifier : model.getClassifiers()) { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java index 965f17c..0b2b9bd 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java @@ -27,28 +27,25 @@ import org.apache.commons.digester3.RuleSetBase; /** * DigesterObjectModelRuleSet - * + * * Definit principalement : - * - la classe d'implementation a utiliser pour chaque noeud - * - la methode a appeler apres chaque noeud - * + * - la classe d'implementation a utiliser pour chaque noeud + * - la methode a appeler apres chaque noeud + * * Ce jeu de regle ne cree pas l'element racine. * Il doit etre cree et ajoute a la pile digester avant l'appel a * <tt>Digester.parse(File)</tt>. - * + * * Exemple: * <code> - * ObjectModel monModel = new ObjectModelImpl() - * Digester d = new Digester(); - * d.push(monModel); - * d.parse(file); + * ObjectModel monModel = new ObjectModelImpl() + * Digester d = new Digester(); + * d.push(monModel); + * d.parse(file); * </code> * * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public class DigesterObjectModelRuleSet extends RuleSetBase { protected String prefix; @@ -81,28 +78,23 @@ public class DigesterObjectModelRuleSet extends RuleSetBase { d.addSetProperties("objectModel/class/class"); d.addSetNext("objectModel/class/class", "addInnerClassifier"); - d.addObjectCreate("objectModel/interface", - ObjectModelInterfaceImpl.class); + d.addObjectCreate("objectModel/interface", ObjectModelInterfaceImpl.class); d.addSetProperties("objectModel/interface"); d.addSetNext("objectModel/interface", "addInterface"); - d.addObjectCreate("objectModel/enumeration", - ObjectModelEnumerationImpl.class); + d.addObjectCreate("objectModel/enumeration", ObjectModelEnumerationImpl.class); d.addSetProperties("objectModel/enumeration"); d.addSetNext("objectModel/enumeration", "addEnumeration"); - d.addObjectCreate("objectModel/enumeration/literal", - ObjectModelImplRef.class); + d.addObjectCreate("objectModel/enumeration/literal", ObjectModelImplRef.class); d.addSetProperties("objectModel/enumeration/literal"); d.addSetNext("objectModel/enumeration/literal", "addLiteral"); - d.addObjectCreate("objectModel/associationClass", - ObjectModelAssociationClassImpl.class); + d.addObjectCreate("objectModel/associationClass", ObjectModelAssociationClassImpl.class); d.addSetProperties("objectModel/associationClass"); d.addSetNext("objectModel/associationClass", "addAssociationClass"); - d.addObjectCreate("*/participant", - ObjectModeImplAssociationClassParticipant.class); + d.addObjectCreate("*/participant", ObjectModeImplAssociationClassParticipant.class); d.addSetProperties("*/participant"); d.addSetNext("*/participant", "addParticipant"); @@ -130,18 +122,15 @@ public class DigesterObjectModelRuleSet extends RuleSetBase { d.addSetProperties("*/operation"); d.addSetNext("*/operation", "addOperation"); - d.addObjectCreate("*/operation/returnParameter", - ObjectModelParameterImpl.class); + d.addObjectCreate("*/operation/returnParameter", ObjectModelParameterImpl.class); d.addSetProperties("*/operation/returnParameter"); d.addSetNext("*/operation/returnParameter", "setReturnParameter"); - d.addObjectCreate("*/operation/parameter", - ObjectModelParameterImpl.class); + d.addObjectCreate("*/operation/parameter", ObjectModelParameterImpl.class); d.addSetProperties("*/operation/parameter"); d.addSetNext("*/operation/parameter", "addParameter"); - d.addObjectCreate("*/operation/exceptionParameter", - ObjectModelParameterImpl.class); + d.addObjectCreate("*/operation/exceptionParameter", ObjectModelParameterImpl.class); d.addSetProperties("*/operation/exceptionParameter"); d.addSetNext("*/operation/exceptionParameter", "addExceptionParameter"); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtension.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtension.java index e51f062..4debe3b 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtension.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtension.java @@ -34,22 +34,18 @@ import java.util.Map; * * Created: 2 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ + * @author Florian Desbois - desbois@codelutin.com + */ public class ExternalCacheExtension { - private static final Log log = - LogFactory.getLog(ExternalCacheExtension.class); + private static final Log log = LogFactory.getLog(ExternalCacheExtension.class); public static final String OBJECTMODEL_EXTENSION = "externalClassifiers"; protected Map<String, ObjectModelClassifierImpl> cache; public ExternalCacheExtension() { - cache = new HashMap<String, ObjectModelClassifierImpl>(); + cache = new HashMap<>(); } @SuppressWarnings("unchecked") diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModeImplAssociationClassParticipant.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModeImplAssociationClassParticipant.java index 5fdd4d2..00281a3 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModeImplAssociationClassParticipant.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModeImplAssociationClassParticipant.java @@ -27,11 +27,8 @@ import org.nuiton.eugene.GeneratorUtil; /** * ObjectModeImplAssociationClassParticipant. * - * @author cedric,chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + * @author cedric, chatellier + */ public class ObjectModeImplAssociationClassParticipant extends ObjectModelImplRef { @@ -61,10 +58,8 @@ public class ObjectModeImplAssociationClassParticipant extends for (ObjectModeImplAssociationClassParticipant participant : associationClass.getParticipantsRefs()) { if (!equals(participant)) { - attributeName = GeneratorUtil - .toLowerCaseFirstLetter(GeneratorUtil - .getClassNameFromQualifiedName(participant - .getName())); + attributeName = GeneratorUtil.toLowerCaseFirstLetter( + GeneratorUtil.getClassNameFromQualifiedName(participant.getName())); break; } } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAssociationClassImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAssociationClassImpl.java index 8a81887..fab4373 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAssociationClassImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAssociationClassImpl.java @@ -38,10 +38,7 @@ import java.util.List; * * @author chatellier * @author cedric - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public class ObjectModelAssociationClassImpl extends ObjectModelClassImpl implements ObjectModelAssociationClass { @@ -49,8 +46,10 @@ public class ObjectModelAssociationClassImpl extends ObjectModelClassImpl .getLog(ObjectModelAssociationClassImpl.class); protected List<ObjectModelAttribute> participantsAttributes; + protected List<ObjectModelClassifier> participantsClassifiers; - protected List<ObjectModeImplAssociationClassParticipant> participantsRefs = new ArrayList<ObjectModeImplAssociationClassParticipant>(); + + protected List<ObjectModeImplAssociationClassParticipant> participantsRefs = new ArrayList<>(); public ObjectModelAssociationClassImpl() { } @@ -66,11 +65,11 @@ public class ObjectModelAssociationClassImpl extends ObjectModelClassImpl } /** - * Returns all participants (that is association ends) attributes for this association class. - * @see ObjectModelAttribute - * - * @return a List containing all participants attributes for this association class. - */ + * Returns all participants (that is association ends) attributes for this association class. + * + * @return a List containing all participants attributes for this association class. + * @see ObjectModelAttribute + */ @Override public List<ObjectModelAttribute> getParticipantsAttributes() { if (participantsAttributes == null) { @@ -80,11 +79,11 @@ public class ObjectModelAssociationClassImpl extends ObjectModelClassImpl } /** - * Returns all participants (that is association ends) classifiers for this association class. - * @see ObjectModelClassifier - * - * @return a List containing all participants classifiers for this association class. - */ + * Returns all participants (that is association ends) classifiers for this association class. + * + * @return a List containing all participants classifiers for this association class. + * @see ObjectModelClassifier + */ @Override public List<ObjectModelClassifier> getParticipantsClassifiers() { if (participantsClassifiers == null) { @@ -94,8 +93,8 @@ public class ObjectModelAssociationClassImpl extends ObjectModelClassImpl } protected void parseParticipantsRefs() { - participantsClassifiers = new ArrayList<ObjectModelClassifier>(); - participantsAttributes = new ArrayList<ObjectModelAttribute>(); + participantsClassifiers = new ArrayList<>(); + participantsAttributes = new ArrayList<>(); for (ObjectModeImplAssociationClassParticipant ref : participantsRefs) { ObjectModelClassifier classifier = objectModelImpl @@ -108,9 +107,9 @@ public class ObjectModelAssociationClassImpl extends ObjectModelClassImpl attribute = classifier.getAttribute(ref.getAttributeName()); if (attribute == null) { log.warn("WARNING : Attribute " + ref.getAttributeName() - + " not found on " + classifier.getQualifiedName()); + + " not found on " + classifier.getQualifiedName()); log.warn("WARNING : Assuming there is no navigability in this direction for the " - + getQualifiedName() + " association class"); + + getQualifiedName() + " association class"); } } participantsAttributes.add(attribute); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java index d9f5a28..6c0ef06 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java @@ -39,14 +39,11 @@ import java.util.Set; /** * ObjectModelAttributeImpl. - * + * * Created: 14 janv. 2004 - * - * @author Cédric Pineau <pineau@codelutin.com> Copyright Code Lutin - * - * @version $Revision$ - * - * Last update : $Date$ by : */ + * + * @author Cédric Pineau - pineau@codelutin.com Copyright Code Lutin + */ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl implements ObjectModelAttribute { @@ -59,8 +56,11 @@ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl public static final ObjectModelJavaModifier DEFAULT_VISIBILITY = ObjectModelJavaModifier.PROTECTED; protected String reverseAttributeName; + protected int reverseMaxMultiplicity = -1; + protected ObjectModelClassifier reference; + protected String associationClassName; private static Set<ObjectModelModifier> authorizedModifiers; @@ -71,8 +71,7 @@ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl public void postInit() { if (name == null) { - name = GeneratorUtil.toLowerCaseFirstLetter(GeneratorUtil - .getClassNameFromQualifiedName(type)); + name = GeneratorUtil.toLowerCaseFirstLetter(GeneratorUtil.getClassNameFromQualifiedName(type)); } super.postInit(); } @@ -123,7 +122,7 @@ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl // http://docs.oracle.com/javase/specs/jls/se7/html/jls-8.html#jls-8.3.1 // static final transient volatile Set<ObjectModelModifier> modifiers = Sets.newHashSet( - (ObjectModelModifier)ObjectModelJavaModifier.STATIC, // Force cast because of generics limitation + (ObjectModelModifier) ObjectModelJavaModifier.STATIC, // Force cast because of generics limitation ObjectModelJavaModifier.FINAL, ObjectModelJavaModifier.TRANSIENT, ObjectModelJavaModifier.VOLATILE, @@ -132,7 +131,7 @@ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl ObjectModelUMLModifier.NAVIGABLE, ObjectModelUMLModifier.ORDERED, ObjectModelUMLModifier.UNIQUE - ); + ); Iterables.addAll(modifiers, ObjectModelJavaModifier.visibilityModifiers); authorizedModifiers = ImmutableSet.copyOf(modifiers); } @@ -150,9 +149,9 @@ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl /** * Returns whether this attribute is an aggregate or not. - * + * * @return a boolean indicating whether this attribute is an aggregate or - * not. + * not. */ @Override public boolean isAggregate() { @@ -161,9 +160,9 @@ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl /** * Returns whether this attribute is an composite or not. - * + * * @return a boolean indicating whether this attribute is an composite or - * not. + * not. */ @Override public boolean isComposite() { @@ -177,7 +176,8 @@ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl visibility = ObjectModelJavaModifier.PUBLIC.toString(); } else if (modifiers.contains(ObjectModelJavaModifier.PRIVATE)) { visibility = ObjectModelJavaModifier.PRIVATE.toString(); - } if (modifiers.contains(ObjectModelJavaModifier.PACKAGE)) { + } + if (modifiers.contains(ObjectModelJavaModifier.PACKAGE)) { visibility = ObjectModelJavaModifier.PACKAGE.toString(); } return visibility; @@ -189,9 +189,9 @@ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl /** * Returns whether this attribute reference a model classifier or not. - * + * * @return a boolean indicating whether this attribute reference a model - * classifier or not. + * classifier or not. */ @Override public boolean referenceClassifier() { @@ -201,9 +201,9 @@ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl /** * Returns the classifier referenced by this attribute or null if it does * not reference a model classifier. - * + * * @return the ObjectModelClassfifier referenced by this attribute or null - * if it does not reference a model classifier. + * if it does not reference a model classifier. */ @Override public ObjectModelClassifier getClassifier() { @@ -214,10 +214,10 @@ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl * Returns the attribute used to reference this class at the other end of * the association or null if this is not an association, or if it is not * bi-directionnal. @ see #getClassifier() - * + * * @return the ObjectModelAttribute used to reference this class at the - * other end of the association or null if this is not an - * association, or if it is not bi-directionnal. + * other end of the association or null if this is not an + * association, or if it is not bi-directionnal. */ @Override public ObjectModelAttribute getReverseAttribute() { @@ -242,7 +242,7 @@ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl public String getName() { if (StringUtils.isEmpty(name) && getClassifier() != null) { name = GeneratorUtil.toLowerCaseFirstLetter(getClassifier() - .getName()); + .getName()); } return name; } @@ -255,9 +255,9 @@ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl /** * Returns the association class associated with this association, or null * if there is none. - * + * * @return a ObjectModelClass corresponding to the association class - * associated with this association, or null if there is none. + * associated with this association, or null if there is none. */ @Override public ObjectModelClass getAssociationClass() { @@ -267,9 +267,9 @@ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl /** * Returns whether this association has an associated association class, ot * not. - * + * * @return a boolean indicating whether this association has an associated - * association class, ot not. + * association class, ot not. */ @Override public boolean hasAssociationClass() { @@ -278,7 +278,7 @@ public class ObjectModelAttributeImpl extends ObjectModelParameterImpl /** * Returns whether this attribute is final or not. - * + * * @return a boolean indicating whether this attribute is final or not. */ @Override diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassImpl.java index 9676a32..0beeddd 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassImpl.java @@ -48,18 +48,21 @@ import java.util.Set; * * Created: 14 janv. 2004 * - * @author Cédric Pineau <pineau@codelutin.com> - * @author fdesbois <fdesbois@codelutin.com> - * @version $Id$ + * @author Cédric Pineau - pineau@codelutin.com + * @author Florian Desbois - desbois@codelutin.com */ public class ObjectModelClassImpl extends ObjectModelClassifierImpl implements ObjectModelClass { private static final Log log = LogFactory.getLog(ObjectModelClassImpl.class); protected List<ObjectModelClass> superclasses; - protected Map<ObjectModelClass, String> superclassesDiscriminators = new HashMap<ObjectModelClass, String>(); - protected List<ObjectModelImplRef> superclassesRefs = new ArrayList<ObjectModelImplRef>(); + + protected Map<ObjectModelClass, String> superclassesDiscriminators = new HashMap<>(); + + protected List<ObjectModelImplRef> superclassesRefs = new ArrayList<>(); + protected List<ObjectModelClass> specialisations; + protected List<ObjectModelClassifier> innerClasses; private static Set<ObjectModelModifier> authorizedModifiers; @@ -73,7 +76,7 @@ public class ObjectModelClassImpl extends ObjectModelClassifierImpl implements O // http://docs.oracle.com/javase/specs/jls/se7/html/jls-8.html#jls-8.1.1 // public protected private abstract static final strictfp Set<ObjectModelModifier> modifiers = Sets.newHashSet( - (ObjectModelModifier)ObjectModelJavaModifier.ABSTRACT, // Force cast because of generics limitation + (ObjectModelModifier) ObjectModelJavaModifier.ABSTRACT, // Force cast because of generics limitation ObjectModelJavaModifier.STATIC, ObjectModelJavaModifier.FINAL, ObjectModelJavaModifier.STRICTFP); @@ -96,18 +99,18 @@ public class ObjectModelClassImpl extends ObjectModelClassifierImpl implements O /** * Digester method to add innerClass to this ObjectModelClass. + * * @param innerClass the ObjectModelClass to add */ public void addInnerClassifier(ObjectModelClassifierImpl innerClass) { innerClass.setDeclaringElement(this); innerClass.setInner(true); if (innerClasses == null) { - innerClasses = new ArrayList<ObjectModelClassifier>(); + innerClasses = new ArrayList<>(); } innerClasses.add(innerClass); } - public void setAbstract(boolean abstractz) { addOrRemoveModifier(ObjectModelJavaModifier.ABSTRACT, abstractz); @@ -116,7 +119,7 @@ public class ObjectModelClassImpl extends ObjectModelClassifierImpl implements O @Override public Collection<ObjectModelClass> getSuperclasses() { if (superclasses == null) { - superclasses = new ArrayList<ObjectModelClass>(); + superclasses = new ArrayList<>(); for (ObjectModelImplRef superclassesRef : superclassesRefs) { ObjectModelImplSuperClassRef ref = (ObjectModelImplSuperClassRef) superclassesRef; @@ -150,9 +153,8 @@ public class ObjectModelClassImpl extends ObjectModelClassifierImpl implements O /** * Returns the discriminator for the given superclass. - * - * @return the discriminator for the given superclass as a String if it - * exists, null otherwise. + * + * @return the discriminator for the given superclass as a String if it exists, null otherwise. */ @Override public String getDiscriminator(ObjectModelClass superclass) { @@ -161,16 +163,14 @@ public class ObjectModelClassImpl extends ObjectModelClassifierImpl implements O /** * Returns all known direct specialized classes for this class. - * + * + * @return a Collection containing all known direct specialized ObjectModelClass for this class. * @see ObjectModelClass - * - * @return a Collection containing all known direct specialized - * ObjectModelClass for this class. */ @Override public Collection<ObjectModelClass> getSpecialisations() { if (specialisations == null) { - specialisations = new ArrayList<ObjectModelClass>(); + specialisations = new ArrayList<>(); for (Object o : objectModelImpl.getClasses()) { ObjectModelClass candidateClass = (ObjectModelClass) o; if (candidateClass.getSuperclasses().contains(this)) { @@ -182,17 +182,15 @@ public class ObjectModelClassImpl extends ObjectModelClassifierImpl implements O } /** - * Returns all known specialized classes for this class for the specified - * discriminator. - * - * @see ObjectModelClass - * + * Returns all known specialized classes for this class for the specified discriminator. + * * @return a Collection containing all known specialized ObjectModelClass - * for this class for the specified discriminator. + * for this class for the specified discriminator. + * @see ObjectModelClass */ @Override public Collection<ObjectModelClass> getSpecialisations(String discriminator) { - List<ObjectModelClass> discriminatedSpecialisations = new ArrayList<ObjectModelClass>(); + List<ObjectModelClass> discriminatedSpecialisations = new ArrayList<>(); for (ObjectModelClass candidateClass : getSpecialisations()) { if (discriminator.equals(candidateClass.getDiscriminator(this))) { discriminatedSpecialisations.add(candidateClass); @@ -203,7 +201,7 @@ public class ObjectModelClassImpl extends ObjectModelClassifierImpl implements O /** * Returns whether this class is abstract or not. - * + * * @return a boolean indicating whether this class is abstract or not. */ @Override @@ -224,9 +222,9 @@ public class ObjectModelClassImpl extends ObjectModelClassifierImpl implements O boolean distinct) { Collection<ObjectModelOperation> result; if (distinct) { - result = new HashSet<ObjectModelOperation>(); + result = new HashSet<>(); } else { - result = new LinkedList<ObjectModelOperation>(); + result = new LinkedList<>(); } getAllSuperclassOperations(result); return result; @@ -265,14 +263,14 @@ public class ObjectModelClassImpl extends ObjectModelClassifierImpl implements O StringBuffer result = new StringBuffer(); result.append("class ").append(getQualifiedName()).append("<<").append(getStereotypes()).append(">> tagvalue: ").append(getTagValues()).append(" "); result.append("extends "); - for (Iterator<?> i = getSuperclasses().iterator(); i.hasNext();) { + for (Iterator<?> i = getSuperclasses().iterator(); i.hasNext(); ) { result.append(((ObjectModelClassifier) i.next()).getName()); if (i.hasNext()) { result.append(", "); } } result.append("implements "); - for (Iterator<?> i = getInterfaces().iterator(); i.hasNext();) { + for (Iterator<?> i = getInterfaces().iterator(); i.hasNext(); ) { result.append(((ObjectModelClassifier) i.next()).getName()); if (i.hasNext()) { result.append(", "); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassifierImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassifierImpl.java index a873810..99bf8c1 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassifierImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassifierImpl.java @@ -43,32 +43,31 @@ import java.util.Map; * * @author chatellier * @author cedric - * @version $Revision$ - * - * Last update : $Date$ - * By : */ -public abstract class ObjectModelClassifierImpl extends ObjectModelElementImpl - implements ObjectModelClassifier { + */ +public abstract class ObjectModelClassifierImpl extends ObjectModelElementImpl implements ObjectModelClassifier { protected boolean extern; protected String qualifiedName; + protected String packageName; + protected List<ObjectModelInterface> interfaces; - protected List<ObjectModelImplRef> interfacesRefs = - new ArrayList<ObjectModelImplRef>(); - protected List<ObjectModelOperation> operations = - new ArrayList<ObjectModelOperation>(); - protected Map<String, ObjectModelAttribute> attributes = - new HashMap<String, ObjectModelAttribute>(); - protected List<ObjectModelAttribute> orderedAttributes = - new ArrayList<ObjectModelAttribute>(); - protected List<ObjectModelDependency> dependencies = - new ArrayList<ObjectModelDependency>(); - + + protected List<ObjectModelImplRef> interfacesRefs = new ArrayList<>(); + + protected List<ObjectModelOperation> operations = new ArrayList<>(); + + protected Map<String, ObjectModelAttribute> attributes = new HashMap<>(); + + protected List<ObjectModelAttribute> orderedAttributes = new ArrayList<>(); + + protected List<ObjectModelDependency> dependencies = new ArrayList<>(); + protected String type; + protected boolean inner; - + @Override public String toString() { return "" + getQualifiedName() + " implements " + getInterfaces(); @@ -147,9 +146,9 @@ public abstract class ObjectModelClassifierImpl extends ObjectModelElementImpl @Override public Collection<ObjectModelInterface> getInterfaces() { if (interfaces == null) { - interfaces = new ArrayList<ObjectModelInterface>(); - for(ObjectModelImplRef ref : interfacesRefs) { - + interfaces = new ArrayList<>(); + for (ObjectModelImplRef ref : interfacesRefs) { + ObjectModelInterfaceImpl interfacez = (ObjectModelInterfaceImpl) objectModelImpl.getInterface(ref.getName()); @@ -158,8 +157,8 @@ public abstract class ObjectModelClassifierImpl extends ObjectModelElementImpl ExternalCacheExtension cache = objectModelImpl.getExtension( - ExternalCacheExtension.OBJECTMODEL_EXTENSION, - ExternalCacheExtension.class); + ExternalCacheExtension.OBJECTMODEL_EXTENSION, + ExternalCacheExtension.class); // get external interface from cache (or create it) interfacez = @@ -173,7 +172,7 @@ public abstract class ObjectModelClassifierImpl extends ObjectModelElementImpl @Override public Collection<ObjectModelOperation> getOperations(String name) { - List<ObjectModelOperation> result = new ArrayList<ObjectModelOperation>(); + List<ObjectModelOperation> result = new ArrayList<>(); for (ObjectModelOperation op : getOperations()) { if (name.equals(op.getName())) { result.add(op); @@ -198,9 +197,9 @@ public abstract class ObjectModelClassifierImpl extends ObjectModelElementImpl boolean distinct) { Collection<ObjectModelOperation> result; if (distinct) { - result = new HashSet<ObjectModelOperation>(); + result = new HashSet<>(); } else { - result = new LinkedList<ObjectModelOperation>(); + result = new LinkedList<>(); } getAllInterfaceOperations(result); return result; @@ -210,7 +209,7 @@ public abstract class ObjectModelClassifierImpl extends ObjectModelElementImpl Collection<ObjectModelOperation> result) { for (ObjectModelClassifier interfacez : getInterfaces()) { result.addAll(interfacez.getOperations()); - ((ObjectModelClassifierImpl)interfacez).getAllInterfaceOperations(result); + ((ObjectModelClassifierImpl) interfacez).getAllInterfaceOperations(result); } return result; } @@ -225,7 +224,7 @@ public abstract class ObjectModelClassifierImpl extends ObjectModelElementImpl * class contains no attribute for this name. * * @return the ObjectModelAttribute of the found attribute, or null if the - * class contains no attribute for this name. + * class contains no attribute for this name. */ @Override public ObjectModelAttribute getAttribute(String attributeName) { @@ -234,7 +233,7 @@ public abstract class ObjectModelClassifierImpl extends ObjectModelElementImpl @Override public Collection<ObjectModelAttribute> getAllInterfaceAttributes() { - Collection<ObjectModelAttribute> result = new LinkedList<ObjectModelAttribute>(); + Collection<ObjectModelAttribute> result = new LinkedList<>(); getAllInterfaceAttributes(result); return result; } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelDependencyImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelDependencyImpl.java index 339f71e..4f6240c 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelDependencyImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelDependencyImpl.java @@ -30,10 +30,7 @@ import org.nuiton.eugene.models.object.ObjectModelDependency; * * Created: april 23th 2009 * - * @author Florian Desbois <desbois@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * + * @author Florian Desbois - desbois@codelutin.com */ public class ObjectModelDependencyImpl extends ObjectModelImplRef implements ObjectModelDependency { @@ -51,7 +48,8 @@ public class ObjectModelDependencyImpl extends ObjectModelImplRef implements Obj /** * Method call for Digester setting properties of Dependency - * @param supplierName + * + * @param supplierName supplier name */ public void setSupplierName(String supplierName) { this.supplierName = supplierName; @@ -63,6 +61,7 @@ public class ObjectModelDependencyImpl extends ObjectModelImplRef implements Obj /** * The object instance of supplier is getting from model when supplier is null + * * @return an ObjectModelClassifier corresponding to the supplier of the dependency */ @Override diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java index 8cda5bc..933a90c 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java @@ -43,10 +43,6 @@ import java.util.Set; * * @author chatellier * @author cedric - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : */ public abstract class ObjectModelElementImpl implements ObjectModelElement { @@ -70,10 +66,10 @@ public abstract class ObjectModelElementImpl implements ObjectModelElement { protected Set<ObjectModelModifier> modifiers; public ObjectModelElementImpl() { - tagValues = new HashMap<String, String>(); - stereotypes = new HashSet<String>(); - comments = new ArrayList<String>(); - modifiers = new HashSet<ObjectModelModifier>(); + tagValues = new HashMap<>(); + stereotypes = new HashSet<>(); + comments = new ArrayList<>(); + modifiers = new HashSet<>(); } /** @param objectModelImpl the objectModelImpl */ @@ -135,7 +131,7 @@ public abstract class ObjectModelElementImpl implements ObjectModelElement { } } - public void addModifier(ObjectModelModifier ... modifiers) { + public void addModifier(ObjectModelModifier... modifiers) { if (modifiers == null || (modifiers.length == 1 && modifiers[0] == null)) { throw new IllegalArgumentException("Modifier is null"); } @@ -152,7 +148,7 @@ public abstract class ObjectModelElementImpl implements ObjectModelElement { removeModifier(Iterables.toArray(modifiers, ObjectModelModifier.class)); } - protected void removeModifier(ObjectModelModifier ... modifiers) { + protected void removeModifier(ObjectModelModifier... modifiers) { for (ObjectModelModifier modifier : modifiers) { this.modifiers.remove(modifier); } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelEnumerationImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelEnumerationImpl.java index 604a229..56d2f6f 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelEnumerationImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelEnumerationImpl.java @@ -35,21 +35,18 @@ import java.util.Set; * * Created: may 4th 2009 * - * @author Florian Desbois <desbois@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * + * @author Florian Desbois - desbois@codelutin.com */ -public class ObjectModelEnumerationImpl extends ObjectModelClassifierImpl - implements ObjectModelEnumeration { +public class ObjectModelEnumerationImpl extends ObjectModelClassifierImpl implements ObjectModelEnumeration { /** * Collection of references corresponding to literal values */ - private Collection<ObjectModelImplRef> literalRefs = new ArrayList<ObjectModelImplRef>(); + private Collection<ObjectModelImplRef> literalRefs = new ArrayList<>(); /** * Add a literal to the ObjectModelEnumeration from Digester + * * @param ref corresponding to a Literal value */ public void addLiteral(ObjectModelImplRef ref) { @@ -69,7 +66,7 @@ public class ObjectModelEnumerationImpl extends ObjectModelClassifierImpl @Override public Collection<String> getLiterals() { - Collection<String> results = new ArrayList<String>(); + Collection<String> results = new ArrayList<>(); for (ObjectModelImplRef ref : literalRefs) { results.add(ref.getName()); } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java index f9578f9..8b65772 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java @@ -47,36 +47,40 @@ import java.util.Map; * several facilities for a direct access to some of the object model elements. * In this concrete class, the tree is build by parsing an object model xml * description using lutinxml XMLObjectParser. - * - * Created: 14 janv. 2004 * - * @author Cédric Pineau <pineau@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ + * Created: 14 janv. 2004 * - * Last update : $Date$ - * by : * + * @author Cédric Pineau - pineau@codelutin.com * @plexus.component role="org.nuiton.eugene.models.Model" role-hint="objectmodel" */ public class ObjectModelImpl implements ObjectModel { /** logger */ private static final Log log = LogFactory.getLog(ObjectModelImpl.class); + protected String name; + protected String version; - protected Map<String, ObjectModelClass> classes = new HashMap<String, ObjectModelClass>(); - protected Map<String, ObjectModelPackage> packages= new HashMap<String, ObjectModelPackage>(); - protected Map<String, ObjectModelInterface> interfaces = new HashMap<String, ObjectModelInterface>(); - protected Map<String, ObjectModelClassifier> classifiers = new HashMap<String, ObjectModelClassifier>(); - protected Map<String, ObjectModelEnumeration> enumerations = new HashMap<String, ObjectModelEnumeration>(); - protected List<String> comments = new ArrayList<String>(); - private Map<String, String> tagValues = new HashMap<String, String>(); + + protected Map<String, ObjectModelClass> classes = new HashMap<>(); + + protected Map<String, ObjectModelPackage> packages = new HashMap<>(); + + protected Map<String, ObjectModelInterface> interfaces = new HashMap<>(); + + protected Map<String, ObjectModelClassifier> classifiers = new HashMap<>(); + + protected Map<String, ObjectModelEnumeration> enumerations = new HashMap<>(); + + protected List<String> comments = new ArrayList<>(); + + private Map<String, String> tagValues = new HashMap<>(); /** * Used to add others specific object to the model * The key defined must be unique to get the significative extension associated to */ - private Map<String, Object> extensions = new HashMap<String, Object>(); + private Map<String, Object> extensions = new HashMap<>(); @Override public String getModelType() { @@ -182,7 +186,7 @@ public class ObjectModelImpl implements ObjectModel { /** * Returns the name of this model. - * + * * @return the name of this model. */ @Override @@ -213,10 +217,9 @@ public class ObjectModelImpl implements ObjectModel { /** * Returns all classifiers defined in this model. - * - * @see ObjectModelClassifier - * + * * @return a Collection containing all ObjectModelClassifier for this model. + * @see ObjectModelClassifier */ @Override public Collection<ObjectModelClassifier> getClassifiers() { @@ -226,25 +229,23 @@ public class ObjectModelImpl implements ObjectModel { /** * Returns the classifier corresponding to the given qualified name, or null * if the model contains no classifier for this qualified name. - * + * * @param qualifiedClassifierName - - * the qualified name of the classifier to retrieve. - * + * the qualified name of the classifier to retrieve. * @return the ObjectModelClassifier of the found classifier, or null if the - * model contains no classifier for this qualified name. + * model contains no classifier for this qualified name. */ @Override public ObjectModelClassifier getClassifier(String qualifiedClassifierName) { return qualifiedClassifierName == null ? null - : classifiers.get(qualifiedClassifierName); + : classifiers.get(qualifiedClassifierName); } /** * Returns all classes defined in this model. - * - * @see ObjectModelClass - * + * * @return a Collection containing all ObjectModelClass for this model. + * @see ObjectModelClass */ @Override public Collection<ObjectModelClass> getClasses() { @@ -254,12 +255,11 @@ public class ObjectModelImpl implements ObjectModel { /** * Returns the class corresponding to the given qualified name, or null if * the model contains no class for this qualified name. - * + * * @param qualifiedClassName - - * the qualified name of the class to retrieve. - * + * the qualified name of the class to retrieve. * @return the ObjectModelClass of the found class, or null if the model - * contains no class for this qualified name. + * contains no class for this qualified name. */ @Override public ObjectModelClass getClass(String qualifiedClassName) { @@ -313,12 +313,11 @@ public class ObjectModelImpl implements ObjectModel { /** * Returns the interface corresponding to the given qualified name, or null * if the model contains no interface for this qualified name. - * + * * @param qualifiedInterfaceName - - * the qualified name of the interface to retrieve. - * + * the qualified name of the interface to retrieve. * @return the ObjectModelInterface of the found interface, or null if the - * model contains no interface for this qualified name. + * model contains no interface for this qualified name. */ @Override public ObjectModelInterface getInterface(String qualifiedInterfaceName) { @@ -334,10 +333,9 @@ public class ObjectModelImpl implements ObjectModel { /** * Returns all interfaces defined in this model. - * - * @see ObjectModelInterface - * + * * @return a Collection containing all ObjectModelInterface for this model. + * @see ObjectModelInterface */ @Override public Collection<ObjectModelInterface> getInterfaces() { @@ -371,7 +369,7 @@ public class ObjectModelImpl implements ObjectModel { /** * Returns all comments not lied to a particular model element - * + * * @return a List containing all comments for this model as Strings. */ @Override @@ -408,20 +406,20 @@ public class ObjectModelImpl implements ObjectModel { initialPackage.documentation = description + "--" + sourceDoc; } - for (it = additionalPackage.getComments().iterator(); it.hasNext();) { + for (it = additionalPackage.getComments().iterator(); it.hasNext(); ) { String comment = (String) it.next(); if (!initialPackage.comments.contains(comment)) { initialPackage.comments.add(comment); } } - for (it = additionalPackage.getStereotypes().iterator(); it.hasNext();) { + for (it = additionalPackage.getStereotypes().iterator(); it.hasNext(); ) { String stereotype = (String) it.next(); if (!initialPackage.getStereotypes().contains(stereotype)) { initialPackage.stereotypes.add(stereotype); } } - for (it = additionalPackage.getTagValues().keySet().iterator(); it.hasNext();) { + for (it = additionalPackage.getTagValues().keySet().iterator(); it.hasNext(); ) { String tagName = (String) it.next(); if (!initialPackage.getTagValues().containsKey(tagName)) { initialPackage.tagValues.put( @@ -469,7 +467,7 @@ public class ObjectModelImpl implements ObjectModel { } // System.out.println("Doc after : " + initialClazzifier.documentation); - for (it = additionalClazzifier.interfacesRefs.iterator(); it.hasNext();) { + for (it = additionalClazzifier.interfacesRefs.iterator(); it.hasNext(); ) { ObjectModelImplRef interfaceRef = (ObjectModelImplRef) it.next(); if (!contains(initialClazzifier.interfacesRefs, interfaceRef)) { initialClazzifier.interfacesRefs.add(interfaceRef); @@ -477,32 +475,32 @@ public class ObjectModelImpl implements ObjectModel { initialClazzifier.interfaces = null; // On force ainsi à // regénérer l'objet } - for (it = additionalClazzifier.getOperations().iterator(); it.hasNext();) { + for (it = additionalClazzifier.getOperations().iterator(); it.hasNext(); ) { ObjectModelOperationImpl operation = (ObjectModelOperationImpl) it.next(); if (!contains(initialClazzifier.getOperations(), operation)) { initialClazzifier.operations.add(operation); } } - for (it = additionalClazzifier.getDependencies().iterator(); it.hasNext();) { + for (it = additionalClazzifier.getDependencies().iterator(); it.hasNext(); ) { ObjectModelDependencyImpl dependency = (ObjectModelDependencyImpl) it.next(); if (!contains(initialClazzifier.getDependencies(), dependency)) { initialClazzifier.dependencies.add(dependency); } } - for (it = additionalClazzifier.getComments().iterator(); it.hasNext();) { + for (it = additionalClazzifier.getComments().iterator(); it.hasNext(); ) { String comment = (String) it.next(); if (!initialClazzifier.comments.contains(comment)) { initialClazzifier.comments.add(comment); } } - for (it = additionalClazzifier.getStereotypes().iterator(); it.hasNext();) { + for (it = additionalClazzifier.getStereotypes().iterator(); it.hasNext(); ) { String stereotype = (String) it.next(); if (!initialClazzifier.getStereotypes().contains(stereotype)) { initialClazzifier.stereotypes.add(stereotype); } } - for (it = additionalClazzifier.getTagValues().keySet().iterator(); it.hasNext();) { + for (it = additionalClazzifier.getTagValues().keySet().iterator(); it.hasNext(); ) { String tagName = (String) it.next(); if (!initialClazzifier.getTagValues().containsKey(tagName)) { initialClazzifier.tagValues.put( @@ -516,18 +514,16 @@ public class ObjectModelImpl implements ObjectModel { /** * This method takes two ObjectModelClassImpl and merges both of them in the * first one - * - * @param initialClazz - * the instance of ObjectModelClassImpl to be modified - * @param additionalClazz - * the instance of ObjectModelClassImpl tu be used for merging + * + * @param initialClazz the instance of ObjectModelClassImpl to be modified + * @param additionalClazz the instance of ObjectModelClassImpl tu be used for merging */ private void mergeClasses(ObjectModelClassImpl initialClazz, - ObjectModelClassImpl additionalClazz) { + ObjectModelClassImpl additionalClazz) { Iterator<?> it; mergeClassifiers(initialClazz, additionalClazz); - for (it = additionalClazz.getAttributes().iterator(); it.hasNext();) { + for (it = additionalClazz.getAttributes().iterator(); it.hasNext(); ) { ObjectModelAttributeImpl attribute = (ObjectModelAttributeImpl) it.next(); if (!contains(initialClazz.getAttributes(), attribute)) { @@ -535,7 +531,7 @@ public class ObjectModelImpl implements ObjectModel { initialClazz.orderedAttributes.add(attribute); } } - for (it = additionalClazz.superclassesRefs.iterator(); it.hasNext();) { + for (it = additionalClazz.superclassesRefs.iterator(); it.hasNext(); ) { ObjectModelImplRef superclassRef = (ObjectModelImplRef) it.next(); if (!contains(initialClazz.superclassesRefs, superclassRef)) { initialClazz.superclassesRefs.add(superclassRef); @@ -550,7 +546,7 @@ public class ObjectModelImpl implements ObjectModel { ObjectModelAssociationClassImpl additionalAssocClazz) { mergeClasses(initialAssocClazz, additionalAssocClazz); Iterator<?> it; - for (it = additionalAssocClazz.participantsRefs.iterator(); it.hasNext();) { + for (it = additionalAssocClazz.participantsRefs.iterator(); it.hasNext(); ) { ObjectModeImplAssociationClassParticipant participant = (ObjectModeImplAssociationClassParticipant) it.next(); if (!contains(initialAssocClazz.participantsRefs, participant)) { @@ -568,7 +564,7 @@ public class ObjectModelImpl implements ObjectModel { } private boolean contains(Collection<ObjectModelAttribute> coll, - ObjectModelAttributeImpl toFind) { + ObjectModelAttributeImpl toFind) { for (ObjectModelAttribute attribute : coll) { if (attribute.getName().equals(toFind.getName())) { // Seul le nom // de l'attribut @@ -616,7 +612,7 @@ public class ObjectModelImpl implements ObjectModel { oldValue + ", new: " + value + ")"); } } - tagValues.put(tagValue,value); + tagValues.put(tagValue, value); } @Override @@ -626,12 +622,13 @@ public class ObjectModelImpl implements ObjectModel { /** * Get the extension associated to the reference (unique). Create it if not exist. - * @param <O> object type returned - * @param reference unique corresponding to the extension to get + * + * @param <O> object type returned + * @param reference unique corresponding to the extension to get * @param extensionClass class of the extension * @return the object value for the extension * @throws ClassCastException when extensionClass is not valid - * @throws RuntimeException when instantiation problem to create new extension + * @throws RuntimeException when instantiation problem to create new extension */ @Override @SuppressWarnings("unchecked") @@ -651,12 +648,12 @@ public class ObjectModelImpl implements ObjectModel { try { result = extensionClass.newInstance(); } catch (Exception eee) { // IllegalAccessException and InstantiationException - throw new RuntimeException("Unable to create new extension '" +extensionClass.getName() + - "' for '" + reference + "'", eee); + throw new RuntimeException("Unable to create new extension '" + extensionClass.getName() + + "' for '" + reference + "'", eee); } extensions.put(reference, result); } else { - result = (O)object; + result = (O) object; } return result; } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplRef.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplRef.java index 851e524..e4854cd 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplRef.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplRef.java @@ -23,17 +23,12 @@ package org.nuiton.eugene.models.object.xml; /** -* ObjectModelImplRef. -* -* Created: 14 janv. 2004 -* -* @author Cédric Pineau <pineau@codelutin.com> -* Copyright Code Lutin -* @version $Revision$ -* -* Last update : $Date$ -* by : $Author$ -*/ + * ObjectModelImplRef. + * + * Created: 14 janv. 2004 + * + * @author Cédric Pineau - pineau@codelutin.com + */ public class ObjectModelImplRef { protected String name; diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplSuperClassRef.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplSuperClassRef.java index 976e886..9b83c2f 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplSuperClassRef.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplSuperClassRef.java @@ -26,15 +26,10 @@ package org.nuiton.eugene.models.object.xml; * Reference to a super class (inheritance relation). * * A discriminator is the name of the inheritance relation. - * - * Created: 14 janv. 2004 * - * @author Cédric Pineau <pineau@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ + * Created: 14 janv. 2004 * - * Last update : $Date$ - * by : $Author$ + * @author Cédric Pineau - pineau@codelutin.com */ public class ObjectModelImplSuperClassRef extends ObjectModelImplRef { @@ -43,7 +38,7 @@ public class ObjectModelImplSuperClassRef extends ObjectModelImplRef { /** * Set name of the inheritance relation. - * + * * @param discrimininator name of the inheritance relation */ public void setDiscriminator(String discrimininator) { @@ -52,7 +47,7 @@ public class ObjectModelImplSuperClassRef extends ObjectModelImplRef { /** * Get name of the inheritance relation. - * + * * @return name of the inheritance relation */ public String getDiscriminator() { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTagValue.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTagValue.java index 7573c89..41394c1 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTagValue.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTagValue.java @@ -24,12 +24,10 @@ package org.nuiton.eugene.models.object.xml; /** * ObjectModelImplTagValue.java - * + * * @author cedric * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ By : */ + */ public class ObjectModelImplTagValue extends ObjectModelImplRef { protected String value; diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelInterfaceImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelInterfaceImpl.java index 3541faf..a892783 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelInterfaceImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelInterfaceImpl.java @@ -37,12 +37,8 @@ import java.util.Set; * * Created: 14 janv. 2004 * - * @author Cédric Pineau <pineau@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * - * Last update : $Date$ - * by : */ + * @author Cédric Pineau - pineau@codelutin.com + */ public class ObjectModelInterfaceImpl extends ObjectModelClassifierImpl implements ObjectModelInterface { private static Set<ObjectModelModifier> authorizedModifiers; @@ -53,7 +49,7 @@ public class ObjectModelInterfaceImpl extends ObjectModelClassifierImpl implemen // http://docs.oracle.com/javase/specs/jls/se7/html/jls-9.html#jls-9.1.1 // public protected private abstract static strictfp Set<ObjectModelModifier> modifiers = Sets.newHashSet( - (ObjectModelModifier)ObjectModelJavaModifier.ABSTRACT, // Force cast because of generics limitation + (ObjectModelModifier) ObjectModelJavaModifier.ABSTRACT, // Force cast because of generics limitation ObjectModelJavaModifier.STATIC, ObjectModelJavaModifier.STRICTFP); modifiers.addAll(ObjectModelJavaModifier.visibilityModifiers); @@ -67,7 +63,7 @@ public class ObjectModelInterfaceImpl extends ObjectModelClassifierImpl implemen StringBuffer result = new StringBuffer(); result.append("interface ").append(getQualifiedName()).append(" "); result.append("extends "); - for (Iterator<?> i = getInterfaces().iterator(); i.hasNext();) { + for (Iterator<?> i = getInterfaces().iterator(); i.hasNext(); ) { result.append(((ObjectModelClassifier) i.next()).getName()); if (i.hasNext()) { result.append(", "); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelOperationImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelOperationImpl.java index e30feee..4143783 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelOperationImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelOperationImpl.java @@ -38,16 +38,12 @@ import java.util.Set; /** * ObjectModelOperationImpl.java - * + * * Created: 14 janv. 2004 - * - * @author Cédric Pineau <pineau@codelutin.com> Copyright Code Lutin - * - * @version $Revision$ - * - * Last update : $Date$ by : */ -public class ObjectModelOperationImpl extends ObjectModelElementImpl implements - ObjectModelOperation { + * + * @author Cédric Pineau - pineau@codelutin.com Copyright Code Lutin + */ +public class ObjectModelOperationImpl extends ObjectModelElementImpl implements ObjectModelOperation { public static final ObjectModelJavaModifier DEFAULT_VISIBILITY = ObjectModelJavaModifier.PUBLIC; @@ -55,9 +51,9 @@ public class ObjectModelOperationImpl extends ObjectModelElementImpl implements protected String transactionLevel = "supports"; - protected List<ObjectModelParameter> parameters = new ArrayList<ObjectModelParameter>(); + protected List<ObjectModelParameter> parameters = new ArrayList<>(); - protected Set<String> exceptions = new HashSet<String>(); + protected Set<String> exceptions = new HashSet<>(); protected String bodyCode = ""; @@ -73,7 +69,7 @@ public class ObjectModelOperationImpl extends ObjectModelElementImpl implements // Annotation public protected private abstract // static final synchronized native strictfp Set<ObjectModelModifier> modifiers = Sets.newHashSet( - (ObjectModelModifier)ObjectModelJavaModifier.ABSTRACT, // Force cast because of generics limitation + (ObjectModelModifier) ObjectModelJavaModifier.ABSTRACT, // Force cast because of generics limitation ObjectModelJavaModifier.STATIC, ObjectModelJavaModifier.FINAL, ObjectModelJavaModifier.SYNCHRONIZED, @@ -87,7 +83,7 @@ public class ObjectModelOperationImpl extends ObjectModelElementImpl implements public String toString() { return getName() + "(" + parameters + ")" + "<<" + getStereotypes() - + ">> throws " + exceptions + " tagvalue: " + getTagValues(); + + ">> throws " + exceptions + " tagvalue: " + getTagValues(); } /** @@ -97,10 +93,10 @@ public class ObjectModelOperationImpl extends ObjectModelElementImpl implements if (o instanceof ObjectModelOperation) { ObjectModelOperation op = (ObjectModelOperation) o; if (getName().equals(op.getName()) - && getParameters().size() == op.getParameters().size()) { + && getParameters().size() == op.getParameters().size()) { for (Iterator<?> i = getParameters().iterator(), opi = op .getParameters().iterator(); i.hasNext() - && opi.hasNext();) { + && opi.hasNext(); ) { ObjectModelParameter p = (ObjectModelParameter) i.next(); ObjectModelParameter pop = (ObjectModelParameter) opi .next(); @@ -150,6 +146,7 @@ public class ObjectModelOperationImpl extends ObjectModelElementImpl implements /** * Add some code to current body + * * @param bodyCode code to add */ public void addBodyCode(String bodyCode) { @@ -176,7 +173,8 @@ public class ObjectModelOperationImpl extends ObjectModelElementImpl implements visibility = ObjectModelJavaModifier.PRIVATE.toString(); } else if (modifiers.contains(ObjectModelJavaModifier.PROTECTED)) { visibility = ObjectModelJavaModifier.PROTECTED.toString(); - } if (modifiers.contains(ObjectModelJavaModifier.PACKAGE)) { + } + if (modifiers.contains(ObjectModelJavaModifier.PACKAGE)) { visibility = ObjectModelJavaModifier.PACKAGE.toString(); } return visibility; @@ -184,7 +182,7 @@ public class ObjectModelOperationImpl extends ObjectModelElementImpl implements /** * Returns whether this operation is abstract or not. - * + * * @return a boolean indicating whether this operation is abstract or not. */ @Override @@ -199,7 +197,7 @@ public class ObjectModelOperationImpl extends ObjectModelElementImpl implements /** * Add new raised exception. - * + * * @param raisedParameter exception to add */ public void addExceptionParameter(ObjectModelParameterImpl raisedParameter) { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelPackageImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelPackageImpl.java index c363cf9..d4961c7 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelPackageImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelPackageImpl.java @@ -60,11 +60,11 @@ public class ObjectModelPackageImpl implements ObjectModelPackage { protected String documentation; - protected Set<String> stereotypes = new HashSet<String>(); + protected Set<String> stereotypes = new HashSet<>(); - protected Map<String, String> tagValues = new HashMap<String, String>(); + protected Map<String, String> tagValues = new HashMap<>(); - protected List<String> comments = new ArrayList<String>(); + protected List<String> comments = new ArrayList<>(); @Override public String getName() { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java index 6c6db4a..a62ecd9 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java @@ -31,19 +31,18 @@ import java.util.Set; /** * ObjectModelParameterImpl. - * + * * Created: 14 janv. 2004 - * - * @author Cédric Pineau <pineau@codelutin.com> Copyright Code Lutin - * - * @version $Revision$ - * - * Last update : $Date$ by : */ + * + * @author Cédric Pineau - pineau@codelutin.com Copyright Code Lutin + */ public class ObjectModelParameterImpl extends ObjectModelElementImpl implements ObjectModelParameter { protected String type; + protected int minMultiplicity = 1; + protected int maxMultiplicity = 1; // protected String ordering = "unspecified"; @@ -74,7 +73,7 @@ public class ObjectModelParameterImpl extends ObjectModelElementImpl implements if (authorizedModifiers == null) { // No particular modifier ? authorizedModifiers = ImmutableSet.of( - (ObjectModelModifier)ObjectModelUMLModifier.UNIQUE, + (ObjectModelModifier) ObjectModelUMLModifier.UNIQUE, ObjectModelUMLModifier.ORDERED, ObjectModelUMLModifier.UNIQUE); } @@ -84,7 +83,7 @@ public class ObjectModelParameterImpl extends ObjectModelElementImpl implements public void setType(String type) { this.type = type; } - + public void setMinMultiplicity(int minMultiplicity) { this.minMultiplicity = minMultiplicity; } @@ -93,10 +92,6 @@ public class ObjectModelParameterImpl extends ObjectModelElementImpl implements this.maxMultiplicity = maxMultiplicity; } - /** - * - * @param ordering - */ public void setOrdering(String ordering) { setOrdered(PROPERTY_ORDERED.equals(ordering)); // this.ordering = ordering; @@ -147,6 +142,6 @@ public class ObjectModelParameterImpl extends ObjectModelElementImpl implements @Override public String toString() { return getType() + " " + getName() + "<<" + getStereotypes() - + ">> tagvalue: " + getTagValues(); + + ">> tagvalue: " + getTagValues(); } } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModel.java b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModel.java index 653168f..595c4d4 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModel.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModel.java @@ -28,21 +28,21 @@ import java.util.List; /** * StateModel - * + * * Model root element. * * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public interface StateModel extends Model { + /** * Plexus role-hint */ String NAME = "statemodel"; + /** * Return the collection of charts + * * @return collection of charts */ List<StateModelStateChart> getStateCharts(); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelComplexState.java b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelComplexState.java index b863414..3dbbc94 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelComplexState.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelComplexState.java @@ -26,18 +26,16 @@ import java.util.Collection; /** * StateModelComplexeState - * + * * Represents a complex state that can be composed with a set of states. * * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public interface StateModelComplexState extends StateModelState { /** * Return the states set + * * @return a collection of states */ Collection<StateModelState> getStates(); @@ -45,14 +43,14 @@ public interface StateModelComplexState extends StateModelState { /** * Return the non initial state pointed by the initial state of the state * set. - * + * * Exemple : - * myComplexeState = ( - * init1 -> state2 -> state3 -> final4 - * ) - * - * myComplexeState.getInitialState() will return state2. - * + * myComplexeState = ( + * init1 -> state2 -> state3 -> final4 + * ) + * + * myComplexeState.getInitialState() will return state2. + * * @return a state */ StateModelState getInitialState(); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelGenerator.java b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelGenerator.java index 8bd1a52..2cb9685 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelGenerator.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelGenerator.java @@ -34,21 +34,19 @@ import java.io.Writer; /** * StateModelGenerator. - * <p/> + * * Pour utiliser ce type de générateur, il faut implanter au moins une des * méthodes generateFrom... et le getFilenameFor... associé si l'on souhaite un * nom de fichier convenable. Si dans une méthode generateFrom... on utilise pas * le writer (output) alors aucun fichier n'est généré. - * <p/> + * * Le nom de l'argument writer doit absolument etre output et pas autre chose si * vous souhaitez utiliser le processeur * {@code org.nuiton.processor.filters.GeneratorTemplatesFilter} pour vous * s'implifier l'écriture des templates. * * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ By : */ + */ public class StateModelGenerator extends AbstractGenerator<StateModel> { /** @@ -72,13 +70,13 @@ public class StateModelGenerator extends AbstractGenerator<StateModel> { } /** - * Par défaut, appel {@link #generateFromModel(MonitorWriter , StateModel)} pour le - * model et {@link #generateFromState(Writer,StateModelState)} pour tous les + * Par défaut, appel {@link #generateFromModel(MonitorWriter, StateModel)} pour le + * model et {@link #generateFromState(Writer, StateModelState)} pour tous les * etats du modele. * * @param stateModel Le modele d'état * @param destDir le dossier de destination - * @throws IOException + * @throws IOException if any IO problem while applying templtate */ @Override public void applyTemplate(StateModel stateModel, File destDir) throws IOException { @@ -88,18 +86,15 @@ public class StateModelGenerator extends AbstractGenerator<StateModel> { String filename = getFilenameFromModel(stateModel); File outputFile = getDestinationFile(destDir, filename); if (isOverwrite() || !isNewerThanSource(outputFile)) { - MonitorWriter monitorOut = new MonitorWriter(new StringWriter()); - try { + try (MonitorWriter monitorOut = new MonitorWriter(new StringWriter())) { generateFromModel(monitorOut, stateModel); write(outputFile, monitorOut); } catch (Exception eee) { log.warn("Erreur lors de la génération du fichier " - + outputFile); + + outputFile); throw new RuntimeException( "Erreur lors de la génération du fichier " + outputFile, eee); - } finally { - monitorOut.close(); } } @@ -116,18 +111,15 @@ public class StateModelGenerator extends AbstractGenerator<StateModel> { .getName()); File outputFiletate = getDestinationFile(destDir, filenameState); if (isOverwrite() || !isNewerThanSource(outputFiletate)) { - MonitorWriter monitorOut = new MonitorWriter(new StringWriter()); - try { + try (MonitorWriter monitorOut = new MonitorWriter(new StringWriter())) { generateFromState(monitorOut, state); write(outputFiletate, monitorOut); } catch (Exception eee) { log.warn("Erreur lors de la génération du fichier " - + outputFiletate); + + outputFiletate); throw new RuntimeException( "Erreur lors de la génération du fichier " - + outputFiletate, eee); - } finally { - monitorOut.close(); + + outputFiletate, eee); } } } @@ -155,8 +147,8 @@ public class StateModelGenerator extends AbstractGenerator<StateModel> { /** * Generate model code * - * @param monitorOut - * @param stateModel + * @param monitorOut the output writer + * @param stateModel the model */ protected void generateFromModel(MonitorWriter monitorOut, StateModel stateModel) { @@ -165,7 +157,7 @@ public class StateModelGenerator extends AbstractGenerator<StateModel> { /** * Return filename from model * - * @param stateModel + * @param stateModel the model * @return model file name */ protected String getFilenameFromModel(StateModel stateModel) { @@ -176,7 +168,7 @@ public class StateModelGenerator extends AbstractGenerator<StateModel> { * Return filename from state * * @param state the state - * @param packageName + * @param packageName the package name * @return the filename */ public String getFilenameFromState(StateModelState state, String packageName) { @@ -188,7 +180,7 @@ public class StateModelGenerator extends AbstractGenerator<StateModel> { * * @param monitorOut the output writer * @param state the state - * @throws IOException + * @throws IOException if any IO problem while generating */ public void generateFromState(Writer monitorOut, StateModelState state) throws IOException { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java index dce9b4c..9dd0d5b 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java @@ -36,15 +36,13 @@ import org.xml.sax.SAXException; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.util.Enumeration; /** * To read state model files into a memory state model. - * <p/> + * * Created: 26 oct. 2009 * - * @author fdesbois <fdesbois@codelutin.com> - * @version $Id$ + * @author Florian Desbois - desbois@codelutin.com * @plexus.component role="org.nuiton.eugene.ModelReader" role-hint="statemodel" */ public class StateModelReader extends ModelReader<StateModel> { @@ -78,9 +76,7 @@ public class StateModelReader extends ModelReader<StateModel> { // try to load property file loadPropertyFile(file, stateModel); - } catch (IOException e) { - log.warn("Can't read model file", e); - } catch (SAXException e) { + } catch (IOException | SAXException e) { log.warn("Can't read model file", e); } } @@ -90,11 +86,10 @@ public class StateModelReader extends ModelReader<StateModel> { /** * Try to load property file, associated to current statemodel file * - * @param stateModelFile - * @param stateModel + * @param stateModelFile state model file + * @param stateModel state model */ - protected void loadPropertyFile(File stateModelFile, - StateModelImpl stateModel) { + protected void loadPropertyFile(File stateModelFile, StateModelImpl stateModel) { // recherche et charge le fichier propriete associe au modele File dir = stateModelFile.getParentFile(); String ext = FileUtil.extension(stateModelFile); @@ -110,25 +105,15 @@ public class StateModelReader extends ModelReader<StateModel> { if (log.isInfoEnabled()) { log.info("Reading model property file " + propFile); } - FileInputStream inStream = null; - try { - inStream = new FileInputStream(propFile); + try (FileInputStream inStream = new FileInputStream(propFile)) { prop.load(inStream); } catch (IOException e) { - log.warn("Cannot read property file " + propFile, e); - } finally { - try { - if (inStream != null) { - inStream.close(); - } - } catch (IOException e) { - log.warn("Cannot close property file " + propFile, e); - } + log.warn("Cannot read or close property file " + propFile, e); } // on ajoute les proprietes du fichier associe au model - for (Enumeration<Object> e = prop.keys(); e.hasMoreElements(); ) { - String key = (String) e.nextElement(); + for (Object o : prop.keySet()) { + String key = (String) o; String value = prop.getProperty(key); if (!key.startsWith("model.tagvalue.")) { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelSimpleState.java b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelSimpleState.java index d5c1a01..a3c5284 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelSimpleState.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelSimpleState.java @@ -24,24 +24,23 @@ package org.nuiton.eugene.models.state; /** * StateModelSimpleState - * + * * A simple state. * * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public interface StateModelSimpleState extends StateModelState { /** * State final status + * * @return true il the state is final */ boolean isFinal(); /** * State initial status + * * @return true if the state is initial */ boolean isInitial(); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelState.java b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelState.java index 34f6d1d..778bdbe 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelState.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelState.java @@ -28,31 +28,30 @@ import java.util.List; * StateModelState.java * * A state, that can be simple or complexe - * + * + * @author chatellier * @see StateModelSimpleState * @see StateModelComplexState - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public interface StateModelState { /** * Get the state name + * * @return state name */ String getName(); /** * Return the state's transition set + * * @return a list of transition */ List<StateModelTransition> getTransitions(); /** * State complex status + * * @return true if the state is complex */ boolean isComplex(); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelStateChart.java b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelStateChart.java index 0669343..8566af5 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelStateChart.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelStateChart.java @@ -24,19 +24,17 @@ package org.nuiton.eugene.models.state; /** * StateModelStateChart - * + * * A chart is, like ComplexState, a set of state. * He got a package name. * * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public interface StateModelStateChart extends StateModelComplexState { /** * Get package name + * * @return package name */ String getPackageName(); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelTransition.java b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelTransition.java index dc290d5..53ac7d2 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelTransition.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelTransition.java @@ -24,24 +24,23 @@ package org.nuiton.eugene.models.state; /** * StateModelTransition - * + * * A transition points to a state and has an avent. * * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public interface StateModelTransition { /** * Return the destination state + * * @return a state */ StateModelState getDestinationState(); /** * Return the event name + * * @return the event name */ String getEvent(); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java index 5a565e5..76d0afa 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java @@ -27,27 +27,25 @@ import org.apache.commons.digester3.RuleSetBase; /** * StateModelDigesterRuleSet - * + * * Definit principalement : - * - la classe d'implementation a utiliser pour chaque noeud - * - la methode a appeler apres chaque noeud - * + * - la classe d'implementation a utiliser pour chaque noeud + * - la methode a appeler apres chaque noeud + * * Ce jeu de regle ne cree pas l'element racine. * Il doit etre cree et ajoute a la pile digester avant l'appel a * <tt>Digester.parse(File)</tt>. - * + * * Exemple: * <code> - * StateModel monModel = new StateModelImpl() - * Digester d = new Digester(); - * d.push(monModel); - * d.parse(file); + * StateModel monModel = new StateModelImpl() + * Digester d = new Digester(); + * d.push(monModel); + * d.parse(file); * </code> - * + * * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ By : */ + */ public class DigesterStateModelRuleSet extends RuleSetBase { protected String prefix; @@ -68,8 +66,7 @@ public class DigesterStateModelRuleSet extends RuleSetBase { // root element must be present on stask digester.addSetProperties("stateModel"); - digester.addObjectCreate("stateModel/stateChart", - StateModelStateChartImpl.class); + digester.addObjectCreate("stateModel/stateChart", StateModelStateChartImpl.class); digester.addSetProperties("stateModel/stateChart"); digester.addSetNext("stateModel/stateChart", "addStateChart"); @@ -77,8 +74,7 @@ public class DigesterStateModelRuleSet extends RuleSetBase { digester.addSetProperties("*/state"); digester.addSetNext("*/state", "addState"); - digester.addObjectCreate("*/complexeState", - StateModelComplexeStateImpl.class); + digester.addObjectCreate("*/complexeState", StateModelComplexeStateImpl.class); digester.addSetProperties("*/complexeState"); digester.addSetNext("*/complexeState", "addState"); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelComplexeStateImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelComplexeStateImpl.java index 174a026..256fccf 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelComplexeStateImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelComplexeStateImpl.java @@ -35,10 +35,7 @@ import java.util.Map; * StateModelComplexeStateImpl.java * * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public class StateModelComplexeStateImpl extends StateModelStateImpl implements StateModelComplexState { @@ -51,11 +48,12 @@ public class StateModelComplexeStateImpl extends StateModelStateImpl implements * Constructor */ public StateModelComplexeStateImpl() { - mapState = new HashMap<String, StateModelState>(); + mapState = new HashMap<>(); } /** * Add a state + * * @param state the state */ public void addState(StateModelState state) { @@ -71,6 +69,7 @@ public class StateModelComplexeStateImpl extends StateModelStateImpl implements /** * Correct association, because, the xml file migth be non ordonated + * * @param parent */ void correctTransitionNameToInstance(StateModelComplexeStateImpl parent) { @@ -106,8 +105,8 @@ public class StateModelComplexeStateImpl extends StateModelStateImpl implements } /** - * @return a state ref by his name * @param stateName a state or null if state doesnt exists + * @return a state ref by his name */ StateModelState getState(String stateName) { return mapState.get(stateName); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java index 8cf18d7..9a2e8db 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java @@ -34,12 +34,8 @@ import java.util.Map; /** * Implementation of the {@link StateModel}. - * - * @author chatellier - * @version $Revision$ * - * Last update : $Date$ - * + * @author chatellier * @plexus.component role="org.nuiton.eugene.models.Model" role-hint="statemodel" */ public class StateModelImpl implements StateModel { @@ -58,7 +54,7 @@ public class StateModelImpl implements StateModel { * Version of this model */ protected String version; - + /** * Model tagged values */ @@ -68,14 +64,14 @@ public class StateModelImpl implements StateModel { * Used to add others specific object to the model * The key defined must be unique to get the significative extension associated to */ - private Map<String, Object> extensions = new HashMap<String, Object>(); + private Map<String, Object> extensions = new HashMap<>(); /** * Construteur */ public StateModelImpl() { - listStateCharts = new ArrayList<StateModelStateChart>(); - modelTagValues = new HashMap<String, String>(); + listStateCharts = new ArrayList<>(); + modelTagValues = new HashMap<>(); } @Override @@ -90,7 +86,7 @@ public class StateModelImpl implements StateModel { /** * Set model name. - * + * * @param name model name */ public void setName(String name) { @@ -99,7 +95,7 @@ public class StateModelImpl implements StateModel { /** * Add chart. - * + * * @param chart chart */ public void addStateChart(StateModelStateChart chart) { @@ -119,6 +115,7 @@ public class StateModelImpl implements StateModel { /** * Add a list of stateCharts into current model + * * @param charts list */ public void addAllStateCharts(Collection<StateModelStateChart> charts) { @@ -161,12 +158,13 @@ public class StateModelImpl implements StateModel { /** * Get the extension associated to the reference (unique). Create it if not exist. - * @param <O> object type returned - * @param reference unique corresponding to the extension to get + * + * @param <O> object type returned + * @param reference unique corresponding to the extension to get * @param extensionClass class of the extension * @return the object value for the extension * @throws ClassCastException when extensionClass is not valid - * @throws RuntimeException when instantiation problem to create new extension + * @throws RuntimeException when instantiation problem to create new extension */ @Override @SuppressWarnings("unchecked") @@ -186,12 +184,12 @@ public class StateModelImpl implements StateModel { try { result = extensionClass.newInstance(); } catch (Exception eee) { // IllegalAccessException and InstantiationException - throw new RuntimeException("Unable to create new extension '" +extensionClass.getName() + + throw new RuntimeException("Unable to create new extension '" + extensionClass.getName() + "' for '" + reference + "'", eee); } extensions.put(reference, result); } else { - result = (O)object; + result = (O) object; } return result; } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelSimpleStateImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelSimpleStateImpl.java index 709c37b..9aeeb24 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelSimpleStateImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelSimpleStateImpl.java @@ -28,10 +28,7 @@ import org.nuiton.eugene.models.state.StateModelSimpleState; * StateModelSimpleStateImpl.java * * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public class StateModelSimpleStateImpl extends StateModelStateImpl implements StateModelSimpleState { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateChartImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateChartImpl.java index 64c2071..895b342 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateChartImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateChartImpl.java @@ -28,10 +28,7 @@ import org.nuiton.eugene.models.state.StateModelStateChart; * StateModelStateChartImpl.java * * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public class StateModelStateChartImpl extends StateModelComplexeStateImpl implements StateModelStateChart { @@ -45,7 +42,7 @@ public class StateModelStateChartImpl extends StateModelComplexeStateImpl /** * Set package name. - * + * * @param packageName package name */ public void setPackage(String packageName) { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateImpl.java index 8fa88a9..36d3608 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateImpl.java @@ -32,18 +32,7 @@ import java.util.List; * StateModelStateImpl.java * * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ -/** - * StateModelStateImpl.java - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public class StateModelStateImpl implements StateModelState { /** @@ -60,7 +49,7 @@ public class StateModelStateImpl implements StateModelState { * Constructor */ public StateModelStateImpl() { - listTransitions = new ArrayList<StateModelTransition>(); + listTransitions = new ArrayList<>(); } @Override @@ -70,6 +59,7 @@ public class StateModelStateImpl implements StateModelState { /** * Set state name + * * @param name the name */ public void setName(String name) { @@ -77,7 +67,8 @@ public class StateModelStateImpl implements StateModelState { } /** - * Add transition + * Add transition + * * @param transition a transition */ public void addTransition(StateModelTransition transition) { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelTransitionImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelTransitionImpl.java index ef85beb..298ccdf 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelTransitionImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelTransitionImpl.java @@ -29,10 +29,7 @@ import org.nuiton.eugene.models.state.StateModelTransition; * StateModelTransitionImpl * * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public class StateModelTransitionImpl implements StateModelTransition { /** @@ -58,6 +55,7 @@ public class StateModelTransitionImpl implements StateModelTransition { /** * ToState name + * * @param stateName name */ public void setToState(String stateName) { @@ -66,19 +64,20 @@ public class StateModelTransitionImpl implements StateModelTransition { /** * Get toState name + * * @return the stateName */ public String getStateName() { return stateName; } - /** + /** * Permet de positionner un lien sur l'instance de l'état. - * + * * On ne peut pas le faire directement car le fichier xml n'est * potentielement par ordonne, et par concequent, les etat n'ont pas encore * ete traite. - * + * * @param state state to set */ public void setState(StateModelState state) { @@ -97,6 +96,7 @@ public class StateModelTransitionImpl implements StateModelTransition { /** * Set transition event + * * @param event event name */ public void setEvent(String event) { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/InvalidStereotypeSyntaxException.java b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/InvalidStereotypeSyntaxException.java index 2a9dbd3..f751d4e 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/InvalidStereotypeSyntaxException.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/InvalidStereotypeSyntaxException.java @@ -29,5 +29,6 @@ package org.nuiton.eugene.models.stereotype; * @since 2.9 */ public class InvalidStereotypeSyntaxException extends Exception { + private static final long serialVersionUID = 1L; } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MismatchStereotypeTargetException.java b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MismatchStereotypeTargetException.java index e612075..f62b9bc 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MismatchStereotypeTargetException.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MismatchStereotypeTargetException.java @@ -29,5 +29,6 @@ package org.nuiton.eugene.models.stereotype; * @since 2.9 */ public class MismatchStereotypeTargetException extends Exception { + private static final long serialVersionUID = 1L; } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MyStereotypeDefinitionProvider.java b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MyStereotypeDefinitionProvider.java index 759693e..c25195e 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MyStereotypeDefinitionProvider.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MyStereotypeDefinitionProvider.java @@ -33,6 +33,6 @@ import org.nuiton.eugene.models.object.ObjectModelAttribute; public class MyStereotypeDefinitionProvider extends StereotypeDefinitionProvider { @StereotypeDefinition(target = ObjectModelAttribute.class, - documentation = "doc of your stereotype") + documentation = "doc of your stereotype") public static final String MY_STEREOTYPE = "mystereotype"; } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/StereotypeDefinition.java b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/StereotypeDefinition.java index 0df0512..2f94f27 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/StereotypeDefinition.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/StereotypeDefinition.java @@ -31,15 +31,14 @@ import java.lang.annotation.Target; /** * To define a stereotype. - * <p/> + * * Place this annotation on the constant defining your stereotype. - * <p/> - * <br/> + * * Example for stereotype named mystereotype which can be only put on a attribute : * <pre> * String STEREOTYPE_MYSTEREOTYPE = "mystereotype"; * \@StereotypeDefinition(target = ObjectModelAttribute.class) - * </pre + * </pre> * * @author Tony Chemit - chemit@codelutin.com * @see EugeneTagValues diff --git a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/StereotypeDefinitionProvider.java b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/StereotypeDefinitionProvider.java index cdc13f8..0920cec 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/StereotypeDefinitionProvider.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/StereotypeDefinitionProvider.java @@ -38,7 +38,7 @@ import java.util.TreeMap; /** * To describe stereotype definitions you can use on your model. Using a such class permits to validate * the stereotypes before generation. - * <p/> + * * Created on 4/27/14. * <h3>Howto</h3> * Overrides this class adding constants with {@link StereotypeDefinition} annotations: @@ -64,8 +64,7 @@ import java.util.TreeMap; public class StereotypeDefinitionProvider { /** Logger. */ - private static final Log log = - LogFactory.getLog(StereotypeDefinitionProvider.class); + private static final Log log = LogFactory.getLog(StereotypeDefinitionProvider.class); protected Map<String, StereotypeDefinition> definition; @@ -74,8 +73,8 @@ public class StereotypeDefinitionProvider { protected boolean verbose; protected StereotypeDefinitionProvider() { - definition = new TreeMap<String, StereotypeDefinition>(); - deprecated = new HashSet<String>(); + definition = new TreeMap<>(); + deprecated = new HashSet<>(); } public boolean isVerbose() { diff --git a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/StereotypeNotFoundException.java b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/StereotypeNotFoundException.java index 166d34c..f5d9a89 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/StereotypeNotFoundException.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/StereotypeNotFoundException.java @@ -29,5 +29,6 @@ package org.nuiton.eugene.models.stereotype; * @since 2.9 */ public class StereotypeNotFoundException extends Exception { + private static final long serialVersionUID = 1L; } 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 b387911..95281ef 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 @@ -73,7 +73,6 @@ public class Stereotypes { * element that is a {@link ObjectModelElement} and return the first not empty tag * element with this stereotype found.</li> * </ul> - * <p/> * <strong>Note:</strong> Order of {@code elements} is important, better then to * always starts from specialized to more general level (for example from attribute, * to classifier or model). @@ -112,7 +111,6 @@ public class Stereotypes { * <ul> * <li>Look into {@code elements} and return the first element with this stereotype found.</li> * </ul> - * <p/> * <strong>Note:</strong> Order of {@code elements} is important, better then to * always starts from specialized to more general level (for example from attribute, * to classifier or model). diff --git a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/InvalidTagValueSyntaxException.java b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/InvalidTagValueSyntaxException.java index 1185f92..7585d91 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/InvalidTagValueSyntaxException.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/InvalidTagValueSyntaxException.java @@ -29,5 +29,6 @@ package org.nuiton.eugene.models.tagvalue; * @since 2.9 */ public class InvalidTagValueSyntaxException extends Exception { + private static final long serialVersionUID = 1L; } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/MismatchTagValueTargetException.java b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/MismatchTagValueTargetException.java index 6df057a..9c2570f 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/MismatchTagValueTargetException.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/MismatchTagValueTargetException.java @@ -29,5 +29,6 @@ package org.nuiton.eugene.models.tagvalue; * @since 2.9 */ public class MismatchTagValueTargetException extends Exception { + private static final long serialVersionUID = 1L; } diff --git a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueAble.java b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueAble.java index 24ac8ad..734e532 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueAble.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueAble.java @@ -50,7 +50,7 @@ public interface TagValueAble { /** * Adds the given {@code value} associated to the {@code tagValue}. - * <p/> + * * Note: If a previous tag value was definied, then it will be replaced. * * @param tagValue the name of the tag value diff --git a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueDefinition.java b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueDefinition.java index 21b66f2..d54a9c1 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueDefinition.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueDefinition.java @@ -32,14 +32,14 @@ import java.lang.annotation.Target; /** * To define a tag value. - * <p/> + * * Place this annotation on the constant defining your tag-value. - * <p/> + * * Example for tag value named mytagvalut which can be only put on a attribute : * <pre> * String TAG_VALUE_MYTAGVALUE = "mytagvalue"; * \@TagValueDefinition(target = ObjectModelAttribute.class) - * </pre + * </pre> * * @author Tony Chemit - chemit@codelutin.com * @see org.nuiton.eugene.EugeneTagValues diff --git a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueDefinitionProvider.java b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueDefinitionProvider.java index 7fb8d04..7778b60 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueDefinitionProvider.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueDefinitionProvider.java @@ -42,7 +42,7 @@ import java.util.TreeMap; /** * To describe tag value definitions you can use on your model. Using a such class permits to validate * the tag values before generation. - * <p/> + * * Created on 4/27/14. * <h3>Howto</h3> * Overrides this class adding constants with {@link TagValueDefinition} annotations: @@ -79,9 +79,9 @@ public class TagValueDefinitionProvider { protected boolean verbose; public TagValueDefinitionProvider() { - definition = new TreeMap<String, TagValueDefinition>(); - deprecated = new HashSet<String>(); - matcher = new HashSet<TagValueDefinitionMatcher>(); + definition = new TreeMap<>(); + deprecated = new HashSet<>(); + matcher = new HashSet<>(); } public boolean isVerbose() { @@ -248,7 +248,7 @@ public class TagValueDefinitionProvider { } protected <M extends TagValueDefinitionMatcher> Map<String, TagValueDefinition> getDefinitionForMatcher(Class<M> matcherType) { - Map<String, TagValueDefinition> result = new TreeMap<String, TagValueDefinition>(); + Map<String, TagValueDefinition> result = new TreeMap<>(); for (Map.Entry<String, TagValueDefinition> entry : definition.entrySet()) { if (matcherType.equals(entry.getValue().matcherClass())) { result.put(entry.getKey(), entry.getValue()); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueNotFoundException.java b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueNotFoundException.java index 7a4ea6f..118267f 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueNotFoundException.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/TagValueNotFoundException.java @@ -29,5 +29,6 @@ package org.nuiton.eugene.models.tagvalue; * @since 2.9 */ public class TagValueNotFoundException extends Exception { + private static final long serialVersionUID = 1L; } 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 7339f27..fb49d77 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 @@ -39,9 +39,9 @@ public class TagValues { /** * Pattern to define tag values authorized at classifier level in the model * properties file. - * <p/> + * * L'expression réguliere match les chaines de type - * <package.ClassName>.<class|attribute|operation>.[name].<stereotype|tagvalue>.[tag] + * <package.ClassName>.<class|attribute|operation>.[name].<stereotype|tagvalue>.[tag] * fr.isisfish.entities.Population.class.stereotype=entity * fr.isisfish.entities.Population.class.tagvalue.persistenceType=flatfile * fr.isisfish.entities.Population.attribute.name.stereotype=... @@ -92,11 +92,11 @@ public class TagValues { /** * Seek for a Boolean tag value. - * <p/> + * * Will first the tag value using the method {@link #findTagValue(String, TagValueAble...)}. - * <p/> + * * If not found, return {@code null}, otherwise return boolean value (case is ignored). - * <p/> + * * <strong>Note:</strong> Order of {@code elements} is important, better then to * always starts from specialized to more general level (for example from attribute, * to classifier or model). @@ -115,11 +115,11 @@ public class TagValues { /** * Seek for a Boolean tag value. - * <p/> + * * Will first the tag value using the method {@link #findTagValue(String, TagValueAble...)}. - * <p/> + * * If not found, return {@code null}, otherwise return boolean value (case is ignored). - * <p/> + * * <strong>Note:</strong> Order of {@code elements} is important, better then to * always starts from specialized to more general level (for example from attribute, * to classifier or model). @@ -139,11 +139,11 @@ public class TagValues { /** * Seek for a boolean tag value. - * <p/> + * * Will first the tag value using the method {@link #findTagValue(String, TagValueAble...)}. - * <p/> + * * If found, return {@code true}, if the value is not null and is {@code "true"} String value (case is ignored). - * <p/> + * * <strong>Note:</strong> Order of {@code elements} is important, better then to * always starts from specialized to more general level (for example from attribute, * to classifier or model). @@ -163,11 +163,11 @@ public class TagValues { /** * Seek for a boolean tag value. - * <p/> + * * Will first the tag value using the method {@link #findTagValue(String, TagValueAble...)}. - * <p/> + * * If found, return {@code true}, if the value is not null and is {@code "true"} String value (case is ignored). - * <p/> + * * <strong>Note:</strong> Order of {@code elements} is important, better then to * always starts from specialized to more general level (for example from attribute, * to classifier or model). @@ -195,7 +195,6 @@ public class TagValues { * value found.</li> * <li>If not found return {@code null}</li> * </ul> - * <p/> * <strong>Note:</strong> Order of {@code elements} is important, better then to * always starts from specialized to more general level (for example from attribute, * to classifier or model). @@ -219,7 +218,6 @@ public class TagValues { * value found.</li> * <li>If not found return {@code defaultValue}</li> * </ul> - * <p/> * <strong>Note:</strong> Order of {@code elements} is important, better then to * always starts from specialized to more general level (for example from attribute, * to classifier or model). @@ -260,7 +258,6 @@ public class TagValues { * <li>Look into {@code elements} and return the first not empty tag value found.</li> * <li>If not found return {@code defaultValue}</li> * </ul> - * <p/> * <strong>Note:</strong> Order of {@code elements} is important, better then to * always starts from specialized to more general level (for example from attribute, * to classifier or model). diff --git a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/matcher/TagValueDefinitionMatcher.java b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/matcher/TagValueDefinitionMatcher.java index 16c86c9..c899ce6 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/matcher/TagValueDefinitionMatcher.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/matcher/TagValueDefinitionMatcher.java @@ -29,7 +29,7 @@ import java.util.Map; /** * To match a Tag value name. - * <p/> + * * Created on 4/26/14. * * @author Tony Chemit - chemit@codelutin.com diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/AbstractChainedFileWriter.java b/eugene/src/main/java/org/nuiton/eugene/writer/AbstractChainedFileWriter.java index 700568d..a8da71b 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/AbstractChainedFileWriter.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/AbstractChainedFileWriter.java @@ -95,10 +95,10 @@ public abstract class AbstractChainedFileWriter implements ChainedFileWriter { "(property key, property description), but was " + Arrays.toString(propertyNameAndDescriptions)); } - entries = new ArrayList<ChainedFileWriterEntry>(); - properties = new TreeMap<String, Object>(); + entries = new ArrayList<>(); + properties = new TreeMap<>(); Map<String, String> authorizedPropertyDescriptions = - new TreeMap<String, String>(); + new TreeMap<>(); for (int i = 0, max = propertyNameAndDescriptions.length / 2; i < max; i++) { authorizedPropertyDescriptions.put( diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriter.java b/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriter.java index ea68f6a..7c88f14 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriter.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriter.java @@ -28,9 +28,8 @@ import java.util.List; import java.util.Map; /** - * Contract to generate files from any incoming sources (zargo, xmi, ...) to any - * other ones. - * <p/> + * Contract to generate files from any incoming sources (zargo, xmi, ...) to any other ones. + * * User: chemit Date: 27 nov. 2009 Time: 11:20:39 * * @since 2.0.0 @@ -41,18 +40,15 @@ public interface ChainedFileWriter { String getInputProtocol(); /** - * Obtain the input protocol of this writer given the passed {@code - * modelType}. + * Obtain the input protocol of this writer given the passed {@code modelType}. * * @param modelType the type of model used - * @return the input protocol or {@code null} if this writer does not accept - * the type of model + * @return the input protocol or {@code null} if this writer does not accept the type of model */ String getInputProtocol(String modelType); /** - * Obtain the output protocol of this writer given the passed {@code - * modelType}. + * Obtain the output protocol of this writer given the passed {@code modelType}. * * @param modelType the type of model used * @return the output protocol or {@code null} if should not be chained @@ -63,8 +59,7 @@ public interface ChainedFileWriter { * Test if a type of model can be treated by this writer. * * @param modelType model type to test - * @return {@code true} if this writer accept the given type of model, - * {@code false} otherwise. + * @return {@code true} if this writer accept the given type of model, {@code false} otherwise. */ boolean acceptModel(String modelType); @@ -72,14 +67,12 @@ public interface ChainedFileWriter { * Test in a entry can be treated by this writer. * * @param include the include to test - * @return {@code true} if the writer accept the entry, {@code false} - * otherwise. + * @return {@code true} if the writer accept the entry, {@code false} otherwise. */ boolean acceptInclude(String include); /** - * @return the default includes files to be treated by the writer (can be an - * ant-like expression) + * @return the default includes files to be treated by the writer (can be an ant-like expression) */ String getDefaultIncludes(); @@ -87,8 +80,7 @@ public interface ChainedFileWriter { String getDefaultInputDirectory(); /** - * @return the defalt relative path where to pick files to treate on a test - * phase. + * @return the defalt relative path where to pick files to treate on a test phase. */ String getDefaultTestInputDirectory(); @@ -97,19 +89,18 @@ public interface ChainedFileWriter { /** * @return the default relative path to add to output basedir on a test - * phase. + * phase. */ String getDefaultTestOutputDirectory(); /** * Obtain the real directory where to write files. - * <p/> + * * //FIXME-TC20091126 make this configurable (via the properties) * * @param outputBasedir the output base directory * @param testPhase {@code true} if writer is used in a test phase - * @return the real output directory where to generate for this particular - * writer + * @return the real output directory where to generate for this particular writer */ File getOutputDirectory(File outputBasedir, boolean testPhase); @@ -120,7 +111,7 @@ public interface ChainedFileWriter { * @param outputBasedir the output base directory * @param testPhase {@code true} if writer is used in a test phase * @return the real output directory where to extract for this particular - * writer + * writer * @since 2.1.3 */ File getExtractDirectory(File outputBasedir, boolean testPhase); @@ -176,14 +167,13 @@ public interface ChainedFileWriter { void addEntry(ChainedFileWriterEntry entry); /** - * @return the array of properties names authorized for the chained - * writer. + * @return the array of properties names authorized for the chained writer. */ String[] getAuthorizedPropertyNames(); /** * @return the dictionnary of authorized property descriptions (keys are - * property names and values are descriptions). + * property names and values are descriptions). */ Map<String, String> getAuthorizedPropertyDescriptions(); diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterConfiguration.java b/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterConfiguration.java index 301be8f..614af5d 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterConfiguration.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterConfiguration.java @@ -52,14 +52,12 @@ public interface ChainedFileWriterConfiguration { File getExtractDirectory(); /** - * @return {@code true} if must regenerate files even if they are up to - * date + * @return {@code true} if must regenerate files even if they are up to date */ boolean isOverwrite(); /** - * @return {@code true} if build is off-line and should not be able to - * access outside resources. + * @return {@code true} if build is off-line and should not be able to access outside resources. */ boolean isOffline(); diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterData.java b/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterData.java index 9dc6f37..2d6db15 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterData.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterData.java @@ -39,7 +39,7 @@ public class ChainedFileWriterData { Map<File, List<File>> resourcesByFile; - + public File getOutputDirectory() { return outputDirectory; } diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java b/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java index b49213e..7031b31 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java @@ -26,11 +26,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder; /** * Definition of of the chained writer entry. - * <p/> + * * Created: 04 mars. 2010 * * @author Tony Chemit - chemit@codelutin.com - * @version $Revision$ * @since 2.0.0 */ public class ChainedFileWriterEntry { @@ -43,7 +42,7 @@ public class ChainedFileWriterEntry { /** * Flag to knwon if resources should be searched in classpath. - * <p/> + * * If sets to {@code true}, then the {@link #inputPath} is the * absolute path where to seek resources in classpath. * diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterToMemoryModel.java b/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterToMemoryModel.java index 150caf4..c715a80 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterToMemoryModel.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterToMemoryModel.java @@ -27,8 +27,7 @@ import org.nuiton.eugene.models.Model; import java.io.File; /** - * Contract to define a specialized {@link ChainedFileWriter} which generate - * no files but a memory model. + * Contract to define a specialized {@link ChainedFileWriter} which generate no files but a memory model. * * @author Tony Chemit - chemit@codelutin.com * @since 2.6.3 @@ -43,16 +42,14 @@ public interface ChainedFileWriterToMemoryModel extends ChainedFileWriter { Model getModel(); /** - * Gets the latest last modified time of physicial files used to load - * the memory model. + * Gets the latest last modified time of physicial files used to load the memory model. * * @return the latest last modified of any files used to load memory model. */ long getLastModifiedSource(); /** - * Gets the directory where to generate later files froma pplying template - * to this memory model. + * Gets the directory where to generate later files froma pplying template to this memory model. * * @return where to generate files from this model. */ diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/ChainedWriterEngine.java b/eugene/src/main/java/org/nuiton/eugene/writer/ChainedWriterEngine.java index d4f4cce..176ecc0 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/ChainedWriterEngine.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/ChainedWriterEngine.java @@ -29,16 +29,15 @@ import java.util.Set; /** * Contract of the chained writer engine. - * <p/> + * * You can register inputs via the method {@link #registerInclude(String)}. - * <p/> + * * And later obtain of the selected writers for your inputs via the method * {@link #getSelectedWriters()}. - * <p/> + * * Created: 17 déc. 2009 * * @author Tony Chemit - chemit@codelutin.com - * @version $Revision$ * @since 2.0.0 */ public interface ChainedWriterEngine { @@ -47,9 +46,8 @@ public interface ChainedWriterEngine { /** * Register in engine a new input source. - * <p/> - * this method will detects writers to register and chain them if - * necessary. + * + * this method will detects writers to register and chain them if necessary. * * @param include the new include to digest */ @@ -66,16 +64,14 @@ public interface ChainedWriterEngine { * Tests if there is a selected writer using the given input protocol. * * @param inputProtocol the inputProtocol to test - * @return {@code true} if there is a selected writer using this input - * protocol + * @return {@code true} if there is a selected writer using this input protocol * @see ChainedFileWriter#getInputProtocol() * @see #getSelectedWriters() */ boolean containsWriter(String inputProtocol); /** - * Filter the given {@code universe} of writers which accept the given - * {@code modelType}. + * Filter the given {@code universe} of writers which accept the given {@code modelType}. * * @param universe the list of writers to filter * @param modelType the accepted model type @@ -106,7 +102,7 @@ public interface ChainedWriterEngine { /** * Filter the given {@code universe} of writers which accept the given * {@code modelType} and {@code include}. - * <p/> + * * The include can have several forms : <ul> <li></li> <li></li> </ul> * * @param universe the list of writers to filter @@ -125,7 +121,7 @@ public interface ChainedWriterEngine { /** * Obtain the universe of files to react by the given {@code writer} * associated with each (distinct). - * <p/> + * * <b>Note:</b> If some files are in class-path (using the classpath: * prefix) then they will be extracted to the * {@link ChainedFileWriterConfiguration#getExtractDirectory()}. diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java b/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java index 18d26d2..16c29d4 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java @@ -40,19 +40,17 @@ import java.util.regex.Pattern; /** * Default implementation of the {@link ChainedWriterEngine}. - * <p/> + * * Created: 17 déc. 2009 * * @author Tony Chemit - chemit@codelutin.com - * @version $Id$ * @plexus.component role="org.nuiton.eugene.writer.ChainedWriterEngine" role-hint="default" * @since 2.0.0 */ public class DefaultChainedWriterEngine implements ChainedWriterEngine { /** Logger */ - private static final Log log = - LogFactory.getLog(DefaultChainedWriterEngine.class); + private static final Log log = LogFactory.getLog(DefaultChainedWriterEngine.class); /** shared configuration */ protected ChainedFileWriterConfiguration configuration; @@ -75,7 +73,7 @@ public class DefaultChainedWriterEngine implements ChainedWriterEngine { public List<ChainedFileWriter> getSelectedWriters() { if (selectedWriters == null) { checkInit("getSelectedWriters"); - selectedWriters = new ArrayList<ChainedFileWriter>(); + selectedWriters = new ArrayList<>(); } return selectedWriters; } @@ -130,8 +128,7 @@ public class DefaultChainedWriterEngine implements ChainedWriterEngine { if (selectedType == null) { // no writer - throw new IllegalArgumentException("could not find a writer for " + - "include pattern : " + include); + throw new IllegalArgumentException("could not find a writer for include pattern : " + include); } // obtain the writer @@ -251,7 +248,7 @@ public class DefaultChainedWriterEngine implements ChainedWriterEngine { @Override public Set<ChainedFileWriter> filterWriterForModelType( Map<String, ChainedFileWriter> universe, String modelType) { - Set<ChainedFileWriter> result = new HashSet<ChainedFileWriter>(); + Set<ChainedFileWriter> result = new HashSet<>(); for (ChainedFileWriter w : universe.values()) { if (w.acceptModel(modelType)) { if (log.isDebugEnabled()) { @@ -306,8 +303,8 @@ public class DefaultChainedWriterEngine implements ChainedWriterEngine { } // split directory and classpath entries - Map<String, Set<String>> directoryEntries = new HashMap<String, Set<String>>(); - Map<String, Set<String>> classpathEntries = new HashMap<String, Set<String>>(); + Map<String, Set<String>> directoryEntries = new HashMap<>(); + Map<String, Set<String>> classpathEntries = new HashMap<>(); for (ChainedFileWriterEntry e : writer.getEntries()) { @@ -322,7 +319,7 @@ public class DefaultChainedWriterEngine implements ChainedWriterEngine { String input = e.getInputPath(); Set<String> includes = currentMap.get(input); if (includes == null) { - currentMap.put(input, includes = new LinkedHashSet<String>()); + currentMap.put(input, includes = new LinkedHashSet<>()); } includes.add(e.getIncludePattern()); diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromClassPath.java b/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromClassPath.java index efd876e..4b7a446 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromClassPath.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromClassPath.java @@ -87,7 +87,7 @@ public class FileGrabberFromClassPath implements FileGrabber { List<File> files = filesByRoot.get(realInputDirectory); if (files == null) { - files = new ArrayList<File>(); + files = new ArrayList<>(); filesByRoot.put(realInputDirectory, files); } @@ -140,7 +140,7 @@ public class FileGrabberFromClassPath implements FileGrabber { throw new IllegalArgumentException("Must have at least one include pattern"); } - List<URL> result = new ArrayList<URL>(); + List<URL> result = new ArrayList<>(); // search in class-path @@ -294,11 +294,8 @@ public class FileGrabberFromClassPath implements FileGrabber { throw new IOException("Could not create directory " + f); } - FileOutputStream out = new FileOutputStream(f); - try { + try (FileOutputStream out = new FileOutputStream(f)) { IOUtils.copy(url.openStream(), out); - } finally { - out.close(); } return f; diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromDirectory.java b/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromDirectory.java index c4da9e5..dbfcf64 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromDirectory.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromDirectory.java @@ -67,7 +67,7 @@ public class FileGrabberFromDirectory implements FileGrabber { List<File> files = filesByRoot.get(realInputDirectory); if (files == null) { - files = new ArrayList<File>(); + files = new ArrayList<>(); filesByRoot.put(realInputDirectory, files); } @@ -93,7 +93,7 @@ public class FileGrabberFromDirectory implements FileGrabber { if (configuration.isVerbose() && log.isDebugEnabled()) { log.debug("[" + file + "] Detected resource " + resourceFile); } - List<File> resources = new ArrayList<File>(1); + List<File> resources = new ArrayList<>(1); resources.add(resourceFile); resourcesByFile.put(file, resources); @@ -110,7 +110,7 @@ public class FileGrabberFromDirectory implements FileGrabber { throw new IllegalArgumentException("Must have at least one include pattern"); } - List<File> result = new ArrayList<File>(); + List<File> result = new ArrayList<>(); DirectoryScanner ds = new DirectoryScanner(); File inputDirectory = new File(inputPath); diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/WriterReport.java b/eugene/src/main/java/org/nuiton/eugene/writer/WriterReport.java index 9e291f9..ab46b8d 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/WriterReport.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/WriterReport.java @@ -41,14 +41,14 @@ public class WriterReport { public Map<String, List<File>> getDatas() { if (datas == null) { - datas = new TreeMap<String, List<File>>(); + datas = new TreeMap<>(); } return datas; } public Map<String, List<File>> getResources() { - if (resources== null) { - resources= new TreeMap<String, List<File>>(); + if (resources == null) { + resources = new TreeMap<>(); } return resources; } @@ -56,7 +56,7 @@ public class WriterReport { public void addFile(String entry, File file, boolean verbose) { List<File> files = getDatas().get(entry); if (files == null) { - files = new ArrayList<File>(); + files = new ArrayList<>(); getDatas().put(entry, files); } files.add(file); @@ -65,7 +65,7 @@ public class WriterReport { public void addResource(String entry, File file, boolean verbose) { List<File> files = getResources().get(entry); if (files == null) { - files = new ArrayList<File>(); + files = new ArrayList<>(); getResources().put(entry, files); } files.add(file); diff --git a/eugene/src/test/java/org/nuiton/eugene/EugeneStereotypesTest.java b/eugene/src/test/java/org/nuiton/eugene/EugeneStereotypesTest.java index 086c9b1..d479aae 100644 --- a/eugene/src/test/java/org/nuiton/eugene/EugeneStereotypesTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/EugeneStereotypesTest.java @@ -62,9 +62,7 @@ public class EugeneStereotypesTest { try { provider.validate(name, type); Assert.assertTrue(expected); - } catch (StereotypeNotFoundException e) { - Assert.assertFalse(expected); - } catch (MismatchStereotypeTargetException e) { + } catch (StereotypeNotFoundException | MismatchStereotypeTargetException e) { Assert.assertFalse(expected); } } diff --git a/eugene/src/test/java/org/nuiton/eugene/EugeneTagValuesTest.java b/eugene/src/test/java/org/nuiton/eugene/EugeneTagValuesTest.java index 08fc055..a37433c 100644 --- a/eugene/src/test/java/org/nuiton/eugene/EugeneTagValuesTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/EugeneTagValuesTest.java @@ -51,7 +51,7 @@ public class EugeneTagValuesTest { @Test public void validate() throws Exception { validate(EugeneTagValues.TAG_CONSTANT_PREFIX, true, ObjectModel.class, ObjectModelPackage.class, ObjectModelClassifier.class, ObjectModelClass.class, ObjectModelEnumeration.class); - validate(EugeneTagValues.TAG_I18N_PREFIX, true, ObjectModel.class,ObjectModelPackage.class, ObjectModelClassifier.class, ObjectModelClass.class, ObjectModelEnumeration.class); + validate(EugeneTagValues.TAG_I18N_PREFIX, true, ObjectModel.class, ObjectModelPackage.class, ObjectModelClassifier.class, ObjectModelClass.class, ObjectModelEnumeration.class); validate(EugeneTagValues.TAG_VERSION, true, ObjectModel.class); validate(EugeneTagValues.TAG_CONSTANT_PREFIX, false, ObjectModelOperation.class, ObjectModelAttribute.class); @@ -78,9 +78,7 @@ public class EugeneTagValuesTest { try { provider.validate(name, type); Assert.assertTrue(expected); - } catch (TagValueNotFoundException e) { - Assert.assertFalse(expected); - } catch (MismatchTagValueTargetException e) { + } catch (TagValueNotFoundException | MismatchTagValueTargetException e) { Assert.assertFalse(expected); } } diff --git a/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java b/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java index d202216..c88fd57 100644 --- a/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java @@ -34,7 +34,9 @@ import java.util.Set; import static org.junit.Assert.assertEquals; -/** @author fdesbois */ +/** + * @author Florian Desbois - desbois@codelutin.com + */ public class GeneratorUtilTest { private static Log log = LogFactory.getLog(GeneratorUtilTest.class); diff --git a/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java b/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java index 621d831..c333ce1 100644 --- a/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java @@ -41,14 +41,9 @@ import java.util.List; /** * JavaBuilderTest - * <p/> * Created: 29 oct. 2009 * - * @author fdesbois - * @version $Revision$ - * <p/> - * Mise a jour: $Date$ - * par : + * @author Florian Desbois - desbois@codelutin.com */ public class JavaBuilderTest { @@ -56,8 +51,7 @@ public class JavaBuilderTest { /** * Test of getModel. - * No test needed : model created in modelBuilder instanciated in - * constructor (ObjectModelBuilder). + * No test needed : model created in modelBuilder instanciated in constructor (ObjectModelBuilder). * * @see ObjectModelBuilderTest#testGetModel() */ @@ -112,8 +106,8 @@ public class JavaBuilderTest { ObjectModelClass modelClass = builder.createClass("Person", "org.chorem.bonzoms"); Assert.assertNotNull(modelClass); - Assert.assertEquals("Person",modelClass.getName()); - Assert.assertEquals("org.chorem.bonzoms",modelClass.getPackageName()); + Assert.assertEquals("Person", modelClass.getName()); + Assert.assertEquals("org.chorem.bonzoms", modelClass.getPackageName()); } /** @@ -128,8 +122,8 @@ public class JavaBuilderTest { ObjectModelClass clazz = builder.createAbstractClass("Person", "org.chorem.bonzoms"); Assert.assertNotNull(clazz); - Assert.assertEquals("Person",clazz.getName()); - Assert.assertEquals("org.chorem.bonzoms",clazz.getPackageName()); + Assert.assertEquals("Person", clazz.getName()); + Assert.assertEquals("org.chorem.bonzoms", clazz.getPackageName()); Assert.assertTrue(clazz.isAbstract()); } @@ -201,7 +195,7 @@ public class JavaBuilderTest { ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelAttribute constant = builder.addConstant(classifier, "GENDER_MALE", "boolean", "true", - ObjectModelJavaModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); Assert.assertTrue(constant.isFinal()); Assert.assertTrue(constant.isStatic()); @@ -221,11 +215,11 @@ public class JavaBuilderTest { ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); builder.addAttribute(classifier, "firstName", "java.lang.String", "", - ObjectModelJavaModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); builder.addAttribute(classifier, "roles", "java.util.List<org.chorem.bonzoms.Role>", "new ArrayList<Role>()", - ObjectModelJavaModifier.PRIVATE, ObjectModelJavaModifier.STATIC); + ObjectModelJavaModifier.PRIVATE, ObjectModelJavaModifier.STATIC); // ANO#474 : manage manually imports for defaultValue builder.addImport(classifier, "java.util.ArrayList"); @@ -305,7 +299,7 @@ public class JavaBuilderTest { builder.addOperation(classifier, "addPropertyChangeListener", null, - ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.ABSTRACT); + ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.ABSTRACT); // Check imports ImportsManagerExtension ext = builder.getModel().getExtension( @@ -331,7 +325,7 @@ public class JavaBuilderTest { ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelOperation operation = builder.addOperation(classifier, "setName", "java.lang.String", - ObjectModelJavaModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); builder.addParameter(operation, "java.lang.String", "name"); @@ -359,7 +353,7 @@ public class JavaBuilderTest { ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelOperation operation = builder.addOperation(classifier, "setName", "java.lang.String", - ObjectModelJavaModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); builder.addException(operation, "java.lang.IllegalArgumentException"); @@ -386,7 +380,7 @@ public class JavaBuilderTest { ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelOperation operation = builder.addOperation(classifier, "setName", "java.lang.String", - ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.ABSTRACT); + ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.ABSTRACT); builder.setOperationBody(operation, "this.name = name"); diff --git a/eugene/src/test/java/org/nuiton/eugene/java/JavaGeneratorUtilTest.java b/eugene/src/test/java/org/nuiton/eugene/java/JavaGeneratorUtilTest.java index d8da256..836a776 100644 --- a/eugene/src/test/java/org/nuiton/eugene/java/JavaGeneratorUtilTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/java/JavaGeneratorUtilTest.java @@ -25,7 +25,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; -import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.models.object.xml.ObjectModelOperationImpl; import org.nuiton.eugene.models.object.xml.ObjectModelParameterImpl; import org.nuiton.util.StringUtil; @@ -160,10 +159,10 @@ public class JavaGeneratorUtilTest { @Test public void capitalizeJavaBeanPropertyName() { - assertCapitalizeJavaBeanPropertyName("a","A"); - assertCapitalizeJavaBeanPropertyName("ab","Ab"); - assertCapitalizeJavaBeanPropertyName("aB","aB"); - assertCapitalizeJavaBeanPropertyName("AB","AB"); + assertCapitalizeJavaBeanPropertyName("a", "A"); + assertCapitalizeJavaBeanPropertyName("ab", "Ab"); + assertCapitalizeJavaBeanPropertyName("aB", "aB"); + assertCapitalizeJavaBeanPropertyName("AB", "AB"); } protected void assertCapitalizeJavaBeanPropertyName(String original, String expected) { diff --git a/eugene/src/test/java/org/nuiton/eugene/java/extension/ImportsManagerExtensionTest.java b/eugene/src/test/java/org/nuiton/eugene/java/extension/ImportsManagerExtensionTest.java index 11261c4..cebfe18 100644 --- a/eugene/src/test/java/org/nuiton/eugene/java/extension/ImportsManagerExtensionTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/java/extension/ImportsManagerExtensionTest.java @@ -34,11 +34,10 @@ import java.util.List; /** * ImportsManagerExtensionTest - * <p/> + * * Created: 2 nov. 2009 * - * @author fdesbois - * @version $Revision$ + * @author Florian Desbois - desbois@codelutin.com */ public class ImportsManagerExtensionTest { diff --git a/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java b/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java index e57088e..571a5a9 100644 --- a/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java @@ -35,11 +35,10 @@ import java.util.Collection; /** * ModelMergeTest. - * <p/> + * * Created: 18 mai 2005 * * @author Arnaud Thimel (Code Lutin) - * @version $Revision$ */ public class ModelMergeTest { diff --git a/eugene/src/test/java/org/nuiton/eugene/models/object/ObjectModelGeneratorTest.java b/eugene/src/test/java/org/nuiton/eugene/models/object/ObjectModelGeneratorTest.java index cd457d9..7b8c588 100644 --- a/eugene/src/test/java/org/nuiton/eugene/models/object/ObjectModelGeneratorTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/models/object/ObjectModelGeneratorTest.java @@ -31,10 +31,6 @@ import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; * Test des fonctions de ObjectModelGenerator. * * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : */ public class ObjectModelGeneratorTest { diff --git a/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java b/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java index 8a79df1..e855483 100644 --- a/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java @@ -47,10 +47,6 @@ import java.util.List; * sur l'exemple isis-fish.xmi * * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : */ public class XMI12ToObjectModelTest { @@ -86,15 +82,12 @@ public class XMI12ToObjectModelTest { File result = new File(destinationDirectory, modelFile); Transformer transformer = factory.newTransformer(new StreamSource(xsl - .openStream())); + .openStream())); transformer.setURIResolver(new ResourceResolver()); - FileOutputStream out = new FileOutputStream(result); - try { + try (FileOutputStream out = new FileOutputStream(result)) { transformer.transform(new StreamSource(xmiFile), new StreamResult(out)); - } finally { - out.close(); } return result; } @@ -130,7 +123,7 @@ public class XMI12ToObjectModelTest { public void testXSLIsis() throws Exception { File xmiFile = new File(Resource.getURL("xmi/1.2/isis-fish.xmi") - .toURI()); + .toURI()); File objectModelFile = transformXMI(xmiFile, "isis-fish.objectmodel"); @@ -151,7 +144,7 @@ public class XMI12ToObjectModelTest { public void testXSLTopia() throws Exception { File xmiFile = new File(Resource.getURL("xmi/1.2/topiatest.xmi") - .toURI()); + .toURI()); File objectModelFile = transformXMI(xmiFile, "topiatest.objectmodel"); @@ -192,7 +185,7 @@ public class XMI12ToObjectModelTest { public void testXSLDependency() throws Exception { File xmiFile = new File(Resource.getURL("xmi/1.2/dependency.xmi") - .toURI()); + .toURI()); File objectModelFile = transformXMI(xmiFile, "dependency.objectmodel"); @@ -223,7 +216,7 @@ public class XMI12ToObjectModelTest { public void testXSLEnumeration() throws Exception { File xmiFile = new File(Resource.getURL("xmi/1.2/enumeration.xmi") - .toURI()); + .toURI()); File objectModelFile = transformXMI(xmiFile, "enumeration.objectmodel"); diff --git a/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java b/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java index 80d61ab..ff87c25 100644 --- a/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java @@ -57,10 +57,6 @@ import static org.junit.Assert.assertTrue; * sur l'exemple TestXMI21.uml * * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : */ public class XMI21ToObjectModelTest { @@ -100,12 +96,9 @@ public class XMI21ToObjectModelTest { String basePath = xmiFile.getParent(); transformer.setURIResolver(new ResourceResolver(basePath)); - FileOutputStream out = new FileOutputStream(result); - try { + try (FileOutputStream out = new FileOutputStream(result)) { transformer.transform(new StreamSource(xmiFile), new StreamResult( out)); - } finally { - out.close(); } return result; @@ -207,10 +200,10 @@ public class XMI21ToObjectModelTest { ObjectModelClass clazzVpodMappingDao = model.getClass("daos.VpodMappingDao"); assertNotNull(clazzVpodMappingDao); assertTrue(clazzVpodMappingDao.hasStereotype("Dao")); - List<ObjectModelOperation> opFindByVpodId = new ArrayList<ObjectModelOperation>(); + List<ObjectModelOperation> opFindByVpodId = new ArrayList<>(); opFindByVpodId.addAll(clazzVpodMappingDao.getOperations("findByVpodId")); assertEquals("entities.VpodMapping", opFindByVpodId.get(0).getReturnType()); - List<ObjectModelParameter> opFindByVpodIdParams = new ArrayList<ObjectModelParameter>(); + List<ObjectModelParameter> opFindByVpodIdParams = new ArrayList<>(); opFindByVpodIdParams.addAll(opFindByVpodId.get(0).getParameters()); assertEquals("String", opFindByVpodIdParams.get(0).getType()); } @@ -247,7 +240,7 @@ public class XMI21ToObjectModelTest { ObjectModelClass clazzLinkSrv = model.getClass("org.sharengo.utils.container.link.services.LinkSrv"); assertNotNull(clazzLinkSrv); assertTrue(clazzLinkSrv.hasStereotype("Service")); - List<ObjectModelOperation> opFindAllByContent = new ArrayList<ObjectModelOperation>(); + List<ObjectModelOperation> opFindAllByContent = new ArrayList<>(); opFindAllByContent.addAll(clazzLinkSrv.getOperations("findAllByContent")); assertEquals(1, opFindAllByContent.size()); assertTrue(opFindAllByContent.get(0).hasStereotype("Remote")); diff --git a/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtensionTest.java b/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtensionTest.java index bc4c8dc..728809f 100644 --- a/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtensionTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtensionTest.java @@ -33,11 +33,9 @@ import static org.junit.Assert.assertNotNull; /** * ExternalCacheExtensionTest - * <p/> * Created: 2 nov. 2009 * - * @author fdesbois - * @version $Revision$ + * @author Florian Desbois - desbois@codelutin.com */ public class ExternalCacheExtensionTest { diff --git a/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderTest.java b/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderTest.java index 4110f94..71fc579 100644 --- a/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderTest.java @@ -44,11 +44,9 @@ import java.util.Set; /** * ObjectModelBuilder - * <p/> * Created: 3 nov. 2009 * - * @author fdesbois - * @version $Revision$ + * @author Florian Desbois - desbois@codelutin.com */ public class ObjectModelBuilderTest { @@ -88,7 +86,7 @@ public class ObjectModelBuilderTest { // model.tagvalue.fr.ifremer.isisfish.types.Month=fr.ifremer.isisfish.types.hibernate.MonthType ObjectModel model = builder.getModel(); Assert.assertEquals("fr.ifremer.isisfish.types.hibernate.MonthType", - model.getTagValue("fr.ifremer.isisfish.types.Month")); + model.getTagValue("fr.ifremer.isisfish.types.Month")); // fr.isisfish.entities.Population.attribute.name.tagvalue.pk=topiaId ObjectModelClass clazz = builder.createClass("Population", "fr.isisfish.entities"); @@ -152,7 +150,7 @@ public class ObjectModelBuilderTest { ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelAttribute attribute = builder.addAttribute(classifier, "firstName", "java.lang.String", "", - ObjectModelJavaModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); Assert.assertNotNull(attribute); Assert.assertEquals("firstName", attribute.getName()); @@ -164,7 +162,7 @@ public class ObjectModelBuilderTest { attribute = builder.addAttribute(classifier, "roles", "java.lang.List<org.chorem.bonzoms.Role>", "new java.lang.ArrayList<org.chorem.bonzoms.Role>()", - ObjectModelJavaModifier.PRIVATE, ObjectModelJavaModifier.STATIC); + ObjectModelJavaModifier.PRIVATE, ObjectModelJavaModifier.STATIC); Assert.assertEquals("new java.lang.ArrayList<org.chorem.bonzoms.Role>()", attribute.getDefaultValue()); Assert.assertTrue(attribute.isStatic()); @@ -192,7 +190,7 @@ public class ObjectModelBuilderTest { Assert.assertFalse(result.isAbstract()); result = builder.addOperation(classifier, "addPropertyChangeListener", "void", - ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.ABSTRACT); + ObjectModelJavaModifier.PUBLIC, ObjectModelJavaModifier.ABSTRACT); Assert.assertTrue(result.isAbstract()); } @@ -210,7 +208,7 @@ public class ObjectModelBuilderTest { ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelOperation operation = builder.addOperation(classifier, "setName", "java.lang.String", - ObjectModelJavaModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); builder.setOperationBody(operation, "this.name = name"); Assert.assertNotNull(operation.getBodyCode()); @@ -271,7 +269,7 @@ public class ObjectModelBuilderTest { ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelOperation operation = builder.addOperation(classifier, "setName", "java.lang.String", - ObjectModelJavaModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); ObjectModelParameter param = builder.addParameter(operation, "java.lang.String", "name"); Assert.assertNotNull(param); @@ -297,7 +295,7 @@ public class ObjectModelBuilderTest { ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelOperation operation = builder.addOperation(classifier, "setName", "java.lang.String", - ObjectModelJavaModifier.PUBLIC); + ObjectModelJavaModifier.PUBLIC); builder.addException(operation, "java.lang.IllegalArgumentException"); Set<String> exceptions = operation.getExceptions(); @@ -360,7 +358,7 @@ public class ObjectModelBuilderTest { ObjectModelClass classB = builder.createClass("Vote", "org.chorem.pollen.business.persistence"); ObjectModelAttribute assocA = builder.addAssociation(classA, classB, "poll", 1, 1, - ObjectModelUMLModifier.COMPOSITE, ObjectModelUMLModifier.NAVIGABLE, ObjectModelUMLModifier.ORDERED); + ObjectModelUMLModifier.COMPOSITE, ObjectModelUMLModifier.NAVIGABLE, ObjectModelUMLModifier.ORDERED); ObjectModelAttribute assocB = builder.addReverseAssociation(assocA, "vote", 0, -1); @@ -385,10 +383,10 @@ public class ObjectModelBuilderTest { ObjectModelClass classB = builder.createClass("Choice", "org.chorem.pollen.business.persistence"); ObjectModelAttribute assocA = builder.addAssociation(classA, classB, "vote", 0, -1, - ObjectModelUMLModifier.NAVIGABLE, ObjectModelUMLModifier.ORDERED); + ObjectModelUMLModifier.NAVIGABLE, ObjectModelUMLModifier.ORDERED); ObjectModelAttribute assocB = builder.addReverseAssociation(assocA, "choice", 1, -1, - ObjectModelUMLModifier.NAVIGABLE, ObjectModelUMLModifier.ORDERED); + ObjectModelUMLModifier.NAVIGABLE, ObjectModelUMLModifier.ORDERED); ObjectModelAssociationClass assocClass = builder.createAssociationClass("VoteToChoice", "org.chorem.pollen.business.persistence", assocA, assocB); diff --git a/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTest.java b/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTest.java index 1a02bc3..3be6c8a 100644 --- a/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTest.java @@ -28,7 +28,9 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.eugene.java.extension.ImportsManagerExtension; -/** @author fdesbois */ +/** + * @author Florian Desbois - desbois@codelutin.com + */ public class ObjectModelImplTest { private static final Log log = LogFactory.getLog(ObjectModelImplTest.class); diff --git a/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java b/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java index dc87646..b1b8aa0 100644 --- a/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java @@ -43,10 +43,6 @@ import java.net.URL; * StateModelTest.java * * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : */ public class StateModelDTDTest { @@ -73,15 +69,15 @@ public class StateModelDTDTest { SAXParser parser = factory.newSAXParser(); // --- Set Input source - FileInputStream stream = new FileInputStream(file); - try { + try (FileInputStream stream = new FileInputStream(file)) { InputSource source = new InputSource(stream); // --- parse XMLReader reader = parser.getXMLReader(); reader.setContentHandler(new DefaultHandler()); reader.setErrorHandler(new DefaultHandler()); reader.setEntityResolver(new EntityResolver() { + @Override public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { @@ -100,8 +96,6 @@ public class StateModelDTDTest { } }); reader.parse(source); - } finally { - stream.close(); } } } diff --git a/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java b/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java index bdc6515..9dc07eb 100644 --- a/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java +++ b/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java @@ -37,10 +37,6 @@ import java.util.Map; * StateModelTest.java * * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : */ public class StateModelTest { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.