Remove custom IntFunction

community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java

@@ -28,7 +28,6 @@
 
 import org.neo4j.collection.primitive.PrimitiveIntIterator;
 import org.neo4j.cursor.Cursor;
-import org.neo4j.function.IntFunction;
 import org.neo4j.graphdb.ConstraintViolationException;
 import org.neo4j.graphdb.Direction;
 import org.neo4j.graphdb.GraphDatabaseService;
@@ -64,7 +63,6 @@
 import org.neo4j.kernel.impl.traversal.OldTraverserWrapper;
 
 import static java.lang.String.format;
-
 import static org.neo4j.collection.primitive.PrimitiveIntCollections.map;
 import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.helpers.collection.IteratorUtil.asList;
@@ -78,7 +76,7 @@ public class NodeProxy
     public interface NodeActions
     {
         Statement statement();
-        
+
         GraphDatabaseService getGraphDatabase();
 
         void assertInUnterminatedTransaction();
@@ -141,29 +139,24 @@ public ResourceIterable<Relationship> getRelationships()
     public ResourceIterable<Relationship> getRelationships( final Direction dir )
     {
         assertInUnterminatedTransaction();
-        return new ResourceIterable<Relationship>()
-        {
-            @Override
-            public ResourceIterator<Relationship> iterator()
+        return () -> {
+            Statement statement = actions.statement();
+            try
             {
-                Statement statement = actions.statement();
-                try
-                {
-                    RelationshipConversion result = new RelationshipConversion( actions );
-                    result.iterator = statement.readOperations().nodeGetRelationships( nodeId, dir );
-                    result.statement = statement;
-                    return result;
-                }
-                catch ( EntityNotFoundException e )
-                {
-                    statement.close();
-                    throw new NotFoundException( format( "Node %d not found", nodeId ), e );
-                }
-                catch ( Throwable e )
-                {
-                    statement.close();
-                    throw e;
-                }
+                RelationshipConversion result = new RelationshipConversion( actions );
+                result.iterator = statement.readOperations().nodeGetRelationships( nodeId, dir );
+                result.statement = statement;
+                return result;
+            }
+            catch ( EntityNotFoundException e )
+            {
+                statement.close();
+                throw new NotFoundException( format( "Node %d not found", nodeId ), e );
+            }
+            catch ( Throwable e )
+            {
+                statement.close();
+                throw e;
             }
         };
     }
@@ -804,20 +797,15 @@ private int[] relTypeIds( RelationshipType[] types, Statement statement )
 
     private Iterable<RelationshipType> map2relTypes( final Statement statement, PrimitiveIntIterator input )
     {
-        return asList( map( new IntFunction<RelationshipType>()
-        {
-            @Override
-            public RelationshipType apply( int id )
+        return asList( map( id -> {
+            try
             {
-                try
-                {
-                    return RelationshipType.withName( statement.readOperations().relationshipTypeGetName( id ) );
-                }
-                catch ( RelationshipTypeIdNotFoundKernelException e )
-                {
-                    throw new ThisShouldNotHappenError( "Jake",
-                            "Kernel API returned non-existent relationship type: " + id );
-                }
+                return RelationshipType.withName( statement.readOperations().relationshipTypeGetName( id ) );
+            }
+            catch ( RelationshipTypeIdNotFoundKernelException e )
+            {
+                throw new ThisShouldNotHappenError( "Jake",
+                        "Kernel API returned non-existent relationship type: " + id );
             }
         }, input ) );
     }

community/primitive-collections/src/main/java/org/neo4j/collection/primitive/PrimitiveIntCollections.java

@@ -22,6 +22,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
+import java.util.function.IntFunction;
 import java.util.function.IntPredicate;
 
 import org.neo4j.collection.primitive.base.Empty;
@@ -704,8 +705,7 @@ protected boolean fetchNext()
         };
     }
 
-    public static <T> Iterator<T> map( final org.neo4j.function.IntFunction<T> mapFunction,
-            final PrimitiveIntIterator source )
+    public static <T> Iterator<T> map( final IntFunction<T> mapFunction, final PrimitiveIntIterator source )
     {
         return new Iterator<T>()
         {

enterprise/ha/src/main/java/org/neo4j/kernel/impl/ha/ClusterManager.java

@@ -40,6 +40,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.function.IntFunction;
 import java.util.function.Predicate;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -56,8 +57,6 @@
 import org.neo4j.cluster.member.ClusterMemberEvents;
 import org.neo4j.cluster.member.ClusterMemberListener;
 import org.neo4j.cluster.protocol.election.NotElectableElectionCredentialsProvider;
-import org.neo4j.function.Function;
-import org.neo4j.function.IntFunction;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.TransactionFailureException;
 import org.neo4j.graphdb.config.Setting;
@@ -141,14 +140,7 @@ public interface RepairKit
 
     public static IntFunction<String> constant( final String value )
     {
-        return new IntFunction<String>()
-        {
-            @Override
-            public String apply( int ignored )
-            {
-                return value;
-            }
-        };
+        return ignored -> value;
     }
 
     private final File root;
@@ -186,15 +178,10 @@ private Map<String,IntFunction<String>> withDefaults( Map<String,IntFunction<Str
      */
     public static Provider fromXml( final URI clustersXml )
     {
-        return new Provider()
-        {
-            @Override
-            public Clusters clusters() throws Exception
-            {
-                DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-                Document clustersXmlDoc = documentBuilder.parse( clustersXml.toURL().openStream() );
-                return new ClustersXMLSerializer( documentBuilder ).read( clustersXmlDoc );
-            }
+        return () -> {
+            DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+            Document clustersXmlDoc = documentBuilder.parse( clustersXml.toURL().openStream() );
+            return new ClustersXMLSerializer( documentBuilder ).read( clustersXmlDoc );
         };
     }
 
@@ -264,14 +251,7 @@ public static Provider clusterWithAdditionalArbiters( int haMemberCount, int arb
 
     public static Provider provided( final Clusters clusters )
     {
-        return new Provider()
-        {
-            @Override
-            public Clusters clusters() throws Throwable
-            {
-                return clusters;
-            }
-        };
+        return () -> clusters;
     }
 
     /**
@@ -334,16 +314,9 @@ public static Predicate<ManagedCluster> masterAvailable( final HighlyAvailableGr
             public boolean test( ManagedCluster cluster )
             {
                 Predicate<HighlyAvailableGraphDatabase> filterMasterPredicate =
-                        new Predicate<HighlyAvailableGraphDatabase>()
-                        {
-                            @Override
-                            public boolean test( HighlyAvailableGraphDatabase node )
-                            {
-                                return !excludedNodes.contains( node ) &&
-                                       node.isAvailable( 0 ) &&
-                                       node.isMaster();
-                            }
-                        };
+                        node -> !excludedNodes.contains( node ) &&
+                               node.isAvailable( 0 ) &&
+                               node.isMaster();
                 return Iterables.filter( filterMasterPredicate, cluster.getAllMembers() ).iterator().hasNext();
             }
 
@@ -661,14 +634,7 @@ public Builder withRootDirectory( File root )
         @Override
         public Builder withSeedDir( final File seedDir )
         {
-            return withStoreDirInitializer( new StoreDirInitializer()
-            {
-                @Override
-                public void initializeStoreDir( int serverId, File storeDir ) throws IOException
-                {
-                    copyRecursively( seedDir, storeDir );
-                }
-            } );
+            return withStoreDirInitializer( ( serverId, storeDir ) -> copyRecursively( seedDir, storeDir ) );
         }
 
         @Override
@@ -737,7 +703,7 @@ private static final class HighlyAvailableGraphDatabaseProxy
 
         public HighlyAvailableGraphDatabaseProxy( final GraphDatabaseBuilder graphDatabaseBuilder )
         {
-            Callable<GraphDatabaseService> starter = () -> graphDatabaseBuilder.newGraphDatabase();
+            Callable<GraphDatabaseService> starter = graphDatabaseBuilder::newGraphDatabase;
             executor = Executors.newFixedThreadPool( 1 );
             untilThen = executor.submit( starter );
         }
@@ -897,13 +863,8 @@ public void stop() throws Throwable
          */
         public Iterable<HighlyAvailableGraphDatabase> getAllMembers()
         {
-            return Iterables.map( new Function<HighlyAvailableGraphDatabaseProxy,HighlyAvailableGraphDatabase>()
-            {
-                @Override
-                public HighlyAvailableGraphDatabase apply( HighlyAvailableGraphDatabaseProxy from )
-                {
-                    return from.get();
-                }
+            return Iterables.map( from -> {
+                return from.get();
             }, members.values() );
         }
 

enterprise/ha/src/test/java/org/neo4j/ha/BackupHaIT.java

@@ -29,7 +29,6 @@
 import java.util.List;
 
 import org.neo4j.backup.OnlineBackupSettings;
-import org.neo4j.function.IntFunction;
 import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster;
 import org.neo4j.test.DbRepresentation;
@@ -38,7 +37,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
-
 import static org.neo4j.backup.BackupEmbeddedIT.createSomeData;
 import static org.neo4j.backup.BackupEmbeddedIT.runBackupToolFromOtherJvmToGetExitCode;
 
@@ -47,14 +45,7 @@ public class BackupHaIT
     @ClassRule
     public static ClusterRule clusterRule = new ClusterRule( BackupHaIT.class )
             .withSharedSetting( OnlineBackupSettings.online_backup_enabled, Settings.TRUE )
-            .withInstanceSetting( OnlineBackupSettings.online_backup_server, new IntFunction<String>()
-            {
-                @Override
-                public String apply( int serverId )
-                {
-                    return (":" + (4444 + serverId));
-                }
-            } );
+            .withInstanceSetting( OnlineBackupSettings.online_backup_server, serverId -> (":" + (4444 + serverId)) );
     @Rule
     public final SuppressOutput suppressOutput = SuppressOutput.suppressAll();
 

enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java

@@ -28,12 +28,12 @@
 import java.net.URI;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.function.IntFunction;
 
 import org.neo4j.cluster.ClusterSettings;
 import org.neo4j.cluster.InstanceId;
 import org.neo4j.cluster.client.ClusterClient;
 import org.neo4j.cluster.protocol.cluster.ClusterListener;
-import org.neo4j.function.IntFunction;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.NotFoundException;
@@ -51,11 +51,9 @@
 import org.neo4j.shell.ShellSettings;
 import org.neo4j.test.TargetDirectory;
 
+import static java.lang.System.currentTimeMillis;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-
-import static java.lang.System.currentTimeMillis;
-
 import static org.neo4j.kernel.impl.ha.ClusterManager.allSeesAllAsAvailable;
 import static org.neo4j.kernel.impl.ha.ClusterManager.clusterOfSize;
 import static org.neo4j.kernel.impl.ha.ClusterManager.masterAvailable;
@@ -131,15 +129,9 @@ public void pullUpdatesShellAppPullsUpdates() throws Throwable
                     HaSettings.tx_push_factor.name(), "0" ,
                     ShellSettings.remote_shell_enabled.name(), "true" ) )
                 .withInstanceConfig( MapUtil.<String,IntFunction<String>>genericMap(
-                    ShellSettings.remote_shell_port.name(), new IntFunction<String>()
-                    {
-                        @Override
-                        public String apply( int oneBasedServerId )
-                        {
-                            return oneBasedServerId >= 1 && oneBasedServerId <= 2 ?
-                                    "" + (SHELL_PORT + oneBasedServerId) : null;
-                        }
-                    } ) ).build();
+                    ShellSettings.remote_shell_port.name(),
+                        (IntFunction<String>) oneBasedServerId -> oneBasedServerId >= 1 && oneBasedServerId <= 2 ?
+                                "" + (SHELL_PORT + oneBasedServerId) : null ) ).build();
         clusterManager.start();
         cluster = clusterManager.getDefaultCluster();