Merge branch '3.5' of github.com:neo4j-contrib/neo4j-streams into 3.5

Author: mneedham

consumer/src/test/kotlin/integrations/kafka/KafkaEventSinkNoTopicAutocreationIT.kt

@@ -67,7 +67,7 @@ class KafkaEventSinkNoTopicAutoCreationIT {
     fun `should consume only the registered topic`() {
         // given
         val topic = "shouldWriteCypherQuery"
-        val client = AdminClient.create(mapOf("bootstrap.servers" to "localhost:" + kafka.firstMappedPort))
+        val client = AdminClient.create(mapOf("bootstrap.servers" to kafka.bootstrapServers.substring("PLAINTEXT://".length)))
         val expectedTopics = listOf(topic)
         client.createTopics(expectedTopics.map { NewTopic(it, 1, 1) })
                 .all()

producer/src/test/kotlin/streams/integrations/KafkaEventRouterNoTopicAutocreationIT.kt

@@ -52,7 +52,7 @@ class KafkaEventRouterNoTopicAutocreationIT {
             Assume.assumeTrue("Kafka container has to exist", exists)
             Assume.assumeTrue("Kafka must be running", kafka.isRunning)
 
-            val client = AdminClient.create(mapOf("bootstrap.servers" to "localhost:" + kafka.firstMappedPort))
+            val client = AdminClient.create(mapOf("bootstrap.servers" to kafka.bootstrapServers.substring("PLAINTEXT://".length)))
             val topicsToCreate = listOf("person")
             client.createTopics(topicsToCreate.map { NewTopic(it, 1, 1) })
                     .all()