Update 3.5 branch (#131)

conker84 · jexp · commit 28526622bf5d · 2019-01-16T12:49:01.000+01:00
* 3.5.0

* updated pom to v 3.5.0

* implemented required changes to make the module compatible with v 3.5
diff --git a/common/pom.xml b/common/pom.xml
@@ -8,13 +8,13 @@
     <artifactId>neo4j-streams-common</artifactId>
     <name>Neo4j Streams - Common</name>
     <description>Neo4j Streams - Commons Package</description>
-    <version>3.4.0</version>
+    <version>3.5.0</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-streams-parent</artifactId>
-        <version>3.4.0</version>
+        <version>3.5.0</version>
     </parent>
 
 </project>
diff --git a/common/src/main/kotlin/streams/utils/Neo4jUtils.kt b/common/src/main/kotlin/streams/utils/Neo4jUtils.kt
@@ -1,8 +1,8 @@
 package streams.utils
 
 import org.neo4j.graphdb.QueryExecutionException
-import org.neo4j.kernel.impl.logging.LogService
 import org.neo4j.kernel.internal.GraphDatabaseAPI
+import org.neo4j.logging.internal.LogService
 import java.lang.reflect.InvocationTargetException
 
 object Neo4jUtils {
diff --git a/common/src/test/kotlin/streams/utils/Neo4jUtilsTest.kt b/common/src/test/kotlin/streams/utils/Neo4jUtilsTest.kt
@@ -1,7 +1,8 @@
 package streams.utils
 
-import org.junit.*
-import org.neo4j.kernel.impl.logging.LogService
+import org.junit.AfterClass
+import org.junit.BeforeClass
+import org.junit.Test
 import org.neo4j.kernel.internal.GraphDatabaseAPI
 import org.neo4j.test.TestGraphDatabaseFactory
 import kotlin.test.assertTrue
diff --git a/consumer/pom.xml b/consumer/pom.xml
@@ -6,22 +6,22 @@
 
     <groupId>org.neo4j</groupId>
     <artifactId>neo4j-streams-consumer</artifactId>
-    <version>3.4.0</version>
+    <version>3.5.0</version>
     <name>Neo4j Streams - Consumer</name>
     <description>Neo4j Streams - Kafka Consumer</description>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-streams-parent</artifactId>
-        <version>3.4.0</version>
+        <version>3.5.0</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-streams-common</artifactId>
-            <version>3.4.0</version>
+            <version>3.5.0</version>
         </dependency>
     </dependencies>
 
diff --git a/consumer/src/main/kotlin/streams/StreamsEventSinkExtensionFactory.kt b/consumer/src/main/kotlin/streams/StreamsEventSinkExtensionFactory.kt
@@ -1,18 +1,20 @@
 package streams
 
-import org.neo4j.kernel.AvailabilityGuard
+import org.neo4j.kernel.availability.AvailabilityGuard
+import org.neo4j.kernel.availability.AvailabilityListener
 import org.neo4j.kernel.configuration.Config
+import org.neo4j.kernel.extension.ExtensionType
 import org.neo4j.kernel.extension.KernelExtensionFactory
-import org.neo4j.kernel.impl.logging.LogService
 import org.neo4j.kernel.impl.spi.KernelContext
 import org.neo4j.kernel.internal.GraphDatabaseAPI
 import org.neo4j.kernel.lifecycle.Lifecycle
 import org.neo4j.kernel.lifecycle.LifecycleAdapter
+import org.neo4j.logging.internal.LogService
 import streams.procedures.StreamsSinkProcedures
 import streams.utils.Neo4jUtils
 import streams.utils.StreamsUtils
 
-class StreamsEventSinkExtensionFactory : KernelExtensionFactory<StreamsEventSinkExtensionFactory.Dependencies>("Streams.Consumer") {
+class StreamsEventSinkExtensionFactory : KernelExtensionFactory<StreamsEventSinkExtensionFactory.Dependencies>(ExtensionType.DATABASE,"Streams.Consumer") {
 
     override fun newInstance(context: KernelContext, dependencies: Dependencies): Lifecycle {
         return StreamsEventLifecycle(dependencies)
@@ -35,7 +37,7 @@ class StreamsEventSinkExtensionFactory : KernelExtensionFactory<StreamsEventSink
 
         override fun start() {
             try {
-                dependencies.availabilityGuard().addListener(object: AvailabilityGuard.AvailabilityListener {
+                dependencies.availabilityGuard().addListener(object: AvailabilityListener {
                     override fun unavailable() {}
 
                     override fun available() {
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-streams-parent</artifactId>
-        <version>3.4.0</version>
+        <version>3.5.0</version>
     </parent>
 
     <!-- Include here all the required dependencies of the final package -->
diff --git a/doc/pom.xml b/doc/pom.xml
@@ -6,14 +6,14 @@
 
     <groupId>org.neo4j</groupId>
     <artifactId>neo4j-streams-docs</artifactId>
-    <version>3.4.0</version>
+    <version>3.5.0</version>
     <name>Neo4j Streams - Docs</name>
     <description>Neo4j Streams - Documentation</description>
 
     <parent>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-streams-parent</artifactId>
-        <version>3.4.0</version>
+        <version>3.5.0</version>
     </parent>
 
     <properties>
diff --git a/kafka-connect-neo4j/pom.xml b/kafka-connect-neo4j/pom.xml
@@ -29,8 +29,8 @@
         <kotlin.coroutines.version>1.0.0</kotlin.coroutines.version>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
         <easymock.version>4.0.1</easymock.version>
-        <neo4j.version>3.4.7</neo4j.version>
-        <neo4j.streams.version>3.4.0</neo4j.streams.version>
+        <neo4j.version>3.5.0</neo4j.version>
+        <neo4j.streams.version>3.5.0</neo4j.streams.version>
     </properties>
 
     <organization>
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.neo4j</groupId>
     <artifactId>neo4j-streams-parent</artifactId>
-    <version>3.4.0</version>
+    <version>3.5.0</version>
     <packaging>pom</packaging>
     <name>Neo4j Streams - Parent</name>
     <description>Neo4j Integration for streaming platforms</description>
@@ -35,7 +35,7 @@
         <java.version>1.8</java.version>
         <kotlin.version>1.3.0</kotlin.version>
         <kotlin.coroutines.version>1.0.0</kotlin.coroutines.version>
-        <neo4j.version>3.4.10</neo4j.version>
+        <neo4j.version>3.5.0</neo4j.version>
         <kafka.version>1.0.1</kafka.version>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
     </properties>
@@ -114,6 +114,12 @@
             <version>${neo4j.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.neo4j.community</groupId>
+            <artifactId>it-test-support</artifactId>
+            <version>${neo4j.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>server-api</artifactId>
diff --git a/producer/pom.xml b/producer/pom.xml
@@ -6,22 +6,22 @@
 
     <groupId>org.neo4j</groupId>
     <artifactId>neo4j-streams-producer</artifactId>
-    <version>3.4.0</version>
+    <version>3.5.0</version>
     <name>Neo4j Streams - Producer</name>
     <description>Neo4j Streams - Kafka Producer</description>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-streams-parent</artifactId>
-        <version>3.4.0</version>
+        <version>3.5.0</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-streams-common</artifactId>
-            <version>3.4.0</version>
+            <version>3.5.0</version>
         </dependency>
     </dependencies>
 
diff --git a/producer/src/main/kotlin/streams/StreamsEventRouter.kt b/producer/src/main/kotlin/streams/StreamsEventRouter.kt
@@ -1,7 +1,7 @@
 package streams
 
 import org.neo4j.kernel.configuration.Config
-import org.neo4j.kernel.impl.logging.LogService
+import org.neo4j.logging.internal.LogService
 import streams.events.StreamsEvent
 
 
diff --git a/producer/src/main/kotlin/streams/StreamsExtensionFactory.kt b/producer/src/main/kotlin/streams/StreamsExtensionFactory.kt
@@ -1,15 +1,16 @@
 package streams
 
 import org.neo4j.kernel.configuration.Config
+import org.neo4j.kernel.extension.ExtensionType
 import org.neo4j.kernel.extension.KernelExtensionFactory
-import org.neo4j.kernel.impl.logging.LogService
 import org.neo4j.kernel.impl.spi.KernelContext
 import org.neo4j.kernel.internal.GraphDatabaseAPI
 import org.neo4j.kernel.lifecycle.Lifecycle
 import org.neo4j.kernel.lifecycle.LifecycleAdapter
+import org.neo4j.logging.internal.LogService
 import streams.procedures.StreamsProcedures
 
-class StreamsExtensionFactory : KernelExtensionFactory<StreamsExtensionFactory.Dependencies>("Streams.Producer") {
+class StreamsExtensionFactory : KernelExtensionFactory<StreamsExtensionFactory.Dependencies>(ExtensionType.DATABASE,"Streams.Producer") {
     override fun newInstance(context: KernelContext, dependencies: Dependencies): Lifecycle {
         val db = dependencies.graphdatabaseAPI()
         val log = dependencies.log()
diff --git a/producer/src/main/kotlin/streams/kafka/KafkaEventRouter.kt b/producer/src/main/kotlin/streams/kafka/KafkaEventRouter.kt
@@ -9,8 +9,8 @@ import org.apache.kafka.common.errors.AuthorizationException
 import org.apache.kafka.common.errors.OutOfOrderSequenceException
 import org.apache.kafka.common.errors.ProducerFencedException
 import org.neo4j.kernel.configuration.Config
-import org.neo4j.kernel.impl.logging.LogService
 import org.neo4j.logging.Log
+import org.neo4j.logging.internal.LogService
 import streams.StreamsEventRouter
 import streams.events.StreamsEvent
 import streams.events.StreamsTransactionEvent
diff --git a/producer/src/test/kotlin/streams/mocks/MockGraphDatabaseAPI.kt b/producer/src/test/kotlin/streams/mocks/MockGraphDatabaseAPI.kt
@@ -9,22 +9,24 @@ import org.neo4j.graphdb.traversal.BidirectionalTraversalDescription
 import org.neo4j.graphdb.traversal.TraversalDescription
 import org.neo4j.internal.kernel.api.Transaction
 import org.neo4j.internal.kernel.api.security.LoginContext
-import org.neo4j.kernel.AvailabilityGuard
+import org.neo4j.io.layout.DatabaseLayout
 import org.neo4j.kernel.configuration.Config
 import org.neo4j.kernel.impl.coreapi.InternalTransaction
-import org.neo4j.kernel.impl.logging.LogService
-import org.neo4j.kernel.impl.logging.NullLogService
-import org.neo4j.kernel.impl.store.StoreId
 import org.neo4j.kernel.internal.GraphDatabaseAPI
-import org.neo4j.logging.NullLog
+import org.neo4j.logging.internal.LogService
+import org.neo4j.logging.internal.NullLogService
+import org.neo4j.storageengine.api.StoreId
 import streams.*
 import java.io.File
-import java.lang.IllegalArgumentException
 import java.net.URL
 import java.util.concurrent.TimeUnit
 import java.util.function.Supplier
 
 class MockGraphDatabaseAPI(private val dependencyResolver: MockDependencyResolver = MockDependencyResolver()) : GraphDatabaseAPI {
+    override fun databaseLayout(): DatabaseLayout {
+        TODO("not implemented")
+    }
+
     override fun createNode(): Node {
         TODO("not implemented")
     }
@@ -85,10 +87,6 @@ class MockGraphDatabaseAPI(private val dependencyResolver: MockDependencyResolve
         TODO("not implemented")
     }
 
-    override fun getStoreDir(): File {
-        TODO("not implemented")
-    }
-
     override fun getAllRelationships(): ResourceIterable<Relationship> {
         TODO("not implemented")
     }
diff --git a/producer/src/test/kotlin/streams/mocks/MockStreamsEventRouter.kt b/producer/src/test/kotlin/streams/mocks/MockStreamsEventRouter.kt
@@ -1,7 +1,7 @@
 package streams.mocks
 
 import org.neo4j.kernel.configuration.Config
-import org.neo4j.kernel.impl.logging.LogService
+import org.neo4j.logging.internal.LogService
 import streams.StreamsEventRouter
 import streams.events.StreamsEvent
 import streams.events.StreamsTransactionEvent
