From 72a9ab9e886cdeabc4b43418a7054a5796a0ff55 Mon Sep 17 00:00:00 2001
From: sliard <samuel.liard@gmail.com>
Date: Mon, 12 Apr 2021 15:58:22 +0200
Subject: [DMAAP-CLIENT] First sonar issues review part2

update Copyright informations
fix checkstyle warning and fix code review comments
remove Prop

Issue-ID: DMAAP-1585
Change-Id: I445ca5d0888a555acbac70af7ed571be26d74f79
Signed-off-by: sliard <samuel.liard@gmail.com>
---
 .../mr/dme/client/PreferredRouteReplyHandler.java  | 86 +++++++++++-----------
 1 file changed, 45 insertions(+), 41 deletions(-)

(limited to 'src/main/java/org/onap/dmaap/mr/dme/client/PreferredRouteReplyHandler.java')

diff --git a/src/main/java/org/onap/dmaap/mr/dme/client/PreferredRouteReplyHandler.java b/src/main/java/org/onap/dmaap/mr/dme/client/PreferredRouteReplyHandler.java
index 70e0d1b..1b13c8e 100644
--- a/src/main/java/org/onap/dmaap/mr/dme/client/PreferredRouteReplyHandler.java
+++ b/src/main/java/org/onap/dmaap/mr/dme/client/PreferredRouteReplyHandler.java
@@ -4,11 +4,13 @@
  *  ================================================================================
  *  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *  ================================================================================
+ *  Modifications Copyright © 2021 Orange.
+ *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
  *  You may obtain a copy of the License at
  *        http://www.apache.org/licenses/LICENSE-2.0
- *  
+ *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,55 +19,57 @@
  *  ============LICENSE_END=========================================================
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
+ *
  *******************************************************************************/
-package org.onap.dmaap.mr.dme.client;
-import java.io.File;
-import java.io.FileWriter;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+package org.onap.dmaap.mr.dme.client;
 
 import com.att.aft.dme2.api.util.DME2ExchangeFaultContext;
 import com.att.aft.dme2.api.util.DME2ExchangeReplyHandler;
 import com.att.aft.dme2.api.util.DME2ExchangeResponseContext;
+import java.io.File;
+import java.io.FileWriter;
 import org.onap.dmaap.mr.client.MRClientFactory;
 import org.onap.dmaap.mr.client.impl.MRSimplerBatchPublisher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PreferredRouteReplyHandler implements DME2ExchangeReplyHandler {
-	private Logger fLog = LoggerFactory.getLogger ( this.getClass().getName () );
-	@Override public void handleReply(DME2ExchangeResponseContext responseData) {
-		
-		if(responseData != null) {
-			MRClientFactory.DME2HeadersMap=responseData.getResponseHeaders();
-			if (responseData.getResponseHeaders().get("transactionId")!=null)
-				
-			fLog.info("Transaction_Id : " + responseData.getResponseHeaders().get("transactionId"));
-			
-			if(responseData.getRouteOffer() != null ){
-				routeWriter("preferredRouteKey",responseData.getRouteOffer());
-				
-			}
-		}
-}
-	
-	@Override public void handleFault(DME2ExchangeFaultContext responseData) {
-		// TODO Auto-generated method stub
- //StaticCache.getInstance().setHandleFaultInvoked(true);
- }
-	@Override public void handleEndpointFault(DME2ExchangeFaultContext responseData) {
-		// TODO Auto-generated method stub
-		 
-	}
-	public void routeWriter(String routeKey, String routeValue){
 
-		try(FileWriter	routeWriter=new FileWriter(new File (MRSimplerBatchPublisher.routerFilePath))){
-			routeWriter.write(routeKey+"="+routeValue);
-			routeWriter.close();
-		
-		}catch(Exception ex){
-			fLog.error("Reply Router Error " + ex);
-		}
-		
-	}
+    private static final Logger logger = LoggerFactory.getLogger(PreferredRouteReplyHandler.class);
+
+    @Override
+    public void handleReply(DME2ExchangeResponseContext responseData) {
+
+        if (responseData != null) {
+            MRClientFactory.DME2HeadersMap = responseData.getResponseHeaders();
+            if (responseData.getResponseHeaders().get("transactionId") != null) {
+                logger.info("Transaction_Id : " + responseData.getResponseHeaders().get("transactionId"));
+            }
+
+            if (responseData.getRouteOffer() != null) {
+                routeWriter("preferredRouteKey", responseData.getRouteOffer());
+            }
+        }
+    }
+
+    @Override
+    public void handleFault(DME2ExchangeFaultContext responseData) {
+
+    }
+
+    @Override
+    public void handleEndpointFault(DME2ExchangeFaultContext responseData) {
+
+    }
+
+    public void routeWriter(String routeKey, String routeValue) {
+
+        try (FileWriter routeWriter = new FileWriter(new File(MRSimplerBatchPublisher.routerFilePath))) {
+            routeWriter.write(routeKey + "=" + routeValue);
+        } catch (Exception ex) {
+            logger.error("Reply Router Error " + ex);
+        }
+
+    }
 }
-- 
cgit 1.2.3-korg