1 files changed, 53 insertions, 59 deletions
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/api/TokensResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/api/TokensResource.java
index 06da8ca..d5bfe22 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/api/TokensResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/api/TokensResource.java
@@ -15,63 +15,57 @@ import com.woorea.openstack.keystone.model.authentication.TokenAuthentication;
 import com.woorea.openstack.keystone.model.authentication.UsernamePassword;
 
 public class TokensResource {
-	
-	private final OpenStackClient CLIENT;
-	
-	public TokensResource(OpenStackClient client) {
-		CLIENT = client;
-	}
-	
-	public Authenticate.Builder authenticate() {
-		return new Authenticate().new Builder();
-	}
-	
-	public Authenticate authenticate(Authentication authentication) {
-		return new Authenticate(authentication);
-	}
-
-	public class Authenticate extends OpenStackRequest<Access> {
-		
-		private Authentication authentication;
-		
-		public Authenticate() {
-			
-		}
-		
-		public Authenticate(Authentication authentication) {
-			super(CLIENT, HttpMethod.POST, "/tokens", Entity.json(authentication), Access.class);
-			this.authentication = authentication;
-		}
-		
-		public Authenticate withTenantId(String tenantId) {
-			authentication.setTenantId(tenantId);
-			return this;
-		}
-		
-		public Authenticate withTenantName(String tenantName) {
-			authentication.setTenantName(tenantName);
-			return this;
-		}
-		
-		public class Builder {
-			
-			public Authenticate withUsernamePassword(String username, String password) {
-				Authentication authentication = new UsernamePassword(username, password);
-				return new Authenticate(authentication);
-			}
-			
-			public Authenticate withToken(String token) {
-				Authentication authentication = new TokenAuthentication(token);
-				return new Authenticate(authentication);
-			}
-			
-			public Authenticate withAccessKey(String accessKey, String secretKey) {
-				Authentication authentication = new AccessKey(accessKey, secretKey);
-				return new Authenticate(authentication);
-			}
-			
-		}
-
-	}
-	
+
+    private final OpenStackClient client;
+
+    public TokensResource(OpenStackClient client) {
+        this.client = client;
+    }
+
+    public Authenticate.Builder authenticate() {
+        return new Authenticate().new Builder();
+    }
+
+    public Authenticate authenticate(Authentication authentication) {
+        return new Authenticate(authentication);
+    }
+
+    public class Authenticate extends OpenStackRequest<Access> {
+
+        private Authentication authentication;
+
+        public Authenticate() {
+
+        }
+
+        public Authenticate(Authentication authentication) {
+            super(client, HttpMethod.POST, "/tokens", Entity.json(authentication), Access.class);
+            this.authentication = authentication;
+        }
+
+        public Authenticate withTenantId(String tenantId) {
+            authentication.setTenantId(tenantId);
+            return this;
+        }
+
+        public Authenticate withTenantName(String tenantName) {
+            authentication.setTenantName(tenantName);
+            return this;
+        }
+
+        public class Builder {
+
+            public Authenticate withUsernamePassword(String username, String password) {
+                return new Authenticate(new UsernamePassword(username, password));
+            }
+
+            public Authenticate withToken(String token) {
+                return new Authenticate(new TokenAuthentication(token));
+            }
+
+            public Authenticate withAccessKey(String accessKey, String secretKey) {
+                return new Authenticate(new AccessKey(accessKey, secretKey));
+            }
+        }
+    }
 }