Sonar Fixes, Formatting

[aaf/authz.git] / auth / auth-certman / src / main / java / org / onap / aaf / auth / cm / ca / X509andChain.java

diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java
index 46a6393..b05747b 100644 (file)
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java
@@ -7,9 +7,9 @@
  * 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.
@@ -25,55 +25,56 @@ import java.security.cert.X509Certificate;
 import java.util.List;
 
 import org.onap.aaf.auth.env.NullTrans;
-import org.onap.aaf.cadi.cm.CertException;
-import org.onap.aaf.cadi.cm.Factory;
+import org.onap.aaf.cadi.configure.CertException;
+import org.onap.aaf.cadi.configure.Factory;
 
 
 /**
- * Have to put the Cert and resulting Trust Chain together. 
+ * Have to put the Cert and resulting Trust Chain together.
  * Treating them separately has caused issues
- * 
+ *
  * @author JonathanGathman
  *
  */
 public class X509andChain {
-       protected X509Certificate cert;
-       protected String[] trustChain;
-       
-       public X509andChain() {
-               cert = null;
-               trustChain = null;
-       }
-       
-       public X509andChain(X509Certificate cert, String[] trustChain) {
-               this.cert = cert;
-               this.trustChain = trustChain;
-       }
+    protected X509Certificate cert;
+    protected String[] trustChain;
+
+    public X509andChain() {
+        cert = null;
+        trustChain = null;
+    }
+
+    public X509andChain(X509Certificate cert, String[] tc) {
+        this.cert = cert;
+        trustChain=tc;
+    }
+
+    public X509andChain(X509Certificate cert, List<String> chain) {
+        this.cert = cert;
+        trustChain = new String[chain.size()+1];
+        chain.toArray(trustChain);
+    }
+
+
+    public void addTrustChainEntry(X509Certificate x509) throws IOException, CertException {
+        if (trustChain==null) {
+            trustChain = new String[] {Factory.toString(NullTrans.singleton(),x509)};
+        } else {
+            String[] temp = new String[trustChain.length+1];
+            System.arraycopy(trustChain, 0, temp, 0, trustChain.length);
+            temp[trustChain.length]=Factory.toString(NullTrans.singleton(),x509);
+            trustChain=temp;
+        }
+    }
+
+
+    public X509Certificate getX509() {
+        return cert;
+    }
 
-       public X509andChain(X509Certificate cert, List<String> chain) {
-               this.cert = cert;
-               trustChain = new String[chain.size()];
-               chain.toArray(trustChain);
-       }
-       
-       
-       public void addTrustChainEntry(X509Certificate x509) throws IOException, CertException {
-               if(trustChain==null) {
-                       trustChain = new String[] {Factory.toString(NullTrans.singleton(),x509)};
-               } else {
-                       String[] temp = new String[trustChain.length+1];
-                       System.arraycopy(trustChain, 0, temp, 0, trustChain.length);
-                       temp[trustChain.length]=Factory.toString(NullTrans.singleton(),x509);
-                       trustChain=temp;
-               }
-       }
+    public String[] getTrustChain() {
+        return trustChain;
+    }
 
-       public X509Certificate getX509() {
-               return cert;
-       }
-       
-       public String[] getTrustChain() {
-               return trustChain;
-       }
-       
 }