Resolved below sonar issues.

removed redundant code.
changed nested if condition to switch case.
added method for resuablity of string builder.
rename variable to follow camelCase.
removed tab char and changed them with spaces.

Issue-ID:SO-98

Change-Id: If4cf02dede7903ed8b35e4e6879b8691d4f3c48d
Signed-off-by: Bharat saraswal <bharat.saraswal@huawei.com>

2 files changed, 78 insertions, 66 deletions

diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/utils/KeystoneTokenProvider.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/utils/KeystoneTokenProvider.java
index fb5127a..3396492 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/utils/KeystoneTokenProvider.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/utils/KeystoneTokenProvider.java
@@ -1,56 +1,56 @@
 package com.woorea.openstack.keystone.utils;
 
-import java.util.concurrent.ConcurrentHashMap;
-
 import com.woorea.openstack.base.client.OpenStackTokenProvider;
 import com.woorea.openstack.keystone.Keystone;
 import com.woorea.openstack.keystone.model.Access;
 import com.woorea.openstack.keystone.model.authentication.UsernamePassword;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class KeystoneTokenProvider {
 
-	protected Keystone keystone;
-
-	protected String username;
-
-	protected String password;
-
-	ConcurrentHashMap<String, Access> hashTenantAccess;
-
-	public KeystoneTokenProvider(String endpoint, String username, String password) {
-		this.keystone = new Keystone(endpoint);
-		this.username = username;
-		this.password = password;
-		this.hashTenantAccess = new ConcurrentHashMap<String, Access>();
-	}
-
-	public Access getAccessByTenant(String tenantName) {
-		Access access = hashTenantAccess.get(tenantName);
-		if (access == null) {
-			access = keystone.tokens().authenticate(new UsernamePassword(username, password))
-				.withTenantName(tenantName)
-				.execute();
-			hashTenantAccess.put(tenantName, access);
-		}
-		return access;
-	}
-
-	public void expireAccessByTenant(String tenantName) {
-		hashTenantAccess.remove(tenantName);
-	}
-
-	public OpenStackTokenProvider getProviderByTenant(final String tenantName) {
-		final KeystoneTokenProvider keystoneTokenProvider = this;
-		return new OpenStackTokenProvider() {
-			@Override
-			public String getToken() {
-				return keystoneTokenProvider.getAccessByTenant(tenantName)
-						.getToken().getId();
-			}
-			@Override
-			public void expireToken() {
-				keystoneTokenProvider.expireAccessByTenant(tenantName);
-			}
-		};
-	}
+    protected Keystone keystone;
+
+    protected String username;
+
+    protected String password;
+
+    protected ConcurrentHashMap<String, Access> hashTenantAccess;
+
+    public KeystoneTokenProvider(String endpoint, String username, String password) {
+        keystone = new Keystone(endpoint);
+        this.username = username;
+        this.password = password;
+        hashTenantAccess = new ConcurrentHashMap<>();
+    }
+
+    public Access getAccessByTenant(String tenantName) {
+        Access access = hashTenantAccess.get(tenantName);
+        if (access == null) {
+            access = keystone.tokens().authenticate(new UsernamePassword(username, password))
+                .withTenantName(tenantName)
+                .execute();
+            hashTenantAccess.put(tenantName, access);
+        }
+        return access;
+    }
+
+    public void expireAccessByTenant(String tenantName) {
+        hashTenantAccess.remove(tenantName);
+    }
+
+    public OpenStackTokenProvider getProviderByTenant(final String tenantName) {
+        final KeystoneTokenProvider keystoneTokenProvider = this;
+        return new OpenStackTokenProvider() {
+            @Override
+            public String getToken() {
+                return keystoneTokenProvider.getAccessByTenant(tenantName)
+                    .getToken().getId();
+            }
+
+            @Override
+            public void expireToken() {
+                keystoneTokenProvider.expireAccessByTenant(tenantName);
+            }
+        };
+    }
 }
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/utils/KeystoneUtils.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/utils/KeystoneUtils.java
index 8269597..b41c092 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/utils/KeystoneUtils.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/utils/KeystoneUtils.java
@@ -1,28 +1,40 @@
 package com.woorea.openstack.keystone.utils;
 
-import java.util.List;
-
 import com.woorea.openstack.keystone.model.Access.Service;
+import java.util.List;
 
 public class KeystoneUtils {
 
-	public static String findEndpointURL(List<Service> serviceCatalog, String type, String region, String facing) {
-		for(Service service : serviceCatalog) {
-			if(type.equals(service.getType())) {
-				for(Service.Endpoint endpoint : service.getEndpoints()) {
-					if(region == null || region.equals(endpoint.getRegion())) {
-						if(endpoint.getPublicURL() != null && facing.equals("public")) {
-							return endpoint.getPublicURL();
-						} else if(endpoint.getInternalURL() != null && facing.equals("internal")) {
-							return endpoint.getInternalURL();
-						} else if(endpoint.getAdminURL() != null && facing.equals("admin")) {
-							return endpoint.getAdminURL();
-						}
-					}
-				}
-			}
-		}
-		throw new RuntimeException("endpoint url not found");
-	}
+    private KeystoneUtils() {
+    }
+
+    public static String findEndpointURL(List<Service> serviceCatalog, String type, String region, String facing) {
+        for (Service service : serviceCatalog) {
+            if (type.equals(service.getType())) {
+                for (Service.Endpoint endpoint : service.getEndpoints()) {
+                    String url = handleServiceEndPoints(endpoint, region, facing);
+                    if (url != null) {
+                        return url;
+                    }
+                }
+            }
+        }
+        throw new RuntimeException("endpoint url not found");
+    }
 
+    private static String handleServiceEndPoints(Service.Endpoint endpoint, String region, String facing) {
+        if (region == null || region.equals(endpoint.getRegion())) {
+            switch (facing) {
+                case "public":
+                    return endpoint.getPublicURL();
+                case "internal":
+                    return endpoint.getInternalURL();
+                case "admin":
+                    return endpoint.getAdminURL();
+                default:
+                    return null;
+            }
+        }
+        return null;
+    }
 }