fixes #191: The latest version of plugin fails to start polling messages (#194)

Author: conker84

common/src/main/kotlin/streams/utils/Neo4jUtils.kt

@@ -41,12 +41,10 @@ object Neo4jUtils {
                 .resolveDependency(LogService::class.java)
     }
 
-    fun isEnterpriseEdition(db: GraphDatabaseAPI): Boolean {
+    fun isCluster(db: GraphDatabaseAPI): Boolean {
         try {
-            return db.execute("""
-                CALL dbms.components() YIELD edition
-                RETURN edition = "enterprise" AS isEnterprise
-            """.trimIndent()).columnAs<Boolean>("isEnterprise").next()
+            db.execute("CALL dbms.cluster.role()").columnAs<String>("role").next()
+            return true
         } catch (e: QueryExecutionException) {
             if (e.statusCode.equals("Neo.ClientError.Procedure.ProcedureNotFound", ignoreCase = true)) {
                 return false

common/src/test/kotlin/streams/utils/Neo4jUtilsTest.kt

@@ -1,7 +1,6 @@
 package streams.utils
 
 import org.junit.*
-import org.neo4j.kernel.impl.logging.LogService
 import org.neo4j.kernel.internal.GraphDatabaseAPI
 import org.neo4j.test.TestGraphDatabaseFactory
 import kotlin.test.assertFalse
@@ -33,8 +32,8 @@ class Neo4jUtilsTest {
     }
 
     @Test
-    fun shouldCheckIfIsEnterpriseEdition() {
-        val isEnterprise = Neo4jUtils.isEnterpriseEdition(db)
+    fun shouldCheckIfIsACluster() {
+        val isEnterprise = Neo4jUtils.isCluster(db)
         assertFalse { isEnterprise }
     }
 

consumer/src/main/kotlin/streams/StreamsEventSinkExtensionFactory.kt

@@ -60,8 +60,8 @@ class StreamsEventSinkExtensionFactory : KernelExtensionFactory<StreamsEventSink
                                         log,
                                         db)
                         // start the Sink
-                        if (Neo4jUtils.isEnterpriseEdition(db)) {
-                            log.info("The Sink module is running in an enterprise edition, checking for the ${Neo4jUtils.LEADER}")
+                        if (Neo4jUtils.isCluster(db)) {
+                            log.info("The Sink module is running in a cluster, checking for the ${Neo4jUtils.LEADER}")
                             Neo4jUtils.executeInLeader(db, log) { initSinkModule() }
                         } else {
                             // check if is writeable instance