MODE-1129 Eliminated dependency on Google Collections

Created a Multimap interface and several implementations to replace the corresponding classes in the Google Collections library. Also added unit tests, and all uses of Google Collections were changed to the new ModeShape multimap classes. All unit and integration tests pass with these changes.
ModeShape · Apr 14, 2011 · 9fe63a1 · 9fe63a1
1 parent bfbf241
commit 9fe63a1
Show file tree

Hide file tree

Showing 36 changed files with 3,650 additions and 62 deletions.
diff --git a/deploy/jbossas/modeshape-jbossas-service/src/assembly/kit.xml b/deploy/jbossas/modeshape-jbossas-service/src/assembly/kit.xml
@@ -42,7 +42,6 @@
 
             <!-- 3rd party dependencies required by the ModeShape JCR engine -->
             <include>joda-time:joda-time</include>
-            <include>com.google.collections:google-collections</include>
             <include>org.apache.lucene:lucene-core</include>
             <include>org.apache.lucene:lucene-analyzers</include>
             <include>org.apache.lucene:lucene-snowball</include>

diff --git a/docs/gettingstarted/src/main/docbook/en-US/content/using_modeshape.xml b/docs/gettingstarted/src/main/docbook/en-US/content/using_modeshape.xml
@@ -384,7 +384,6 @@ deploy/modeshape-jboss-beans.xml
 deploy/modeshape-services.jar/
 deploy/modeshape-services.jar/META-INF/
 deploy/modeshape-services.jar/aperture-1.1.0.Beta1.jar 
-deploy/modeshape-services.jar/google-collections-1.0.jar  
 deploy/modeshape-services.jar/joda-time-1.6.jar  
 deploy/modeshape-services.jar/lucene-analyzers-3.0.2.jar  
 deploy/modeshape-services.jar/lucene-core-3.0.2.jar  

