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>

1 files changed, 51 insertions, 53 deletions

diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/Keystone.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/Keystone.java
index 38d42f0..c8d8e09 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/Keystone.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/Keystone.java
@@ -1,5 +1,7 @@
 package com.woorea.openstack.keystone;
 
+import com.woorea.openstack.base.client.OpenStackClient;
+import com.woorea.openstack.base.client.OpenStackClientConnector;
 import com.woorea.openstack.keystone.api.EndpointsResource;
 import com.woorea.openstack.keystone.api.RolesResource;
 import com.woorea.openstack.keystone.api.ServicesResource;
@@ -7,59 +9,55 @@ import com.woorea.openstack.keystone.api.TenantsResource;
 import com.woorea.openstack.keystone.api.TokensResource;
 import com.woorea.openstack.keystone.api.UsersResource;
 
-import com.woorea.openstack.base.client.OpenStackClient;
-import com.woorea.openstack.base.client.OpenStackClientConnector;
-
 public class Keystone extends OpenStackClient {
-	
-	private final TokensResource TOKENS;
-	
-	private final TenantsResource TENANTS;
-	
-	private final UsersResource USERS;
-	
-	private final RolesResource ROLES;
-	
-	private final ServicesResource SERVICES;
-	
-	private final EndpointsResource ENDPOINTS;
-	
-	public Keystone(String endpoint, OpenStackClientConnector connector) {
-		super(endpoint, connector);
-		TOKENS = new TokensResource(this);
-		TENANTS = new TenantsResource(this);
-		USERS = new UsersResource(this);
-		ROLES = new RolesResource(this);
-		SERVICES = new ServicesResource(this);
-		ENDPOINTS = new EndpointsResource(this);
-	}
-	
-	public Keystone(String endpoint) {
-		this(endpoint, null);
-	}
-	
-	public TokensResource tokens() {
-		return TOKENS;
-	}
-	
-	public TenantsResource tenants() {
-		return TENANTS;
-	}
-	
-	public UsersResource users() {
-		return USERS;
-	}
-	
-	public RolesResource roles() {
-		return ROLES;
-	}
-	
-	public ServicesResource services() {
-		return SERVICES;
-	}
-	
-	public EndpointsResource endpoints() {
-		return ENDPOINTS;
-	}
 
+    private final TokensResource tokens;
+
+    private final TenantsResource tenants;
+
+    private final UsersResource users;
+
+    private final RolesResource roles;
+
+    private final ServicesResource services;
+
+    private final EndpointsResource endpoints;
+
+    public Keystone(String endpoint, OpenStackClientConnector connector) {
+        super(endpoint, connector);
+        tokens = new TokensResource(this);
+        tenants = new TenantsResource(this);
+        users = new UsersResource(this);
+        roles = new RolesResource(this);
+        services = new ServicesResource(this);
+        endpoints = new EndpointsResource(this);
+    }
+
+    public Keystone(String endpoint) {
+        this(endpoint, null);
+    }
+
+    public TokensResource tokens() {
+        return tokens;
+    }
+
+    public TenantsResource tenants() {
+        return tenants;
+    }
+
+    public UsersResource users() {
+        return users;
+    }
+
+    public RolesResource roles() {
+        return roles;
+    }
+
+    public ServicesResource services() {
+        return services;
+    }
+
+    public EndpointsResource endpoints() {
+        return endpoints;
+    }
 }