From 2e4fee97a87281b2ce850ccfe731d3d6d45ed8a6 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Fri, 9 Feb 2024 08:15:01 +0100 Subject: [PATCH] feat: Deprecate usage of ...SSL_CA_LOCATION config param --- .../etl/processor/pseudonym/GpasPseudonymGenerator.java | 4 ++-- .../dev/dnpm/etl/processor/config/AppConfigProperties.kt | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java b/src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java index 07f16c5..62e702f 100644 --- a/src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java +++ b/src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java @@ -1,7 +1,7 @@ /* * This file is part of ETL-Processor * - * Copyright (c) 2023 Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors + * Copyright (c) 2024 Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published @@ -91,7 +91,7 @@ public class GpasPseudonymGenerator implements Generator { try { if (StringUtils.isNotBlank(gpasCfg.getSslCaLocation())) { customSslContext = getSslContext(gpasCfg.getSslCaLocation()); - log.debug(String.format("%s has been initialized with SSL certificate %s", + log.warn(String.format("%s has been initialized with SSL certificate %s. This is deprecated in favor of including Root CA.", this.getClass().getName(), gpasCfg.getSslCaLocation())); } } catch (IOException | KeyManagementException | KeyStoreException | CertificateException | diff --git a/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfigProperties.kt b/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfigProperties.kt index b18bc02..2290d44 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfigProperties.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfigProperties.kt @@ -53,9 +53,11 @@ data class GPasConfigProperties( val target: String = "etl-processor", val username: String?, val password: String?, - val sslCaLocation: String?, - - ) { + @get:DeprecatedConfigurationProperty( + reason = "Deprecated in favor of including Root CA" + ) + val sslCaLocation: String? +) { companion object { const val NAME = "app.pseudonymize.gpas" }