diff --git a/docs/reference/src/main/docbook/en-US/content/connectors/infinispan.xml b/docs/reference/src/main/docbook/en-US/content/connectors/infinispan.xml
@@ -250,7 +250,6 @@ JcrConfiguration config = new JcrConfiguration().loadFrom("/configRepository.xml
       <listitem><para>modeshape-common</para></listitem>
       <listitem><para>modeshape-graph</para></listitem>
       <listitem><para>modeshape-connector-infinispan</para></listitem>
-      <listitem><para>google-collections</para></listitem>
       <listitem><para>joda-time</para></listitem>
     </itemizedlist>
     Only these libraries contain the classes that are used to store content within Infinispan.

diff --git a/docs/reference/src/main/docbook/en-US/content/jcr/configuration.xml b/docs/reference/src/main/docbook/en-US/content/jcr/configuration.xml
@@ -1180,7 +1180,6 @@ deploy/modeshape-jboss-beans.xml
 deploy/modeshape-services.jar/
 deploy/modeshape-services.jar/META-INF/
 deploy/modeshape-services.jar/aperture-1.1.0.Beta1.jar 
-deploy/modeshape-services.jar/google-collections-1.0.jar  
 deploy/modeshape-services.jar/joda-time-1.6.jar  
 deploy/modeshape-services.jar/lucene-analyzers-3.0.2.jar  
 deploy/modeshape-services.jar/lucene-core-3.0.2.jar  

diff --git a/docs/reference/src/main/docbook/en-US/content/jcr/web_access.xml b/docs/reference/src/main/docbook/en-US/content/jcr/web_access.xml
@@ -416,7 +416,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 	|	+ log4j.properties (Optional)
 	+ /lib
 	|	+ aperture-1.1.0.Beta1.jar
-	|	+ google-collections-1.0.jar
 	|	+ hamcrest-core-1.1.jar
 	|	+ jakarta-regexp-1.4.jar
 	|	+ jcr-2.0.jar
@@ -1075,7 +1074,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 	|	+ activation-1.1.jar
 	|	+ commons-codec-1.2.jar
 	|	+ commons-httpclient-3.1.jar
-	|	+ google-collections-1.0.jar
 	|	+ hamcrest-core-1.1.jar
 	|	+ httpclient-4.0.jar
 	|	+ httpcore-4.0.1.jar

diff --git a/extensions/modeshape-connector-store-jpa/pom.xml b/extensions/modeshape-connector-store-jpa/pom.xml
@@ -46,10 +46,6 @@
       <artifactId>hsqldb</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.collections</groupId>
-      <artifactId>google-collections</artifactId>
-    </dependency>
     <!-- 
     Testing (note the scope)
     -->

diff --git a/.../src/main/java/org/modeshape/connector/store/jpa/model/simple/SimpleRequestProcessor.java b/.../src/main/java/org/modeshape/connector/store/jpa/model/simple/SimpleRequestProcessor.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import org.modeshape.common.collection.LinkedListMultimap;
 import org.modeshape.connector.store.jpa.JpaConnectorI18n;
 import org.modeshape.connector.store.jpa.JpaSource;
 import org.modeshape.graph.ExecutionContext;
@@ -20,7 +21,6 @@
 import org.modeshape.graph.request.InvalidRequestException;
 import org.modeshape.graph.request.ReadBranchRequest;
 import org.modeshape.graph.request.processor.RequestProcessor;
-import com.google.common.collect.LinkedListMultimap;
 
 /**
  * Extension of the {@link MapRequestProcessor} that provides a {@link #process(ReadBranchRequest)} implementation optimized for

diff --git a/extensions/modeshape-search-lucene/pom.xml b/extensions/modeshape-search-lucene/pom.xml
@@ -53,10 +53,6 @@
       <artifactId>lucene-misc</artifactId>
       <version>3.0.2</version>
     </dependency>
-      <dependency>
-         <groupId>com.google.collections</groupId>
-         <artifactId>google-collections</artifactId>
-      </dependency>
     <!-- 
     Testing (note the scope)
     -->

diff --git a/...ape-search-lucene/src/test/java/org/modeshape/search/lucene/LuceneConfigurationsTest.java b/...ape-search-lucene/src/test/java/org/modeshape/search/lucene/LuceneConfigurationsTest.java
@@ -39,8 +39,8 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
+import org.modeshape.common.collection.HashMultimap;
+import org.modeshape.common.collection.Multimap;
 
 public class LuceneConfigurationsTest {
 

diff --git a/...s/modeshape-sequencer-teiid/src/main/java/org/modeshape/sequencer/teiid/CndFromEcore.java b/...s/modeshape-sequencer-teiid/src/main/java/org/modeshape/sequencer/teiid/CndFromEcore.java
@@ -28,6 +28,8 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import org.modeshape.common.collection.ArrayListMultimap;
+import org.modeshape.common.collection.Multimap;
 import org.modeshape.common.collection.Problems;
 import org.modeshape.common.collection.SimpleProblems;
 import org.modeshape.common.i18n.I18n;
@@ -43,8 +45,6 @@
 import org.modeshape.graph.property.basic.LocalNamespaceRegistry;
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
 
 /**
  * Utility class to generate a CND file from an ECore model.

diff --git a/...eshape-sequencer-teiid/src/main/java/org/modeshape/sequencer/teiid/ReferenceResolver.java b/...eshape-sequencer-teiid/src/main/java/org/modeshape/sequencer/teiid/ReferenceResolver.java
@@ -28,6 +28,8 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.UUID;
+import org.modeshape.common.collection.ArrayListMultimap;
+import org.modeshape.common.collection.Multimap;
 import org.modeshape.common.text.Jsr283Encoder;
 import org.modeshape.common.text.TextEncoder;
 import org.modeshape.graph.ExecutionContext;
@@ -40,8 +42,6 @@
 import org.modeshape.graph.property.ValueFactories;
 import org.modeshape.graph.property.ValueFactory;
 import org.modeshape.graph.property.ValueFormatException;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
 
 /**
  * 

diff --git a/...modeshape-sequencer-teiid/src/main/java/org/modeshape/sequencer/teiid/XmiModelReader.java b/...modeshape-sequencer-teiid/src/main/java/org/modeshape/sequencer/teiid/XmiModelReader.java
@@ -33,6 +33,8 @@
 import java.util.Set;
 import java.util.UUID;
 import org.modeshape.common.annotation.NotThreadSafe;
+import org.modeshape.common.collection.ArrayListMultimap;
+import org.modeshape.common.collection.Multimap;
 import org.modeshape.common.text.Jsr283Encoder;
 import org.modeshape.common.text.TextEncoder;
 import org.modeshape.graph.JcrLexicon;
@@ -58,8 +60,6 @@
 import org.modeshape.sequencer.teiid.lexicon.VdbLexicon;
 import org.modeshape.sequencer.teiid.lexicon.XmiLexicon;
 import org.modeshape.sequencer.teiid.lexicon.XsiLexicon;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
 
 /**
  *