Fix sonar blocker in ChefAdpater

Issue-ID: APPC-156
Change-Id: Ic2cbb76bb639094386c14bd06e068c9d5ad7bd0d
Signed-off-by: Skip Wonnell <skip@att.com>

diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java
index d20228e..2fc836c 100644 (file)
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/openecomp/appc/adapter/chef/chefclient/Utils.java
@@ -45,7 +45,7 @@ import org.bouncycastle.openssl.PEMKeyPair;
 
 public class Utils {
     private Utils(){}
 
 public class Utils {
     private Utils(){}

-
+    

     public static String sha1AndBase64(String inStr) {
         MessageDigest md = null;
         String outStr = null;
     public static String sha1AndBase64(String inStr) {
         MessageDigest md = null;
         String outStr = null;


@@ -59,18 +59,11 @@ public class Utils {
         }
         return new String(outbty);
     }
         }
         return new String(outbty);
     }

-
+    

     public static String signWithRSA(String inStr, String pemPath) {
         byte[] outStr = null;
     public static String signWithRSA(String inStr, String pemPath) {
         byte[] outStr = null;

-        BufferedReader br = null;
-        try {
-            br = new BufferedReader(new FileReader(pemPath));
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-        Security.addProvider(new BouncyCastleProvider());
-        try {
-
+        try ( BufferedReader br  = new BufferedReader(new FileReader(pemPath))) {
+            Security.addProvider(new BouncyCastleProvider());

             PEMParser pemParser = new PEMParser(br);
             JcaPEMKeyConverter converter = new JcaPEMKeyConverter();
             Object object = pemParser.readObject();
             PEMParser pemParser = new PEMParser(br);
             JcaPEMKeyConverter converter = new JcaPEMKeyConverter();
             Object object = pemParser.readObject();


@@ -79,10 +72,8 @@ public class Utils {
             Signature instance = Signature.getInstance("RSA");
             instance.initSign(privateKey);
             instance.update(inStr.getBytes());
             Signature instance = Signature.getInstance("RSA");
             instance.initSign(privateKey);
             instance.update(inStr.getBytes());

-

             byte[] signature = instance.sign();
             outStr = Base64.encode(signature);
             byte[] signature = instance.sign();
             outStr = Base64.encode(signature);

-            String tmp = new String(outStr);

         } catch (InvalidKeyException e) {
             e.printStackTrace();
         } catch (IOException e) {
         } catch (InvalidKeyException e) {
             e.printStackTrace();
         } catch (IOException e) {


@@ -94,7 +85,7 @@ public class Utils {
         }
         return new String(outStr);
     }
         }
         return new String(outStr);
     }

-
+    

     public static String[] splitAs60(String inStr) {
         int count = inStr.length() / 60;
         String[] out = new String[count + 1];
     public static String[] splitAs60(String inStr) {
         int count = inStr.length() / 60;
         String[] out = new String[count + 1];


@@ -109,5 +100,4 @@ public class Utils {
         }
         return out;
     }
         }
         return out;
     }

-

 }
 }