Revert "Bjorncs/java deps cleanup"

4 files changed, 15 insertions, 22 deletions

diff --git a/document/pom.xml b/document/pom.xml
index f5c5dec5b7c..1696d525f6f 100644
--- a/document/pom.xml
+++ b/document/pom.xml
@@ -27,6 +27,10 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationType2AnnotationContainer.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationType2AnnotationContainer.java
index b0079759b21..121ccfb2cda 100644
--- a/document/src/main/java/com/yahoo/document/annotation/AnnotationType2AnnotationContainer.java
+++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationType2AnnotationContainer.java
@@ -1,10 +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.document.annotation;
 
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
+import org.apache.commons.collections.map.MultiValueMap;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.IdentityHashMap;
 import java.util.Iterator;
@@ -12,11 +10,11 @@ import java.util.NoSuchElementException;
 
 /**
  *
- * @author Einar M R Rosenvinge
+ * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
  */
 // TODO: Should this be removed?
 public class AnnotationType2AnnotationContainer extends IteratingAnnotationContainer {
-    private final Multimap<AnnotationType, Annotation> annotationType2Annotation = Multimaps.newMultimap(new IdentityHashMap<>(), ArrayList::new);
+    private final MultiValueMap annotationType2Annotation = MultiValueMap.decorate(new IdentityHashMap());
 
     @Override
     void annotateAll(Collection<Annotation> annotations) {
diff --git a/document/src/main/java/com/yahoo/document/annotation/SpanNode2AnnotationContainer.java b/document/src/main/java/com/yahoo/document/annotation/SpanNode2AnnotationContainer.java
index c19f02f5c0b..b65b6b7b4d6 100644
--- a/document/src/main/java/com/yahoo/document/annotation/SpanNode2AnnotationContainer.java
+++ b/document/src/main/java/com/yahoo/document/annotation/SpanNode2AnnotationContainer.java
@@ -1,9 +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.document.annotation;
 
-
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
+import org.apache.commons.collections.map.MultiValueMap;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -15,10 +13,10 @@ import java.util.List;
 /**
  * TODO: Should this be removed?
  *
- * @author Einar M R Rosenvinge
+ * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
  */
 class SpanNode2AnnotationContainer extends AnnotationContainer {
-    private final Multimap<SpanNode, Annotation> spanNode2Annotation = Multimaps.newMultimap(new IdentityHashMap<>(), ArrayList::new);
+    private final MultiValueMap spanNode2Annotation = MultiValueMap.decorate(new IdentityHashMap());
 
     @Override
     void annotateAll(Collection<Annotation> annotations) {
@@ -45,7 +43,7 @@ class SpanNode2AnnotationContainer extends AnnotationContainer {
     @Override
     @SuppressWarnings("unchecked")
     Iterator<Annotation> iterator(SpanNode node) {
-        Collection<Annotation> annotationsForNode = spanNode2Annotation.get(node);
+        Collection<Annotation> annotationsForNode = spanNode2Annotation.getCollection(node);
         if (annotationsForNode == null) {
             return Collections.<Annotation>emptyList().iterator();
         }
@@ -65,7 +63,7 @@ class SpanNode2AnnotationContainer extends AnnotationContainer {
         }
         List<Collection<Annotation>> annotationLists = new ArrayList<Collection<Annotation>>(nodes.size());
         for (SpanNode includedNode : nodes.keySet()) {
-            Collection<Annotation> includedAnnotations = spanNode2Annotation.get(includedNode);
+            Collection<Annotation> includedAnnotations = spanNode2Annotation.getCollection(includedNode);
             if (includedAnnotations != null) {
                 annotationLists.add(includedAnnotations);
             }
diff --git a/document/src/main/java/com/yahoo/document/annotation/SpanTree.java b/document/src/main/java/com/yahoo/document/annotation/SpanTree.java
index 05e5ff41cf1..2206d95aa38 100644
--- a/document/src/main/java/com/yahoo/document/annotation/SpanTree.java
+++ b/document/src/main/java/com/yahoo/document/annotation/SpanTree.java
@@ -2,7 +2,6 @@
 package com.yahoo.document.annotation;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMultiset;
 import com.yahoo.document.CollectionDataType;
 import com.yahoo.document.Field;
 import com.yahoo.document.MapDataType;
@@ -12,14 +11,9 @@ import com.yahoo.document.datatypes.FieldValue;
 import com.yahoo.document.datatypes.MapFieldValue;
 import com.yahoo.document.datatypes.StringFieldValue;
 import com.yahoo.document.datatypes.StructuredFieldValue;
+import org.apache.commons.collections.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * A SpanTree holds a root node of a tree of SpanNodes, and a List of Annotations pointing to these nodes
@@ -678,8 +672,7 @@ public class SpanTree implements Iterable<Annotation>, SpanNodeParent, Comparabl
         List<Annotation> annotationCollection = new LinkedList<Annotation>(getAnnotations());
         List<Annotation> otherAnnotations = new LinkedList<Annotation>(tree.getAnnotations());
 
-        return annotationCollection.size() == otherAnnotations.size() &&
-                ImmutableMultiset.copyOf(annotationCollection).equals(ImmutableMultiset.copyOf(otherAnnotations));
+        return annotationCollection.size() == otherAnnotations.size() && CollectionUtils.isEqualCollection(annotationCollection, otherAnnotations);
     }
 
     @Override