Fix checkstyle and compilation after rebase.

neo4j · May 22, 2018 · 7961280 · 7961280
1 parent 52b78ed
commit 7961280
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DelegatingTokenHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DelegatingTokenHolder.java
@@ -19,11 +19,13 @@
  */
 package org.neo4j.kernel.impl.core;
 
+import org.eclipse.collections.api.set.primitive.IntSet;
+import org.eclipse.collections.api.set.primitive.MutableIntSet;
+import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet;
+
 import java.util.List;
 import java.util.function.IntPredicate;
 
-import org.neo4j.collection.primitive.Primitive;
-import org.neo4j.collection.primitive.PrimitiveIntSet;
 import org.neo4j.graphdb.TransactionFailureException;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.kernel.api.exceptions.ReadOnlyDbException;
@@ -162,25 +164,22 @@ private synchronized void createMissingTokens( String[] names, int[] ids )
     {
         // We redo the resolving under the lock, to make sure that these ids are really missing, and won't be
         // created concurrently with us.
-        PrimitiveIntSet unresolvedIndexes = Primitive.intSet();
+        MutableIntSet unresolvedIndexes = new IntHashSet();
         resolveIds( names, ids, i -> !unresolvedIndexes.add( i ) );
         if ( !unresolvedIndexes.isEmpty() )
         {
             // We still have unresolved ids to create.
             createUnresolvedTokens( unresolvedIndexes, names, ids );
-            unresolvedIndexes.visitKeys( i ->
-            {
-                tokenCache.put( tokenFactory.newToken( names[i], ids[i] ) );
-                return false;
-            } );
+            unresolvedIndexes.forEach( i ->
+                    tokenCache.put( tokenFactory.newToken( names[i], ids[i] ) ) );
         }
     }
 
-    private void createUnresolvedTokens( PrimitiveIntSet unresolvedIndexes, String[] names, int[] ids )
+    private void createUnresolvedTokens( IntSet unresolvedIndexes, String[] names, int[] ids )
     {
         try
         {
-            tokenCreator.createTokens( names, ids, unresolvedIndexes );
+            tokenCreator.createTokens( names, ids, unresolvedIndexes::contains );
         }
         catch ( ReadOnlyDbException e )
         {

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/KernelToken.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/KernelToken.java
@@ -58,7 +58,6 @@ public int labelGetOrCreateForName( String labelName ) throws IllegalTokenNameEx
         return store.labelGetOrCreateForName( labelName );
     }
 
-
     @Override
     public void labelGetOrCreateForNames( String[] labelNames, int[] labelIds )
             throws IllegalTokenNameException, TooManyLabelsException