Skip to content

Commit 01d766a

Browse files
authored
fixes #296: Fix Java 8 support (#297)
1 parent ab94d23 commit 01d766a

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ object JSONUtils {
8585

8686
init {
8787
val module = SimpleModule("Neo4jKafkaSerializer")
88-
StreamsUtils.ignoreExceptions({ module.addSerializer(Point::class.java, PointSerializer()) }, NoClassDefFoundError::class.java) // in case is loaded from
89-
StreamsUtils.ignoreExceptions({ module.addSerializer(PointValue::class.java, PointValueSerializer()) }, NoClassDefFoundError::class.java) // in case is loaded from
88+
StreamsUtils.ignoreExceptions({ module.addSerializer(Point::class.java, PointSerializer()) }, NoClassDefFoundError::class.java, UnsupportedClassVersionError::class.java) // in case is loaded from
89+
StreamsUtils.ignoreExceptions({ module.addSerializer(PointValue::class.java, PointValueSerializer()) }, NoClassDefFoundError::class.java, UnsupportedClassVersionError::class.java) // in case is loaded from
9090
module.addSerializer(TemporalAccessor::class.java, TemporalAccessorSerializer())
9191
OBJECT_MAPPER.registerModule(module)
9292
OBJECT_MAPPER.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)

kafka-connect-neo4j/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@
6262
<groupId>org.neo4j.driver</groupId>
6363
<artifactId>neo4j-java-driver</artifactId>
6464
</dependency>
65-
66-
<dependency>
67-
<groupId>org.neo4j</groupId>
68-
<artifactId>neo4j-values</artifactId>
69-
<version>${neo4j.version}</version>
70-
</dependency>
7165
</dependencies>
7266

7367
<build>

kafka-connect-neo4j/src/main/kotlin/streams/kafka/connect/sink/Neo4jSinkConnectorConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class Neo4jSinkConnectorConfig(originals: Map<*, *>): AbstractConfig(config(), o
220220
.importance(ConfigDef.Importance.HIGH)
221221
.defaultValue("bolt://localhost:7687")
222222
.group(ConfigGroup.CONNECTION)
223-
.validator(Validators.validURI("bolt", "bolt+routing"))
223+
.validator(Validators.validURI("bolt", "bolt+routing", "neo4j"))
224224
.build())
225225
.define(ConfigKeyBuilder
226226
.of(CONNECTION_POOL_MAX_SIZE, ConfigDef.Type.INT)

kafka-connect-neo4j/src/test/kotlin/streams/kafka/connect/sink/Neo4jSinkTaskTest.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ import org.apache.kafka.connect.data.Timestamp
77
import org.apache.kafka.connect.sink.SinkRecord
88
import org.apache.kafka.connect.sink.SinkTask
99
import org.apache.kafka.connect.sink.SinkTaskContext
10-
import org.junit.After
11-
import org.junit.Before
12-
import org.junit.Ignore
1310
import org.junit.Rule
1411
import org.junit.Test
1512
import org.mockito.Mockito.mock
@@ -24,7 +21,8 @@ import streams.service.sink.strategy.CUDNode
2421
import streams.service.sink.strategy.CUDNodeRel
2522
import streams.service.sink.strategy.CUDOperations
2623
import streams.service.sink.strategy.CUDRelationship
27-
import java.util.*
24+
import java.util.Date
25+
import java.util.UUID
2826
import java.util.stream.Collectors
2927
import java.util.stream.StreamSupport
3028
import kotlin.test.assertEquals

0 commit comments

Comments
 (0)