From: Jonathan Gathman <jonathan.gathman@att.com>
Date: Tue, 22 May 2018 20:27:44 +0000 (+0000)
Subject: Merge "Fix sonar issued in LocalCA"
X-Git-Tag: Beijing-2.1.1~16
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f67bf8364fdaf118570673b36f85e8d7617ea1f5;hp=95ee8a7c28a286ca28b68cf27aca36351d43f692;p=aaf%2Fauthz.git

Merge "Fix sonar issued in LocalCA"
---

diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/LocalCA.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/LocalCA.java
index cd8886da..e2287c3b 100644
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/LocalCA.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/LocalCA.java
@@ -97,7 +97,7 @@ public class LocalCA extends CA {
 			String fileName = f.getName();
 			if(fileName.endsWith(".key")) {
 				caKey = Factory.toPrivateKey(NullTrans.singleton(),f);
-				List<FileReader> frs = new ArrayList<FileReader>(params.length-1);
+				List<FileReader> frs = new ArrayList<>(params.length-1);
 				try {
 					String dir = access.getProperty(CM_PUBLIC_DIR, "");
 					if(!"".equals(dir) && !dir.endsWith("/")) {
@@ -128,8 +128,8 @@ public class LocalCA extends CA {
 					KeyStore keyStore;
 					FileInputStream fis = null;
 					if(fileName.endsWith(".pkcs11")) {
-						String ksType;
-						p = Factory.getSecurityProvider(ksType="PKCS11",params);
+						String ksType="PKCS11";
+						p = Factory.getSecurityProvider(ksType,params);
 						keyStore = KeyStore.getInstance(ksType,p);
 					} else if(fileName.endsWith(".jks")) {
 						keyStore = KeyStore.getInstance("JKS");
@@ -216,7 +216,7 @@ public class LocalCA extends CA {
 					SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(new RSAKeyParameters(false,rpk.getModulus(),rpk.getPublicExponent()))
 //					new SubjectPublicKeyInfo(ASN1Sequence.getInstance(caCert.getPublicKey().getEncoded()))
 					);
-			List<GeneralName> lsan = new ArrayList<GeneralName>();
+			List<GeneralName> lsan = new ArrayList<>();
 			for(String s : csrmeta.sans()) {
 				lsan.add(new GeneralName(GeneralName.dNSName,s));
 			}