This is an automated email from the git hooks/post-receive script. New commit to branch feature/editor in repository eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit 5ba610d449497d6cc7d6f19b5e5d32dc547884e9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 2 18:09:28 2016 +0200 Use new API in mojos + remove extension of providers no more used --- eugene-maven-plugin/pom.xml | 5 + .../nuiton/eugene/plugin/AvailableDataMojo.java | 197 +++++++-------------- .../org/nuiton/eugene/plugin/GenerateMojo.java | 150 +++------------- .../nuiton/eugene/plugin/StereotypesReport.java | 24 ++- .../org/nuiton/eugene/plugin/TagValuesReport.java | 21 +-- .../renderer/AbstractEugeneReportRenderer.java | 28 +-- .../plugin/renderer/StereotypesReportRenderer.java | 57 +++--- .../plugin/renderer/TagValuesReportRenderer.java | 60 ++++--- .../writer/BaseChainedFileWriterToMemoryModel.java | 27 +-- 9 files changed, 206 insertions(+), 363 deletions(-) diff --git a/eugene-maven-plugin/pom.xml b/eugene-maven-plugin/pom.xml index 162ca3d..d28cb38 100644 --- a/eugene-maven-plugin/pom.xml +++ b/eugene-maven-plugin/pom.xml @@ -97,6 +97,11 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> 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 8157f4c..23bc216 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 @@ -22,6 +22,8 @@ package org.nuiton.eugene.plugin; +import com.google.common.base.Function; +import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -33,21 +35,20 @@ import org.apache.maven.plugins.annotations.ResolutionScope; import org.nuiton.eugene.ModelReader; import org.nuiton.eugene.Template; import org.nuiton.eugene.models.Model; +import org.nuiton.eugene.models.extension.stereotype.StereotypeMetadata; +import org.nuiton.eugene.models.extension.stereotype.provider.StereotypeMetadatasProvider; +import org.nuiton.eugene.models.extension.tagvalue.TagValueMetadata; +import org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider; import org.nuiton.eugene.models.object.ObjectModel; -import org.nuiton.eugene.models.stereotype.StereotypeDefinition; -import org.nuiton.eugene.models.stereotype.StereotypeDefinitionProvider; -import org.nuiton.eugene.models.stereotype.StereotypeDefinitionProviders; -import org.nuiton.eugene.models.tagvalue.TagValueDefinition; -import org.nuiton.eugene.models.tagvalue.TagValueDefinitionProvider; -import org.nuiton.eugene.models.tagvalue.TagValueDefinitionProviders; import org.nuiton.eugene.writer.ChainedFileWriter; import java.util.Arrays; import java.util.EnumSet; -import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; +import static org.nuiton.i18n.I18n.t; + /** * Obtain the list of some known data informations. * @@ -58,7 +59,6 @@ import java.util.Set; * @since 2.0.0 */ @Mojo(name = "available-data", - requiresProject = true, requiresDirectInvocation = true, requiresDependencyResolution = ResolutionScope.TEST) public class AvailableDataMojo extends AbstractMojo { @@ -108,24 +108,20 @@ public class AvailableDataMojo extends AbstractMojo { * * @since 2.9 */ - @Component(role = StereotypeDefinitionProvider.class) - protected Map<String, StereotypeDefinitionProvider> stereotypeDefinitionProviders; + @Component(role = StereotypeMetadatasProvider.class) + protected Map<String, StereotypeMetadatasProvider> stereotypeMetadatasProviders; /** * All available tag value providers introspects via plexus. * * @since 2.9 */ - @Component(role = TagValueDefinitionProvider.class) - protected Map<String, TagValueDefinitionProvider> tagValueDefinitionProviders; - - protected Map<String, TagValueDefinitionProvider> loadedTagValueDefinitionProviders; - - protected Map<String, StereotypeDefinitionProvider> loadedStereotypeDefinitionProviders; + @Component(role = TagValueMetadatasProvider.class) + protected Map<String, TagValueMetadatasProvider> tagValueMetadatasProviders; - protected TagValueDefinitionProvider currentTagValueDefinitionProvider; + protected TagValueMetadatasProvider currentTagValueMetadatasProvider; - protected StereotypeDefinitionProvider currentStereotypeDefinitionProvider; + protected StereotypeMetadatasProvider currentStereotypeMetadatasProvider; @Override public void execute() throws MojoExecutionException, MojoFailureException { @@ -155,45 +151,18 @@ public class AvailableDataMojo extends AbstractMojo { safeDataTypes.add(data); } catch (IllegalArgumentException e) { getLog().warn( - "does not know data type : " + s + " use one of " + - Arrays.toString(AvailableData.values()) + "does not know data type : " + s + " use one of " + Arrays.toString(AvailableData.values()) ); } } } - if (safeDataTypes.contains(AvailableData.stereotype)) { - - loadedStereotypeDefinitionProviders = new LinkedHashMap<String, StereotypeDefinitionProvider>(); - // init stores - for (Map.Entry<String, StereotypeDefinitionProvider> e : stereotypeDefinitionProviders.entrySet()) { - StereotypeDefinitionProvider provider = StereotypeDefinitionProviders.newProvider( - Arrays.asList(e.getValue()), - false - ); - loadedStereotypeDefinitionProviders.put(e.getKey(), provider); - } - } - - if (safeDataTypes.contains(AvailableData.tagvalue)) { - - loadedTagValueDefinitionProviders = new LinkedHashMap<String, TagValueDefinitionProvider>(); - // init stores - for (Map.Entry<String, TagValueDefinitionProvider> e : tagValueDefinitionProviders.entrySet()) { - TagValueDefinitionProvider provider = TagValueDefinitionProviders.newProvider( - Arrays.asList(e.getValue()), - false - ); - loadedTagValueDefinitionProviders.put(e.getKey(), provider); - } - } for (AvailableData data : safeDataTypes) { buffer.append("\n"); appendData(data, buffer); } - getLog().info("Get datas for data types : " + safeDataTypes + - buffer.toString()); + getLog().info("Get datas for data types : " + safeDataTypes + buffer.toString()); } protected void appendData(AvailableData data, StringBuilder buffer) { @@ -203,25 +172,24 @@ public class AvailableDataMojo extends AbstractMojo { if (data == AvailableData.tagvalue) { int nbData = 0; - for (TagValueDefinitionProvider provider : loadedTagValueDefinitionProviders.values()) { - currentTagValueDefinitionProvider = provider; + for (TagValueMetadatasProvider provider : tagValueMetadatasProviders.values()) { + currentTagValueMetadatasProvider = provider; nbData += data.getData(this).size(); } - currentTagValueDefinitionProvider = null; + currentTagValueMetadatasProvider = null; String format = "\nFound %s %ss in %s provider(s) : %s\n"; buffer.append(String.format(format, - nbData, - dataType, - loadedTagValueDefinitionProviders.size(), - loadedTagValueDefinitionProviders.keySet()) + nbData, + dataType, + tagValueMetadatasProviders.size(), + tagValueMetadatasProviders.keySet()) ); - for (Map.Entry<String, TagValueDefinitionProvider> e : loadedTagValueDefinitionProviders.entrySet()) { + for (Map.Entry<String, TagValueMetadatasProvider> e : tagValueMetadatasProviders.entrySet()) { String providerName = e.getKey(); - TagValueDefinitionProvider provider = e.getValue(); - currentTagValueDefinitionProvider = provider; + currentTagValueMetadatasProvider = e.getValue(); Map<String, ?> map = data.getData(this); int size = map.size(); @@ -244,25 +212,24 @@ public class AvailableDataMojo extends AbstractMojo { } else if (data == AvailableData.stereotype) { int nbData = 0; - for (StereotypeDefinitionProvider provider : loadedStereotypeDefinitionProviders.values()) { - currentStereotypeDefinitionProvider = provider; + for (StereotypeMetadatasProvider provider : stereotypeMetadatasProviders.values()) { + currentStereotypeMetadatasProvider = provider; nbData += data.getData(this).size(); } - currentStereotypeDefinitionProvider = null; + currentStereotypeMetadatasProvider = null; String format = "\nFound %s %ss in %s provider(s) : %s\n"; buffer.append(String.format(format, - nbData, - dataType, - loadedStereotypeDefinitionProviders.size(), - loadedStereotypeDefinitionProviders.keySet()) + nbData, + dataType, + stereotypeMetadatasProviders.size(), + stereotypeMetadatasProviders.keySet()) ); - for (Map.Entry<String, StereotypeDefinitionProvider> e : loadedStereotypeDefinitionProviders.entrySet()) { + for (Map.Entry<String, StereotypeMetadatasProvider> e : stereotypeMetadatasProviders.entrySet()) { String providerName = e.getKey(); - StereotypeDefinitionProvider provider = e.getValue(); - currentStereotypeDefinitionProvider = provider; + currentStereotypeMetadatasProvider = e.getValue(); Map<String, ?> map = data.getData(this); int size = map.size(); @@ -321,18 +288,17 @@ public class AvailableDataMojo extends AbstractMojo { @Override String toString(Object data) { ChainedFileWriter w = (ChainedFileWriter) data; - StringBuilder b = new StringBuilder(super.toString(data)); - b.append("\n").append(" inputProtocol : "); - b.append(w.getInputProtocol()); - b.append("\n").append(" outputProtocol : "); - b.append(w.getOutputProtocol(ObjectModel.NAME)); - b.append("\n").append(" defaultIncludes : "); - b.append(w.getDefaultIncludes()); - b.append("\n").append(" defaultInputDirectory : "); - b.append(w.getDefaultInputDirectory()); - b.append("\n").append(" defaultTestInputDirectory : "); - b.append(w.getDefaultTestInputDirectory()); - return b.toString(); + String b = super.toString(data) + "\n" + " inputProtocol : " + + w.getInputProtocol() + + "\n" + " outputProtocol : " + + w.getOutputProtocol(ObjectModel.NAME) + + "\n" + " defaultIncludes : " + + w.getDefaultIncludes() + + "\n" + " defaultInputDirectory : " + + w.getDefaultInputDirectory() + + "\n" + " defaultTestInputDirectory : " + + w.getDefaultTestInputDirectory(); + return b; } }, modelreader { @@ -350,19 +316,25 @@ public class AvailableDataMojo extends AbstractMojo { tagvalue { @Override public Map<String, ?> getData(AvailableDataMojo mojo) { - return mojo.getCurrentTagValueDefinitionProvider().getDefinition(); + Set<TagValueMetadata> tagValues = mojo.currentTagValueMetadatasProvider.getTagValues(); + return Maps.uniqueIndex(tagValues, new Function<TagValueMetadata, String>() { + @Override + public String apply(TagValueMetadata input) { + return input.getName(); + } + }); } @Override String toString(Object data) { - TagValueDefinition d = (TagValueDefinition) data; + TagValueMetadata d = (TagValueMetadata) data; StringBuilder sb = new StringBuilder(); - Class<?>[] targets = d.target(); + Set<Class<?>> targets = d.getTargets(); for (Class<?> aClass : targets) { sb.append(", ").append(aClass.getSimpleName()); } String result = sb.toString(); - if (targets.length > 0) { + if (targets.size() > 0) { result = result.substring(2); } return result; @@ -377,25 +349,31 @@ public class AvailableDataMojo extends AbstractMojo { buffer.append("] targets : '"); buffer.append(toString(value)); buffer.append("\' : "); - buffer.append(((TagValueDefinition) value).documentation()); + buffer.append(t(((TagValueMetadata) value).getDescription())); } }, stereotype { @Override public Map<String, ?> getData(AvailableDataMojo mojo) { - return mojo.getCurrentStereotypeDefinitionProvider().getDefinition(); + Set<StereotypeMetadata> stereotypes = mojo.currentStereotypeMetadatasProvider.getStereotypes(); + return Maps.uniqueIndex(stereotypes, new Function<StereotypeMetadata, String>() { + @Override + public String apply(StereotypeMetadata input) { + return input.getName(); + } + }); } @Override String toString(Object data) { - StereotypeDefinition d = (StereotypeDefinition) data; + StereotypeMetadata d = (StereotypeMetadata) data; StringBuilder sb = new StringBuilder(); - Class<?>[] targets = d.target(); + Set<Class<?>> targets = d.getTargets(); for (Class<?> aClass : targets) { sb.append(", ").append(aClass.getSimpleName()); } String result = sb.toString(); - if (targets.length > 0) { + if (targets.size() > 0) { result = result.substring(2); } return result; @@ -410,7 +388,7 @@ public class AvailableDataMojo extends AbstractMojo { buffer.append("] targets : '"); buffer.append(toString(value)); buffer.append("\' : "); - buffer.append(((StereotypeDefinition) value).documentation()); + buffer.append(t(((StereotypeMetadata) value).getDescription())); } }; @@ -431,45 +409,4 @@ public class AvailableDataMojo extends AbstractMojo { } } - public TagValueDefinitionProvider getCurrentTagValueDefinitionProvider() { - return currentTagValueDefinitionProvider; - } - - public StereotypeDefinitionProvider getCurrentStereotypeDefinitionProvider() { - return currentStereotypeDefinitionProvider; - } - - protected TagValueDefinitionProvider getTagValueDefinitionProvider() throws MojoExecutionException { - - TagValueDefinitionProvider provider; - - if (tagValueDefinitionProviders == null || tagValueDefinitionProviders.isEmpty()) { - - // could not find any model properties via plexus - // try to obtain them by ServiceLoader - - provider = TagValueDefinitionProviders.newProvider(getClass().getClassLoader(), false); - } else { - provider = TagValueDefinitionProviders.newProvider(tagValueDefinitionProviders.values(), false); - } - return provider; - } - - - protected StereotypeDefinitionProvider getStereotypeDefinitionProvider() throws MojoExecutionException { - - StereotypeDefinitionProvider provider; - - if (stereotypeDefinitionProviders == null || stereotypeDefinitionProviders.isEmpty()) { - - // could not find any model properties via plexus - // try to obtain them by ServiceLoader - - provider = StereotypeDefinitionProviders.newProvider(getClass().getClassLoader(), false); - } else { - provider = StereotypeDefinitionProviders.newProvider(stereotypeDefinitionProviders.values(), false); - } - return provider; - } - } 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 0172e55..4f410be 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 @@ -38,12 +38,6 @@ import org.nuiton.eugene.ModelHelper; import org.nuiton.eugene.ModelReader; import org.nuiton.eugene.Template; import org.nuiton.eugene.models.Model; -import org.nuiton.eugene.models.extension.stereotype.StereotypeMetadatasProviderManagerExtension; -import org.nuiton.eugene.models.extension.stereotype.provider.AggregateStereotypeMetadatasProvider; -import org.nuiton.eugene.models.extension.stereotype.provider.StereotypeMetadatasProvider; -import org.nuiton.eugene.models.extension.tagvalue.TagValueMetadatasProviderManagerExtension; -import org.nuiton.eugene.models.extension.tagvalue.provider.AggregateTagValueMetadatasProvider; -import org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider; import org.nuiton.eugene.models.object.reader.InvalidModelPropertiesException; import org.nuiton.eugene.plugin.writer.BaseChainedFileWriter; import org.nuiton.eugene.plugin.writer.BaseChainedFileWriterToMemoryModel; @@ -65,7 +59,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collections; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; @@ -81,10 +75,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 2.5 */ -@Mojo(name = "generate", - requiresProject = true, - requiresDirectInvocation = false, - requiresDependencyResolution = ResolutionScope.COMPILE) +@Mojo(name = "generate", requiresDependencyResolution = ResolutionScope.COMPILE) public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterConfiguration, PluginWithEncoding { /** @@ -196,7 +187,6 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon * * By default, use an {@code objectmodel}. * - * @required * @since 2.0.0 */ @Parameter(property = "eugene.modelType", defaultValue = "objectmodel", required = true) @@ -205,7 +195,6 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon /** * Properties to pass to writer. * - * @parameter * @since 2.0.0 */ @Parameter @@ -334,38 +323,6 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon /** All available templates introspects via plexus. */ @Component(role = Template.class) protected Map<String, Template<?>> modelTemplates; -// -// /** -// * All available stereotype providers introspects via plexus. -// * -// * @since 2.9 -// */ -// @Component(role = StereotypeMetadatasProvider.class) -// protected Map<String, StereotypeMetadatasProvider> stereotypeMetadatasProviders; -// -// /** -// * All available tag value providers introspects via plexus. -// * -// * @since 2.9 -// */ -// @Component(role = TagValueMetadatasProvider.class) -// protected Map<String, TagValueMetadatasProvider> tagValueMetadatasProviders; - - /** - * All available stereotype providers introspects via plexus. - * - * @since 3.0 - */ - @Component(role = StereotypeMetadatasProvider.class) - protected Set<StereotypeMetadatasProvider> stereotypeMetadatasProviders; - - /** - * All available tag value providers introspects via plexus. - * - * @since 3.0 - */ - @Component(role = TagValueMetadatasProvider.class) - protected Set<TagValueMetadatasProvider> tagValueMetadatasProviders; /** The engine to compute {@link ChainedFileWriter} from inputs entries. */ @Component(role = ChainedWriterEngine.class) @@ -379,7 +336,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon protected List<Template<Model>> templateList; protected WriterReport newWriterReport() { - WriterReport writerReport = new WriterReport() { + return new WriterReport() { @Override public void addFile(String entry, File file, boolean b) { @@ -403,7 +360,6 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon } } }; - return writerReport; } @Override @@ -424,14 +380,14 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon if (model == null) { throw new MojoExecutionException( "No modelType named '" + modelType + "', use one of " + - _models.keySet() + _models.keySet() ); } if (inputs.length == 0) { throw new MojoExecutionException( "Must specify something to include using the includes " + - "property" + "property" ); } //FIXME-TC20091217 use a configurator in plexus ? @@ -467,7 +423,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon } if (properties == null) { - properties = new LinkedHashMap<String, Object>(); + properties = new LinkedHashMap<>(); } if (engine.containsWriter("xmi")) { @@ -475,7 +431,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon // add xmi writer support properties.put(XmiChainedFileWriter.PROP_FULL_PACKAGE_PATH, - fullPackagePath); + fullPackagePath); properties.put(XmiChainedFileWriter.PROP_EXTRACTED_PACKAGES, extractedPackages); properties.put(XmiChainedFileWriter.PROP_RESOLVER, resolver); } @@ -484,14 +440,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon // add model writer support - properties.put(BaseChainedFileWriterToMemoryModel.PROP_TAG_VALUE_DEFINITION_PROVIDER, - getTagValueMetadatasProvider()); - - properties.put(BaseChainedFileWriterToMemoryModel.PROP_STEREOTYPE_DEFINITION_PROVIDER, - getStereotypeMetadatasProvider()); - - properties.put(BaseChainedFileWriterToMemoryModel.PROP_FAIL_IF_UNSAFE, - failIfUnsafe); + properties.put(BaseChainedFileWriterToMemoryModel.PROP_FAIL_IF_UNSAFE, failIfUnsafe); } // init templates @@ -519,7 +468,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon } try { - List<String> skipInputList = new ArrayList<String>(); + List<String> skipInputList = new ArrayList<>(); if (!StringUtils.isEmpty(skipInputs)) { @@ -530,12 +479,12 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon // launch writers in incoming order of dicovering of them - Set<ChainedFileWriterToMemoryModel> models = new HashSet<ChainedFileWriterToMemoryModel>(); + Set<ChainedFileWriterToMemoryModel> models = new HashSet<>(); for (ChainedFileWriter writer : engine.getSelectedWriters()) { if (skipInputList.contains(writer.getInputProtocol())) { getLog().info("Skip phase [" + writer.getInputProtocol() + - "] as required in skipInputs configuration."); + "] as required in skipInputs configuration."); continue; } long t0 = System.nanoTime(); @@ -592,28 +541,17 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon getLog().info("Process phase [generator]"); - AggregateTagValueMetadatasProvider tagValueMetadatasProvider = getTagValueMetadatasProvider(); - AggregateStereotypeMetadatasProvider stereotypeMetadatasProvider = getStereotypeMetadatasProvider(); - for (ChainedFileWriterToMemoryModel entry : models) { Model model = entry.getModel(); - // init tag values extension - TagValueMetadatasProviderManagerExtension extension = model.getExtension(TagValueMetadatasProviderManagerExtension.OBJECTMODEL_EXTENSION, TagValueMetadatasProviderManagerExtension.class); - extension.setProdiver(tagValueMetadatasProvider); - - // init stereotype extension - StereotypeMetadatasProviderManagerExtension stereotypeExtension = model.getExtension(StereotypeMetadatasProviderManagerExtension.OBJECTMODEL_EXTENSION, StereotypeMetadatasProviderManagerExtension.class); - stereotypeExtension.setProdiver(stereotypeMetadatasProvider); - Long lastModified = entry.getLastModifiedSource(); File outputDir = entry.getOutputDirectory(); applyTemplates(model, - lastModified, - outputDir, - templateList, - writerReport); + lastModified, + outputDir, + templateList, + writerReport); // must fix source compile roots fixCompileSourceRoots(outputDir); @@ -801,8 +739,8 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon public ClassLoader getFixedClassLoader() throws MojoExecutionException { if (fixedClassLoader == null) { - Set<String> urlsAsString = new HashSet<String>(); - List<URL> urls = new ArrayList<URL>(); + Set<String> urlsAsString = new HashSet<>(); + List<URL> urls = new ArrayList<>(); try { ClassLoader loader; @@ -811,7 +749,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon getProject().getBuild().getOutputDirectory()); if (verbose) { getLog().info("Add in generator's classLoader : " + - extraClassPathDirectory); + extraClassPathDirectory); } addDirectoryToUrlsList( extraClassPathDirectory, @@ -843,8 +781,8 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon (MavenProject) entry.getValue(); if (verbose) { getLog().info("Add project reference in " + - "generator's classLoader : '" + - relatedProject.getArtifact() + "'"); + "generator's classLoader : '" + + relatedProject.getArtifact() + "'"); } //TODO il faudrait peut-etre aussi ajouter les //TODO dependances ? @@ -943,7 +881,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon project.addTestCompileSourceRoot(destDirGen.getPath()); Resource resources = new Resource(); resources.setDirectory(destDirGen.getAbsolutePath()); - resources.setExcludes(Arrays.asList("**/*.java")); + resources.setExcludes(Collections.singletonList("**/*.java")); if (isVerbose()) { getLog().info("Add test resource root :" + resources); } @@ -958,7 +896,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon project.addCompileSourceRoot(destDirGen.getPath()); Resource resources = new Resource(); resources.setDirectory(destDirGen.getAbsolutePath()); - resources.setExcludes(Arrays.asList("**/*.java")); + resources.setExcludes(Collections.singletonList("**/*.java")); if (isVerbose()) { getLog().info("Add resource root :" + resources); } @@ -967,42 +905,6 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon } } - protected AggregateTagValueMetadatasProvider getTagValueMetadatasProvider() throws MojoExecutionException { - - AggregateTagValueMetadatasProvider provider; - - if (tagValueMetadatasProviders == null || - tagValueMetadatasProviders.isEmpty() || - isTestPhase()) { - - // could not find any model properties via plexus - // try to obtain them by ServiceLoader - - provider = new AggregateTagValueMetadatasProvider(getFixedClassLoader()); - } else { - provider = new AggregateTagValueMetadatasProvider(tagValueMetadatasProviders); - } - return provider; - } - - - protected AggregateStereotypeMetadatasProvider getStereotypeMetadatasProvider() throws MojoExecutionException { - - AggregateStereotypeMetadatasProvider provider; - - if (stereotypeMetadatasProviders == null || - stereotypeMetadatasProviders.isEmpty() || - isTestPhase()) { - - // could not find any model properties via plexus - // try to obtain them by ServiceLoader - - provider = new AggregateStereotypeMetadatasProvider(getFixedClassLoader()); - } else { - provider = new AggregateStereotypeMetadatasProvider(stereotypeMetadatasProviders); - } - return provider; - } protected List<Template<Model>> initTemplates() { @@ -1024,7 +926,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon } } else { templateProperties.put(Template.PROP_GENERATED_PACKAGES, - generatedPackages); + generatedPackages); if (verbose) { getLog().info("generating only for packages " + generatedPackages); } @@ -1032,7 +934,7 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon // init templates - List<Template<Model>> templatesList = new ArrayList<Template<Model>>(); + List<Template<Model>> templatesList = new ArrayList<>(); if (StringUtils.isNotEmpty(templates)) { String[] templatesNames = templates.split(","); @@ -1044,14 +946,14 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon if (template == null) { getLog().warn("template [" + templateName + "] is not " + - "registred via plexus, try to load it directly"); + "registred via plexus, try to load it directly"); try { template = (Template<Model>) Class.forName( templateName, true, loader).newInstance(); } catch (Exception e) { throw new IllegalStateException( "Can't obtain template [" + templateName + - "] for reason " + e.getMessage(), e + "] for reason " + e.getMessage(), e ); } } 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 351a3a7..34ed9cb 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 @@ -27,24 +27,23 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.reporting.MavenReportException; -import org.nuiton.eugene.models.stereotype.StereotypeDefinitionProvider; -import org.nuiton.eugene.models.tagvalue.TagValueDefinitionProvider; +import org.nuiton.eugene.models.extension.stereotype.provider.StereotypeMetadatasProvider; import org.nuiton.eugene.plugin.renderer.StereotypesReportRenderer; import java.util.Locale; import java.util.Map; /** - * To report a {@link TagValueDefinitionProvider}. + * To report a {@link StereotypeMetadatasProvider}. * * Created on 5/31/14. * * @author Tony Chemit - chemit@codelutin.com * @since 2.10 */ -@Mojo(name = "stereotypes-report", requiresProject = true, requiresReports = true, +@Mojo(name = "stereotypes-report", requiresReports = true, requiresDependencyResolution = ResolutionScope.COMPILE) -public class StereotypesReport extends AbstractEugeneReport<StereotypeDefinitionProvider> { +public class StereotypesReport extends AbstractEugeneReport<StereotypeMetadatasProvider> { /** * Name of the stereotypes provider. @@ -54,13 +53,13 @@ public class StereotypesReport extends AbstractEugeneReport<StereotypeDefinition @Parameter(property = "eugene.providerName", defaultValue = "${project.artifactId}", required = true) protected String providerName; - @Component(role = StereotypeDefinitionProvider.class) - protected Map<String, StereotypeDefinitionProvider> providers; + @Component(role = StereotypeMetadatasProvider.class) + protected Map<String, StereotypeMetadatasProvider> providers; @Override - protected StereotypeDefinitionProvider initData(Locale locale) throws MavenReportException { + protected StereotypeMetadatasProvider initData(Locale locale) throws MavenReportException { - StereotypeDefinitionProvider provider = providers.get(providerName); + StereotypeMetadatasProvider provider = providers.get(providerName); if (provider == null) { @@ -69,18 +68,15 @@ public class StereotypesReport extends AbstractEugeneReport<StereotypeDefinition } - provider.init(); - return provider; } @Override - protected StereotypesReportRenderer createRenderer(Locale locale, StereotypeDefinitionProvider data) { + protected StereotypesReportRenderer createRenderer(Locale locale, StereotypeMetadatasProvider data) { - StereotypesReportRenderer renderer = new StereotypesReportRenderer( + return new StereotypesReportRenderer( getSink(), i18n, locale, getOutputName(), javaDocDestDir, jxrDestDir, data); - return renderer; } 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 87d3c0e..fef45e5 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 @@ -27,14 +27,14 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.reporting.MavenReportException; -import org.nuiton.eugene.models.tagvalue.TagValueDefinitionProvider; +import org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider; import org.nuiton.eugene.plugin.renderer.TagValuesReportRenderer; import java.util.Locale; import java.util.Map; /** - * To report a {@link TagValueDefinitionProvider}. + * To report a {@link TagValueMetadatasProvider}. * * Created on 5/31/14. * @@ -43,7 +43,7 @@ import java.util.Map; */ @Mojo(name = "tag-values-report", requiresProject = true, requiresReports = true, requiresDependencyResolution = ResolutionScope.COMPILE) -public class TagValuesReport extends AbstractEugeneReport<TagValueDefinitionProvider> { +public class TagValuesReport extends AbstractEugeneReport<TagValueMetadatasProvider> { /** * Name of the tagValue provider. @@ -53,13 +53,13 @@ public class TagValuesReport extends AbstractEugeneReport<TagValueDefinitionProv @Parameter(property = "eugene.providerName", defaultValue = "${project.artifactId}", required = true) protected String providerName; - @Component(role = TagValueDefinitionProvider.class) - protected Map<String, TagValueDefinitionProvider> providers; + @Component(role = TagValueMetadatasProvider.class) + protected Map<String, TagValueMetadatasProvider> providers; @Override - protected TagValueDefinitionProvider initData(Locale locale) throws MavenReportException { + protected TagValueMetadatasProvider initData(Locale locale) throws MavenReportException { - TagValueDefinitionProvider provider = providers.get(providerName); + TagValueMetadatasProvider provider = providers.get(providerName); if (provider == null) { @@ -68,18 +68,15 @@ public class TagValuesReport extends AbstractEugeneReport<TagValueDefinitionProv } - provider.init(); - return provider; } @Override - protected TagValuesReportRenderer createRenderer(Locale locale, TagValueDefinitionProvider data) { + protected TagValuesReportRenderer createRenderer(Locale locale, TagValueMetadatasProvider data) { - TagValuesReportRenderer renderer = new TagValuesReportRenderer( + return new TagValuesReportRenderer( getSink(), i18n, locale, getOutputName(), javaDocDestDir, jxrDestDir, data); - return renderer; } diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/renderer/AbstractEugeneReportRenderer.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/renderer/AbstractEugeneReportRenderer.java index c7ac914..5a69f35 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/renderer/AbstractEugeneReportRenderer.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/renderer/AbstractEugeneReportRenderer.java @@ -22,7 +22,7 @@ package org.nuiton.eugene.plugin.renderer; * #L% */ -import org.apache.commons.collections4.MapUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkEventAttributeSet; import org.apache.maven.doxia.sink.SinkEventAttributes; @@ -40,7 +40,7 @@ import org.nuiton.eugene.models.object.ObjectModelPackage; import org.nuiton.eugene.models.object.ObjectModelParameter; import java.util.Locale; -import java.util.Map; +import java.util.Set; /** * @author Tony Chemit - chemit@codelutin.com @@ -72,7 +72,9 @@ public abstract class AbstractEugeneReportRenderer<D, DD> extends AbstractMavenR protected final String jxrDestDir; - protected abstract Map<String, DD> getDataDetails(); + protected abstract Set<DD> getDataDetails(); + + protected abstract String getProviderDescription(D data); public AbstractEugeneReportRenderer(Sink sink, I18N i18n, @@ -112,6 +114,9 @@ public abstract class AbstractEugeneReportRenderer<D, DD> extends AbstractMavenR sink.paragraph(); sink.text(getText("report.overview.text")); sink.text(" "); + sink.italic(); + sink.text(getProviderDescription(data)); + sink.italic_(); sink.bold(); sink.text(implementation); sink.bold_(); @@ -132,14 +137,13 @@ public abstract class AbstractEugeneReportRenderer<D, DD> extends AbstractMavenR sink.link_(); sink.paragraph_(); - Map<String, DD> detailEntries = getDataDetails(); + Set<DD> detailEntries = getDataDetails(); renderSummaryTable(data, detailEntries); sink.section1_(); - - if (MapUtils.isNotEmpty(detailEntries)) { + if (CollectionUtils.isNotEmpty(detailEntries)) { sink.section1(); @@ -153,9 +157,9 @@ public abstract class AbstractEugeneReportRenderer<D, DD> extends AbstractMavenR sink.text(getText("report.detail.text")); sink.paragraph_(); - for (Map.Entry<String, DD> detailEntry : detailEntries.entrySet()) { + for (DD detailEntry : detailEntries) { - renderDetail(detailEntry.getKey(), detailEntry.getValue()); + renderDetail(detailEntry); } @@ -167,9 +171,9 @@ public abstract class AbstractEugeneReportRenderer<D, DD> extends AbstractMavenR protected abstract String getEugeneDocLink(); - protected abstract void renderSummaryTable(D provider, Map<String, DD> detailEntries); + protected abstract void renderSummaryTable(D provider, Set<DD> detailEntries); - protected abstract void renderDetail(String key, DD detail); + protected abstract void renderDetail(DD detail); protected String getText(boolean key) { return getText("report." + String.valueOf(key)); @@ -249,9 +253,9 @@ public abstract class AbstractEugeneReportRenderer<D, DD> extends AbstractMavenR sink.tableCell_(); } - protected void renderTargets(Class<?>... targets) { + protected void renderTargets(Set<Class<?>> targets) { - boolean moreThanOne = targets.length > 1; + boolean moreThanOne = targets.size() > 1; if (moreThanOne) { diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/renderer/StereotypesReportRenderer.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/renderer/StereotypesReportRenderer.java index 5c532a6..1605b25 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/renderer/StereotypesReportRenderer.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/renderer/StereotypesReportRenderer.java @@ -22,14 +22,14 @@ package org.nuiton.eugene.plugin.renderer; * #L% */ -import org.apache.commons.collections4.MapUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.maven.doxia.sink.Sink; import org.codehaus.plexus.i18n.I18N; -import org.nuiton.eugene.models.stereotype.StereotypeDefinition; -import org.nuiton.eugene.models.stereotype.StereotypeDefinitionProvider; +import org.nuiton.eugene.models.extension.stereotype.StereotypeMetadata; +import org.nuiton.eugene.models.extension.stereotype.provider.StereotypeMetadatasProvider; import java.util.Locale; -import java.util.Map; +import java.util.Set; /** * Created on 5/31/14. @@ -37,7 +37,7 @@ import java.util.Map; * @author Tony Chemit - chemit@codelutin.com * @since 2.10 */ -public class StereotypesReportRenderer extends AbstractEugeneReportRenderer<StereotypeDefinitionProvider, StereotypeDefinition> { +public class StereotypesReportRenderer extends AbstractEugeneReportRenderer<StereotypeMetadatasProvider, StereotypeMetadata> { public StereotypesReportRenderer(Sink sink, I18N i18n, @@ -45,19 +45,31 @@ public class StereotypesReportRenderer extends AbstractEugeneReportRenderer<Ster String bundleName, String javaDocDestDir, String jxrDestDir, - StereotypeDefinitionProvider data) { + StereotypeMetadatasProvider data) { super(sink, i18n, locale, bundleName, javaDocDestDir, jxrDestDir, data); } @Override - protected Map<String, StereotypeDefinition> getDataDetails() { - return data.getDefinition(); + protected Set<StereotypeMetadata> getDataDetails() { + return data.getStereotypes(); } @Override - protected void renderSummaryTable(StereotypeDefinitionProvider provider, Map<String, StereotypeDefinition> details) { + protected String getProviderDescription(StereotypeMetadatasProvider data) { + return data.getDescription(); + } + + @Override + protected void renderSummaryTable(StereotypeMetadatasProvider provider, Set<StereotypeMetadata> details) { + + sink.section2(); - if (MapUtils.isEmpty(details)) { + sink.sectionTitle2(); + sink.text(getText("report.provider.stereotype.name")); + sink.text(provider.getDescription()); + sink.sectionTitle2_(); + + if (CollectionUtils.isEmpty(details)) { sink.text(getText("report.noStereotype")); @@ -79,14 +91,13 @@ public class StereotypesReportRenderer extends AbstractEugeneReportRenderer<Ster sinkHeaderCellText(getText("report.stereotype.description")); sink.tableRow_(); - for (Map.Entry<String, StereotypeDefinition> entry : details.entrySet()) { + for (StereotypeMetadata entry : details) { - String stereotypeName = entry.getKey(); - StereotypeDefinition stereotypeDefinition = entry.getValue(); + String stereotypeName = entry.getName(); sink.tableRow(); sinkCellLink(stereotypeName, "./" + bundleName + ".html#detail_" + stereotypeName); - sinkCellText(stereotypeDefinition.documentation()); + sinkCellText(entry.getDescription()); sink.tableRow_(); } @@ -97,15 +108,17 @@ public class StereotypesReportRenderer extends AbstractEugeneReportRenderer<Ster } + sink.section2_(); + } @Override - protected void renderDetail(String key, StereotypeDefinition detail) { + protected void renderDetail(StereotypeMetadata detail) { sink.section2(); sink.sectionTitle2(); - sink.anchor("detail_" + key); - sink.text(getText("report.detail.stereotype.title") + " " + key); + sink.anchor("detail_" + detail.getName()); + sink.text(getText("report.detail.stereotype.title") + " " + detail.getName()); sink.anchor_(); sink.sectionTitle2_(); @@ -115,19 +128,19 @@ public class StereotypesReportRenderer extends AbstractEugeneReportRenderer<Ster sink.tableRow(); sinkHeaderCellText(getText("report.detail.stereotype.name")); - sinkCellText(key); + sinkCellText(detail.getName()); sink.tableRow_(); sink.tableRow(); sinkHeaderCellText(getText("report.detail.stereotype.description")); - sinkCellText(detail.documentation()); + sinkCellText(detail.getDescription()); sink.tableRow_(); sink.tableRow(); sinkHeaderCellText(getText("report.detail.stereotype.target")); sink.tableCell(); - renderTargets(detail.target()); + renderTargets(detail.getTargets()); sink.tableCell_(); sink.tableRow_(); @@ -153,9 +166,9 @@ public class StereotypesReportRenderer extends AbstractEugeneReportRenderer<Ster String url; if (locale.getCountry().equals(Locale.FRENCH.getCountry())) { - url = "http://doc.nuiton.org/eugene/fr/eugene/stereotypes.html"; + url = "http://eugene.nuiton.org/v/latest/fr/eugene/stereotypes.html"; } else { - url = "http://doc.nuiton.org/eugene/eugene/stereotypes.html"; + url = "http://eugene.nuiton.org/v/latest/eugene/stereotypes.html"; } return url; diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/renderer/TagValuesReportRenderer.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/renderer/TagValuesReportRenderer.java index 5ef953c..1e502e8 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/renderer/TagValuesReportRenderer.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/renderer/TagValuesReportRenderer.java @@ -22,14 +22,14 @@ package org.nuiton.eugene.plugin.renderer; * #L% */ -import org.apache.commons.collections4.MapUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.maven.doxia.sink.Sink; import org.codehaus.plexus.i18n.I18N; -import org.nuiton.eugene.models.tagvalue.TagValueDefinition; -import org.nuiton.eugene.models.tagvalue.TagValueDefinitionProvider; +import org.nuiton.eugene.models.extension.tagvalue.TagValueMetadata; +import org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider; import java.util.Locale; -import java.util.Map; +import java.util.Set; /** * Created on 5/31/14. @@ -37,7 +37,7 @@ import java.util.Map; * @author Tony Chemit - chemit@codelutin.com * @since 2.10 */ -public class TagValuesReportRenderer extends AbstractEugeneReportRenderer<TagValueDefinitionProvider, TagValueDefinition> { +public class TagValuesReportRenderer extends AbstractEugeneReportRenderer<TagValueMetadatasProvider, TagValueMetadata> { public TagValuesReportRenderer(Sink sink, I18N i18n, @@ -45,19 +45,31 @@ public class TagValuesReportRenderer extends AbstractEugeneReportRenderer<TagVal String bundleName, String javaDocDestDir, String jxrDestDir, - TagValueDefinitionProvider data) { + TagValueMetadatasProvider data) { super(sink, i18n, locale, bundleName, javaDocDestDir, jxrDestDir, data); } @Override - protected Map<String, TagValueDefinition> getDataDetails() { - return data.getDefinition(); + protected Set<TagValueMetadata> getDataDetails() { + return data.getTagValues(); } @Override - protected void renderSummaryTable(TagValueDefinitionProvider provider, Map<String, TagValueDefinition> details) { + protected String getProviderDescription(TagValueMetadatasProvider data) { + return data.getDescription(); + } - if (MapUtils.isEmpty(details)) { + @Override + protected void renderSummaryTable(TagValueMetadatasProvider provider, Set<TagValueMetadata> details) { + + sink.section2(); + + sink.sectionTitle2(); + sink.text(getText("report.provider.tagvalue.name")); + sink.text(provider.getDescription()); + sink.sectionTitle2_(); + + if (CollectionUtils.isEmpty(details)) { sink.text(getText("report.noTagValues")); @@ -79,14 +91,13 @@ public class TagValuesReportRenderer extends AbstractEugeneReportRenderer<TagVal sinkHeaderCellText(getText("report.tagValue.description")); sink.tableRow_(); - for (Map.Entry<String, TagValueDefinition> entry : details.entrySet()) { + for (TagValueMetadata entry : details) { - String tagValueName = entry.getKey(); - TagValueDefinition tagValueDefinition = entry.getValue(); + String tagValueName = entry.getName(); sink.tableRow(); sinkCellLink(tagValueName, "./" + bundleName + ".html#detail_" + tagValueName); - sinkCellText(tagValueDefinition.documentation()); + sinkCellText(entry.getDescription()); sink.tableRow_(); } @@ -96,16 +107,17 @@ public class TagValuesReportRenderer extends AbstractEugeneReportRenderer<TagVal sink.section3_(); } + sink.section2_(); } @Override - protected void renderDetail(String key, TagValueDefinition detail) { + protected void renderDetail(TagValueMetadata detail) { sink.section2(); sink.sectionTitle2(); - sink.anchor("detail_" + key); - sink.text(getText("report.detail.tagValue.title") + " " + key); + sink.anchor("detail_" + detail.getName()); + sink.text(getText("report.detail.tagValue.title") + " " + detail.getName()); sink.anchor_(); sink.sectionTitle2_(); @@ -115,29 +127,29 @@ public class TagValuesReportRenderer extends AbstractEugeneReportRenderer<TagVal sink.tableRow(); sinkHeaderCellText(getText("report.detail.tagValue.name")); - sinkCellText(key); + sinkCellText(detail.getName()); sink.tableRow_(); sink.tableRow(); sinkHeaderCellText(getText("report.detail.tagValue.description")); - sinkCellText(detail.documentation()); + sinkCellText(detail.getDescription()); sink.tableRow_(); sink.tableRow(); sinkHeaderCellText(getText("report.detail.tagValue.defaultValue")); - sinkCellText(detail.defaultValue()); + sinkCellText(detail.getDefaultValue()); sink.tableRow_(); sink.tableRow(); sinkHeaderCellText(getText("report.detail.tagValue.matcherClass")); - sinkCellText(detail.matcherClass().getName()); + sinkCellText(detail.getMatcherClass().getName()); sink.tableRow_(); sink.tableRow(); sinkHeaderCellText(getText("report.detail.tagValue.target")); sink.tableCell(); - renderTargets(detail.target()); + renderTargets(detail.getTargets()); sink.tableCell_(); sink.tableRow_(); @@ -163,9 +175,9 @@ public class TagValuesReportRenderer extends AbstractEugeneReportRenderer<TagVal String url; if (locale.getCountry().equals(Locale.FRENCH.getCountry())) { - url = "http://doc.nuiton.org/eugene/fr/eugene/tagValues.html"; + url = "http://eugene.nuiton.org/v/latest/fr/eugene/tagValues.html"; } else { - url = "http://doc.nuiton.org/eugene/eugene/tagValues.html"; + url = "http://eugene.nuiton.org/v/latest/eugene/tagValues.html"; } return url; diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriterToMemoryModel.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriterToMemoryModel.java index 897c546..3eb3787 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriterToMemoryModel.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriterToMemoryModel.java @@ -25,9 +25,7 @@ package org.nuiton.eugene.plugin.writer; import org.nuiton.eugene.ModelReader; import org.nuiton.eugene.models.Model; import org.nuiton.eugene.models.extension.stereotype.InvalidStereotypeSyntaxException; -import org.nuiton.eugene.models.extension.stereotype.provider.StereotypeMetadatasProvider; import org.nuiton.eugene.models.extension.tagvalue.InvalidTagValueSyntaxException; -import org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.reader.extension.LoadModelExtension; import org.nuiton.eugene.writer.ChainedFileWriterConfiguration; @@ -51,15 +49,8 @@ public abstract class BaseChainedFileWriterToMemoryModel extends BaseChainedFile public static final String PROP_MODEL_READER = "modelReader"; - public static final String PROP_TAG_VALUE_DEFINITION_PROVIDER = "tagValueMetadatasProvider"; - - public static final String PROP_STEREOTYPE_DEFINITION_PROVIDER = "stereotypeMetadatasProvider"; - public static final String PROP_FAIL_IF_UNSAFE = "failIfUnsafe"; - @Deprecated - public static final String PROP_MODEL_PROPERTIES_PROVIDER = "modelPropertiesProvider"; - public static final String PROP_READER = "reader"; protected Model model; @@ -72,9 +63,6 @@ public abstract class BaseChainedFileWriterToMemoryModel extends BaseChainedFile super( PROP_READER, "reader", PROP_MODEL_READER, "xmlModelReader", - PROP_TAG_VALUE_DEFINITION_PROVIDER, "tagValueMetadatasProvider", - PROP_STEREOTYPE_DEFINITION_PROVIDER, "stereotypeMetadatasProvider", - PROP_MODEL_PROPERTIES_PROVIDER, "modelPropertiesProvider", PROP_FAIL_IF_UNSAFE, "failIfUnsafe" ); } @@ -117,14 +105,6 @@ public abstract class BaseChainedFileWriterToMemoryModel extends BaseChainedFile return getProperty(PROP_READER, String.class); } - protected TagValueMetadatasProvider getTagValueDefinitionProvider() { - return getProperty(PROP_TAG_VALUE_DEFINITION_PROVIDER, TagValueMetadatasProvider.class); - } - - protected StereotypeMetadatasProvider getStereotypeDefinitionProvider() { - return getProperty(PROP_STEREOTYPE_DEFINITION_PROVIDER, StereotypeMetadatasProvider.class); - } - protected boolean isFailIfUnsafe() { Boolean property = getProperty(PROP_FAIL_IF_UNSAFE, Boolean.class); return property != null && property; @@ -150,7 +130,7 @@ public abstract class BaseChainedFileWriterToMemoryModel extends BaseChainedFile try { ClassLoader fixedClassLoader = loader; modelReader = (ModelReader<?>) Class.forName(reader, true, - fixedClassLoader).newInstance(); + fixedClassLoader).newInstance(); String modelTypeFromReader = modelReader.getModelType(); if (!modelType.equals(modelTypeFromReader)) { throw new IllegalStateException("Model reader [" + modelTypeFromReader + "] does not match with modelType: " + modelType); @@ -159,7 +139,7 @@ public abstract class BaseChainedFileWriterToMemoryModel extends BaseChainedFile throw eee; } catch (Exception eee) { throw new IllegalStateException("could not obtain reader " - + reader, eee); + + reader, eee); } } else { @@ -181,9 +161,6 @@ public abstract class BaseChainedFileWriterToMemoryModel extends BaseChainedFile boolean verbose = configuration.isVerbose(); - getModelReader().setStereotypeMetadatasProvider(getStereotypeDefinitionProvider()); - getModelReader().setTagValueMetadatasProvider(getTagValueDefinitionProvider()); - // set the verbose level of the model reader getModelReader().setVerbose(verbose); } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.