From c8ad74042c7b776421504c2bd0c427768cc8aa9e Mon Sep 17 00:00:00 2001
From: vincenzo-ingenito <vincenzo.ingenito@hotmail.it>
Date: Thu, 12 Dec 2024 11:19:35 +0000
Subject: [PATCH] feat: Change pathname

---
 .../ms/gtw/statusmanager/config/kafka/KafkaConsumerCFG.java | 2 +-
 .../ms/gtw/statusmanager/config/kafka/KafkaProducerCFG.java | 2 +-
 .../gtw/statusmanager/config/kafka/KafkaPropertiesCFG.java  | 4 ++--
 .../kafka/oauth2/CustomAuthenticateCallbackHandler.java     | 6 +++---
 src/main/resources/application.properties                   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/KafkaConsumerCFG.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/KafkaConsumerCFG.java
index 74a35be..8d521e5 100644
--- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/KafkaConsumerCFG.java
+++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/KafkaConsumerCFG.java
@@ -94,7 +94,7 @@ public Map<String, Object> consumerConfigs() {
 			props.put("sasl.login.callback.handler.class", CustomAuthenticateCallbackHandler.class);
 			props.put("kafka.oauth.tenantId", kafkaPropsCfg.getTenantId());	
 			props.put("kafka.oauth.appId", kafkaPropsCfg.getAppId());	
-			props.put("kafka.oauth.pfxName", kafkaPropsCfg.getPfxName());	
+			props.put("kafka.oauth.pfxPathName", kafkaPropsCfg.getPfxPathName());	
 			props.put("kafka.oauth.pwd", kafkaPropsCfg.getPwd());	
 		}
 
diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/KafkaProducerCFG.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/KafkaProducerCFG.java
index ce0d2d2..815d5bd 100644
--- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/KafkaProducerCFG.java
+++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/KafkaProducerCFG.java
@@ -76,7 +76,7 @@ public Map<String, Object> 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/statusmanager/config/kafka/KafkaPropertiesCFG.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/KafkaPropertiesCFG.java
index c80b312..ec1769d 100644
--- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/KafkaPropertiesCFG.java
+++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/KafkaPropertiesCFG.java
@@ -24,8 +24,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/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/oauth2/CustomAuthenticateCallbackHandler.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/oauth2/CustomAuthenticateCallbackHandler.java
index 10cf1ee..5611a3b 100644
--- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/oauth2/CustomAuthenticateCallbackHandler.java
+++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/statusmanager/config/kafka/oauth2/CustomAuthenticateCallbackHandler.java
@@ -44,7 +44,7 @@ public class CustomAuthenticateCallbackHandler implements AuthenticateCallbackHa
 	
     private String appId;
 	
-    private String pfxName;
+    private String pfxPathName;
     
     private String pwd;
 	
@@ -63,7 +63,7 @@ public void configure(Map<String, ?> configs, String mechanism, List<AppConfigur
                 .build();
         this.tenantId = "https://login.microsoftonline.com/"+ Arrays.asList(configs.get("kafka.oauth.tenantId")).get(0).toString();
         this.appId = Arrays.asList(configs.get("kafka.oauth.appId")).get(0).toString();
-        this.pfxName = Arrays.asList(configs.get("kafka.oauth.pfxName")).get(0).toString();
+        this.pfxPathName = Arrays.asList(configs.get("kafka.oauth.pfxPathName")).get(0).toString();
         this.pwd = Arrays.asList(configs.get("kafka.oauth.pwd")).get(0).toString();
 
     }
@@ -89,7 +89,7 @@ private OAuthBearerToken getOAuthBearerToken() throws MalformedURLException, Int
             synchronized(this) {
                 if (this.aadClient == null) {
                 	IClientCredential credential = null;
-            	    try (FileInputStream certificato = new FileInputStream(new File(pfxName))) {
+            	    try (FileInputStream certificato = new FileInputStream(new File(pfxPathName))) {
                 		credential = ClientCredentialFactory.createFromCertificate(certificato, this.pwd);	
                 	} catch(Exception ex) {
                 		log.error("Error while try to crate credential from certificate");
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b56567f..bdcbb2e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -74,7 +74,7 @@ kafka.statusmanager.topic=MDS-SA-0004_FU_001_STATUS
 kafka.statusmanager.eds.topic=MDS-SA-0004_FU_002_STATUS
 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 DEAD LETTER #####################
 kafka.statusmanager.deadletter.topic=MDS-SA-0004_FU_001_STATUS-DLT