Skip to content

refactor: remove redundant logic to replace database in property keys #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
venikkin merged 3 commits into from
Jan 8, 2024
Merged

refactor: remove redundant logic to replace database in property keys #50

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff560db
refactor: remove redundant logic to replace database in property keys
venikkin Jan 4, 2024
6c47985
Merge remote-tracking branch 'origin/main' into remove-dbname-prop-su…
venikkin Jan 5, 2024
9aba7b3
Merge branch 'main' into remove-dbname-prop-suffix
venikkin Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 5 additions & 21 deletions sink/src/main/kotlin/org/neo4j/connectors/kafka/sink/utils/Topics.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package org.neo4j.connectors.kafka.sink.utils

import java.util.Locale
import kotlin.reflect.jvm.javaType
import org.neo4j.connectors.kafka.service.TopicType
import org.neo4j.connectors.kafka.service.TopicTypeGroup
Expand Down Expand Up @@ -68,27 +67,12 @@ data class Topics(
TopicType.PATTERN_RELATIONSHIP to relPatternTopics)

companion object {
fun from(
originalConfig: Map<String, Any?>,
dbName: String = "",
invalidTopics: List<String> = emptyList()
): Topics {
val config =
originalConfig
.filterKeys {
if (dbName.isNotBlank()) it.lowercase(Locale.ROOT).endsWith(".to.$dbName")
else !it.contains(".to.")
}
.mapKeys {
if (dbName.isNotBlank()) it.key.replace(".to.$dbName", "", true) else it.key
}
fun from(config: Map<String, Any?>, invalidTopics: List<String> = emptyList()): Topics {
val cypherTopics = TopicUtils.filterByPrefix(config, SinkConfiguration.CYPHER_TOPIC_PREFIX)
val mergeNodeProperties =
originalConfig[SinkConfiguration.PATTERN_NODE_MERGE_PROPERTIES].toString().toBoolean()
config[SinkConfiguration.PATTERN_NODE_MERGE_PROPERTIES].toString().toBoolean()
val mergeRelProperties =
originalConfig[SinkConfiguration.PATTERN_RELATIONSHIP_MERGE_PROPERTIES]
.toString()
.toBoolean()
config[SinkConfiguration.PATTERN_RELATIONSHIP_MERGE_PROPERTIES].toString().toBoolean()
val nodePatternTopics =
TopicUtils.filterByPrefix(
config, SinkConfiguration.PATTERN_NODE_TOPIC_PREFIX, invalidTopics)
Expand All @@ -110,12 +94,12 @@ data class Topics(
TopicUtils.splitTopics(config[SinkConfiguration.CUD_TOPICS] as? String, invalidTopics)
val sourceIdStrategyConfig =
SourceIdIngestionStrategyConfig(
originalConfig
config
.getOrDefault(
SinkConfiguration.CDC_SOURCE_ID_LABEL_NAME,
SourceIdIngestionStrategyConfig.DEFAULT.labelName)
.toString(),
originalConfig
config
.getOrDefault(
SinkConfiguration.CDC_SOURCE_ID_ID_NAME,
SourceIdIngestionStrategyConfig.DEFAULT.idName)
Expand Down