Skip to content

Commit fbe9056

Browse files
authored
chore: remove legacy (#151)
1 parent 00b1856 commit fbe9056

File tree

111 files changed

+317
-13910
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+317
-13910
lines changed

common/src/main/kotlin/org/neo4j/connectors/kafka/configuration/DeprecatedNeo4jConfiguration.kt

Lines changed: 0 additions & 252 deletions
This file was deleted.

common/src/main/kotlin/org/neo4j/connectors/kafka/configuration/Neo4jConfiguration.kt

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ open class Neo4jConfiguration(configDef: ConfigDef, originals: Map<*, *>, val ty
6262
AbstractConfig(configDef, originals), Closeable {
6363
private val logger: Logger = LoggerFactory.getLogger(Neo4jConfiguration::class.java)
6464

65-
private val deprecated: Boolean by lazy {
66-
originalsStrings().getOrElse(DEPRECATED) { "false" }.toBoolean()
67-
}
68-
6965
val database
7066
get(): String = getString(DATABASE)
7167

@@ -164,7 +160,7 @@ open class Neo4jConfiguration(configDef: ConfigDef, originals: Map<*, *>, val ty
164160
}
165161
}
166162

167-
config.withUserAgent(userAgent(type.description, deprecated, userAgentComment()))
163+
config.withUserAgent(userAgent(type.description, userAgentComment()))
168164
config.withConnectionAcquisitionTimeout(
169165
connectionAcquisitionTimeout.inWholeMilliseconds, TimeUnit.MILLISECONDS)
170166
config.withConnectionTimeout(connectionTimeout.inWholeMilliseconds, TimeUnit.MILLISECONDS)
@@ -211,7 +207,7 @@ open class Neo4jConfiguration(configDef: ConfigDef, originals: Map<*, *>, val ty
211207
TransactionConfig.builder()
212208
.withMetadata(
213209
buildMap {
214-
this["app"] = connectorInformation(type.description, deprecated)
210+
this["app"] = connectorInformation(type.description)
215211

216212
val metadata = telemetryData()
217213
if (metadata.isNotEmpty()) {
@@ -225,8 +221,6 @@ open class Neo4jConfiguration(configDef: ConfigDef, originals: Map<*, *>, val ty
225221
open fun userAgentComment(): String = ""
226222

227223
companion object {
228-
const val DEPRECATED = "neo4j.deprecated"
229-
230224
const val DEFAULT_MAX_RETRY_ATTEMPTS = 5
231225
val DEFAULT_MAX_RETRY_DURATION = 30.seconds
232226

@@ -260,47 +254,6 @@ open class Neo4jConfiguration(configDef: ConfigDef, originals: Map<*, *>, val ty
260254
const val SECURITY_TRUST_STRATEGY = "neo4j.security.trust-strategy"
261255
const val SECURITY_CERT_FILES = "neo4j.security.cert-files"
262256

263-
fun migrateSettings(oldSettings: Map<String, Any>, onlyKnown: Boolean): Map<String, String> {
264-
val migrated = mutableMapOf<String, String>()
265-
266-
oldSettings.forEach {
267-
@Suppress("DEPRECATION")
268-
when (it.key) {
269-
DeprecatedNeo4jConfiguration.SERVER_URI -> migrated[URI] = it.value.toString()
270-
DeprecatedNeo4jConfiguration.CONNECTION_LIVENESS_CHECK_TIMEOUT_MSECS ->
271-
migrated[POOL_IDLE_TIME_BEFORE_TEST] = "${it.value}ms"
272-
DeprecatedNeo4jConfiguration.CONNECTION_MAX_CONNECTION_LIFETIME_MSECS ->
273-
migrated[POOL_MAX_CONNECTION_LIFETIME] = "${it.value}ms"
274-
DeprecatedNeo4jConfiguration.CONNECTION_POOL_MAX_SIZE ->
275-
migrated[POOL_MAX_CONNECTION_POOL_SIZE] = it.value.toString()
276-
DeprecatedNeo4jConfiguration.RETRY_MAX_ATTEMPTS ->
277-
migrated[MAX_TRANSACTION_RETRY_ATTEMPTS] = it.value.toString()
278-
DeprecatedNeo4jConfiguration.RETRY_BACKOFF_MSECS ->
279-
migrated[MAX_TRANSACTION_RETRY_TIMEOUT] = "${it.value}ms"
280-
DeprecatedNeo4jConfiguration.CONNECTION_MAX_CONNECTION_ACQUISITION_TIMEOUT_MSECS ->
281-
migrated[POOL_CONNECTION_ACQUISITION_TIMEOUT] = "${it.value}ms"
282-
DeprecatedNeo4jConfiguration.ENCRYPTION_ENABLED ->
283-
migrated[SECURITY_ENCRYPTED] = it.value.toString()
284-
DeprecatedNeo4jConfiguration.ENCRYPTION_CA_CERTIFICATE_PATH ->
285-
migrated[SECURITY_CERT_FILES] = it.value.toString()
286-
DeprecatedNeo4jConfiguration.ENCRYPTION_TRUST_STRATEGY ->
287-
migrated[SECURITY_TRUST_STRATEGY] = it.value.toString()
288-
DeprecatedNeo4jConfiguration.AUTHENTICATION_TYPE,
289-
DeprecatedNeo4jConfiguration.AUTHENTICATION_BASIC_USERNAME,
290-
DeprecatedNeo4jConfiguration.AUTHENTICATION_BASIC_PASSWORD,
291-
DeprecatedNeo4jConfiguration.AUTHENTICATION_BASIC_REALM,
292-
DeprecatedNeo4jConfiguration.AUTHENTICATION_KERBEROS_TICKET ->
293-
migrated[it.key] = it.value.toString()
294-
else ->
295-
if (!onlyKnown) {
296-
migrated[it.key] = it.value.toString()
297-
}
298-
}
299-
}
300-
301-
return migrated
302-
}
303-
304257
/** Perform validation on dependent configuration items */
305258
fun validate(config: org.apache.kafka.common.config.Config) {
306259
// authentication configuration

common/src/main/kotlin/org/neo4j/connectors/kafka/events/ProcedureResults.kt

Lines changed: 0 additions & 21 deletions
This file was deleted.

common/src/main/kotlin/org/neo4j/connectors/kafka/events/StreamsPluginStatus.kt

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)