Removed the Tuple module, replaced tuples with lists.

rapidoid · Oct 12, 2015 · 8ca9ac9 · 8ca9ac9
1 parent a978b5d
commit 8ca9ac9
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 113 deletions.
diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,6 @@
 	<modules>
 		<module>rapidoid-annotations</module>
 		<module>rapidoid-u</module>
-		<module>rapidoid-tuple</module>
 		<module>rapidoid-config</module>
 		<module>rapidoid-lambda</module>
 		<module>rapidoid-concurrent</module>

diff --git a/rapidoid-ctx/pom.xml b/rapidoid-ctx/pom.xml
@@ -27,11 +27,6 @@
 			<artifactId>rapidoid-log</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.rapidoid</groupId>
-			<artifactId>rapidoid-tuple</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.rapidoid</groupId>
 			<artifactId>rapidoid-test-commons</artifactId>

diff --git a/rapidoid-ctx/src/main/java/org/rapidoid/ctx/Classes.java b/rapidoid-ctx/src/main/java/org/rapidoid/ctx/Classes.java
@@ -28,15 +28,15 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.tuple.Tuple;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.1.0")
 public class Classes extends LinkedHashMap<String, Class<?>> {
 
 	private static final long serialVersionUID = 8987037790459772014L;
 
-	private final Map<Tuple, List<Class<?>>> cache = Collections.synchronizedMap(new HashMap<Tuple, List<Class<?>>>());
+	private final Map<List<?>, List<Class<?>>> cache = Collections
+			.synchronizedMap(new HashMap<List<?>, List<Class<?>>>());
 
 	public static Classes from(Iterable<Class<?>> classes) {
 		Classes clss = new Classes();
@@ -48,7 +48,7 @@ public static Classes from(Iterable<Class<?>> classes) {
 		return clss;
 	}
 
-	public Map<Tuple, List<Class<?>>> getCache() {
+	public Map<List<?>, List<Class<?>>> getCache() {
 		return cache;
 	}
 

diff --git a/rapidoid-http/src/main/java/org/rapidoid/webapp/Scan.java b/rapidoid-http/src/main/java/org/rapidoid/webapp/Scan.java
@@ -13,7 +13,6 @@
 import org.rapidoid.lambda.Predicate;
 import org.rapidoid.log.Log;
 import org.rapidoid.scan.ClasspathUtil;
-import org.rapidoid.tuple.Tuple;
 import org.rapidoid.util.U;
 
 /*
@@ -76,13 +75,13 @@ private static synchronized List<Class<?>> scanClasses(String packageName, Strin
 
 		packageName = U.or(packageName, "");
 
-		Tuple cacheKey = null;
+		List<?> cacheKey = null;
 
 		WebApp app = Ctxs.ctx().app();
 		Classes appClasses = app.getClasses();
-		Map<Tuple, List<Class<?>>> cache = appClasses.getCache();
+		Map<List<?>, List<Class<?>>> cache = appClasses.getCache();
 
-		cacheKey = new Tuple(packageName, nameRegex, filter, annotated, classLoader);
+		cacheKey = U.list(packageName, nameRegex, filter, annotated, classLoader);
 		List<Class<?>> cachedClasses = cache.get(cacheKey);
 		if (cachedClasses != null) {
 			return cachedClasses;

diff --git a/rapidoid-scan/pom.xml b/rapidoid-scan/pom.xml
@@ -37,11 +37,6 @@
 			<artifactId>rapidoid-lambda</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.rapidoid</groupId>
-			<artifactId>rapidoid-tuple</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.rapidoid</groupId>
 			<artifactId>rapidoid-test-commons</artifactId>

diff --git a/rapidoid-tuple/pom.xml b/rapidoid-tuple/pom.xml
diff --git a/rapidoid-tuple/src/main/java/org/rapidoid/tuple/Tuple.java b/rapidoid-tuple/src/main/java/org/rapidoid/tuple/Tuple.java
diff --git a/rapidoid-x-inmem/src/main/java/org/rapidoidx/inmem/InMem.java b/rapidoid-x-inmem/src/main/java/org/rapidoidx/inmem/InMem.java
@@ -62,7 +62,6 @@
 import org.rapidoid.lambda.Predicate;
 import org.rapidoid.log.Log;
 import org.rapidoid.security.Secure;
-import org.rapidoid.tuple.Tuple;
 import org.rapidoid.util.OptimisticConcurrencyControlException;
 import org.rapidoid.util.SuccessException;
 import org.rapidoid.util.U;
@@ -366,7 +365,7 @@ private RelPair getRelPair(Object entity, Prop prop, String rel, boolean inverse
 		Class<?> srcType = inverse ? cls : entCls;
 		Class<?> destType = inverse ? entCls : cls;
 
-		Tuple key = new Tuple(rel, srcType, destType);
+		List<?> key = U.list(rel, srcType, destType);
 		RelPair relPair = data.relPairs.get(key);
 
 		Prop srcProp, destProp;

diff --git a/rapidoid-x-inmem/src/main/java/org/rapidoidx/inmem/InMemData.java b/rapidoid-x-inmem/src/main/java/org/rapidoidx/inmem/InMemData.java
@@ -22,6 +22,7 @@
  */
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ConcurrentMap;
@@ -35,7 +36,6 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.beany.PropertySelector;
 import org.rapidoid.concurrent.Callback;
-import org.rapidoid.tuple.Tuple;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
@@ -53,7 +53,7 @@ public class InMemData implements Serializable {
 
 	final PropertySelector relPropSelector;
 
-	final ConcurrentMap<Tuple, RelPair> relPairs = new ConcurrentHashMap<Tuple, RelPair>();
+	final ConcurrentMap<List<?>, RelPair> relPairs = new ConcurrentHashMap<List<?>, RelPair>();
 
 	final AtomicLong ids = new AtomicLong();