From 7769a402f92a02aa5977a3e3780600d9295b9931 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Tue, 30 Apr 2024 16:44:54 +0200 Subject: [PATCH 1/2] Just an attempt to keep structure What happens is that license is handled as string, that later deep below (in XmlWriterUtil, from plexus-utils) is stripped by Line Separators (hence paragraph lines are out) and spit into string. Instead, make this a list of strings, and just write them out line by line, as XML comment structure allows it. Not ideal, as Properties allows only strings. Unsure why internal parameters are Properties and not Map for example... --- .../modello/ModelloParameterConstants.java | 2 +- .../plugin/AbstractModelloGenerator.java | 36 +++++++++++-------- .../maven/AbstractModelloGeneratorMojo.java | 12 ++++--- .../java/AbstractJavaModelloGenerator.java | 2 +- .../plugins/xml/AbstractXmlGenerator.java | 5 ++- 5 files changed, 36 insertions(+), 21 deletions(-) diff --git a/modello-core/src/main/java/org/codehaus/modello/ModelloParameterConstants.java b/modello-core/src/main/java/org/codehaus/modello/ModelloParameterConstants.java index 0a329be81..820dbe545 100644 --- a/modello-core/src/main/java/org/codehaus/modello/ModelloParameterConstants.java +++ b/modello-core/src/main/java/org/codehaus/modello/ModelloParameterConstants.java @@ -81,7 +81,7 @@ public class ModelloParameterConstants { public static final String XSD_ENFORCE_MANDATORY_ELEMENTS = "modello.xsd.enforce.mandatory.element"; /** - * The license text as string, to be added to generated files, if needed. + * The license text as list of strings, to be added to generated files, if needed. * * @since 2.3.1 */ diff --git a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java index 23170bd7c..3908ab2bb 100644 --- a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java +++ b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java @@ -31,6 +31,7 @@ import java.nio.charset.Charset; import java.nio.file.Path; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Properties; @@ -66,7 +67,7 @@ public abstract class AbstractModelloGenerator implements ModelloGenerator { private String encoding; - private String licenseText; + private List licenseText; @Inject private BuildContext buildContext; @@ -89,7 +90,10 @@ protected void initialize(Model model, Properties parameters) throws ModelloExce encoding = parameters.getProperty(ModelloParameterConstants.ENCODING); - licenseText = parameters.getProperty(ModelloParameterConstants.LICENSE_TEXT); + String licenseTextPacked = parameters.getProperty(ModelloParameterConstants.LICENSE_TEXT); + if (licenseTextPacked != null) { + licenseText = Arrays.asList(licenseTextPacked.split("\\|")); + } } protected Model getModel() { @@ -112,25 +116,29 @@ protected String getEncoding() { return encoding; } - protected String getHeader() { - String header = getLicenseHeader(); - if (header == null) { - return getGeneratedHeader(); + protected List getHeader() { + List header = new ArrayList<>(); + List license = getLicenseHeader(); + if (license != null) { + header.addAll(license); + } + List generated = getGeneratedHeader(); + if (generated != null) { + header.addAll(generated); } - header += System.lineSeparator(); - header += getGeneratedHeader(); return header; } - protected String getGeneratedHeader() { + protected List getGeneratedHeader() { String version = getClass().getPackage().getImplementationVersion(); - return "=================== DO NOT EDIT THIS FILE ====================" + System.lineSeparator() - + "Generated by Modello" + ((version == null) ? "" : (' ' + version)) + "," + System.lineSeparator() - + "any modifications will be overwritten." + System.lineSeparator() - + "=============================================================="; + return Arrays.asList( + "=================== DO NOT EDIT THIS FILE ====================", + "Generated by Modello" + ((version == null) ? "" : (' ' + version)) + ",", + "any modifications will be overwritten.", + "=============================================================="); } - protected String getLicenseHeader() { + protected List getLicenseHeader() { return licenseText; } diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java index a8a6e677c..b0d713f48 100644 --- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java +++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java @@ -27,9 +27,11 @@ import java.io.IOException; import java.nio.file.Files; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Properties; +import java.util.stream.Collectors; import org.apache.maven.model.Resource; import org.apache.maven.plugin.AbstractMojo; @@ -183,19 +185,21 @@ public void execute() throws MojoExecutionException { } if (licenseText != null || licenseFile != null) { - String license = ""; + List license = null; if (licenseText != null) { // licenseText prevails - license = licenseText; + license = Arrays.asList(licenseText.split(System.lineSeparator())); } else { try { // load it up and hard fail if cannot, as it is user misconfiguration - license = String.join(System.lineSeparator(), Files.readAllLines(licenseFile.toPath())); + license = Files.readAllLines(licenseFile.toPath()).stream() + .map(l -> StringUtils.stripEnd(l, null)) + .collect(Collectors.toList()); } catch (IOException e) { throw new MojoExecutionException("Could not load up license text from " + licenseFile, e); } } - parameters.setProperty(ModelloParameterConstants.LICENSE_TEXT, license); + parameters.setProperty(ModelloParameterConstants.LICENSE_TEXT, String.join("|", license)); } customizeParameters(parameters); diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/AbstractJavaModelloGenerator.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/AbstractJavaModelloGenerator.java index 806b80d79..42f371d97 100644 --- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/AbstractJavaModelloGenerator.java +++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/AbstractJavaModelloGenerator.java @@ -94,7 +94,7 @@ protected JSourceWriter newJSourceWriter(String packageName, String className) t private JComment getHeaderComment() { JComment comment = new JComment(); - comment.setComment(getHeader()); + comment.setComment(String.join(System.lineSeparator(), getHeader())); return comment; } diff --git a/modello-plugins/modello-plugin-xml/src/main/java/org/codehaus/modello/plugins/xml/AbstractXmlGenerator.java b/modello-plugins/modello-plugin-xml/src/main/java/org/codehaus/modello/plugins/xml/AbstractXmlGenerator.java index d793f8a0d..7de38ba9f 100644 --- a/modello-plugins/modello-plugin-xml/src/main/java/org/codehaus/modello/plugins/xml/AbstractXmlGenerator.java +++ b/modello-plugins/modello-plugin-xml/src/main/java/org/codehaus/modello/plugins/xml/AbstractXmlGenerator.java @@ -41,7 +41,10 @@ */ public abstract class AbstractXmlGenerator extends AbstractModelloGenerator { protected void initHeader(XMLWriter w) { - XmlWriterUtil.writeComment(w, getHeader()); + List header = getHeader(); + for (String headerLine : header) { + XmlWriterUtil.writeComment(w, headerLine); + } } /** From a2e2113883d8863f192ccf9823b256d9fe6d3118 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 2 May 2024 09:41:03 +0200 Subject: [PATCH 2/2] Move off Properties for parameters (#441) Make it Map so not only strings can be passed to modello. --- .../java/org/codehaus/modello/Modello.java | 6 ++-- .../java/org/codehaus/modello/ModelloCli.java | 17 ++++----- .../modello/core/DefaultModelloCore.java | 8 ++--- .../codehaus/modello/core/ModelloCore.java | 6 ++-- .../plugin/AbstractModelloGenerator.java | 36 ++++++------------- .../modello/plugin/ModelloGenerator.java | 4 +-- .../maven/AbstractModelloGeneratorMojo.java | 30 ++++++++-------- .../AbstractModelloSourceGeneratorMojo.java | 9 ++--- .../maven/ModelloJacksonReaderMojo.java | 6 ++-- .../maven/ModelloJacksonWriterMojo.java | 6 ++-- .../maven/ModelloJsonSchemaGeneratorMojo.java | 5 +-- .../modello/maven/ModelloVelocityMojo.java | 4 +-- .../modello/maven/ModelloXdocMojo.java | 5 +-- .../maven/ModelloXpp3ExtendedWriterMojo.java | 4 +-- .../modello/maven/ModelloXsdMojo.java | 8 +++-- ...bstractModelloSourceGeneratorMojoTest.java | 6 ++-- .../plugin/converters/ConverterGenerator.java | 7 ++-- .../converters/ConverterGeneratorTest.java | 23 ++++++------ .../plugin/dom4j/Dom4jReaderGenerator.java | 5 +-- .../plugin/dom4j/Dom4jWriterGenerator.java | 5 +-- .../plugin/dom4j/Dom4jGeneratorTest.java | 4 +-- .../dom4j/FeaturesDom4jGeneratorTest.java | 4 +-- .../jackson/JacksonReaderGenerator.java | 7 ++-- .../jackson/JacksonWriterGenerator.java | 5 +-- .../plugin/jackson/JacksonGeneratorTest.java | 4 +-- .../java/AbstractJavaModelloGenerator.java | 6 ++-- .../plugin/java/JavaModelloGenerator.java | 4 +-- .../java/AnnotationsJavaGeneratorTest.java | 4 +-- .../plugin/java/AssociationGeneratorTest.java | 4 +-- ...iDirectionalOverrideJavaGeneratorTest.java | 4 +-- .../plugin/java/BuilderJavaGeneratorTest.java | 4 +-- .../java/FeaturesJava5GeneratorTest.java | 4 +-- .../FeaturesVersionJavaGeneratorTest.java | 10 +++--- .../plugin/java/InterfaceAssociationTest.java | 4 +-- .../plugin/java/JavaGeneratorTest.java | 4 +-- .../java/LocationsJavaGeneratorTest.java | 4 +-- .../plugin/java/PackageVersionJavaTest.java | 6 ++-- .../modello/plugin/java/Permission.java | 4 +-- .../codehaus/modello/plugin/java/Role.java | 16 ++++----- .../java/StaticCreatorJavaGeneratorTest.java | 4 +-- .../plugin/java/TmpJavaGeneratorTest.java | 4 +-- .../java/ToStringJavaGeneratorTest.java | 4 +-- .../plugin/jdom/JDOMWriterGenerator.java | 5 +-- .../jdom/FeaturesJDOMGeneratorTest.java | 4 +-- .../jsonschema/JsonSchemaGenerator.java | 11 +++--- .../plugin/sax/SaxWriterGenerator.java | 5 +-- .../modello/plugin/sax/SaxGeneratorTest.java | 4 +-- .../snakeyaml/SnakeYamlReaderGenerator.java | 5 +-- .../snakeyaml/SnakeYamlWriterGenerator.java | 5 +-- .../plugin/stax/AbstractStaxGenerator.java | 7 ++-- .../plugin/stax/StaxReaderGenerator.java | 7 ++-- .../plugin/stax/StaxSerializerGenerator.java | 7 ++-- .../plugin/stax/StaxWriterGenerator.java | 4 +-- .../stax/AbstractStaxGeneratorTestCase.java | 10 +++--- .../stax/BooleanTypeStaxGeneratorTest.java | 4 +-- .../stax/FeaturesStaxDomGeneratorTest.java | 4 +-- .../xml/stax/FeaturesStaxGeneratorTest.java | 4 +-- .../xml/stax/NoAdderStaxGeneratorTest.java | 4 +-- .../plugin/velocity/VelocityGenerator.java | 14 ++++---- .../modello/plugin/xdoc/XdocGenerator.java | 23 ++++++------ .../plugin/xdoc/XdocGeneratorTest.java | 10 +++--- .../plugins/xml/AbstractXmlJavaGenerator.java | 4 +-- .../plugin/xpp3/AbstractXpp3Generator.java | 4 +-- .../plugin/xpp3/Xpp3ReaderGenerator.java | 9 ++--- .../plugin/xpp3/Xpp3WriterGenerator.java | 9 ++--- .../xml/xpp3/AbstractElementTest.java | 4 +-- .../xpp3/BooleanTypeXpp3GeneratorTest.java | 4 +-- .../xpp3/FeaturesXpp3DomGeneratorTest.java | 4 +-- .../xml/xpp3/FeaturesXpp3GeneratorTest.java | 4 +-- .../LocationsSourceXpp3GeneratorTest.java | 4 +-- .../xml/xpp3/LocationsXpp3GeneratorTest.java | 4 +-- .../xpp3/StandaloneReadXpp3GeneratorTest.java | 4 +-- .../generator/xml/xpp3/Xpp3GeneratorTest.java | 4 +-- .../modello/plugin/xsd/XsdGenerator.java | 25 ++++++------- .../plugin/xsd/ChangesXsdGeneratorTest.java | 4 +-- .../plugin/xsd/FeaturesXsdGeneratorTest.java | 6 ++-- .../plugin/xsd/ModelloXsdGeneratorTest.java | 4 +-- .../plugin/xsd/PluginsXsdGeneratorTest.java | 4 +-- .../modello/plugin/xsd/XsdGeneratorTest.java | 4 +-- .../modello/AbstractModelloGeneratorTest.java | 21 +++++------ 80 files changed, 292 insertions(+), 285 deletions(-) diff --git a/modello-core/src/main/java/org/codehaus/modello/Modello.java b/modello-core/src/main/java/org/codehaus/modello/Modello.java index 2b73884ff..00fb71147 100644 --- a/modello-core/src/main/java/org/codehaus/modello/Modello.java +++ b/modello-core/src/main/java/org/codehaus/modello/Modello.java @@ -26,7 +26,7 @@ import java.io.Reader; import java.io.Writer; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; @@ -44,14 +44,14 @@ public Modello(ModelloCore core) { this.core = core; } - public void generate(Reader modelReader, String outputType, Properties parameters) + public void generate(Reader modelReader, String outputType, Map parameters) throws ModelloException, ModelValidationException { Model model = core.loadModel(modelReader); core.generate(model, outputType, parameters); } - public void translate(Reader reader, Writer writer, String outputType, Properties parameters) + public void translate(Reader reader, Writer writer, String outputType, Map parameters) throws ModelloException, ModelValidationException { Model model = core.translate(reader, outputType, parameters); diff --git a/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java b/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java index ba8f029f9..1b4cd9743 100644 --- a/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java +++ b/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java @@ -23,7 +23,8 @@ */ import java.io.File; -import java.util.Properties; +import java.util.HashMap; +import java.util.Map; import org.codehaus.plexus.DefaultPlexusContainer; import org.codehaus.plexus.util.StringUtils; @@ -37,7 +38,7 @@ public class ModelloCli { private static String outputType; - private static Properties parameters; + private static Map parameters; public static void main(String[] args) throws Exception { Modello modello = new DefaultPlexusContainer().lookup(Modello.class); @@ -58,7 +59,7 @@ public static void parseArgumentsFromCommandLine(String[] args) throws Exception outputType = args[1]; - parameters = new Properties(); + parameters = new HashMap<>(); String outputDirectory = args[2]; @@ -70,7 +71,7 @@ public static void parseArgumentsFromCommandLine(String[] args) throws Exception System.exit(1); } - parameters.setProperty(ModelloParameterConstants.OUTPUT_DIRECTORY, outputDirectory); + parameters.put(ModelloParameterConstants.OUTPUT_DIRECTORY, outputDirectory); String modelVersion = args[3]; @@ -82,7 +83,7 @@ public static void parseArgumentsFromCommandLine(String[] args) throws Exception System.exit(1); } - parameters.setProperty(ModelloParameterConstants.VERSION, modelVersion); + parameters.put(ModelloParameterConstants.VERSION, modelVersion); String packageWithVersion = args[4]; @@ -94,7 +95,7 @@ public static void parseArgumentsFromCommandLine(String[] args) throws Exception System.exit(1); } - parameters.setProperty(ModelloParameterConstants.PACKAGE_WITH_VERSION, packageWithVersion); + parameters.put(ModelloParameterConstants.PACKAGE_WITH_VERSION, packageWithVersion); String javaSource = args[5]; @@ -106,10 +107,10 @@ public static void parseArgumentsFromCommandLine(String[] args) throws Exception System.exit(1); } - parameters.setProperty(ModelloParameterConstants.OUTPUT_JAVA_SOURCE, javaSource); + parameters.put(ModelloParameterConstants.OUTPUT_JAVA_SOURCE, javaSource); if (args.length > 6) { - parameters.setProperty(ModelloParameterConstants.ENCODING, args[6]); + parameters.put(ModelloParameterConstants.ENCODING, args[6]); } } diff --git a/modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java b/modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java index b5480140c..92997dcc6 100644 --- a/modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java +++ b/modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java @@ -31,8 +31,8 @@ import java.io.Writer; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.Map; -import java.util.Properties; import org.codehaus.modello.ModelloException; import org.codehaus.modello.ModelloRuntimeException; @@ -251,11 +251,11 @@ public void saveModel(Model model, Writer writer) throws ModelloException { throw new ModelloRuntimeException("Not implemented."); } - public Model translate(Reader reader, String inputType, Properties parameters) throws ModelloException { + public Model translate(Reader reader, String inputType, Map parameters) throws ModelloException { throw new ModelloRuntimeException("Not implemented."); } - public void generate(Model model, String outputType, Properties parameters) throws ModelloException { + public void generate(Model model, String outputType, Map parameters) throws ModelloException { if (model == null) { throw new ModelloRuntimeException("Illegal argument: model == null."); } @@ -265,7 +265,7 @@ public void generate(Model model, String outputType, Properties parameters) thro } if (parameters == null) { - parameters = new Properties(); + parameters = new HashMap<>(); } ModelloGenerator generator = generatorPluginManager.getGeneratorPlugin(outputType); diff --git a/modello-core/src/main/java/org/codehaus/modello/core/ModelloCore.java b/modello-core/src/main/java/org/codehaus/modello/core/ModelloCore.java index 1f9e5a5eb..c6c6a9918 100644 --- a/modello-core/src/main/java/org/codehaus/modello/core/ModelloCore.java +++ b/modello-core/src/main/java/org/codehaus/modello/core/ModelloCore.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.io.Reader; import java.io.Writer; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -46,8 +46,8 @@ public interface ModelloCore { void saveModel(Model model, Writer writer) throws ModelloException; - Model translate(Reader reader, String inputType, Properties parameters) + Model translate(Reader reader, String inputType, Map parameters) throws ModelloException, ModelValidationException; - void generate(Model model, String outputType, Properties parameters) throws ModelloException; + void generate(Model model, String outputType, Map parameters) throws ModelloException; } diff --git a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java index 3908ab2bb..f58a8c28c 100644 --- a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java +++ b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java @@ -33,7 +33,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.ModelloParameterConstants; @@ -76,24 +76,21 @@ protected Logger getLogger() { return logger; } - protected void initialize(Model model, Properties parameters) throws ModelloException { + protected void initialize(Model model, Map parameters) throws ModelloException { this.model = model; - outputDirectory = new File(getParameter(parameters, ModelloParameterConstants.OUTPUT_DIRECTORY)); + outputDirectory = new File(requireParameter(parameters, ModelloParameterConstants.OUTPUT_DIRECTORY)); - String version = getParameter(parameters, ModelloParameterConstants.VERSION); + String version = requireParameter(parameters, ModelloParameterConstants.VERSION); generatedVersion = new Version(version); packageWithVersion = - Boolean.parseBoolean(getParameter(parameters, ModelloParameterConstants.PACKAGE_WITH_VERSION)); + Boolean.parseBoolean(requireParameter(parameters, ModelloParameterConstants.PACKAGE_WITH_VERSION)); - encoding = parameters.getProperty(ModelloParameterConstants.ENCODING); + encoding = (String) parameters.get(ModelloParameterConstants.ENCODING); - String licenseTextPacked = parameters.getProperty(ModelloParameterConstants.LICENSE_TEXT); - if (licenseTextPacked != null) { - licenseText = Arrays.asList(licenseTextPacked.split("\\|")); - } + licenseText = (List) parameters.get(ModelloParameterConstants.LICENSE_TEXT); } protected Model getModel() { @@ -237,19 +234,8 @@ protected boolean isEmpty(String string) { // Parameter utils // ---------------------------------------------------------------------- - /** - * @deprecated Use {@link #getParameter(Properties, String)} instead - * @param name parameter name - * @param parameters the properties - * @return the parameter value - */ - @Deprecated - protected String getParameter(String name, Properties parameters) { - return getParameter(parameters, name); - } - - protected String getParameter(Properties parameters, String name) { - String value = parameters.getProperty(name); + protected String requireParameter(Map parameters, String name) { + String value = (String) parameters.get(name); if (value == null) { throw new ModelloRuntimeException("Missing parameter '" + name + "'."); @@ -258,8 +244,8 @@ protected String getParameter(Properties parameters, String name) { return value; } - protected String getParameter(Properties parameters, String name, String defaultValue) { - return parameters.getProperty(name, defaultValue); + protected String getParameter(Map parameters, String name, String defaultValue) { + return (String) parameters.getOrDefault(name, defaultValue); } protected BuildContext getBuildContext() { diff --git a/modello-core/src/main/java/org/codehaus/modello/plugin/ModelloGenerator.java b/modello-core/src/main/java/org/codehaus/modello/plugin/ModelloGenerator.java index caacb67db..197131f4b 100644 --- a/modello-core/src/main/java/org/codehaus/modello/plugin/ModelloGenerator.java +++ b/modello-core/src/main/java/org/codehaus/modello/plugin/ModelloGenerator.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -31,5 +31,5 @@ * @author Trygve Laugstøl */ public interface ModelloGenerator { - void generate(Model model, Properties parameters) throws ModelloException; + void generate(Model model, Map parameters) throws ModelloException; } diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java index b0d713f48..7dc03da8f 100644 --- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java +++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java @@ -29,8 +29,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.List; -import java.util.Properties; +import java.util.Map; import java.util.stream.Collectors; import org.apache.maven.model.Resource; @@ -144,8 +145,8 @@ protected boolean producesResources() { * * @return the parameters */ - protected Properties createParameters() { - return new Properties(); + protected Map createParameters() { + return new HashMap<>(); } /** @@ -156,7 +157,7 @@ protected Properties createParameters() { * * @param parameters the parameters to customize */ - protected void customizeParameters(Properties parameters) {} + protected void customizeParameters(Map parameters) {} // ---------------------------------------------------------------------- // @@ -171,21 +172,20 @@ public void execute() throws MojoExecutionException { // Initialize the parameters // ---------------------------------------------------------------------- - Properties parameters = createParameters(); + Map parameters = createParameters(); - parameters.setProperty(ModelloParameterConstants.OUTPUT_DIRECTORY, outputDirectory); + parameters.put(ModelloParameterConstants.OUTPUT_DIRECTORY, outputDirectory); - parameters.setProperty(ModelloParameterConstants.VERSION, version); + parameters.put(ModelloParameterConstants.VERSION, version); - parameters.setProperty(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(packageWithVersion)); + parameters.put(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(packageWithVersion)); if (!packagedVersions.isEmpty()) { - parameters.setProperty( - ModelloParameterConstants.ALL_VERSIONS, StringUtils.join(packagedVersions.iterator(), ",")); + parameters.put(ModelloParameterConstants.ALL_VERSIONS, StringUtils.join(packagedVersions.iterator(), ",")); } if (licenseText != null || licenseFile != null) { - List license = null; + List license; if (licenseText != null) { // licenseText prevails license = Arrays.asList(licenseText.split(System.lineSeparator())); @@ -199,7 +199,7 @@ public void execute() throws MojoExecutionException { throw new MojoExecutionException("Could not load up license text from " + licenseFile, e); } } - parameters.setProperty(ModelloParameterConstants.LICENSE_TEXT, String.join("|", license)); + parameters.put(ModelloParameterConstants.LICENSE_TEXT, license); } customizeParameters(parameters); @@ -227,7 +227,7 @@ public void execute() throws MojoExecutionException { /** * Performs execute on a single specified model. */ - private void doExecute(String modelStr, String outputDirectory, Properties parameters) + private void doExecute(String modelStr, String outputDirectory, Map parameters) throws MojoExecutionException { if (!buildContext.hasDelta(modelStr)) { getLog().debug("Skipping unchanged model: " + modelStr); @@ -247,9 +247,9 @@ private void doExecute(String modelStr, String outputDirectory, Properties param modelloCore.generate(model, getGeneratorType(), parameters); for (String version : packagedVersions) { - parameters.setProperty(ModelloParameterConstants.VERSION, version); + parameters.put(ModelloParameterConstants.VERSION, version); - parameters.setProperty(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(true)); + parameters.put(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(true)); getLog().info("Generating packaged version: " + version); modelloCore.generate(model, getGeneratorType(), parameters); diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloSourceGeneratorMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloSourceGeneratorMojo.java index 54e7eb5a1..1d29ab19f 100644 --- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloSourceGeneratorMojo.java +++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloSourceGeneratorMojo.java @@ -23,6 +23,7 @@ */ import java.io.File; +import java.util.Map; import java.util.Optional; import java.util.Properties; import java.util.function.Supplier; @@ -87,11 +88,11 @@ public void setOutputDirectory(File outputDirectory) { } @Override - protected void customizeParameters(Properties parameters) { + protected void customizeParameters(Map parameters) { super.customizeParameters(parameters); if (encoding != null) { - parameters.setProperty(ModelloParameterConstants.ENCODING, encoding); + parameters.put(ModelloParameterConstants.ENCODING, encoding); } if (javaSource == null) { @@ -101,9 +102,9 @@ protected void customizeParameters(Properties parameters) { javaSource = javaSource.substring("1.".length()); } getLog().debug("javaSource=" + javaSource); - parameters.setProperty(ModelloParameterConstants.OUTPUT_JAVA_SOURCE, javaSource); + parameters.put(ModelloParameterConstants.OUTPUT_JAVA_SOURCE, javaSource); - parameters.setProperty(ModelloParameterConstants.DOM_AS_XPP3, Boolean.toString(domAsXpp3)); + parameters.put(ModelloParameterConstants.DOM_AS_XPP3, Boolean.toString(domAsXpp3)); } private String discoverJavaSource() { diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloJacksonReaderMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloJacksonReaderMojo.java index 12a16251c..03ed311d3 100644 --- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloJacksonReaderMojo.java +++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloJacksonReaderMojo.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -41,10 +41,10 @@ protected String getGeneratorType() { } @Override - protected void customizeParameters(Properties parameters) { + protected void customizeParameters(Map parameters) { super.customizeParameters(parameters); - if ("true".equals(parameters.getProperty(ModelloParameterConstants.DOM_AS_XPP3)) + if ("true".equals(parameters.get(ModelloParameterConstants.DOM_AS_XPP3)) && !getProject().getArtifactMap().containsKey("com.fasterxml.jackson.core:jackson-databind")) { getLog().warn("Jackson DOM support requires auxiliary com.fasterxml.jackson.core:jackson-databind module!"); } diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloJacksonWriterMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloJacksonWriterMojo.java index 02b8ed16b..e78880a50 100644 --- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloJacksonWriterMojo.java +++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloJacksonWriterMojo.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -41,10 +41,10 @@ protected String getGeneratorType() { } @Override - protected void customizeParameters(Properties parameters) { + protected void customizeParameters(Map parameters) { super.customizeParameters(parameters); - if ("true".equals(parameters.getProperty(ModelloParameterConstants.DOM_AS_XPP3)) + if ("true".equals(parameters.get(ModelloParameterConstants.DOM_AS_XPP3)) && !getProject().getArtifactMap().containsKey("com.fasterxml.jackson.core:jackson-databind")) { getLog().warn("Jackson DOM support requires auxiliary com.fasterxml.jackson.core:jackson-databind module!"); } diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloJsonSchemaGeneratorMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloJsonSchemaGeneratorMojo.java index 3a0a9e09a..af1195a3a 100644 --- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloJsonSchemaGeneratorMojo.java +++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloJsonSchemaGeneratorMojo.java @@ -23,7 +23,7 @@ */ import java.io.File; -import java.util.Properties; +import java.util.Map; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -49,7 +49,8 @@ public final class ModelloJsonSchemaGeneratorMojo extends AbstractModelloGenerat @Parameter private String jsonSchemaFileName; - protected void customizeParameters(Properties parameters) { + @Override + protected void customizeParameters(Map parameters) { super.customizeParameters(parameters); if (jsonSchemaFileName != null) { diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java index eb28b7140..b616f3c91 100644 --- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java +++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java @@ -23,7 +23,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.stream.Collectors; import org.apache.maven.plugins.annotations.LifecyclePhase; @@ -85,7 +84,8 @@ protected String getGeneratorType() { return "velocity"; } - protected void customizeParameters(Properties parameters) { + @Override + protected void customizeParameters(Map parameters) { super.customizeParameters(parameters); Map params = this.params == null diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloXdocMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloXdocMojo.java index c210806a3..5205c8684 100644 --- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloXdocMojo.java +++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloXdocMojo.java @@ -23,7 +23,7 @@ */ import java.io.File; -import java.util.Properties; +import java.util.Map; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; @@ -76,7 +76,8 @@ public void setOutputDirectory(File outputDirectory) { this.outputDirectory = outputDirectory; } - protected void customizeParameters(Properties parameters) { + @Override + protected void customizeParameters(Map parameters) { super.customizeParameters(parameters); // Use version if firstVersion was not specified diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloXpp3ExtendedWriterMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloXpp3ExtendedWriterMojo.java index bc4ed44e3..9b80588fe 100644 --- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloXpp3ExtendedWriterMojo.java +++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloXpp3ExtendedWriterMojo.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -49,7 +49,7 @@ protected String getGeneratorType() { return "xpp3-extended-writer"; } - protected void customizeParameters(Properties parameters) { + protected void customizeParameters(Map parameters) { super.customizeParameters(parameters); if (extendedClassnameSuffix != null) { diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloXsdMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloXsdMojo.java index ce2e63a70..d4682006f 100644 --- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloXsdMojo.java +++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloXsdMojo.java @@ -23,7 +23,7 @@ */ import java.io.File; -import java.util.Properties; +import java.util.Map; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -63,13 +63,15 @@ protected String getGeneratorType() { return "xsd"; } - protected void customizeParameters(Properties parameters) { + @Override + protected void customizeParameters(Map parameters) { super.customizeParameters(parameters); if (xsdFileName != null) { parameters.put(ModelloParameterConstants.OUTPUT_XSD_FILE_NAME, xsdFileName); } - parameters.put(ModelloParameterConstants.XSD_ENFORCE_MANDATORY_ELEMENTS, enforceMandatoryElements); + parameters.put( + ModelloParameterConstants.XSD_ENFORCE_MANDATORY_ELEMENTS, Boolean.toString(enforceMandatoryElements)); } protected boolean producesCompilableResult() { diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/AbstractModelloSourceGeneratorMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/AbstractModelloSourceGeneratorMojoTest.java index b2e5de849..1b1d2a551 100644 --- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/AbstractModelloSourceGeneratorMojoTest.java +++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/AbstractModelloSourceGeneratorMojoTest.java @@ -1,5 +1,7 @@ package org.codehaus.modello.maven; +import java.util.HashMap; +import java.util.Map; import java.util.Properties; import org.apache.maven.model.Model; @@ -37,11 +39,11 @@ public MavenProject getProject() { private void executeJavaSourceTest(Properties projectProperties, String expexted) { ModelloSourceGeneratorMojoTest modelloSourceGeneratorMojoTest = new ModelloSourceGeneratorMojoTest(projectProperties); - Properties properties = new Properties(); + Map properties = new HashMap<>(); modelloSourceGeneratorMojoTest.customizeParameters(properties); - assertEquals(properties.getProperty(ModelloParameterConstants.OUTPUT_JAVA_SOURCE), expexted); + assertEquals(properties.get(ModelloParameterConstants.OUTPUT_JAVA_SOURCE), expexted); } @Test diff --git a/modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java b/modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java index 9990951a8..686da7c98 100644 --- a/modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java +++ b/modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.ModelloParameterConstants; @@ -57,11 +57,10 @@ */ @Named("converters") public class ConverterGenerator extends AbstractJavaModelloGenerator { - public void generate(Model model, Properties parameters) throws ModelloException { + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); - String[] versions = - parameters.getProperty(ModelloParameterConstants.ALL_VERSIONS).split(","); + String[] versions = ((String) parameters.get(ModelloParameterConstants.ALL_VERSIONS)).split(","); List allVersions = new ArrayList(versions.length); for (String version : versions) { diff --git a/modello-plugins/modello-plugin-converters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java b/modello-plugins/modello-plugin-converters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java index 8976ffbad..b630cccbc 100644 --- a/modello-plugins/modello-plugin-converters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java +++ b/modello-plugins/modello-plugin-converters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java @@ -23,7 +23,8 @@ */ import java.io.Reader; -import java.util.Properties; +import java.util.HashMap; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.ModelloException; @@ -56,10 +57,10 @@ private void generateConverterClasses(Reader modelReader, String fromVersion, St Model model = modello.loadModel(modelReader); - Properties parameters = new Properties(); - parameters.setProperty( + Map parameters = new HashMap<>(); + parameters.put( ModelloParameterConstants.OUTPUT_DIRECTORY, getOutputDirectory().getAbsolutePath()); - parameters.setProperty(ModelloParameterConstants.ALL_VERSIONS, fromVersion + "," + toVersion); + parameters.put(ModelloParameterConstants.ALL_VERSIONS, fromVersion + "," + toVersion); generateClasses(parameters, modello, model, fromVersion, toVersion, "java"); generateClasses(parameters, modello, model, fromVersion, toVersion, "stax-reader"); @@ -68,23 +69,23 @@ private void generateConverterClasses(Reader modelReader, String fromVersion, St } private void generateClasses( - Properties parameters, + Map parameters, ModelloCore modello, Model model, String fromVersion, String toVersion, String outputType) throws ModelloException { - parameters.setProperty(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(false)); - parameters.setProperty(ModelloParameterConstants.VERSION, toVersion); + parameters.put(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(false)); + parameters.put(ModelloParameterConstants.VERSION, toVersion); modello.generate(model, outputType, parameters); - parameters.setProperty(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(true)); - parameters.setProperty(ModelloParameterConstants.VERSION, fromVersion); + parameters.put(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(true)); + parameters.put(ModelloParameterConstants.VERSION, fromVersion); modello.generate(model, outputType, parameters); - parameters.setProperty(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(true)); - parameters.setProperty(ModelloParameterConstants.VERSION, toVersion); + parameters.put(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(true)); + parameters.put(ModelloParameterConstants.VERSION, toVersion); modello.generate(model, outputType, parameters); } } diff --git a/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jReaderGenerator.java b/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jReaderGenerator.java index 2502b1e06..e6035b1a8 100644 --- a/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jReaderGenerator.java +++ b/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jReaderGenerator.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -56,7 +56,8 @@ public class Dom4jReaderGenerator extends AbstractXmlJavaGenerator { private boolean requiresDomSupport; - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); requiresDomSupport = false; diff --git a/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jWriterGenerator.java b/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jWriterGenerator.java index d20b11b0a..59d4a84fa 100644 --- a/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jWriterGenerator.java +++ b/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jWriterGenerator.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -59,7 +59,8 @@ public class Dom4jWriterGenerator extends AbstractXmlJavaGenerator { private boolean requiresDomSupport; - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); requiresDomSupport = false; diff --git a/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/Dom4jGeneratorTest.java b/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/Dom4jGeneratorTest.java index d511c6112..9fc204267 100644 --- a/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/Dom4jGeneratorTest.java +++ b/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/Dom4jGeneratorTest.java @@ -23,7 +23,7 @@ */ import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -78,7 +78,7 @@ public void testDom4jGenerator() throws Throwable { assertEquals("builder", xml.getTagName()); - Properties parameters = getModelloParameters("4.0.0"); + Map parameters = getModelloParameters("4.0.0"); modello.generate(model, "java", parameters); modello.generate(model, "dom4j-writer", parameters); diff --git a/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/FeaturesDom4jGeneratorTest.java b/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/FeaturesDom4jGeneratorTest.java index 45982aacc..ee417c3e6 100644 --- a/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/FeaturesDom4jGeneratorTest.java +++ b/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/FeaturesDom4jGeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -41,7 +41,7 @@ public void testJavaGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "java", parameters); modello.generate(model, "dom4j-writer", parameters); diff --git a/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java b/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java index 897773db8..91bb2e48f 100644 --- a/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java +++ b/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -74,7 +74,8 @@ protected boolean isLocationTracking() { return false; } - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); requiresDomSupport = false; @@ -752,7 +753,7 @@ private void writePrimitiveField( sc.add(objectName + "." + setterName + "( " + keyCapture + parserGetter + " );"); - if (keyCapture.length() > 0) { + if (!keyCapture.isEmpty()) { writeSetLocation(locationKey, locatorName, null, sc); } } diff --git a/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java b/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java index 809c1447b..313a785ef 100644 --- a/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java +++ b/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -53,7 +53,8 @@ public class JacksonWriterGenerator extends AbstractJacksonGenerator { private boolean requiresDomSupport; - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); requiresDomSupport = true; diff --git a/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java b/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java index 972977f06..08c2c7e0f 100644 --- a/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java +++ b/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java @@ -23,7 +23,7 @@ */ import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -50,7 +50,7 @@ public void testJacksonGenerator() throws Throwable { assertEquals(28, classesList.size()); // now generate sources and test them - Properties parameters = getModelloParameters("4.0.0", 8); + Map parameters = getModelloParameters("4.0.0", 8); modello.generate(model, "java", parameters); modello.generate(model, "jackson-writer", parameters); diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/AbstractJavaModelloGenerator.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/AbstractJavaModelloGenerator.java index 42f371d97..eb625b43d 100644 --- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/AbstractJavaModelloGenerator.java +++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/AbstractJavaModelloGenerator.java @@ -31,7 +31,7 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.ModelloParameterConstants; @@ -67,9 +67,9 @@ public abstract class AbstractJavaModelloGenerator extends AbstractModelloGenera protected boolean domAsXpp3 = true; - protected void initialize(Model model, Properties parameters) throws ModelloException { + protected void initialize(Model model, Map parameters) throws ModelloException { super.initialize(model, parameters); - domAsXpp3 = !"false".equals(parameters.getProperty(ModelloParameterConstants.DOM_AS_XPP3)); + domAsXpp3 = !"false".equals(parameters.get(ModelloParameterConstants.DOM_AS_XPP3)); } /** diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java index de3960177..890c26c2a 100644 --- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java +++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java @@ -31,8 +31,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Objects; -import java.util.Properties; import java.util.Set; import org.codehaus.modello.ModelloException; @@ -90,7 +90,7 @@ public class JavaModelloGenerator extends AbstractJavaModelloGenerator { "String" })); - public void generate(Model model, Properties parameters) throws ModelloException { + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); try { diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJavaGeneratorTest.java index 77aca5516..63a93009f 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJavaGeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -41,7 +41,7 @@ public void testJavaGeneratorWithAnnotations() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/models/annotations.mdo")); - Properties parameters = getModelloParameters("1.0.0", 8); + Map parameters = getModelloParameters("1.0.0", 8); modello.generate(model, "java", parameters); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AssociationGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AssociationGeneratorTest.java index 942bc170b..f454e5be7 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AssociationGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AssociationGeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -41,7 +41,7 @@ public void testJavaGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/models/oneToManyAssociation.mdo")); - Properties parameters = getModelloParameters("4.0.0"); + Map parameters = getModelloParameters("4.0.0"); modello.generate(model, "java", parameters); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BiDirectionalOverrideJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BiDirectionalOverrideJavaGeneratorTest.java index f9c1bb2b7..b349731a5 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BiDirectionalOverrideJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BiDirectionalOverrideJavaGeneratorTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -37,7 +37,7 @@ public void testJavaGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/models/bidirectional-override.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "java", parameters); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BuilderJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BuilderJavaGeneratorTest.java index f667ebca3..222eb50f9 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BuilderJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BuilderJavaGeneratorTest.java @@ -23,7 +23,7 @@ */ import java.io.File; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -44,7 +44,7 @@ public void testJavaGeneratorWithBuilder() throws Exception { Model model = modello.loadModel(getXmlResourceReader("/models/builder.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "java", parameters); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesJava5GeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesJava5GeneratorTest.java index 815809b93..feb7e33e2 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesJava5GeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesJava5GeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -41,7 +41,7 @@ public void testJavaGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); - Properties parameters = getModelloParameters("2.0.0", 8); + Map parameters = getModelloParameters("2.0.0", 8); modello.generate(model, "java", parameters); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesVersionJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesVersionJavaGeneratorTest.java index 6d99b9dc0..a4db27b32 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesVersionJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesVersionJavaGeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.ModelloParameterConstants; @@ -44,14 +44,14 @@ public void testJavaGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); - Properties parameters = getModelloParameters(); - parameters.setProperty(ModelloParameterConstants.ALL_VERSIONS, ALL_VERSIONS); - parameters.setProperty(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(true)); + Map parameters = getModelloParameters(); + parameters.put(ModelloParameterConstants.ALL_VERSIONS, ALL_VERSIONS); + parameters.put(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(true)); String[] versions = ALL_VERSIONS.split(","); for (String version : versions) { - parameters.setProperty(ModelloParameterConstants.VERSION, version); + parameters.put(ModelloParameterConstants.VERSION, version); modello.generate(model, "java", parameters); } diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/InterfaceAssociationTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/InterfaceAssociationTest.java index 6347fc70c..96b39f287 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/InterfaceAssociationTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/InterfaceAssociationTest.java @@ -1,6 +1,6 @@ package org.codehaus.modello.plugin.java; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -16,7 +16,7 @@ public void testJavaGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/models/interfaceAssociation.mdo")); - Properties parameters = getModelloParameters("4.0.0", 8); + Map parameters = getModelloParameters("4.0.0", 8); modello.generate(model, "java", parameters); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/JavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/JavaGeneratorTest.java index 8af8da190..1e28b5d35 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/JavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/JavaGeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -41,7 +41,7 @@ public void testJavaGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/models/maven.mdo")); - Properties parameters = getModelloParameters("4.0.0"); + Map parameters = getModelloParameters("4.0.0"); modello.generate(model, "java", parameters); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/LocationsJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/LocationsJavaGeneratorTest.java index 59d1e869c..bb1ee0dca 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/LocationsJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/LocationsJavaGeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -42,7 +42,7 @@ public void testLocations() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/locations.mdo")); - Properties parameters = getModelloParameters("1.0.0", 8); + Map parameters = getModelloParameters("1.0.0", 8); modello.generate(model, "java", parameters); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/PackageVersionJavaTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/PackageVersionJavaTest.java index 3a84974ca..b50eb7366 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/PackageVersionJavaTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/PackageVersionJavaTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.ModelloParameterConstants; @@ -42,8 +42,8 @@ public void testThatTheCorrectVersionIsInThePackageName() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/models/maven.mdo")); - Properties parameters = getModelloParameters("4.0.0"); - parameters.setProperty(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(true)); + Map parameters = getModelloParameters("4.0.0"); + parameters.put(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(true)); modello.generate(model, "java", parameters); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/Permission.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/Permission.java index 4585afb81..0c972b9ac 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/Permission.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/Permission.java @@ -22,7 +22,7 @@ * @author Joakim Erdfelt */ public interface Permission { - public String getName(); + String getName(); - public void setName(String name); + void setName(String name); } diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/Role.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/Role.java index b17c3b3f5..a822848d5 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/Role.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/Role.java @@ -24,19 +24,19 @@ * @author Joakim Erdfelt */ public interface Role { - public String getName(); + String getName(); - public void setName(String name); + void setName(String name); - public void setRoles(List roles); + void setRoles(List roles); - public List getRoles(); + List getRoles(); - public void addRole(Role role); + void addRole(Role role); - public void removeRole(Role role); + void removeRole(Role role); - public void setPermission(Permission permission); + void setPermission(Permission permission); - public Permission getPermission(); + Permission getPermission(); } diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/StaticCreatorJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/StaticCreatorJavaGeneratorTest.java index 2d4aaa6ce..a7905c34b 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/StaticCreatorJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/StaticCreatorJavaGeneratorTest.java @@ -23,7 +23,7 @@ */ import java.io.File; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -40,7 +40,7 @@ public void testJavaGeneratorWithStaticCreator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/models/static-creator.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "java", parameters); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/TmpJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/TmpJavaGeneratorTest.java index 790d6e403..7d65a9094 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/TmpJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/TmpJavaGeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -48,7 +48,7 @@ public void testJavaGeneratorWithTmp() throws Exception { Model model = modello.loadModel(getXmlResourceReader("/models/tmp.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "java", parameters); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/ToStringJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/ToStringJavaGeneratorTest.java index 561a15e74..8e86383e4 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/ToStringJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/ToStringJavaGeneratorTest.java @@ -23,7 +23,7 @@ */ import java.io.File; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -48,7 +48,7 @@ public void testJavaGeneratorWithToString() throws Exception { Model model = modello.loadModel(getXmlResourceReader("/models/tostring.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "java", parameters); diff --git a/modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java b/modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java index 4a5eb555e..c7435cb17 100644 --- a/modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java +++ b/modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -51,7 +51,8 @@ public class JDOMWriterGenerator extends AbstractJDOMGenerator { private boolean requiresDomSupport; - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); requiresDomSupport = false; diff --git a/modello-plugins/modello-plugin-jdom/src/test/java/org/codehaus/modello/plugin/jdom/FeaturesJDOMGeneratorTest.java b/modello-plugins/modello-plugin-jdom/src/test/java/org/codehaus/modello/plugin/jdom/FeaturesJDOMGeneratorTest.java index d092b20aa..6216392c7 100644 --- a/modello-plugins/modello-plugin-jdom/src/test/java/org/codehaus/modello/plugin/jdom/FeaturesJDOMGeneratorTest.java +++ b/modello-plugins/modello-plugin-jdom/src/test/java/org/codehaus/modello/plugin/jdom/FeaturesJDOMGeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -41,7 +41,7 @@ public void testJavaGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "java", parameters); modello.generate(model, "stax-reader", parameters); diff --git a/modello-plugins/modello-plugin-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java b/modello-plugins/modello-plugin-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java index 4389b1e69..dacab04b4 100644 --- a/modello-plugins/modello-plugin-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java +++ b/modello-plugins/modello-plugin-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java @@ -29,7 +29,7 @@ import java.nio.charset.StandardCharsets; import java.util.LinkedList; import java.util.List; -import java.util.Properties; +import java.util.Map; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; @@ -53,7 +53,8 @@ @Named("jsonschema") public final class JsonSchemaGenerator extends AbstractXmlJavaGenerator { - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); try { @@ -63,7 +64,7 @@ public void generate(Model model, Properties parameters) throws ModelloException } } - private void generateJsonSchema(Properties parameters) throws IOException, ModelloException { + private void generateJsonSchema(Map parameters) throws IOException, ModelloException { Model objectModel = getModel(); File directory = getOutputDirectory(); @@ -77,7 +78,7 @@ private void generateJsonSchema(Properties parameters) throws IOException, Model } // we assume parameters not null - String schemaFileName = parameters.getProperty(ModelloParameterConstants.OUTPUT_JSONSCHEMA_FILE_NAME); + String schemaFileName = (String) parameters.get(ModelloParameterConstants.OUTPUT_JSONSCHEMA_FILE_NAME); File schemaFile; @@ -137,7 +138,7 @@ private void writeClassDocumentation(JsonGenerator generator, ModelClass modelCl generator.writeObjectFieldStart("properties"); - List required = new LinkedList(); + List required = new LinkedList<>(); ModelClass reference = modelClass; // traverse the whole modelClass hierarchy to create the nested Builder instance diff --git a/modello-plugins/modello-plugin-sax/src/main/java/org/codehaus/modello/plugin/sax/SaxWriterGenerator.java b/modello-plugins/modello-plugin-sax/src/main/java/org/codehaus/modello/plugin/sax/SaxWriterGenerator.java index 7da5605b7..c28f590b1 100644 --- a/modello-plugins/modello-plugin-sax/src/main/java/org/codehaus/modello/plugin/sax/SaxWriterGenerator.java +++ b/modello-plugins/modello-plugin-sax/src/main/java/org/codehaus/modello/plugin/sax/SaxWriterGenerator.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -58,7 +58,8 @@ public class SaxWriterGenerator extends AbstractXmlJavaGenerator { private boolean requiresDomSupport; - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); requiresDomSupport = false; diff --git a/modello-plugins/modello-plugin-sax/src/test/java/org/codehaus/modello/plugin/sax/SaxGeneratorTest.java b/modello-plugins/modello-plugin-sax/src/test/java/org/codehaus/modello/plugin/sax/SaxGeneratorTest.java index 92b66315c..fb415f02d 100644 --- a/modello-plugins/modello-plugin-sax/src/test/java/org/codehaus/modello/plugin/sax/SaxGeneratorTest.java +++ b/modello-plugins/modello-plugin-sax/src/test/java/org/codehaus/modello/plugin/sax/SaxGeneratorTest.java @@ -23,7 +23,7 @@ */ import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -78,7 +78,7 @@ public void testXpp3Generator() throws Throwable { assertEquals("builder", xml.getTagName()); // now generate sources and test them - Properties parameters = getModelloParameters("4.0.0"); + Map parameters = getModelloParameters("4.0.0"); modello.generate(model, "java", parameters); modello.generate(model, "sax-writer", parameters); diff --git a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java index 8e3959a36..d53a40a5e 100644 --- a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java +++ b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -70,7 +70,8 @@ protected boolean isLocationTracking() { return false; } - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); locationTracker = sourceTracker = null; diff --git a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java index 31359f77c..cd1a5f9dc 100644 --- a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java +++ b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -51,7 +51,8 @@ @Named("snakeyaml-writer") public class SnakeYamlWriterGenerator extends AbstractSnakeYamlGenerator { - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); try { diff --git a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/AbstractStaxGenerator.java b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/AbstractStaxGenerator.java index 22917e03a..67e57a116 100644 --- a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/AbstractStaxGenerator.java +++ b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/AbstractStaxGenerator.java @@ -24,7 +24,7 @@ import java.util.HashSet; import java.util.List; -import java.util.Properties; +import java.util.Map; import java.util.Set; import org.codehaus.modello.ModelloException; @@ -41,7 +41,8 @@ public abstract class AbstractStaxGenerator extends AbstractXmlJavaGenerator { private Set parts; - protected void initialize(Model model, Properties parameters) throws ModelloException { + @Override + protected void initialize(Model model, Map parameters) throws ModelloException { super.initialize(model, parameters); parts = null; @@ -75,7 +76,7 @@ protected ModelField getReferenceIdentifierField(ModelAssociation association) t protected boolean isAssociationPartToClass(ModelClass modelClass) { if (parts == null) { - parts = new HashSet(); + parts = new HashSet<>(); for (ModelClass clazz : modelClass.getModel().getClasses(getGeneratedVersion())) { for (ModelField modelField : clazz.getFields(getGeneratedVersion())) { if (modelField instanceof ModelAssociation) { diff --git a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java index 7957c2048..736d77eb1 100644 --- a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java +++ b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java @@ -27,7 +27,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.ModelloParameterConstants; @@ -61,7 +61,8 @@ public class StaxReaderGenerator extends AbstractStaxGenerator { private boolean requiresDomSupport; - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); requiresDomSupport = false; @@ -71,7 +72,7 @@ public void generate(Model model, Properties parameters) throws ModelloException VersionDefinition versionDefinition = model.getVersionDefinition(); if (versionDefinition != null) { - String versions = parameters.getProperty(ModelloParameterConstants.ALL_VERSIONS); + String versions = (String) parameters.get(ModelloParameterConstants.ALL_VERSIONS); if (versions != null) { generateStaxReaderDelegate(Arrays.asList(versions.split(","))); diff --git a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxSerializerGenerator.java b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxSerializerGenerator.java index 566c3f115..3358a02c4 100644 --- a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxSerializerGenerator.java +++ b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxSerializerGenerator.java @@ -27,7 +27,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -49,7 +49,8 @@ @Named("stax-serializer") public class StaxSerializerGenerator extends AbstractStaxGenerator { - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); try { @@ -345,7 +346,7 @@ private void addField(JClass jClass, String fieldType, String fieldName, String } private void add(JClass jClass, String name, String before, String after, JParameter... params) { - List names = new ArrayList(); + List names = new ArrayList<>(); JMethod jMethod = new JMethod("write" + name); jMethod.addException(new JClass("XMLStreamException")); diff --git a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxWriterGenerator.java b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxWriterGenerator.java index 9149136e9..aa0314acb 100644 --- a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxWriterGenerator.java +++ b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxWriterGenerator.java @@ -27,7 +27,7 @@ import java.io.IOException; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -61,7 +61,7 @@ public class StaxWriterGenerator extends AbstractStaxGenerator { @Inject private StaxSerializerGenerator serializerGenerator; - public void generate(Model model, Properties parameters) throws ModelloException { + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); requiresDomSupport = false; diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java index 7d548f560..2f79de979 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.ModelloParameterConstants; @@ -48,18 +48,18 @@ protected void verifyModel(Model model, String className) throws Exception { } protected void verifyModel(Model model, String className, String[] versions) throws Exception { - Properties parameters = getModelloParameters("4.0.0"); + Map parameters = getModelloParameters("4.0.0"); modello.generate(model, "java", parameters); modello.generate(model, "stax-writer", parameters); modello.generate(model, "stax-reader", parameters); if (versions != null && versions.length > 0) { - parameters.setProperty(ModelloParameterConstants.ALL_VERSIONS, StringUtils.join(versions, ",")); + parameters.put(ModelloParameterConstants.ALL_VERSIONS, StringUtils.join(versions, ",")); for (String version : versions) { - parameters.setProperty(ModelloParameterConstants.VERSION, version); - parameters.setProperty(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(true)); + parameters.put(ModelloParameterConstants.VERSION, version); + parameters.put(ModelloParameterConstants.PACKAGE_WITH_VERSION, Boolean.toString(true)); modello.generate(model, "java", parameters); modello.generate(model, "stax-writer", parameters); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java index e9eba8767..38cfd2f6f 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java @@ -19,7 +19,7 @@ * under the License. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -35,7 +35,7 @@ public void testBooleanType() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/boolean.mdo")); - Properties parameters = getModelloParameters("1.0.0", 8); + Map parameters = getModelloParameters("1.0.0", 8); modello.generate(model, "java", parameters); modello.generate(model, "stax-reader", parameters); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java index e673d3c86..319653d51 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -41,7 +41,7 @@ public void testJavaGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); parameters.put("modello.dom.xpp3", "false"); modello.generate(model, "java", parameters); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java index 39a3c6e46..6a71a43ff 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -41,7 +41,7 @@ public void testJavaGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "java", parameters); modello.generate(model, "stax-writer", parameters); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/NoAdderStaxGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/NoAdderStaxGeneratorTest.java index 739b6d3c5..41acd67d0 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/NoAdderStaxGeneratorTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/NoAdderStaxGeneratorTest.java @@ -19,7 +19,7 @@ * under the License. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -35,7 +35,7 @@ public void testNoAdder() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/noAdder.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "java", parameters); modello.generate(model, "stax-reader", parameters); diff --git a/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java b/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java index ea79a785a..85237fa06 100644 --- a/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java +++ b/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java @@ -53,26 +53,26 @@ public class VelocityGenerator extends AbstractModelloGenerator { @Override @SuppressWarnings("unchecked") - public void generate(Model model, Properties parameters) throws ModelloException { + public void generate(Model model, Map parameters) throws ModelloException { try { Map params = (Map) Objects.requireNonNull(parameters.get(VELOCITY_PARAMETERS)); - String templates = getParameter(parameters, VELOCITY_TEMPLATES); - String output = getParameter(parameters, ModelloParameterConstants.OUTPUT_DIRECTORY); + String templates = requireParameter(parameters, VELOCITY_TEMPLATES); + String output = requireParameter(parameters, ModelloParameterConstants.OUTPUT_DIRECTORY); Properties props = new Properties(); - props.put("resource.loader.file.path", getParameter(parameters, VELOCITY_BASEDIR)); + props.put("resource.loader.file.path", requireParameter(parameters, VELOCITY_BASEDIR)); RuntimeInstance velocity = new RuntimeInstance(); velocity.init(props); VelocityContext context = new VelocityContext(); - for (Map.Entry prop : parameters.entrySet()) { - context.put(prop.getKey().toString(), prop.getValue()); + for (Map.Entry prop : parameters.entrySet()) { + context.put(prop.getKey(), prop.getValue()); } for (Map.Entry prop : params.entrySet()) { context.put(prop.getKey(), prop.getValue()); } - Version version = new Version(getParameter(parameters, ModelloParameterConstants.VERSION)); + Version version = new Version(requireParameter(parameters, ModelloParameterConstants.VERSION)); context.put("version", version); context.put("model", model); context.put("Helper", new Helper(version)); diff --git a/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java b/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java index e7d1d8a70..c9746bf43 100644 --- a/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java +++ b/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java @@ -74,15 +74,16 @@ public class XdocGenerator extends AbstractXmlGenerator { private Version version = DEFAULT_VERSION_RANGE.getFromVersion(); - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); - if (parameters.getProperty(ModelloParameterConstants.FIRST_VERSION) != null) { - firstVersion = new Version(parameters.getProperty(ModelloParameterConstants.FIRST_VERSION)); + if (parameters.get(ModelloParameterConstants.FIRST_VERSION) != null) { + firstVersion = new Version((String) parameters.get(ModelloParameterConstants.FIRST_VERSION)); } - if (parameters.getProperty(ModelloParameterConstants.VERSION) != null) { - version = new Version(parameters.getProperty(ModelloParameterConstants.VERSION)); + if (parameters.get(ModelloParameterConstants.VERSION) != null) { + version = new Version((String) parameters.get(ModelloParameterConstants.VERSION)); } try { @@ -92,7 +93,7 @@ public void generate(Model model, Properties parameters) throws ModelloException } } - private void generateXdoc(Properties parameters) throws IOException { + private void generateXdoc(Map parameters) throws IOException { Model objectModel = getModel(); File directory = getOutputDirectory(); @@ -106,7 +107,7 @@ private void generateXdoc(Properties parameters) throws IOException { } // we assume parameters not null - String xdocFileName = parameters.getProperty(ModelloParameterConstants.OUTPUT_XDOC_FILE_NAME); + String xdocFileName = (String) parameters.get(ModelloParameterConstants.OUTPUT_XDOC_FILE_NAME); File f = new File(directory, objectModel.getId() + ".xml"); @@ -441,7 +442,7 @@ private void writeFieldsTable(XMLWriter w, List fields, boolean elem * @return the String representing the tree model */ private String getModelXmlDescriptor(ModelClass rootModelClass) { - return getElementXmlDescriptor(rootModelClass, null, new Stack()); + return getElementXmlDescriptor(rootModelClass, null, new Stack<>()); } /** @@ -466,7 +467,7 @@ private String getElementXmlDescriptor(ModelClass modelClass, ModelAssociation a sb.append(tagName).append(""); boolean addNewline = false; - if (stack.size() == 0) { + if (stack.isEmpty()) { // try to add XML Schema reference try { String targetNamespace = @@ -501,7 +502,7 @@ private String getElementXmlDescriptor(ModelClass modelClass, ModelAssociation a List attributeFields = getXmlAttributeFields(fields); - if (attributeFields.size() > 0) { + if (!attributeFields.isEmpty()) { for (ModelField f : attributeFields) { XmlFieldMetadata xmlFieldMetadata = (XmlFieldMetadata) f.getMetadata(XmlFieldMetadata.ID); @@ -522,7 +523,7 @@ private String getElementXmlDescriptor(ModelClass modelClass, ModelAssociation a fields.removeAll(attributeFields); - if ((fields.size() == 0) || ((fields.size() == 1) && hasContentField(fields))) { + if ((fields.isEmpty()) || ((fields.size() == 1) && hasContentField(fields))) { sb.append("/>\n"); } else { sb.append(">\n"); diff --git a/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java b/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java index d740643f7..da8ac6d5f 100644 --- a/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java +++ b/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java @@ -26,7 +26,7 @@ import java.nio.file.Files; import java.util.HashSet; import java.util.List; -import java.util.Properties; +import java.util.Map; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -69,7 +69,7 @@ public void testHtmlToXml() throws Exception { Model model = modello.loadModel(getXmlResourceReader("/html4.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "xdoc", parameters); @@ -119,7 +119,7 @@ private void checkMavenXdocGenerator() throws Exception { assertEquals("builder", xml.getTagName()); - Properties parameters = getModelloParameters("4.0.0"); + Map parameters = getModelloParameters("4.0.0"); modello.generate(model, "xdoc", parameters); @@ -134,7 +134,7 @@ public void checkFeaturesXdocGenerator() throws Exception { Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); - Properties parameters = getModelloParameters("1.5.0"); + Map parameters = getModelloParameters("1.5.0"); modello.generate(model, "xdoc", parameters); @@ -150,7 +150,7 @@ public void checkSettingsXdocGenerator() throws Exception { Model model = modello.loadModel(getXmlResourceReader("/settings.mdo")); - Properties parameters = getModelloParameters("1.5.0"); + Map parameters = getModelloParameters("1.5.0"); modello.generate(model, "xdoc", parameters); diff --git a/modello-plugins/modello-plugin-xml/src/main/java/org/codehaus/modello/plugins/xml/AbstractXmlJavaGenerator.java b/modello-plugins/modello-plugin-xml/src/main/java/org/codehaus/modello/plugins/xml/AbstractXmlJavaGenerator.java index 70f8e5d66..e131f13a5 100644 --- a/modello-plugins/modello-plugin-xml/src/main/java/org/codehaus/modello/plugins/xml/AbstractXmlJavaGenerator.java +++ b/modello-plugins/modello-plugin-xml/src/main/java/org/codehaus/modello/plugins/xml/AbstractXmlJavaGenerator.java @@ -23,7 +23,7 @@ */ import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -44,7 +44,7 @@ public abstract class AbstractXmlJavaGenerator extends AbstractJavaModelloGenerator { protected boolean strictXmlAttributes; - protected void initialize(Model model, Properties parameters) throws ModelloException { + protected void initialize(Model model, Map parameters) throws ModelloException { super.initialize(model, parameters); strictXmlAttributes = diff --git a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/AbstractXpp3Generator.java b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/AbstractXpp3Generator.java index d1c7f22b9..828fd2060 100644 --- a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/AbstractXpp3Generator.java +++ b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/AbstractXpp3Generator.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -44,7 +44,7 @@ protected boolean isLocationTracking() { } @Override - protected void initialize(Model model, Properties parameters) throws ModelloException { + protected void initialize(Model model, Map parameters) throws ModelloException { super.initialize(model, parameters); requiresDomSupport = false; diff --git a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java index 787266e57..6e229ca87 100644 --- a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java +++ b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.model.Model; @@ -68,7 +68,7 @@ public class Xpp3ReaderGenerator extends AbstractXpp3Generator { private String trackingArgs; @Override - protected void initialize(Model model, Properties parameters) throws ModelloException { + protected void initialize(Model model, Map parameters) throws ModelloException { super.initialize(model, parameters); trackingArgs = locationField = ""; @@ -83,7 +83,8 @@ protected void initialize(Model model, Properties parameters) throws ModelloExce } } - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); try { @@ -984,7 +985,7 @@ private void writePrimitiveField( throw new IllegalArgumentException("Unknown type: " + type); } - if (keyCapture.length() > 0) { + if (!keyCapture.isEmpty()) { writeSetLocation(locationKey, locatorName, null, sc); } } diff --git a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3WriterGenerator.java b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3WriterGenerator.java index 9962e174c..5bfa472cc 100644 --- a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3WriterGenerator.java +++ b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3WriterGenerator.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.ModelloException; import org.codehaus.modello.ModelloParameterConstants; @@ -67,16 +67,17 @@ protected void writeLocationTracking(JSourceCode sc, String name, String key) { } @Override - protected void initialize(Model model, Properties parameters) throws ModelloException { + protected void initialize(Model model, Map parameters) throws ModelloException { super.initialize(model, parameters); extendedClassnameSuffix = "Ex"; if (isLocationTracking()) { - extendedClassnameSuffix = parameters.getProperty(ModelloParameterConstants.EXTENDED_CLASSNAME_SUFFIX); + extendedClassnameSuffix = (String) parameters.get(ModelloParameterConstants.EXTENDED_CLASSNAME_SUFFIX); } } - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); try { diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/AbstractElementTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/AbstractElementTest.java index b2836c994..8003f8cf8 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/AbstractElementTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/AbstractElementTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -42,7 +42,7 @@ public void testAbstract() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/abstract.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "java", parameters); modello.generate(model, "xpp3-writer", parameters); diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/BooleanTypeXpp3GeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/BooleanTypeXpp3GeneratorTest.java index 2aa847316..1ff1c1bc5 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/BooleanTypeXpp3GeneratorTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/BooleanTypeXpp3GeneratorTest.java @@ -19,7 +19,7 @@ * under the License. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -35,7 +35,7 @@ public void testBooleanType() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/boolean.mdo")); - Properties parameters = getModelloParameters("1.0.0", 8); // autoboxing + Map parameters = getModelloParameters("1.0.0", 8); // autoboxing modello.generate(model, "java", parameters); modello.generate(model, "xpp3-reader", parameters); diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3DomGeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3DomGeneratorTest.java index ff93f7c91..f8fd3e8b0 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3DomGeneratorTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3DomGeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -41,7 +41,7 @@ public void testJavaGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); parameters.put("modello.dom.xpp3", "false"); modello.generate(model, "java", parameters); diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3GeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3GeneratorTest.java index b06ca72c2..17c3e6b14 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3GeneratorTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3GeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -41,7 +41,7 @@ public void testJavaGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "java", parameters); modello.generate(model, "xpp3-writer", parameters); diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsSourceXpp3GeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsSourceXpp3GeneratorTest.java index d0b37665d..884e2ad9c 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsSourceXpp3GeneratorTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsSourceXpp3GeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -42,7 +42,7 @@ public void testLocationsWithSource() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/locations+source.mdo")); - Properties parameters = getModelloParameters("1.0.0", 8); + Map parameters = getModelloParameters("1.0.0", 8); modello.generate(model, "java", parameters); modello.generate(model, "xpp3-reader", parameters); diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsXpp3GeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsXpp3GeneratorTest.java index 0854e41f2..03be37976 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsXpp3GeneratorTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsXpp3GeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -42,7 +42,7 @@ public void testLocationsOnly() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/locations.mdo")); - Properties parameters = getModelloParameters("1.0.0", 8); + Map parameters = getModelloParameters("1.0.0", 8); modello.generate(model, "java", parameters); modello.generate(model, "xpp3-reader", parameters); diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/StandaloneReadXpp3GeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/StandaloneReadXpp3GeneratorTest.java index 5cd3d0e9e..247d0e08a 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/StandaloneReadXpp3GeneratorTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/StandaloneReadXpp3GeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -38,7 +38,7 @@ public void testStandaloneRead() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/standaloneRead.mdo")); - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "java", parameters); modello.generate(model, "xpp3-reader", parameters); diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/Xpp3GeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/Xpp3GeneratorTest.java index 77344fd8a..9471365e7 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/Xpp3GeneratorTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/Xpp3GeneratorTest.java @@ -23,7 +23,7 @@ */ import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -79,7 +79,7 @@ public void testXpp3Generator() throws Throwable { assertEquals("builder", xml.getTagName()); // now generate sources and test them - Properties parameters = getModelloParameters("4.0.0", 8); + Map parameters = getModelloParameters("4.0.0", 8); modello.generate(model, "java", parameters); modello.generate(model, "xpp3-writer", parameters); diff --git a/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java b/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java index 5cdc0e0a5..21efc9dd8 100644 --- a/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java +++ b/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java @@ -30,6 +30,7 @@ import java.nio.charset.StandardCharsets; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.Set; @@ -58,9 +59,10 @@ public class XsdGenerator extends AbstractXmlGenerator { */ private static final String ANY_NAME = "*"; - protected static final String LS = System.getProperty("line.separator"); + protected static final String LS = System.lineSeparator(); - public void generate(Model model, Properties parameters) throws ModelloException { + @Override + public void generate(Model model, Map parameters) throws ModelloException { initialize(model, parameters); try { @@ -70,7 +72,7 @@ public void generate(Model model, Properties parameters) throws ModelloException } } - private void generateXsd(Properties parameters) throws IOException, ModelloException { + private void generateXsd(Map parameters) throws IOException, ModelloException { Model objectModel = getModel(); File directory = getOutputDirectory(); @@ -84,9 +86,9 @@ private void generateXsd(Properties parameters) throws IOException, ModelloExcep } // we assume parameters not null - String xsdFileName = parameters.getProperty(ModelloParameterConstants.OUTPUT_XSD_FILE_NAME); + String xsdFileName = (String) parameters.get(ModelloParameterConstants.OUTPUT_XSD_FILE_NAME); boolean enforceMandatoryElements = - Boolean.parseBoolean(parameters.getProperty(ModelloParameterConstants.XSD_ENFORCE_MANDATORY_ELEMENTS)); + Boolean.parseBoolean((String) parameters.get(ModelloParameterConstants.XSD_ENFORCE_MANDATORY_ELEMENTS)); File f = new File(directory, objectModel.getId() + "-" + getGeneratedVersion() + ".xsd"); @@ -94,9 +96,7 @@ private void generateXsd(Properties parameters) throws IOException, ModelloExcep f = new File(directory, xsdFileName); } - Writer writer = new CachingWriter(f, StandardCharsets.UTF_8); - - try { + try (Writer writer = new CachingWriter(f, StandardCharsets.UTF_8)) { XMLWriter w = new PrettyPrintXMLWriter(writer); writer.append("").write(LS); @@ -134,12 +134,9 @@ private void generateXsd(Properties parameters) throws IOException, ModelloExcep // Element descriptors // Traverse from root so "abstract" models aren't included int initialCapacity = objectModel.getClasses(getGeneratedVersion()).size(); - writeComplexTypeDescriptor( - w, objectModel, root, new HashSet(initialCapacity), enforceMandatoryElements); + writeComplexTypeDescriptor(w, objectModel, root, new HashSet<>(initialCapacity), enforceMandatoryElements); w.endElement(); - } finally { - writer.close(); } } @@ -205,9 +202,9 @@ private void writeComplexTypeDescriptor( writeClassDocumentation(w, modelClass); - Set toWrite = new HashSet(); + Set toWrite = new HashSet<>(); - if (fields.size() > 0) { + if (!fields.isEmpty()) { XsdClassMetadata xsdClassMetadata = (XsdClassMetadata) modelClass.getMetadata(XsdClassMetadata.ID); boolean compositorAll = XsdClassMetadata.COMPOSITOR_ALL.equals(xsdClassMetadata.getCompositor()); diff --git a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ChangesXsdGeneratorTest.java b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ChangesXsdGeneratorTest.java index d3c013121..b47ee5d8d 100755 --- a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ChangesXsdGeneratorTest.java +++ b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ChangesXsdGeneratorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -42,7 +42,7 @@ public void testXsdGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/changes.mdo")); // generate XSD file - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "xsd", parameters); diff --git a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/FeaturesXsdGeneratorTest.java b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/FeaturesXsdGeneratorTest.java index cf9063fdd..06378fdac 100644 --- a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/FeaturesXsdGeneratorTest.java +++ b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/FeaturesXsdGeneratorTest.java @@ -29,7 +29,7 @@ import javax.xml.validation.Validator; import java.io.File; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloGeneratorTest; import org.codehaus.modello.ModelloException; @@ -51,8 +51,8 @@ public void testXsdGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); - Properties parameters = getModelloParameters("1.0.0"); - parameters.setProperty(ModelloParameterConstants.XSD_ENFORCE_MANDATORY_ELEMENTS, "true"); + Map parameters = getModelloParameters("1.0.0"); + parameters.put(ModelloParameterConstants.XSD_ENFORCE_MANDATORY_ELEMENTS, "true"); modello.generate(model, "xsd", parameters); diff --git a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ModelloXsdGeneratorTest.java b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ModelloXsdGeneratorTest.java index 2dec50768..224d119c4 100644 --- a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ModelloXsdGeneratorTest.java +++ b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ModelloXsdGeneratorTest.java @@ -24,7 +24,7 @@ import javax.xml.parsers.SAXParser; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -47,7 +47,7 @@ public ModelloXsdGeneratorTest() { public void testXsdGenerator() throws Throwable { ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Properties parameters = getModelloParameters("1.4.0"); + Map parameters = getModelloParameters("1.4.0"); Model model = modello.loadModel(getTestFile("../../src/main/mdo/modello.mdo")); diff --git a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/PluginsXsdGeneratorTest.java b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/PluginsXsdGeneratorTest.java index 98ddb19f8..9b9bffadf 100644 --- a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/PluginsXsdGeneratorTest.java +++ b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/PluginsXsdGeneratorTest.java @@ -4,7 +4,7 @@ import javax.xml.parsers.SAXParser; import java.io.IOException; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloGeneratorTest; import org.codehaus.modello.ModelloException; @@ -38,7 +38,7 @@ public void testWithNameWildcard() Model model = modello.loadModel(getXmlResourceReader("/plugin.mdo")); // generate XSD file - Properties parameters = getModelloParameters("1.0.0"); + Map parameters = getModelloParameters("1.0.0"); modello.generate(model, "xsd", parameters); diff --git a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/XsdGeneratorTest.java b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/XsdGeneratorTest.java index e4d34a826..9fc86d5d3 100644 --- a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/XsdGeneratorTest.java +++ b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/XsdGeneratorTest.java @@ -23,7 +23,7 @@ */ import java.util.List; -import java.util.Properties; +import java.util.Map; import org.codehaus.modello.AbstractModelloGeneratorTest; import org.codehaus.modello.core.ModelloCore; @@ -78,7 +78,7 @@ public void testXsdGenerator() throws Throwable { assertEquals("builder", xml.getTagName()); // generate XSD file - Properties parameters = getModelloParameters("4.0.0"); + Map parameters = getModelloParameters("4.0.0"); modello.generate(model, "xsd", parameters); diff --git a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java index 50a8b9c87..b76605ce6 100644 --- a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java +++ b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java @@ -29,8 +29,9 @@ import java.io.File; import java.io.IOException; import java.io.Reader; +import java.util.HashMap; +import java.util.Map; import java.util.Optional; -import java.util.Properties; import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.PlexusConstants; @@ -67,25 +68,25 @@ public String getName() { return name; } - protected Properties getModelloParameters() { - Properties parameters = new Properties(); + protected Map getModelloParameters() { + Map parameters = new HashMap<>(); - parameters.setProperty("modello.output.directory", getOutputDirectory().getAbsolutePath()); + parameters.put("modello.output.directory", getOutputDirectory().getAbsolutePath()); return parameters; } - protected Properties getModelloParameters(String version) { + protected Map getModelloParameters(String version) { return getModelloParameters(version, null); } - protected Properties getModelloParameters(String version, Integer javaSource) { - Properties parameters = getModelloParameters(); + protected Map getModelloParameters(String version, Integer javaSource) { + Map parameters = getModelloParameters(); - parameters.setProperty("modello.package.with.version", Boolean.toString(false)); - parameters.setProperty("modello.version", version); + parameters.put("modello.package.with.version", Boolean.toString(false)); + parameters.put("modello.version", version); Optional.ofNullable(javaSource) - .ifPresent(a -> parameters.setProperty("modello.output.java.source", Integer.toString(a))); + .ifPresent(a -> parameters.put("modello.output.java.source", Integer.toString(a))); return parameters; }