diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-01-03 15:50:01 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-01-03 16:07:05 +0100 |
commit | fd9a51908e8e71dee9c37034cb552f001a7cf401 (patch) | |
tree | 9d3d5767512cb399ee28da9120d5d1ffcae4fcbb /container-search | |
parent | 922b2ce499cbd96d83abfc35f92f1c35edac5fe2 (diff) |
Remove use of apache commons libraries in container-search
Diffstat (limited to 'container-search')
3 files changed, 3 insertions, 18 deletions
diff --git a/container-search/pom.xml b/container-search/pom.xml index 2f82728179b..84ee5b2bc65 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -78,14 +78,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <exclusions> @@ -112,10 +104,6 @@ </exclusions> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </dependency> - <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j</artifactId> </dependency> diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java index 57d093fb1c1..37b0fd7ebfb 100644 --- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java @@ -22,7 +22,6 @@ import com.yahoo.search.query.ParameterParser; import com.yahoo.search.result.ErrorMessage; import com.yahoo.search.searchchain.Execution; import com.yahoo.vespa.streamingvisitors.VdsStreamingSearcher; -import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.Collection; @@ -222,7 +221,7 @@ public class ClusterSearcher extends Searcher { return new Result(query, ErrorMessage.createInvalidQueryParameter("Requested rank profile '" + rankProfile + "' is undefined for document type" + plural + " '" + - StringUtils.join(invalidInDocTypes.iterator(), ", ") + "'")); + String.join(", ", invalidInDocTypes) + "'")); } return null; diff --git a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java index 6e36881ae63..ec1836fd07b 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java @@ -27,7 +27,6 @@ import com.yahoo.search.federation.sourceref.SourceRefResolver; import com.yahoo.search.federation.sourceref.SourcesTarget; import com.yahoo.search.federation.sourceref.UnresolvedSearchChainException; import com.yahoo.search.query.Properties; -import com.yahoo.search.query.properties.QueryProperties; import com.yahoo.search.query.properties.SubProperties; import com.yahoo.search.result.ErrorMessage; import com.yahoo.search.result.Hit; @@ -39,7 +38,6 @@ import com.yahoo.search.searchchain.ForkingSearcher; import com.yahoo.search.searchchain.FutureResult; import com.yahoo.search.searchchain.SearchChainRegistry; import com.yahoo.search.searchchain.model.federation.FederationOptions; -import org.apache.commons.lang.StringUtils; import java.time.Clock; import java.util.ArrayList; @@ -319,8 +317,8 @@ public class FederationSearcher extends ForkingSearcher { } private ErrorMessage missingSearchChainsErrorMessage(List<UnresolvedSearchChainException> unresolvedSearchChainExceptions) { - String message = StringUtils.join(getMessagesSet(unresolvedSearchChainExceptions), ' ') + - " Valid source refs are " + StringUtils.join(allSourceRefDescriptions().iterator(), ", ") +'.'; + String message = String.join(" ", getMessagesSet(unresolvedSearchChainExceptions)) + + " Valid source refs are " + String.join(", ", allSourceRefDescriptions()) +'.'; return ErrorMessage.createInvalidQueryParameter(message); } |