fixing warnings from checkstyle in common-app-api

[sdc.git] / common-app-api / src / main / java / org / openecomp / sdc / common / http / config / BasicAuthorization.java

diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/BasicAuthorization.java b/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/BasicAuthorization.java
index efd1b55..47338b7 100644 (file)
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/BasicAuthorization.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/BasicAuthorization.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.
@@ -53,19 +53,17 @@ public class BasicAuthorization {
         return password;
     }
 
-    
+
     private void setPassword(String password, boolean isEncoded) {
         validate(password);
-        if(isEncoded) {
+        if (isEncoded) {
             Either<String, String> passkey = SecurityUtil.INSTANCE.decrypt(password);
-            if(passkey.isLeft()) {
+            if (passkey.isLeft()) {
                 this.password = passkey.left().value();
-            }
-            else {
+            } else {
                 throw new IllegalArgumentException(passkey.right().value());
             }
-        }
-        else {
+        } else {
             this.password = password;
         }
     }
@@ -81,26 +79,28 @@ public class BasicAuthorization {
 
     @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;
+        }
         BasicAuthorization other = (BasicAuthorization) obj;
         if (password == null) {
-            if (other.password != null)
+            if (other.password != null) {
                 return false;
-        }
-        else if (!password.equals(other.password))
+            }
+        } else if (!password.equals(other.password)) {
             return false;
+        }
         if (userName == null) {
-            if (other.userName != null)
-                return false;
+            return other.userName == null;
+        } else {
+            return userName.equals(other.userName);
         }
-        else if (!userName.equals(other.userName))
-            return false;
-        return true;
     }
 
     @Override
@@ -113,7 +113,7 @@ public class BasicAuthorization {
     }
 
     private void validate(String str) {
-        if(StringUtils.isEmpty(str)) {
+        if (StringUtils.isEmpty(str)) {
             throw new IllegalArgumentException("BasicAuthorization username and/or password cannot be empty");
         }
     }