Remove use of common-lang in predicate-search

3 files changed, 6 insertions, 7 deletions

diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaFeedWriter.java b/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaFeedWriter.java
index a23339aa532..982d2488105 100644
--- a/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaFeedWriter.java
+++ b/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaFeedWriter.java
@@ -1,8 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.predicate.utils;
 
+import com.google.common.html.HtmlEscapers;
 import com.yahoo.document.predicate.Predicate;
-import org.apache.commons.lang.StringEscapeUtils;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -35,7 +35,7 @@ public class VespaFeedWriter extends BufferedWriter {
         try {
             this.append(String.format("<document documenttype=\"%2$s\" documentid=\"id:%1$s:%2$s::%3$d\">\n",
                     namespace, documentType, id));
-            this.append("<" + fieldName + ">" + StringEscapeUtils.escapeHtml(predicate.toString()) + "</" + fieldName + ">\n");
+            this.append("<" + fieldName + ">" + HtmlEscapers.htmlEscaper().escape(predicate.toString()) + "</" + fieldName + ">\n");
             this.append("</document>\n");
         } catch (IOException e) {
             throw new RuntimeException(e);
diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java
index 5d7e668a0de..24aa59955bc 100644
--- a/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java
+++ b/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java
@@ -9,9 +9,8 @@ import com.yahoo.document.predicate.PredicateHash;
 import com.yahoo.document.predicate.RangeEdgePartition;
 import com.yahoo.document.predicate.RangePartition;
 import com.yahoo.search.predicate.index.Feature;
-import com.yahoo.search.predicate.index.conjunction.IndexableFeatureConjunction;
 import com.yahoo.search.predicate.index.IntervalWithBounds;
-import org.apache.commons.lang.ArrayUtils;
+import com.yahoo.search.predicate.index.conjunction.IndexableFeatureConjunction;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -232,7 +231,7 @@ public class PredicateTreeAnnotatorTest {
         long hash = PredicateHash.hash64(feature);
         List<Integer> actualIntervals = r.intervalMap.get(hash);
         assertNotNull(actualIntervals);
-        assertArrayEquals(ArrayUtils.toPrimitive(expectedIntervals), Ints.toArray(actualIntervals));
+        assertArrayEquals(Ints.toArray(Arrays.asList(expectedIntervals)), Ints.toArray(actualIntervals));
     }
 
     private static void assertBoundsContains(PredicateTreeAnnotations r, String feature, IntervalWithBounds expectedBounds) {
diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java
index 31777959704..13a15cab52a 100644
--- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java
+++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.predicate.index;
 
-import org.apache.commons.lang.ArrayUtils;
+import com.google.common.primitives.Ints;
 import org.eclipse.collections.impl.map.mutable.primitive.ObjectIntHashMap;
 import org.junit.Test;
 
@@ -109,7 +109,7 @@ public class CachedPostingListCounterTest {
 
     private static PostingList postingList(Integer... docIds) {
         PostingList postingList = mock(PostingList.class);
-        when(postingList.getDocIds()).thenReturn(ArrayUtils.toPrimitive(docIds));
+        when(postingList.getDocIds()).thenReturn(Ints.toArray(Arrays.asList((docIds))));
         return postingList;
     }