Changed to java.util.function.Function

neo4j · Dec 5, 2015 · ddeada0 · ddeada0
1 parent a63a880
commit ddeada0
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java b/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java
@@ -24,6 +24,8 @@
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.util.SelfSignedCertificate;
 
+import java.util.function.Function;
+
 import org.neo4j.bolt.transport.BoltProtocol;
 import org.neo4j.bolt.transport.NettyServer;
 import org.neo4j.bolt.transport.SocketTransport;
@@ -33,7 +35,6 @@
 import org.neo4j.bolt.v1.runtime.internal.concurrent.ThreadedSessions;
 import org.neo4j.bolt.v1.transport.BoltProtocolV1;
 import org.neo4j.collection.primitive.PrimitiveLongObjectMap;
-import org.neo4j.function.Function;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.config.Setting;
 import org.neo4j.graphdb.factory.Description;

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/SocketTransport.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/SocketTransport.java
@@ -25,8 +25,9 @@
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.ssl.SslContext;
 
+import java.util.function.Function;
+
 import org.neo4j.collection.primitive.PrimitiveLongObjectMap;
-import org.neo4j.function.Function;
 import org.neo4j.helpers.HostnamePort;
 import org.neo4j.logging.LogProvider;
 

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/SocketTransportHandler.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/SocketTransportHandler.java
@@ -26,9 +26,9 @@
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.function.Function;
 
 import org.neo4j.collection.primitive.PrimitiveLongObjectMap;
-import org.neo4j.function.Function;
 import org.neo4j.logging.Log;
 import org.neo4j.logging.LogProvider;
 

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/WebSocketTransport.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/WebSocketTransport.java
@@ -28,8 +28,9 @@
 import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
 import io.netty.handler.ssl.SslContext;
 
+import java.util.function.Function;
+
 import org.neo4j.collection.primitive.PrimitiveLongObjectMap;
-import org.neo4j.function.Function;
 import org.neo4j.helpers.HostnamePort;
 import org.neo4j.logging.LogProvider;
 

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/ProtocolChooserTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/ProtocolChooserTest.java
@@ -23,10 +23,11 @@
 import io.netty.channel.Channel;
 import org.junit.Test;
 
+import java.util.function.Function;
+
 import org.neo4j.bolt.transport.BoltProtocol;
 import org.neo4j.collection.primitive.Primitive;
 import org.neo4j.collection.primitive.PrimitiveLongObjectMap;
-import org.neo4j.function.Function;
 
 import static io.netty.buffer.Unpooled.wrappedBuffer;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -162,4 +163,4 @@ public void shouldFallBackToNoneProtocolIfNoMatch() throws Throwable
         assertThat( outcome, equalTo( NO_APPLICABLE_PROTOCOL ) );
         assertThat( chooser.chosenProtocol(), nullValue() );
     }
-}
+}
diff --git a/...ity/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/SocketTransportHandlerTest.java b/...ity/bolt/src/test/java/org/neo4j/bolt/v1/transport/socket/SocketTransportHandlerTest.java
@@ -25,12 +25,13 @@
 import io.netty.channel.ChannelHandlerContext;
 import org.junit.Test;
 
+import java.util.function.Function;
+
 import org.neo4j.bolt.transport.BoltProtocol;
 import org.neo4j.bolt.transport.SocketTransportHandler;
 import org.neo4j.bolt.v1.runtime.Session;
 import org.neo4j.bolt.v1.transport.BoltProtocolV1;
 import org.neo4j.collection.primitive.PrimitiveLongObjectMap;
-import org.neo4j.function.Function;
 import org.neo4j.kernel.impl.logging.NullLogService;
 import org.neo4j.logging.AssertableLogProvider;
 import org.neo4j.logging.NullLogProvider;