Move cache implementations to internal package (open-telemetry#4746)

* Move cache implementations to internal package * Fix import * Fix import order
RashmiRam · May 23, 2022 · d1cf603 · d1cf603
1 parent dc3649b
commit d1cf603
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 27 deletions.
diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/Cache.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/Cache.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.api.cache;
 
-import io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
+import io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import java.util.function.Function;
 import javax.annotation.Nullable;
 

diff --git a/...ation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/WeakLockFreeCache.java b/...ation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/WeakLockFreeCache.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.api.cache;
 
-import io.opentelemetry.instrumentation.api.cache.weaklockfree.WeakConcurrentMap;
+import io.opentelemetry.instrumentation.api.cache.internal.weaklockfree.WeakConcurrentMap;
 import java.util.function.Function;
 
 final class WeakLockFreeCache<K, V> implements Cache<K, V> {

diff --git a/...inkedhashmap/ConcurrentLinkedHashMap.java → ...inkedhashmap/ConcurrentLinkedHashMap.java b/...inkedhashmap/ConcurrentLinkedHashMap.java → ...inkedhashmap/ConcurrentLinkedHashMap.java
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap;
+package io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap;
 
-import static io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap.ConcurrentLinkedHashMap.DrainStatus.IDLE;
-import static io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap.ConcurrentLinkedHashMap.DrainStatus.PROCESSING;
-import static io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap.ConcurrentLinkedHashMap.DrainStatus.REQUIRED;
+import static io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.ConcurrentLinkedHashMap.DrainStatus.IDLE;
+import static io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.ConcurrentLinkedHashMap.DrainStatus.PROCESSING;
+import static io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.ConcurrentLinkedHashMap.DrainStatus.REQUIRED;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableMap;
 import static java.util.Collections.unmodifiableSet;

diff --git a/...concurrentlinkedhashmap/EntryWeigher.java → ...concurrentlinkedhashmap/EntryWeigher.java b/...concurrentlinkedhashmap/EntryWeigher.java → ...concurrentlinkedhashmap/EntryWeigher.java
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap;
+package io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap;
 
 import javax.annotation.concurrent.ThreadSafe;
 

diff --git a/...urrentlinkedhashmap/EvictionListener.java → ...urrentlinkedhashmap/EvictionListener.java b/...urrentlinkedhashmap/EvictionListener.java → ...urrentlinkedhashmap/EvictionListener.java
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap;
+package io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap;
 
 import javax.annotation.concurrent.ThreadSafe;
 

diff --git a/.../concurrentlinkedhashmap/LinkedDeque.java → .../concurrentlinkedhashmap/LinkedDeque.java b/.../concurrentlinkedhashmap/LinkedDeque.java → .../concurrentlinkedhashmap/LinkedDeque.java
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap;
+package io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap;
 
 import java.util.AbstractCollection;
 import java.util.Collection;

diff --git a/...ache/concurrentlinkedhashmap/Weigher.java → ...rnal/concurrentlinkedhashmap/Weigher.java b/...ache/concurrentlinkedhashmap/Weigher.java → ...rnal/concurrentlinkedhashmap/Weigher.java
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap;
+package io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap;
 
 import javax.annotation.concurrent.ThreadSafe;
 

diff --git a/...che/concurrentlinkedhashmap/Weighers.java → ...nal/concurrentlinkedhashmap/Weighers.java b/...che/concurrentlinkedhashmap/Weighers.java → ...nal/concurrentlinkedhashmap/Weighers.java
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap;
+package io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap;
 
-import static io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap.ConcurrentLinkedHashMap.checkNotNull;
+import static io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.ConcurrentLinkedHashMap.checkNotNull;
 
 import java.io.Serializable;
 import java.util.Collection;

diff --git a/...concurrentlinkedhashmap/package-info.java → ...concurrentlinkedhashmap/package-info.java b/...concurrentlinkedhashmap/package-info.java → ...concurrentlinkedhashmap/package-info.java
@@ -30,24 +30,26 @@
  * This package contains an implementation of a bounded {@link java.util.concurrent.ConcurrentMap}
  * data structure.
  *
- * <p>{@link io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap.Weigher} is a simple
- * interface for determining how many units of capacity an entry consumes. Depending on which
- * concrete Weigher class is used, an entry may consume a different amount of space within the
- * cache. The {@link io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap.Weighers}
- * class provides utility methods for obtaining the most common kinds of implementations.
- *
- * <p>{@link io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap.EvictionListener}
+ * <p>{@link io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.Weigher} is
+ * a simple interface for determining how many units of capacity an entry consumes. Depending on
+ * which concrete Weigher class is used, an entry may consume a different amount of space within the
+ * cache. The {@link
+ * io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.Weighers} class
+ * provides utility methods for obtaining the most common kinds of implementations.
+ *
+ * <p>{@link
+ * io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.EvictionListener}
  * provides the ability to be notified when an entry is evicted from the map. An eviction occurs
  * when the entry was automatically removed due to the map exceeding a capacity threshold. It is not
  * called when an entry was explicitly removed.
  *
  * <p>The {@link
- * io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap.ConcurrentLinkedHashMap} class
- * supplies an efficient, scalable, thread-safe, bounded map. As with the <tt>Java Collections
+ * io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.ConcurrentLinkedHashMap}
+ * class supplies an efficient, scalable, thread-safe, bounded map. As with the <tt>Java Collections
  * Framework</tt> the "Concurrent" prefix is used to indicate that the map is not governed by a
  * single exclusion lock.
  *
  * @see <a href="http://code.google.com/p/concurrentlinkedhashmap/">
  *     http://code.google.com/p/concurrentlinkedhashmap/</a>
  */
-package io.opentelemetry.instrumentation.api.cache.concurrentlinkedhashmap;
+package io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap;
diff --git a/...aklockfree/AbstractWeakConcurrentMap.java → ...aklockfree/AbstractWeakConcurrentMap.java b/...aklockfree/AbstractWeakConcurrentMap.java → ...aklockfree/AbstractWeakConcurrentMap.java
@@ -23,7 +23,7 @@
 // Suppress warnings since this is vendored as-is.
 // CHECKSTYLE:OFF
 
-package io.opentelemetry.instrumentation.api.cache.weaklockfree;
+package io.opentelemetry.instrumentation.api.cache.internal.weaklockfree;
 
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
@@ -278,7 +278,7 @@ public String toString() {
    * The weak key invokes the latent key's equality method upon evaluation.
    */
 
-  public static final class WeakKey<K> extends WeakReference<K> {
+  static final class WeakKey<K> extends WeakReference<K> {
 
     private final int hashCode;
 

diff --git a/...cache/weaklockfree/WeakConcurrentMap.java → ...ernal/weaklockfree/WeakConcurrentMap.java b/...cache/weaklockfree/WeakConcurrentMap.java → ...ernal/weaklockfree/WeakConcurrentMap.java
@@ -23,7 +23,7 @@
 // Suppress warnings since this is vendored as-is.
 // CHECKSTYLE:OFF
 
-package io.opentelemetry.instrumentation.api.cache.weaklockfree;
+package io.opentelemetry.instrumentation.api.cache.internal.weaklockfree;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -115,7 +115,9 @@ public WeakConcurrentMap(boolean cleanerThread, boolean reuseKeys) {
    * @param target ConcurrentMap implementation that this class wraps.
    */
   public WeakConcurrentMap(
-      boolean cleanerThread, boolean reuseKeys, ConcurrentMap<WeakKey<K>, V> target) {
+      boolean cleanerThread,
+      boolean reuseKeys,
+      ConcurrentMap<AbstractWeakConcurrentMap.WeakKey<K>, V> target) {
     super(target);
     this.reuseKeys = reuseKeys;
     if (cleanerThread) {
@@ -180,7 +182,7 @@ public boolean equals(Object other) {
       if (other instanceof WeakConcurrentMap.LookupKey<?>) {
         return ((LookupKey<?>) other).key == key;
       } else {
-        return ((WeakKey<?>) other).get() == key;
+        return ((AbstractWeakConcurrentMap.WeakKey<?>) other).get() == key;
       }
     }