From 4c75dfd937d00bfb9cbacc146c1909cc2af60348 Mon Sep 17 00:00:00 2001
From: leventov <leventov@ya.ru>
Date: Sat, 26 Sep 2015 20:51:08 +0300
Subject: [PATCH] Remove unused type parameter in ReplicatedMapEntryStages
 class

---
 .../chronicle/map/ReplicatedChronicleMap.java | 38 +++++++++----------
 .../stage/entry/ReplicatedMapEntryStages.java |  2 +-
 .../map/impl/stage/input/ReplicatedInput.java |  2 +-
 ...icatedMapAbsentDelegatingForIteration.java |  2 +-
 .../iter/ReplicatedMapEntryDelegating.java    |  2 +-
 .../iter/ReplicatedMapSegmentIteration.java   |  2 +-
 .../impl/stage/query/ReplicatedMapAbsent.java |  2 +-
 .../impl/stage/query/ReplicatedMapQuery.java  |  4 +-
 .../stage/replication/ReplicationUpdate.java  |  2 +-
 9 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
index 958966d01..84a502b45 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -115,8 +115,8 @@ public class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? sup
     public long cleanupTimeout;
     
     public transient MapRemoteOperations<K, V, R> remoteOperations;
-    transient CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R, ?> remoteOpContext;
-    transient CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R, ?> remoteItContext;
+    transient CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R> remoteOpContext;
+    transient CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R> remoteItContext;
 
     transient BitSetFrame mainSegmentsModIterFrameForUpdates;
     transient BitSetFrame mainSegmentsModIterFrameForIteration;
