Skip to content

Commit 2f52b30

Browse files
authored
Update versions.json to support Neo4j 4.2 (#438)
1 parent 8ccd59e commit 2f52b30

File tree

5 files changed

+126
-153
lines changed

5 files changed

+126
-153
lines changed

consumer/src/main/kotlin/streams/procedures/QueueBasedSpliterator.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package streams.procedures
22

33
import org.neo4j.graphdb.NotInTransactionException
4-
import org.neo4j.graphdb.TransactionGuardException
54
import org.neo4j.graphdb.TransactionTerminatedException
65
import org.neo4j.procedure.TerminationGuard
76
import java.util.Spliterator
@@ -37,7 +36,7 @@ class QueueBasedSpliterator<T> constructor(private val queue: BlockingQueue<T>,
3736
false
3837
} catch (e: Exception) {
3938
when (e) {
40-
is TransactionGuardException, is TransactionTerminatedException, is NotInTransactionException -> true
39+
is TransactionTerminatedException, is NotInTransactionException -> true
4140
else -> throw e
4241
}
4342
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.junit.Test
1212
import org.neo4j.function.ThrowingSupplier
1313
import org.neo4j.test.rule.ImpermanentDbmsRule
1414
import org.testcontainers.containers.KafkaContainer
15+
import org.testcontainers.containers.Network
1516
import streams.KafkaTestUtils
1617
import streams.extensions.execute
1718
import streams.setConfig
@@ -47,6 +48,7 @@ class KafkaEventSinkNoTopicAutoCreationIT {
4748
var exists = false
4849
StreamsUtils.ignoreExceptions({
4950
kafka = KafkaContainer(confluentPlatformVersion)
51+
.withNetwork(Network.newNetwork())
5052
kafka.withEnv("KAFKA_AUTO_CREATE_TOPICS_ENABLE", "false")
5153
kafka.start()
5254
exists = true

0 commit comments

Comments
 (0)