Sonar fixes

Issue-ID: AAI-2877
Change-Id: Ida4f641c4cc87b69ba5d0ae2c7f3804e53af5b68
Signed-off-by: David Brilla <david.brilla@tieto.com>

1 files changed, 19 insertions, 25 deletions

diff --git a/aai-traversal/src/main/java/org/onap/aai/service/AuthorizationService.java b/aai-traversal/src/main/java/org/onap/aai/service/AuthorizationService.java
index c0fa93e..b4fa996 100644
--- a/aai-traversal/src/main/java/org/onap/aai/service/AuthorizationService.java
+++ b/aai-traversal/src/main/java/org/onap/aai/service/AuthorizationService.java
@@ -21,7 +21,6 @@ package org.onap.aai.service;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.att.eelf.configuration.EELFManager;
 import org.eclipse.jetty.util.security.Password;
 import org.onap.aai.Profiles;
 import org.onap.aai.util.AAIConstants;
@@ -30,7 +29,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Base64;
@@ -60,38 +59,33 @@ public class AuthorizationService {
                 String usernamePassword = null;
                 String accessType = null;
 
-                try {
-                    String [] userAccessType = str.split(",");
+                String [] userAccessType = str.split(",");
 
-                    if(userAccessType == null || userAccessType.length != 2){
-                        throw new RuntimeException("Please check the realm.properties file as it is not conforming to the basic auth");
-                    }
+                if(userAccessType.length != 2){
+                    throw new RuntimeException("Please check the realm.properties file as it is not conforming to the basic auth");
+                }
 
-                    usernamePassword = userAccessType[0];
-                    accessType       = userAccessType[1];
+                usernamePassword = userAccessType[0];
+                accessType       = userAccessType[1];
 
-                    String[] usernamePasswordArray = usernamePassword.split(":");
+                String[] usernamePasswordArray = usernamePassword.split(":");
 
-                    if(usernamePasswordArray == null || usernamePasswordArray.length != 3){
-                        throw new RuntimeException("This username / pwd is not a valid entry in realm.properties");
-                    }
+                if(usernamePasswordArray.length != 3){
+                    throw new RuntimeException("This username / pwd is not a valid entry in realm.properties");
+                }
 
-                    String username = usernamePasswordArray[0];
-                    String password = null;
+                String username = usernamePasswordArray[0];
+                String password = null;
 
-                    if(str.contains("OBF:")){
-                        password = usernamePasswordArray[1] + ":" + usernamePasswordArray[2];
-                        password = Password.deobfuscate(password);
-                    }
+                if(str.contains("OBF:")){
+                    password = usernamePasswordArray[1] + ":" + usernamePasswordArray[2];
+                    password = Password.deobfuscate(password);
+                }
 
-                    bytes = ENCODER.encode((username + ":" + password).getBytes("UTF-8"));
+                bytes = ENCODER.encode((username + ":" + password).getBytes(StandardCharsets.UTF_8));
 
-                    authorizedUsers.put(new String(bytes), accessType);
+                authorizedUsers.put(new String(bytes), accessType);
 
-                } catch (UnsupportedEncodingException e)
-                {
-                    logger.error("Unable to support the encoding of the file" + basicAuthFile);
-                }
 
                 authorizedUsers.put(new String(ENCODER.encode(bytes)), accessType);
             });