@@ -143,9 +143,9 @@ public class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? sup
     @Override
     void initQueryContext() {
         queryCxt = new ThreadLocal<
-                CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R, ?>>() {
+                CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R>>() {
             @Override
-            protected CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R, ?>
+            protected CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R>
             initialValue() {
                 return new CompiledReplicatedMapQueryContext<>(ReplicatedChronicleMap.this);
             }
@@ -155,9 +155,9 @@ public class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? sup
     @Override
     void initIterationContext() {
         iterCxt = new ThreadLocal<
-                CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R, ?>>() {
+                CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R>>() {
             @Override
-            protected CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R, ?>
+            protected CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R>
             initialValue() {
                 return new CompiledReplicatedMapIterationContext<>(ReplicatedChronicleMap.this);
             }
@@ -472,14 +472,14 @@ public class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? sup
         }
     }
     
-    private CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R, ?> q() {
+    private CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R> q() {
         //noinspection unchecked
-        return (CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R, ?>) queryCxt.get();
+        return (CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R>) queryCxt.get();
     }
 
     @Override
-    public CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R, ?> mapContext() {
-        CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R, ?> q = q().getContext();
+    public CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R> mapContext() {
+        CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R> q = q().getContext();
         q.initUsed(true);
         return q;
     }
@@ -488,7 +488,7 @@ public class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? sup
      * Assumed to be called from a single thread - the replication thread. Not to waste time
      * for going into replication thread's threadLocal map, cache the context in Map's field
      */
-    private CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R, ?> remoteOpContext() {
+    private CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R> remoteOpContext() {
         if (remoteOpContext == null) {
             remoteOpContext = q();
         }
@@ -497,7 +497,7 @@ public class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? sup
         return remoteOpContext;
     }
 
-    private CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R, ?> remoteItContext() {
+    private CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R> remoteItContext() {
         if (remoteItContext == null) {
             remoteItContext = i();
         }
@@ -512,20 +512,20 @@ public class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? sup
      */
     @Override
     public void readExternalEntry(@NotNull Bytes source) {
-        try (CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R, ?> remoteOpContext =
+        try (CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R> remoteOpContext =
                      mapContext()) {
             remoteOpContext.initReplicationInput(source);
             remoteOpContext.processReplicatedEvent();
         }
     }
 
-    private CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R, ?> i() {
+    private CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R> i() {
         //noinspection unchecked
-        return (CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R, ?>) iterCxt.get();
+        return (CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R>) iterCxt.get();
     }
 
-    public CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R, ?> iterationContext() {
-        CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R, ?> c = i().getContext();
+    public CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R> iterationContext() {
+        CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R> c = i().getContext();
         c.initUsed(true);
         return c;
     }
@@ -742,7 +742,7 @@ public class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? sup
                 this.position = position;
                 int tierIndexMinusOne = (int) (position >>> segmentIndexShift);
 
-                try (CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R, ?> context =
+                try (CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R> context =
                         iterationContext()) {
                     if (iterationMainSegmentsAreaOrTierBulk < 0) {
                         // if main area
@@ -827,7 +827,7 @@ public class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? sup
 
         @Override
         public void dirtyEntries(long fromTimeStamp) {
-            try (CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R, ?> c =
+            try (CompiledReplicatedMapIterationContext<K, KI, MKI, V, VI, MVI, R> c =
                          iterationContext()) {
                 // iterate over all the segments and mark bit in the modification iterator
                 // that correspond to entries with an older timestamp
diff --git a/src/main/java/net/openhft/chronicle/map/impl/stage/entry/ReplicatedMapEntryStages.java b/src/main/java/net/openhft/chronicle/map/impl/stage/entry/ReplicatedMapEntryStages.java
index ed4c1b2e1..9301b68f8 100644
--- a/src/main/java/net/openhft/chronicle/map/impl/stage/entry/ReplicatedMapEntryStages.java
+++ b/src/main/java/net/openhft/chronicle/map/impl/stage/entry/ReplicatedMapEntryStages.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
 import static net.openhft.chronicle.map.ReplicatedChronicleMap.ADDITIONAL_ENTRY_BYTES;
 
 @Staged
-public abstract class ReplicatedMapEntryStages<K, V, T> extends MapEntryStages<K, V>
+public abstract class ReplicatedMapEntryStages<K, V> extends MapEntryStages<K, V>
         implements MapReplicableEntry<K, V>, MapAbsentEntry<K, V> {
     
     @StageRef ReplicatedChronicleMapHolder<?, ?, ?, ?, ?, ?, ?> mh;
diff --git a/src/main/java/net/openhft/chronicle/map/impl/stage/input/ReplicatedInput.java b/src/main/java/net/openhft/chronicle/map/impl/stage/input/ReplicatedInput.java
index 23d9e467c..c40d56f0b 100644
--- a/src/main/java/net/openhft/chronicle/map/impl/stage/input/ReplicatedInput.java
+++ b/src/main/java/net/openhft/chronicle/map/impl/stage/input/ReplicatedInput.java
@@ -48,7 +48,7 @@ public abstract class ReplicatedInput<K, V, R>
     @StageRef KeySearch<?> ks;
     @StageRef ReplicatedMapQuery<K, V, ?> q;
     @StageRef SegmentStages s;
-    @StageRef ReplicatedMapEntryStages<K, V, ?> e;
+    @StageRef ReplicatedMapEntryStages<K, V> e;
     @StageRef DummyValueZeroData<V> dummyValue;
 
     @Override
diff --git a/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapAbsentDelegatingForIteration.java b/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapAbsentDelegatingForIteration.java
index e9279c273..9666a4802 100644
--- a/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapAbsentDelegatingForIteration.java
+++ b/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapAbsentDelegatingForIteration.java
@@ -31,7 +31,7 @@ public class ReplicatedMapAbsentDelegatingForIteration<K, V>
         implements MapAbsentEntry<K, V>, ReplicableEntryDelegating {
 
     @StageRef ReplicatedMapSegmentIteration<K, V, ?> delegate;
-    @StageRef ReplicatedMapEntryStages<K, V, ?> e;
+    @StageRef ReplicatedMapEntryStages<K, V> e;
 
     @NotNull
     @Override
diff --git a/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapEntryDelegating.java b/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapEntryDelegating.java
index 6454a7bb0..c9e3daede 100644
--- a/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapEntryDelegating.java
+++ b/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapEntryDelegating.java
@@ -31,7 +31,7 @@ public class  ReplicatedMapEntryDelegating<K, V>
         implements MapEntry<K, V>, ReplicableEntryDelegating {
 
     @StageRef ReplicatedMapSegmentIteration<K, V, ?> delegate;
-    @StageRef ReplicatedMapEntryStages<K, V, ?> e;
+    @StageRef ReplicatedMapEntryStages<K, V> e;
 
     @NotNull
     @Override
diff --git a/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapSegmentIteration.java b/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapSegmentIteration.java
index 1b9c45ce2..2ba7836a8 100644
--- a/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapSegmentIteration.java
+++ b/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapSegmentIteration.java
@@ -39,7 +39,7 @@ public abstract class ReplicatedMapSegmentIteration<K, V, R> extends MapSegmentI
         ReplicatedHashSegmentContext<K, MapEntry<K, V>>, MapAbsentEntry<K, V> {
 
     @StageRef VanillaChronicleHashHolder<?, ?, ?> hh;
-    @StageRef ReplicatedMapEntryStages<K, V, ?> e;
+    @StageRef ReplicatedMapEntryStages<K, V> e;
     @StageRef ReplicationUpdate<K> ru;
     @StageRef DummyValueZeroData<V> dummyValue;
     @StageRef ReplicatedMapAbsentDelegatingForIteration<K, V> absentEntryDelegating;
diff --git a/src/main/java/net/openhft/chronicle/map/impl/stage/query/ReplicatedMapAbsent.java b/src/main/java/net/openhft/chronicle/map/impl/stage/query/ReplicatedMapAbsent.java
index 0686eb16e..a9a6ecfe1 100644
--- a/src/main/java/net/openhft/chronicle/map/impl/stage/query/ReplicatedMapAbsent.java
+++ b/src/main/java/net/openhft/chronicle/map/impl/stage/query/ReplicatedMapAbsent.java
@@ -29,7 +29,7 @@ import static net.openhft.chronicle.hash.impl.stage.query.KeySearch.SearchState.
 public abstract class ReplicatedMapAbsent<K, V> extends MapAbsent<K, V> {
 
     @StageRef MapQuery<K, V, ?> q;
-    @StageRef ReplicatedMapEntryStages<K, V, ?> e;
+    @StageRef ReplicatedMapEntryStages<K, V> e;
     @StageRef ReplicationUpdate<K> ru;
 
     @Override
diff --git a/src/main/java/net/openhft/chronicle/map/impl/stage/query/ReplicatedMapQuery.java b/src/main/java/net/openhft/chronicle/map/impl/stage/query/ReplicatedMapQuery.java
index 524c70eab..03a954889 100644
--- a/src/main/java/net/openhft/chronicle/map/impl/stage/query/ReplicatedMapQuery.java
+++ b/src/main/java/net/openhft/chronicle/map/impl/stage/query/ReplicatedMapQuery.java
@@ -29,13 +29,11 @@ import net.openhft.sg.StageRef;
 import net.openhft.sg.Staged;
 import org.jetbrains.annotations.Nullable;
 
-import static net.openhft.chronicle.hash.impl.stage.query.KeySearch.SearchState.DELETED;
-
 @Staged
 public abstract class ReplicatedMapQuery<K, V, R> extends MapQuery<K, V, R>
         implements MapRemoteQueryContext<K, V, R>, ReplicableEntry {
 
-    @StageRef ReplicatedMapEntryStages<K, V, ?> e;
+    @StageRef ReplicatedMapEntryStages<K, V> e;
     @StageRef ReplicationUpdate ru;
 
     @StageRef BytesReturnValue<V> bytesReturnValue;
diff --git a/src/main/java/net/openhft/chronicle/map/impl/stage/replication/ReplicationUpdate.java b/src/main/java/net/openhft/chronicle/map/impl/stage/replication/ReplicationUpdate.java
index 10ee3d47d..2c998a539 100644
--- a/src/main/java/net/openhft/chronicle/map/impl/stage/replication/ReplicationUpdate.java
+++ b/src/main/java/net/openhft/chronicle/map/impl/stage/replication/ReplicationUpdate.java
@@ -28,7 +28,7 @@ import net.openhft.sg.Staged;
 @Staged
 public abstract class ReplicationUpdate<K> implements RemoteOperationContext<K> {
     @StageRef SegmentStages s;
-    @StageRef ReplicatedMapEntryStages<K, ?, ?> e;
+    @StageRef ReplicatedMapEntryStages<K, ?> e;
     @StageRef ReplicatedChronicleMapHolder<?, ?, ?, ?, ?, ?, ?> mh;
     @StageRef CheckOnEachPublicOperation checkOnEachPublicOperation;