Better generics and removed unused field

neo4j · Sep 4, 2017 · 8eb8f7a · 8eb8f7a
1 parent 57ed5b0
commit 8eb8f7a
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/...el/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexPopulator.java b/...el/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndexPopulator.java
@@ -60,8 +60,7 @@ public abstract class NativeSchemaNumberIndexPopulator<KEY extends SchemaNumberK
     private final KEY treeKey;
     private final VALUE treeValue;
     private final ConflictDetectingValueMerger<KEY,VALUE> conflictDetectingValueMerger;
-    private final NativeSchemaNumberIndexUpdater<KEY,VALUE> singleUpdater;
+    private WorkSync<IndexUpdateApply<KEY,VALUE>,IndexUpdateWork<KEY,VALUE>> workSync;
-    private WorkSync<IndexUpdateApply,IndexUpdateWork> workSync;
 
     private Writer<KEY,VALUE> singleTreeWriter;
     private byte[] failureBytes;
@@ -73,7 +72,6 @@ public abstract class NativeSchemaNumberIndexPopulator<KEY extends SchemaNumberK
         this.treeKey = layout.newKey();
         this.treeValue = layout.newValue();
         this.conflictDetectingValueMerger = new ConflictDetectingValueMerger<>();
-        singleUpdater = new NativeSchemaNumberIndexUpdater<>( layout.newKey(), layout.newValue() );
     }
 
     @Override
@@ -185,7 +183,7 @@ private void applyWithWorkSync( Collection<? extends IndexEntryUpdate<?>> update
     {
         try
         {
-            workSync.apply( new IndexUpdateWork( updates ) );
+            workSync.apply( new IndexUpdateWork<>( updates ) );
         }
         catch ( ExecutionException e )
         {
@@ -264,7 +262,8 @@ public void process( IndexEntryUpdate indexEntryUpdate ) throws Exception
         }
     }
 
-    private static class IndexUpdateWork implements Work<IndexUpdateApply,IndexUpdateWork>
+    private static class IndexUpdateWork<KEY extends SchemaNumberKey, VALUE extends SchemaNumberValue>
+            implements Work<IndexUpdateApply<KEY,VALUE>,IndexUpdateWork<KEY,VALUE>>
     {
         private final Collection<? extends IndexEntryUpdate<?>> updates;
 
@@ -274,15 +273,15 @@ private static class IndexUpdateWork implements Work<IndexUpdateApply,IndexUpdat
         }
 
         @Override
-        public IndexUpdateWork combine( IndexUpdateWork work )
+        public IndexUpdateWork<KEY,VALUE> combine( IndexUpdateWork<KEY,VALUE> work )
         {
             ArrayList<IndexEntryUpdate<?>> combined = new ArrayList<>( updates );
             combined.addAll( work.updates );
-            return new IndexUpdateWork( combined );
+            return new IndexUpdateWork<>( combined );
         }
 
         @Override
-        public void apply( IndexUpdateApply indexUpdateApply ) throws Exception
+        public void apply( IndexUpdateApply<KEY,VALUE> indexUpdateApply ) throws Exception
         {
             for ( IndexEntryUpdate<?> indexEntryUpdate : updates )
             {