1 files changed, 28 insertions, 24 deletions

diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/ClientCertificate.java b/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/ClientCertificate.java
index 259d965b0d..1f6c070094 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/ClientCertificate.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/ClientCertificate.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.
@@ -22,7 +22,7 @@ package org.openecomp.sdc.common.http.config;
 
 import fj.data.Either;
 import org.apache.commons.lang3.StringUtils;
-import org.openecomp.sdc.security.SecurityUtil;
+import org.onap.sdc.security.SecurityUtil;
 
 public class ClientCertificate {
     private String keyStore;
@@ -35,7 +35,7 @@ public class ClientCertificate {
         setKeyStore(clientCertificate.getKeyStore());
         setKeyStorePassword(clientCertificate.getKeyStorePassword(), false);
     }
-
+    
     public void setKeyStore(String keyStore) {
         validate(keyStore);
         this.keyStore = keyStore;
@@ -47,14 +47,16 @@ public class ClientCertificate {
 
     private void setKeyStorePassword(String keyStorePassword, boolean isEncoded) {
         validate(keyStorePassword);
-        if (isEncoded) {
+        if(isEncoded) {
             Either<String, String> passkey = SecurityUtil.INSTANCE.decrypt(keyStorePassword);
             if (passkey.isLeft()) {
                 this.keyStorePassword = passkey.left().value();
-            } else {
+            }
+            else {
                 throw new IllegalArgumentException(passkey.right().value());
             }
-        } else {
+        }
+        else {
             this.keyStorePassword = keyStorePassword;
         }
     }
@@ -66,7 +68,7 @@ public class ClientCertificate {
     public String getKeyStorePassword() {
         return keyStorePassword;
     }
-
+    
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -78,37 +80,39 @@ public class ClientCertificate {
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
+        if (this == obj)
             return true;
-        }
-        if (obj == null) {
+        if (obj == null)
             return false;
-        }
-        if (getClass() != obj.getClass()) {
+        if (getClass() != obj.getClass())
             return false;
-        }
         ClientCertificate other = (ClientCertificate) obj;
         if (keyStore == null) {
-            if (other.keyStore != null) {
+            if (other.keyStore != null)
                 return false;
-            }
-        } else if (!keyStore.equals(other.keyStore)) {
-            return false;
         }
+        else if (!keyStore.equals(other.keyStore))
+            return false;
         if (keyStorePassword == null) {
-            return other.keyStorePassword == null;
-        } else {
-            return keyStorePassword.equals(other.keyStorePassword);
+            if (other.keyStorePassword != null)
+                return false;
         }
+        else if (!keyStorePassword.equals(other.keyStorePassword))
+            return false;
+        return true;
     }
 
     @Override
     public String toString() {
-        return "ClientCertificate [keyStore=" + keyStore + "]";
+        StringBuilder builder = new StringBuilder();
+        builder.append("ClientCertificate [keyStore=");
+        builder.append(keyStore);
+        builder.append("]");
+        return builder.toString();
     }
-
+    
     private void validate(String str) {
-        if (StringUtils.isEmpty(str)) {
+        if(StringUtils.isEmpty(str)) {
             throw new IllegalArgumentException("ClientCertificate keystore and/or kestorePassword cannot be empty");
         }
     }