moved classes into org.bson.util so that they could be made package protected

jyemin · jyemin · commit 549115f6d5e5 · 2012-02-02T22:00:10.000-05:00
diff --git a/src/main/org/bson/util/AbstractCopyOnWriteMap.java b/src/main/org/bson/util/AbstractCopyOnWriteMap.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.bson.util.concurrent;
+package org.bson.util;
 
-import static org.bson.util.concurrent.Assertions.notNull;
+import static org.bson.util.Assertions.notNull;
 import static java.util.Collections.unmodifiableCollection;
 import static java.util.Collections.unmodifiableSet;
-import org.bson.util.concurrent.annotations.GuardedBy;
-import org.bson.util.concurrent.annotations.ThreadSafe;
+import org.bson.util.annotations.GuardedBy;
+import org.bson.util.annotations.ThreadSafe;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -42,7 +42,7 @@
  * navigable maps.
  */
 @ThreadSafe
-public abstract class AbstractCopyOnWriteMap<K, V, M extends Map<K, V>> implements ConcurrentMap<K, V>, Serializable {
+abstract class AbstractCopyOnWriteMap<K, V, M extends Map<K, V>> implements ConcurrentMap<K, V>, Serializable {
     private static final long serialVersionUID = 4508989182041753878L;
 
     @GuardedBy("lock")
diff --git a/src/main/org/bson/util/Assertions.java b/src/main/org/bson/util/Assertions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.bson.util.concurrent;
+package org.bson.util;
 
 /**
  * Design by contract assertions.
diff --git a/src/main/org/bson/util/ClassAncestry.java b/src/main/org/bson/util/ClassAncestry.java
@@ -1,7 +1,7 @@
 package org.bson.util;
 
 import static java.util.Collections.unmodifiableList;
-import static org.bson.util.concurrent.CopyOnWriteMap.newHashMap;
+import static org.bson.util.CopyOnWriteMap.newHashMap;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/org/bson/util/ClassMap.java b/src/main/org/bson/util/ClassMap.java
@@ -21,10 +21,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.bson.util.concurrent.ComputingMap;
-import org.bson.util.concurrent.CopyOnWriteMap;
-import org.bson.util.concurrent.Function;
-
 /**
  * Maps Class objects to values. A ClassMap is different from a regular Map in
  * that get(c) does not only look to see if 'c' is a key in the Map, but also
diff --git a/src/main/org/bson/util/ComputingMap.java b/src/main/org/bson/util/ComputingMap.java
@@ -1,13 +1,13 @@
-package org.bson.util.concurrent;
+package org.bson.util;
 
-import static org.bson.util.concurrent.Assertions.notNull;
+import static org.bson.util.Assertions.notNull;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 
-public final class ComputingMap<K, V> implements Map<K, V>, Function<K, V> {
+final class ComputingMap<K, V> implements Map<K, V>, Function<K, V> {
 
     public static <K, V> Map<K, V> create(Function<K, V> function) {
         return new ComputingMap<K, V>(CopyOnWriteMap.<K, V> newHashMap(), function);
diff --git a/src/main/org/bson/util/CopyOnWriteMap.java b/src/main/org/bson/util/CopyOnWriteMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.bson.util.concurrent;
+package org.bson.util;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -23,10 +23,10 @@
 import java.util.TreeMap;
 import java.util.WeakHashMap;
 
-import org.bson.util.concurrent.annotations.GuardedBy;
-import org.bson.util.concurrent.annotations.ThreadSafe;
+import org.bson.util.annotations.GuardedBy;
+import org.bson.util.annotations.ThreadSafe;
 
-import org.bson.util.concurrent.AbstractCopyOnWriteMap.View.Type;
+import org.bson.util.AbstractCopyOnWriteMap.View.Type;
 
 /**
  * A thread-safe variant of {@link Map} in which all mutative operations (the
@@ -56,7 +56,7 @@
  * underlying Map implementations
  * <p>
  * There are supplied implementations for the common j.u.c {@link Map}
- * implementations via the {@link CopyOnWriteMaps} static {@link Builder}.
+ * implementations via the {@link CopyOnWriteMap} static {@link Builder}.
  * <p>
  * Collection views of the keys, values and entries are optionally
  * {@link View.Type.LIVE live} or {@link View.Type.STABLE stable}. Live views
@@ -78,7 +78,7 @@
  * @author Jed Wesley-Smith
  */
 @ThreadSafe
-public abstract class CopyOnWriteMap<K, V> extends AbstractCopyOnWriteMap<K, V, Map<K, V>> {
+abstract class CopyOnWriteMap<K, V> extends AbstractCopyOnWriteMap<K, V, Map<K, V>> {
     private static final long serialVersionUID = 7935514534647505917L;
 
     /**
diff --git a/src/main/org/bson/util/Function.java b/src/main/org/bson/util/Function.java
@@ -0,0 +1,5 @@
+package org.bson.util;
+
+interface Function<A, B> {
+    B apply(A a);
+}
diff --git a/src/main/org/bson/util/annotations/GuardedBy.java b/src/main/org/bson/util/annotations/GuardedBy.java
@@ -8,7 +8,7 @@
  * must include this copyright and license notice.
  */
 
-package org.bson.util.concurrent.annotations;
+package org.bson.util.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/org/bson/util/annotations/Immutable.java b/src/main/org/bson/util/annotations/Immutable.java
@@ -1,6 +1,3 @@
-package org.bson.util.concurrent.annotations;
-import java.lang.annotation.*;
-
 /*
  * Copyright (c) 2005 Brian Goetz and Tim Peierls
  * Released under the Creative Commons Attribution License
@@ -11,6 +8,9 @@
  * must include this copyright and license notice.
  */
 
+package org.bson.util.annotations;
+
+import java.lang.annotation.*;
 
 /**
  * The class to which this annotation is applied is immutable.  This means that
diff --git a/src/main/org/bson/util/annotations/NotThreadSafe.java b/src/main/org/bson/util/annotations/NotThreadSafe.java
@@ -1,6 +1,3 @@
-package org.bson.util.concurrent.annotations;
-import java.lang.annotation.*;
-
 /*
  * Copyright (c) 2005 Brian Goetz and Tim Peierls
  * Released under the Creative Commons Attribution License
@@ -11,6 +8,10 @@
  * must include this copyright and license notice.
  */
 
+package org.bson.util.annotations;
+
+import java.lang.annotation.*;
+
 
 /**
  * The class to which this annotation is applied is not thread-safe.
diff --git a/src/main/org/bson/util/annotations/ThreadSafe.java b/src/main/org/bson/util/annotations/ThreadSafe.java
@@ -1,6 +1,3 @@
-package org.bson.util.concurrent.annotations;
-import java.lang.annotation.*;
-
 /*
  * Copyright (c) 2005 Brian Goetz and Tim Peierls
  * Released under the Creative Commons Attribution License
@@ -11,6 +8,9 @@
  * must include this copyright and license notice.
  */
 
+package org.bson.util.annotations;
+
+import java.lang.annotation.*;
 
 
 /**
diff --git a/src/main/org/bson/util/concurrent/Function.java b/src/main/org/bson/util/concurrent/Function.java
