This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-text.git
The following commit(s) were added to refs/heads/master by this push: new b74ff3c - checkstyle.version 8.21 -> 8.23. - Checkstyle. b74ff3c is described below commit b74ff3ccea36147460804290a9e5316abe9f08e2 Author: Gary Gregory <gardgreg...@gmail.com> AuthorDate: Tue Aug 6 17:42:38 2019 -0400 - checkstyle.version 8.21 -> 8.23. - Checkstyle. --- pom.xml | 2 +- src/changes/changes.xml | 1 + src/main/java/org/apache/commons/text/StringSubstitutor.java | 3 ++- src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java | 3 ++- .../java/org/apache/commons/text/lookup/StringLookupFactoryTest.java | 3 ++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d9322a7..15ce468 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory> <checkstyle.plugin.version>3.0.0</checkstyle.plugin.version> - <checkstyle.version>8.21</checkstyle.version> + <checkstyle.version>8.23</checkstyle.version> <spotbugs.plugin.version>3.1.12</spotbugs.plugin.version> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7f41562..e8866e8 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -52,6 +52,7 @@ The <action> type attribute can be add,update,fix,remove. <action issue="TEXT-170" type="add" dev="ggregory" due-to="Gary Gregory">Add String lookup for host names and IP addresses (DnsStringLookup).</action> <action issue="TEXT-171" type="fix" dev="ggregory" due-to="Gary Gregory">StringLookupFactory.addDefaultStringLookups(Map) does not convert keys to lower case.</action> <action type="update" dev="ggregory" due-to="Gary Gregory">Expand Javadoc for StringSubstitutor and friends.</action> + <action type="update" dev="ggregory" due-to="Gary Gregory">[site] checkstyle.version 8.21 -> 8.23.</action> </release> diff --git a/src/main/java/org/apache/commons/text/StringSubstitutor.java b/src/main/java/org/apache/commons/text/StringSubstitutor.java index 07f8507..3fc13da 100644 --- a/src/main/java/org/apache/commons/text/StringSubstitutor.java +++ b/src/main/java/org/apache/commons/text/StringSubstitutor.java @@ -248,7 +248,8 @@ public class StringSubstitutor { * </p> * * <pre> - * StringSubstitutor.createInterpolator().replace("OS name: ${sys:os.name}, " + "3 + 4 = ${script:javascript:3 + 4}"); + * StringSubstitutor.createInterpolator() + * .replace("OS name: ${sys:os.name}, " + "3 + 4 = ${script:javascript:3 + 4}"); * </pre> * * @return a new instance using the interpolator string lookup. diff --git a/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java b/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java index ebda233..b083ee7 100644 --- a/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java +++ b/src/main/java/org/apache/commons/text/lookup/StringLookupFactory.java @@ -293,7 +293,8 @@ public final class StringLookupFactory { // "base64" is deprecated in favor of KEY_BASE64_DECODER. stringLookupMap.put("base64", Base64DecoderStringLookup.INSTANCE); for (final DefaultStringLookup stringLookup : DefaultStringLookup.values()) { - stringLookupMap.put(InterpolatorStringLookup.toKey(stringLookup.getKey()), stringLookup.getStringLookup()); + stringLookupMap.put(InterpolatorStringLookup.toKey(stringLookup.getKey()), + stringLookup.getStringLookup()); } } } diff --git a/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java b/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java index 527959c..5bf07fd 100644 --- a/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java +++ b/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java @@ -40,7 +40,8 @@ public class StringLookupFactoryTest { assertTrue(stringLookupMap.containsKey(InterpolatorStringLookup.toKey(StringLookupFactory.KEY_JAVA))); assertTrue(stringLookupMap.containsKey(InterpolatorStringLookup.toKey(StringLookupFactory.KEY_LOCALHOST))); assertTrue(stringLookupMap.containsKey(InterpolatorStringLookup.toKey(StringLookupFactory.KEY_PROPERTIES))); - assertTrue(stringLookupMap.containsKey(InterpolatorStringLookup.toKey(StringLookupFactory.KEY_RESOURCE_BUNDLE))); + assertTrue( + stringLookupMap.containsKey(InterpolatorStringLookup.toKey(StringLookupFactory.KEY_RESOURCE_BUNDLE))); assertTrue(stringLookupMap.containsKey(InterpolatorStringLookup.toKey(StringLookupFactory.KEY_SCRIPT))); assertTrue(stringLookupMap.containsKey(InterpolatorStringLookup.toKey(StringLookupFactory.KEY_SYS))); assertTrue(stringLookupMap.containsKey(InterpolatorStringLookup.toKey(StringLookupFactory.KEY_URL)));