From eef42905e0e85afb7401e6407180cc9b30587ed4 Mon Sep 17 00:00:00 2001 From: vincenzo-ingenito Date: Thu, 12 Dec 2024 11:04:49 +0000 Subject: [PATCH] feat: Pfx change pathname --- .../fse2/ms/gtw/dispatcher/config/kafka/KafkaProducerCFG.java | 4 ++-- .../ms/gtw/dispatcher/config/kafka/KafkaPropertiesCFG.java | 4 ++-- src/main/resources/application.properties | 2 +- src/main/resources/logback-spring.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/config/kafka/KafkaProducerCFG.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/config/kafka/KafkaProducerCFG.java index a7c837c..a278ff3 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/config/kafka/KafkaProducerCFG.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/config/kafka/KafkaProducerCFG.java @@ -90,7 +90,7 @@ public Map producerConfigs() { props.put("sasl.login.callback.handler.class", CustomAuthenticateCallbackHandler.class); props.put("kafka.oauth.tenantId", kafkaPropCFG.getTenantId()); props.put("kafka.oauth.appId", kafkaPropCFG.getAppId()); - props.put("kafka.oauth.pfxName", kafkaPropCFG.getPfxName()); + props.put("kafka.oauth.pfxPathName", kafkaPropCFG.getPfxPathName()); props.put("kafka.oauth.pwd", kafkaPropCFG.getPwd()); } @@ -164,7 +164,7 @@ public Map producerWithoutTransactionConfigs() { props.put("sasl.login.callback.handler.class", CustomAuthenticateCallbackHandler.class); props.put("kafka.oauth.tenantId", kafkaPropCFG.getTenantId()); props.put("kafka.oauth.appId", kafkaPropCFG.getAppId()); - props.put("kafka.oauth.pfxName", kafkaPropCFG.getPfxName()); + props.put("kafka.oauth.pfxPathName", kafkaPropCFG.getPfxPathName()); props.put("kafka.oauth.pwd", kafkaPropCFG.getPwd()); } diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/config/kafka/KafkaPropertiesCFG.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/config/kafka/KafkaPropertiesCFG.java index 0f60e26..be4f42a 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/config/kafka/KafkaPropertiesCFG.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/config/kafka/KafkaPropertiesCFG.java @@ -75,8 +75,8 @@ public class KafkaPropertiesCFG { @Value("${kafka.oauth.appId}") private String appId; - @Value("${kafka.oauth.pfxName}") - private String pfxName; + @Value("${kafka.oauth.pfxPathName}") + private String pfxPathName; @Value("${kafka.oauth.pwd}") private String pwd; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7c32dba..5690c1f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -64,7 +64,7 @@ kafka.properties.ssl.truststore.password=${TRUST_JKS_PASSWORD} kafka.properties.request.timeout.ms= kafka.oauth.tenantId=${TENANT_ID} kafka.oauth.appId=${APP_ID} -kafka.oauth.pfxName=${PFX_NAME_RESOURCE_PATH} +kafka.oauth.pfxPathName=${PFX_NAME_RESOURCE_PATH} kafka.oauth.pwd=${PWD} ####### KAFKA PRODUCER SETTINGS ################ kafka.producer.client-id=springboot-gtw-dispatcher diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 3ddfdf1..e0414d7 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -75,7 +75,7 @@ sasl.login.callback.handler.class=it.finanze.sanita.fse2.ms.gtw.dispatcher.config.kafka.oauth2.CustomAuthenticateCallbackHandler kafka.oauth.tenantId=${kafka.oauth.tenantId} kafka.oauth.appId=${kafka.oauth.appId} - kafka.oauth.pfxName=${kafka.oauth.pfxName} + kafka.oauth.pfxName=${kafka.oauth.pfxPathName} kafka.oauth.pwd=${kafka.oauth.pwd} ssl.truststore.location=${kafka.properties.ssl.truststore.location}