This is an automated email from the ASF dual-hosted git repository. hansbrende pushed a commit to branch ANY23-439 in repository https://gitbox.apache.org/repos/asf/any23.git
commit 098f121ffa9b64ee9d91ca3b9f54407cd7453ecb Author: Hans <[email protected]> AuthorDate: Thu Sep 26 00:48:10 2019 -0500 ANY23-439 replace commons-lang with commons-lang3 --- cli/pom.xml | 4 ++-- core/pom.xml | 4 ++-- .../extractor/calendar/BaseCalendarExtractor.java | 2 +- .../apache/any23/extractor/html/HCardExtractor.java | 2 +- .../apache/any23/extractor/microdata/ItemScope.java | 2 +- .../any23/extractor/microdata/MicrodataParser.java | 2 +- .../apache/any23/rdf/Any23ValueFactoryWrapper.java | 2 +- .../main/java/org/apache/any23/util/StringUtils.java | 19 ++++++++----------- pom.xml | 6 +++--- 9 files changed, 20 insertions(+), 23 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 22ec356..a2b01a6 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -94,8 +94,8 @@ <!-- END: Any23 --> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> diff --git a/core/pom.xml b/core/pom.xml index 9db8ced..c975aa4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -263,8 +263,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <!-- used by Tika --> diff --git a/core/src/main/java/org/apache/any23/extractor/calendar/BaseCalendarExtractor.java b/core/src/main/java/org/apache/any23/extractor/calendar/BaseCalendarExtractor.java index e0c5559..792ef07 100644 --- a/core/src/main/java/org/apache/any23/extractor/calendar/BaseCalendarExtractor.java +++ b/core/src/main/java/org/apache/any23/extractor/calendar/BaseCalendarExtractor.java @@ -45,7 +45,7 @@ import org.apache.any23.extractor.ExtractionResult; import org.apache.any23.extractor.Extractor; import org.apache.any23.extractor.IssueReport; import org.apache.any23.vocab.ICAL; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.eclipse.rdf4j.model.BNode; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Value; diff --git a/core/src/main/java/org/apache/any23/extractor/html/HCardExtractor.java b/core/src/main/java/org/apache/any23/extractor/html/HCardExtractor.java index 803efff..e45e7e4 100644 --- a/core/src/main/java/org/apache/any23/extractor/html/HCardExtractor.java +++ b/core/src/main/java/org/apache/any23/extractor/html/HCardExtractor.java @@ -24,7 +24,7 @@ import org.apache.any23.extractor.IssueReport; import org.apache.any23.extractor.TagSoupExtractionResult; import org.apache.any23.extractor.html.annotations.Includes; import org.apache.any23.vocab.VCard; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.eclipse.rdf4j.model.BNode; import org.eclipse.rdf4j.model.Resource; import org.eclipse.rdf4j.model.IRI; diff --git a/core/src/main/java/org/apache/any23/extractor/microdata/ItemScope.java b/core/src/main/java/org/apache/any23/extractor/microdata/ItemScope.java index 1612aad..599611c 100644 --- a/core/src/main/java/org/apache/any23/extractor/microdata/ItemScope.java +++ b/core/src/main/java/org/apache/any23/extractor/microdata/ItemScope.java @@ -18,7 +18,7 @@ package org.apache.any23.extractor.microdata; import org.apache.any23.rdf.RDFUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.eclipse.rdf4j.common.net.ParsedIRI; import org.eclipse.rdf4j.model.IRI; diff --git a/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParser.java b/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParser.java index 0c993e1..4d4b0db 100644 --- a/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParser.java +++ b/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataParser.java @@ -18,7 +18,7 @@ package org.apache.any23.extractor.microdata; import org.apache.any23.extractor.html.DomUtils; import org.apache.any23.rdf.RDFUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Literal; import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil; diff --git a/core/src/main/java/org/apache/any23/rdf/Any23ValueFactoryWrapper.java b/core/src/main/java/org/apache/any23/rdf/Any23ValueFactoryWrapper.java index d0c20a9..afa1e62 100644 --- a/core/src/main/java/org/apache/any23/rdf/Any23ValueFactoryWrapper.java +++ b/core/src/main/java/org/apache/any23/rdf/Any23ValueFactoryWrapper.java @@ -22,7 +22,7 @@ import java.math.BigInteger; import java.util.Date; import org.apache.any23.extractor.IssueReport; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.eclipse.rdf4j.model.BNode; import org.eclipse.rdf4j.model.Literal; import org.eclipse.rdf4j.model.Resource; diff --git a/core/src/main/java/org/apache/any23/util/StringUtils.java b/core/src/main/java/org/apache/any23/util/StringUtils.java index e9c2494..b050641 100644 --- a/core/src/main/java/org/apache/any23/util/StringUtils.java +++ b/core/src/main/java/org/apache/any23/util/StringUtils.java @@ -16,9 +16,6 @@ */ package org.apache.any23.util; -import java.util.regex.Pattern; -import org.apache.commons.lang.WordUtils; - /** * This class provides a set of string utility methods. * @@ -194,18 +191,18 @@ public class StringUtils { in = in.trim().replaceAll("-", "_"); - // If no white chars found inside a string return uncapitalized - if (in.trim().matches("\\S+")) { - return WordUtils.uncapitalize(in); + if (in.matches("\\S+")) { + return org.apache.commons.lang3.StringUtils.uncapitalize(in); } in = in.toLowerCase(); - if (Pattern.matches("\\S+(\\s+\\S+)+", in)) { - String[] words = in.split("\\s", 2); - in = words[0] + WordUtils.capitalize(words[1]).replaceAll("\\s", ""); + String[] words = in.split("\\s+"); + StringBuilder sb = new StringBuilder(in.length()); + sb.append(words[0]); + for (int i = 1; i < words.length; i++) { + sb.append(org.apache.commons.lang3.StringUtils.capitalize(words[i])); } - - return in; + return sb.toString(); } private StringUtils() { diff --git a/pom.xml b/pom.xml index 05483c8..3a63d24 100644 --- a/pom.xml +++ b/pom.xml @@ -331,9 +331,9 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.9</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId>
