From 647809423cd9b307927da9ce993dd22922e4f771 Mon Sep 17 00:00:00 2001 From: "daniel.martins" Date: Thu, 20 Jul 2023 08:44:21 +0200 Subject: [PATCH] Java 17 support by updating dependencies --- maven-config-processor-plugin/pom.xml | 217 +++++++++++------- .../code/configprocessor/ConfigProcessor.java | 60 +++-- .../ant/AntExpressionResolver.java | 26 ++- .../maven/MavenExpressionResolver.java | 18 +- .../ProcessingConfigurationParser.java | 31 ++- .../processing/AbstractAction.java | 13 +- .../configprocessor/processing/AddAction.java | 33 +-- .../processing/ModifyAction.java | 7 +- .../processing/RemoveAction.java | 5 +- ...rtiesUncommentActionProcessingAdvisor.java | 16 +- .../properties/model/PropertyMapping.java | 5 +- .../configprocessor/ConfigProcessorTest.java | 11 +- .../util/PropertiesUtilsTest.java | 14 +- 13 files changed, 284 insertions(+), 172 deletions(-) diff --git a/maven-config-processor-plugin/pom.xml b/maven-config-processor-plugin/pom.xml index d1475a7..1fb5b2a 100644 --- a/maven-config-processor-plugin/pom.xml +++ b/maven-config-processor-plugin/pom.xml @@ -1,11 +1,13 @@ - + 4.0.0 org.sonatype.oss oss-parent - 7 + 9 com.google.code.maven-config-processor-plugin @@ -14,7 +16,8 @@ maven-plugin Config Processor Maven Plugin - Generates configuration files modified according to a ruleset to prepare them for different environments + Generates configuration files modified according to a ruleset + to prepare them for different environments http://code.google.com/p/maven-config-processor-plugin 2009 @@ -24,7 +27,7 @@ - 2.0 + 3.0 @@ -37,8 +40,10 @@ Plugin users maven-config-processor-users@googlegroups.com maven-config-processor-users-subscribe@googlegroups.com - maven-config-processor-users-unsubscribe@googlegroups.com - http://groups.google.com/group/maven-config-processor-users/topics + + maven-config-processor-users-unsubscribe@googlegroups.com + + http://groups.google.com/group/maven-config-processor-users/topics @@ -52,81 +57,84 @@ - scm:svn:https://maven-config-processor-plugin.googlecode.com/svn/trunk/maven-config-processor-plugin - scm:svn:https://maven-config-processor-plugin.googlecode.com/svn/trunk/maven-config-processor-plugin - http://maven-config-processor-plugin.googlecode.com/svn/trunk/maven-config-processor-plugin + + scm:svn:https://maven-config-processor-plugin.googlecode.com/svn/trunk/maven-config-processor-plugin + + scm:svn:https://maven-config-processor-plugin.googlecode.com/svn/trunk/maven-config-processor-plugin + + http://maven-config-processor-plugin.googlecode.com/svn/trunk/maven-config-processor-plugin org.apache.ant ant - 1.9.15 + 1.10.13 org.apache.maven maven-plugin-api - 2.0 + 3.9.3 org.apache.maven maven-core - 2.0.9 + 3.9.3 + + + + org.apache.maven + maven-compat + 3.9.3 org.apache.maven maven-project - 2.0.4 + 2.2.1 org.apache.maven.shared maven-shared-io - 1.1 + 3.0.0 - commons-lang - commons-lang - 2.4 + org.apache.commons + commons-lang3 + 3.12.0 com.thoughtworks.xstream xstream - 1.4.10-java7 + 1.4.20 xerces xercesImpl - 2.12.0 + 2.12.2 junit junit - 4.13.1 + 4.13.2 test org.easymock easymock - 2.0 + 5.1.0 test - - org.easymock - easymockclassextension - 2.5.2 - test - @@ -159,12 +167,12 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 3.11.0 true true - 1.5 - 1.5 + 1.8 + 1.8 @@ -172,7 +180,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.12 + 3.1.2 **/*Test.java @@ -216,58 +224,21 @@ maven-assembly-plugin - 2.2-beta-3 + 3.6.0 src/assembly/ant-task.xml + org.apache.maven.plugins maven-site-plugin - 3.1 - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - com.google.code.maven-license-plugin - maven-license-plugin - [1.4.0,) - - format - - - - - - - - - org.apache.maven.plugins - maven-plugin-plugin - [3.2,) - - descriptor - - - - - - - - - + 3.12.1 @@ -278,28 +249,30 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.1 + 3.4.5 org.apache.maven.plugins maven-plugin-plugin - 2.4.3 + 3.9.0 org.apache.maven.plugins maven-javadoc-plugin - 2.8.1 + 3.5.0 maven + none + org.apache.maven.plugins maven-changelog-plugin - 2.0 + 2.3 range 30 @@ -309,7 +282,7 @@ org.codehaus.mojo taglist-maven-plugin - 2.3 + 3.0.0 TODO @@ -317,22 +290,21 @@ - org.apache.maven.plugins maven-pmd-plugin - 2.4 + 3.21.0 ${project.reporting.outputDirectory} ${project.reporting.outputDirectory} - 1.6 + 1.8 org.codehaus.mojo javancss-maven-plugin - 2.0-beta-2 + 2.1 ${project.reporting.outputDirectory} @@ -341,7 +313,7 @@ org.codehaus.mojo findbugs-maven-plugin - 2.4.0 + 3.0.5 true true @@ -351,7 +323,7 @@ org.codehaus.mojo cobertura-maven-plugin - 2.3 + 2.7 html @@ -359,12 +331,89 @@ - + org.apache.maven.plugins maven-jxr-plugin - 2.3 + 3.3.0 + + + + + doclint-java8-disable + + [1.8,) + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + none + + + + + + + only-eclipse + + + m2e.version + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + com.google.code.maven-license-plugin + maven-license-plugin + [1.4.0,) + + format + + + + + + + + + + org.apache.maven.plugins + maven-plugin-plugin + [3.2,) + + descriptor + + + + + + + + + + + + + + + + diff --git a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/ConfigProcessor.java b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/ConfigProcessor.java index b6b9bc1..5f42644 100644 --- a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/ConfigProcessor.java +++ b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/ConfigProcessor.java @@ -15,23 +15,38 @@ */ package com.google.code.configprocessor; -import static com.google.code.configprocessor.util.IOUtils.*; -import static org.apache.commons.lang.StringUtils.*; - -import java.io.*; -import java.util.*; - -import org.apache.commons.lang.*; -import org.apache.tools.ant.*; - -import com.google.code.configprocessor.expression.*; -import com.google.code.configprocessor.io.*; -import com.google.code.configprocessor.log.*; -import com.google.code.configprocessor.maven.*; -import com.google.code.configprocessor.parsing.*; -import com.google.code.configprocessor.processing.*; -import com.google.code.configprocessor.processing.properties.*; -import com.google.code.configprocessor.processing.xml.*; +import static com.google.code.configprocessor.util.IOUtils.close; +import static com.google.code.configprocessor.util.IOUtils.forceMkdirs; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.apache.tools.ant.DirectoryScanner; + +import com.google.code.configprocessor.expression.ExpressionResolver; +import com.google.code.configprocessor.io.FileResolver; +import com.google.code.configprocessor.log.LogAdapter; +import com.google.code.configprocessor.maven.AntrunXmlPlexusConfigurationWriter; +import com.google.code.configprocessor.parsing.ProcessingConfigurationParser; +import com.google.code.configprocessor.processing.Action; +import com.google.code.configprocessor.processing.ActionProcessor; +import com.google.code.configprocessor.processing.properties.PropertiesActionProcessor; +import com.google.code.configprocessor.processing.xml.XmlActionProcessor; +import com.google.code.configprocessor.processing.xml.XmlHelper; public class ConfigProcessor { @@ -146,9 +161,9 @@ protected Action getAction(Transformation transformation) throws ConfigProcessor StringWriter writer = new StringWriter(); AntrunXmlPlexusConfigurationWriter xmlWriter = new AntrunXmlPlexusConfigurationWriter(); xmlWriter.write(transformation.getRules(), writer); - String configContent = trimToNull(writer.toString()); - configContent = removeStart(configContent, ""); - configContent = removeEnd(configContent, ""); + String configContent = StringUtils.trimToNull(writer.toString()); + configContent = StringUtils.removeStart(configContent, ""); + configContent = StringUtils.removeEnd(configContent, ""); StringBuilder sb = new StringBuilder(configContent.length() + XmlHelper.ROOT_PROCESSOR_START.length() + XmlHelper.ROOT_PROCESSOR_END.length()); sb.append(XmlHelper.ROOT_PROCESSOR_START); sb.append(configContent); @@ -186,7 +201,8 @@ protected String getConfigIdentifier(Transformation transformation) throws Confi } catch (IOException e) { throw new ConfigProcessorException("Shouldn't happen because there is no I/O here", e); } - return abbreviate(trimToNull(removeStart(writer.toString(), "")), 100); + return StringUtils.abbreviate(StringUtils.trimToNull(StringUtils.removeStart(writer.toString(), "")), + 100); } return transformation.getConfig(); } @@ -236,7 +252,7 @@ protected List getMatchingFiles(String pattern) throws ConfigProcessorExce scanner.setCaseSensitive(false); scanner.scan(); String[] fileNames = scanner.getIncludedFiles(); - List files = new ArrayList(); + List files = new ArrayList<>(); for (String fileName : fileNames) { files.add(new File(baseDir, fileName)); } diff --git a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/ant/AntExpressionResolver.java b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/ant/AntExpressionResolver.java index d6a0762..83830a7 100644 --- a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/ant/AntExpressionResolver.java +++ b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/ant/AntExpressionResolver.java @@ -15,11 +15,15 @@ */ package com.google.code.configprocessor.ant; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Map; +import java.util.Properties; -import org.apache.tools.ant.*; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.PropertyHelper; -import com.google.code.configprocessor.expression.*; +import com.google.code.configprocessor.expression.ExpressionResolver; public class AntExpressionResolver implements ExpressionResolver { @@ -44,7 +48,8 @@ public AntExpressionResolver(Project project, Properties specificProperties, boo this.replacePlaceholders = replacePlaceholders; } - public String resolve(String value, boolean isPropertiesValue) { + @Override + public String resolve(String value, boolean isPropertiesValue) { String resolvedValue; if (replacePlaceholders) { @@ -55,11 +60,22 @@ public String resolve(String value, boolean isPropertiesValue) { String name = (String) names.nextElement(); ph.setUserProperty(null, name, specificProperties.getProperty(name)); } - resolvedValue = ph.replaceProperties(null, value, specificProperties); + resolvedValue = ph.replaceProperties(null, value, loopConvert(specificProperties)); } else { resolvedValue = value; } return resolvedValue; } + + private Hashtable loopConvert(Properties prop) + { + Hashtable retMap = new Hashtable<>(); + for (Map.Entry entry : prop.entrySet()) + { + retMap.put(String.valueOf(entry.getKey()), entry.getValue()); + } + return retMap; + } + } diff --git a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/maven/MavenExpressionResolver.java b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/maven/MavenExpressionResolver.java index 5e35530..5175ad2 100644 --- a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/maven/MavenExpressionResolver.java +++ b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/maven/MavenExpressionResolver.java @@ -15,15 +15,16 @@ */ package com.google.code.configprocessor.maven; -import org.apache.commons.lang.*; -import org.codehaus.plexus.component.configurator.expression.*; +import org.apache.commons.lang3.StringUtils; +import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; +import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; -import com.google.code.configprocessor.expression.*; -import com.google.code.configprocessor.util.*; +import com.google.code.configprocessor.expression.ExpressionResolver; +import com.google.code.configprocessor.util.PropertiesUtils; /** * Resolver of placeholders. - * + * * @author Leandro Aparecido * @see org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator */ @@ -50,12 +51,13 @@ public MavenExpressionResolver(ExpressionEvaluator evaluator, boolean replacePla /** * Resolves the given text replacing any placeholders if necessary. - * + * * @param value Value to resolve. * @param isPropertiesValue True is the value will be used in .properties files and should be escaped. * @return Resolved value with values replaced as necessary. */ - public String resolve(String value, boolean isPropertiesValue) { + @Override + public String resolve(String value, boolean isPropertiesValue) { String resolvedValue; if (replacePlaceholders) { @@ -65,7 +67,7 @@ public String resolve(String value, boolean isPropertiesValue) { throw new IllegalArgumentException("Expression [" + value + "] did not resolve to String"); } resolvedValue = (String) aux; - + if (isPropertiesValue && !StringUtils.equals(value, resolvedValue)) { resolvedValue = PropertiesUtils.escapePropertyValue(resolvedValue); } diff --git a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/parsing/ProcessingConfigurationParser.java b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/parsing/ProcessingConfigurationParser.java index fbb9bd7..6d4dbf9 100644 --- a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/parsing/ProcessingConfigurationParser.java +++ b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/parsing/ProcessingConfigurationParser.java @@ -15,13 +15,23 @@ */ package com.google.code.configprocessor.parsing; -import java.io.*; -import java.nio.charset.*; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.nio.charset.Charset; -import com.google.code.configprocessor.*; -import com.google.code.configprocessor.processing.*; -import com.thoughtworks.xstream.*; -import com.thoughtworks.xstream.converters.reflection.*; +import com.google.code.configprocessor.ParsingException; +import com.google.code.configprocessor.processing.AddAction; +import com.google.code.configprocessor.processing.CommentAction; +import com.google.code.configprocessor.processing.ModifyAction; +import com.google.code.configprocessor.processing.NestedAction; +import com.google.code.configprocessor.processing.RemoveAction; +import com.google.code.configprocessor.processing.UncommentAction; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider; +import com.thoughtworks.xstream.security.NoTypePermission; +import com.thoughtworks.xstream.security.NullPermission; +import com.thoughtworks.xstream.security.PrimitiveTypePermission; public class ProcessingConfigurationParser { @@ -44,6 +54,15 @@ public NestedAction parse(Reader is) throws ParsingException { protected XStream getXStream() { XStream xstream = new XStream(new PureJavaReflectionProvider()); + // clear out existing permissions and start a whitelist + xstream.addPermission(NoTypePermission.NONE); + // allow some basics + xstream.addPermission(NullPermission.NULL); + xstream.addPermission(PrimitiveTypePermission.PRIMITIVES); + // allow any type from the same package + xstream.allowTypesByWildcard(new String[] { "com.google.code.configprocessor.processing**" + }); + xstream.alias("processor", NestedAction.class); xstream.alias("add", AddAction.class); xstream.alias("modify", ModifyAction.class); diff --git a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/AbstractAction.java b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/AbstractAction.java index 2513a17..e264327 100644 --- a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/AbstractAction.java +++ b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/AbstractAction.java @@ -15,12 +15,12 @@ */ package com.google.code.configprocessor.processing; -import org.apache.commons.lang.*; +import org.apache.commons.lang3.StringUtils; public abstract class AbstractAction implements Action { private static final long serialVersionUID = 2344519551554135862L; - + private String name; private String value; private boolean strict; @@ -28,7 +28,7 @@ public abstract class AbstractAction implements Action { public AbstractAction(String name, String value) { this.name = name; this.value = value; - this.strict = true; + strict = true; } public String getName() { @@ -46,11 +46,12 @@ public String getValue() { public void setValue(String value) { this.value = value; } - - public boolean isStrict() { + + @Override + public boolean isStrict() { return strict; } - + public void setStrict(boolean strict) { this.strict = strict; } diff --git a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/AddAction.java b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/AddAction.java index 8b2ee24..9dc6620 100644 --- a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/AddAction.java +++ b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/AddAction.java @@ -15,12 +15,12 @@ */ package com.google.code.configprocessor.processing; -import org.apache.commons.lang.*; +import org.apache.commons.lang3.StringUtils; public class AddAction extends AbstractAction { private static final long serialVersionUID = -5444028483023476286L; - + private static final boolean DEFAULT_IGNORE_ROOT = true; private boolean first; @@ -42,11 +42,11 @@ public AddAction(String name, String value) { public AddAction(String file, String after, String before) { super(null, null); - + this.file = file; this.after = after; this.before = before; - this.ignoreRoot = DEFAULT_IGNORE_ROOT; + ignoreRoot = DEFAULT_IGNORE_ROOT; } public AddAction(String name, String value, String after, String before) { @@ -54,10 +54,11 @@ public AddAction(String name, String value, String after, String before) { this.after = after; this.before = before; - this.ignoreRoot = DEFAULT_IGNORE_ROOT; + ignoreRoot = DEFAULT_IGNORE_ROOT; } - - public void validate() throws ActionValidationException { + + @Override + public void validate() throws ActionValidationException { if (getFile() == null && getValue() == null) { throw new ActionValidationException("File or value are required", this); } @@ -99,7 +100,7 @@ public void setLast(boolean last) { public String getAfter() { return StringUtils.trimToNull(after); } - + public void setAfter(String after) { this.after = after; } @@ -107,19 +108,19 @@ public void setAfter(String after) { public String getBefore() { return StringUtils.trimToNull(before); } - + public void setBefore(String before) { this.before = before; } - + public String getInside() { return StringUtils.trimToNull(inside); } - + public void setInside(String inside) { this.inside = inside; } - + public String getFile() { return StringUtils.trimToNull(file); } @@ -127,19 +128,19 @@ public String getFile() { public void setFile(String file) { this.file = file; } - + public boolean isIgnoreRoot() { return ignoreRoot; } - + public void setIgnoreRoot(boolean ignoreRoot) { this.ignoreRoot = ignoreRoot; } - + public NestedAction getNestedAction() { return nestedAction; } - + public void setNestedAction(NestedAction nestedAction) { this.nestedAction = nestedAction; } diff --git a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/ModifyAction.java b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/ModifyAction.java index 571e8d2..1f12be4 100644 --- a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/ModifyAction.java +++ b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/ModifyAction.java @@ -15,10 +15,10 @@ */ package com.google.code.configprocessor.processing; -import org.apache.commons.lang.StringUtils; - import java.util.regex.Pattern; +import org.apache.commons.lang3.StringUtils; + public class ModifyAction extends AbstractAction { private static final long serialVersionUID = 3614101885803457281L; @@ -45,7 +45,8 @@ public ModifyAction(String name, String value, NodeSetPolicy nodeSetPolicy) { this.nodeSetPolicy = nodeSetPolicy.toString(); } - public void validate() throws ActionValidationException { + @Override + public void validate() throws ActionValidationException { if (getName() == null) { if (getValue() == null) { if (getFind() == null || getReplace() == null) { diff --git a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/RemoveAction.java b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/RemoveAction.java index cb6eece..f7ff65f 100644 --- a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/RemoveAction.java +++ b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/RemoveAction.java @@ -15,7 +15,7 @@ */ package com.google.code.configprocessor.processing; -import org.apache.commons.lang.*; +import org.apache.commons.lang3.StringUtils; public class RemoveAction extends AbstractAction { @@ -36,7 +36,8 @@ public RemoveAction(String name, NodeSetPolicy nodeSetPolicy) { this.nodeSetPolicy = nodeSetPolicy.toString(); } - public void validate() throws ActionValidationException { + @Override + public void validate() throws ActionValidationException { if (getName() == null) { throw new ActionValidationException("Name is required", this); } diff --git a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/properties/PropertiesUncommentActionProcessingAdvisor.java b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/properties/PropertiesUncommentActionProcessingAdvisor.java index 7a38609..6f0e663 100644 --- a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/properties/PropertiesUncommentActionProcessingAdvisor.java +++ b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/properties/PropertiesUncommentActionProcessingAdvisor.java @@ -15,13 +15,17 @@ */ package com.google.code.configprocessor.processing.properties; -import java.util.regex.*; +import java.util.regex.Pattern; -import org.apache.commons.lang.*; +import org.apache.commons.lang3.StringUtils; -import com.google.code.configprocessor.expression.*; -import com.google.code.configprocessor.processing.*; -import com.google.code.configprocessor.processing.properties.model.*; +import com.google.code.configprocessor.expression.ExpressionResolver; +import com.google.code.configprocessor.processing.UncommentAction; +import com.google.code.configprocessor.processing.properties.model.Comment; +import com.google.code.configprocessor.processing.properties.model.PropertiesFileItem; +import com.google.code.configprocessor.processing.properties.model.PropertiesFileItemAdvice; +import com.google.code.configprocessor.processing.properties.model.PropertiesFileItemAdviceType; +import com.google.code.configprocessor.processing.properties.model.PropertyMapping; public class PropertiesUncommentActionProcessingAdvisor extends AbstractPropertiesActionProcessingAdvisor { @@ -45,7 +49,7 @@ public PropertiesFileItemAdvice process(PropertiesFileItem item) { if (!StringUtils.isBlank(text)) { PropertyMapping mapping = new PropertyMapping(); mapping.parse(text, true); - + if (mapping.getPropertyName().trim().equals(action.getName())) { return new PropertiesFileItemAdvice(PropertiesFileItemAdviceType.MODIFY, mapping); } diff --git a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/properties/model/PropertyMapping.java b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/properties/model/PropertyMapping.java index fcc3b0c..161141a 100644 --- a/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/properties/model/PropertyMapping.java +++ b/maven-config-processor-plugin/src/main/java/com/google/code/configprocessor/processing/properties/model/PropertyMapping.java @@ -15,7 +15,7 @@ */ package com.google.code.configprocessor.processing.properties.model; -import org.apache.commons.lang.*; +import org.apache.commons.lang3.StringUtils; public class PropertyMapping implements PropertiesFileItem { @@ -75,7 +75,8 @@ public void parse(String text, boolean trim) { } } - public String getAsText() { + @Override + public String getAsText() { StringBuilder sb = new StringBuilder(); sb.append(getPropertyName()); sb.append("="); diff --git a/maven-config-processor-plugin/src/test/java/com/google/code/configprocessor/ConfigProcessorTest.java b/maven-config-processor-plugin/src/test/java/com/google/code/configprocessor/ConfigProcessorTest.java index 7a9a3ba..b6fa375 100644 --- a/maven-config-processor-plugin/src/test/java/com/google/code/configprocessor/ConfigProcessorTest.java +++ b/maven-config-processor-plugin/src/test/java/com/google/code/configprocessor/ConfigProcessorTest.java @@ -15,13 +15,14 @@ */ package com.google.code.configprocessor; -import static org.easymock.EasyMock.*; -import static org.easymock.classextension.EasyMock.*; -import static org.junit.Assert.*; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.junit.Assert.assertEquals; -import java.io.*; +import java.io.File; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; public class ConfigProcessorTest { diff --git a/maven-config-processor-plugin/src/test/java/com/google/code/configprocessor/util/PropertiesUtilsTest.java b/maven-config-processor-plugin/src/test/java/com/google/code/configprocessor/util/PropertiesUtilsTest.java index b9d2e3b..a1a59d6 100644 --- a/maven-config-processor-plugin/src/test/java/com/google/code/configprocessor/util/PropertiesUtilsTest.java +++ b/maven-config-processor-plugin/src/test/java/com/google/code/configprocessor/util/PropertiesUtilsTest.java @@ -15,10 +15,10 @@ */ package com.google.code.configprocessor.util; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; -import org.apache.commons.lang.*; -import org.junit.*; +import org.apache.commons.lang3.StringUtils; +import org.junit.Test; public class PropertiesUtilsTest { @@ -26,22 +26,22 @@ public class PropertiesUtilsTest { public void getAsTextSimple() { executeExportingTest("value", "value"); } - + @Test public void getAsTextNullValue() { executeExportingTest(null, null); } - + @Test public void getAsTextEmptyValue() { executeExportingTest("", StringUtils.EMPTY); } - + @Test public void getAsTextEscapingBackslashes() { executeExportingTest("c:\\\\file.txt", "c:\\file.txt"); } - + @Test public void getAsTextEscapingLineBreaks() { executeExportingTest("value1\\\rvalue2", "value1\rvalue2");