basic code refactoring take 2

Issue-ID: SO-729

Change-Id: Icc4e10dd2ef5299df7f9d6b80437fa64bdc9c48b
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

diff --git a/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackResponseStatus.java b/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackResponseStatus.java
index 30838eb..b69e0e1 100644 (file)
--- a/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackResponseStatus.java
+++ b/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackResponseStatus.java
@@ -18,10 +18,10 @@ package com.woorea.openstack.base.client;
 
 public class OpenStackResponseStatus {
 
-       public static final int OK = 200;
+    public static final int OK = 200;
 
-       public static final int NOT_AUTHORIZED = 401;
+    public static final int NOT_AUTHORIZED = 401;
 
-       public static final int CONFLICT = 409;
+    public static final int CONFLICT = 409;
 
 }

diff --git a/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackSimpleTokenProvider.java b/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackSimpleTokenProvider.java
index bc92595..a7dd2e5 100644 (file)
--- a/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackSimpleTokenProvider.java
+++ b/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackSimpleTokenProvider.java
@@ -18,19 +18,19 @@ package com.woorea.openstack.base.client;
 
 public class OpenStackSimpleTokenProvider implements OpenStackTokenProvider {
 
-       String token;
+    String token;
 
-       public OpenStackSimpleTokenProvider(String token) {
-               this.token = token;
-       }
+    public OpenStackSimpleTokenProvider(String token) {
+        this.token = token;
+    }
 
-       @Override
-       public String getToken() {
-               return this.token;
-       }
+    @Override
+    public String getToken() {
+        return this.token;
+    }
 
-       @Override
-       public void expireToken() {
-       }
+    @Override
+    public void expireToken() {
+    }
 
 }

diff --git a/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackTokenProvider.java b/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackTokenProvider.java
index 6fcb20c..f7f2629 100644 (file)
--- a/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackTokenProvider.java
+++ b/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackTokenProvider.java
@@ -18,8 +18,8 @@ package com.woorea.openstack.base.client;
 
 public interface OpenStackTokenProvider {
 
-       String getToken();
+    String getToken();
 
-       void expireToken();
+    void expireToken();
 
 }

diff --git a/openstack-client/src/main/java/com/woorea/openstack/common/client/AbstractOpenStackClient.java b/openstack-client/src/main/java/com/woorea/openstack/common/client/AbstractOpenStackClient.java
index 0c717c7..4319304 100644 (file)
--- a/openstack-client/src/main/java/com/woorea/openstack/common/client/AbstractOpenStackClient.java
+++ b/openstack-client/src/main/java/com/woorea/openstack/common/client/AbstractOpenStackClient.java
@@ -32,110 +32,110 @@ package com.woorea.openstack.common.client;
 //
 //public class AbstractOpenStackClient {
 //
-//     protected String endpointURL;
-//     
-//     protected String token;
-//     
-//     protected LoggingFilter loggingFilter;
-//     
-//     protected ClientRequestFilter tokenFilter = new ClientRequestFilter() {
-//             
-//             @Override
-//             public void filter(ClientRequestContext requestContext) throws IOException {
-//                     requestContext.getHeaders().putSingle("X-Auth-Token", token);
-//             }
-//     };
+//    protected String endpointURL;
+//    
+//    protected String token;
+//    
+//    protected LoggingFilter loggingFilter;
+//    
+//    protected ClientRequestFilter tokenFilter = new ClientRequestFilter() {
+//        
+//        @Override
+//        public void filter(ClientRequestContext requestContext) throws IOException {
+//            requestContext.getHeaders().putSingle("X-Auth-Token", token);
+//        }
+//    };
 //
-//     public AbstractOpenStackClient(String endpointURL, String token) {
-//             this.endpointURL = endpointURL;
-//             this.token = token;
-//     }
-//     
-//     public AbstractOpenStackClient(String endpointURL) {
-//             this(endpointURL, null);
-//     }
+//    public AbstractOpenStackClient(String endpointURL, String token) {
+//        this.endpointURL = endpointURL;
+//        this.token = token;
+//    }
+//    
+//    public AbstractOpenStackClient(String endpointURL) {
+//        this(endpointURL, null);
+//    }
 //
-//     /**
-//      * @param token the token to set
-//      */
-//     public void setToken(String token) {
-//             this.token = token;
-//     }
-//     
-//     public OpenStackRequest request(String uri, String... mediaTypes) {
-//             WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
-//             if(token != null) {
-//                     endpoint.register(tokenFilter);
-//             }
-//             return new OpenStackRequest(endpoint.path(uri).request(mediaTypes));
-//     }
-//     
-//     public OpenStackRequest request(String uri) {
-//             return request(uri, MediaType.APPLICATION_JSON);
-//     }
-//     
-//     protected WebTarget create(String endpoint) {
-//             WebTarget target = OpenStack.CLIENT.target(endpoint);
-//             if(loggingFilter != null) {
-//                     target.register(loggingFilter);
-//             }
-//             if(token != null) {
-//                     target.register(tokenFilter);
-//             }
-//             return target;
-//     }
-//     
-//     public void enableLogging(Logger logger, int entitySize) {
-//             loggingFilter = new LoggingFilter(logger, entitySize);
-//     }
-//     
-//     public void disableLogging() {
-//             loggingFilter = null;
-//     }
-//     
-//     public static class OpenStackRequest {
-//             
-//             private Builder builder;
-//             
-//             private OpenStackRequest(Builder builder) {
-//                     this.builder = builder;
-//             }
-//             
-//             public <ResponseType> ResponseType execute(String method, Class<ResponseType> type) {
-//                     return builder.method(method, type);
-//             }
-//             
-//             public <RequestType, ResponseType> ResponseType execute(String method, Entity<RequestType> data, Class<ResponseType> type) {
-//                     return builder.method(method, data, type);
-//             }
-//             
-//             public void execute(String method) {
-//                     builder.method(method);
-//             }
-//             
-//             public <RequestType> void execute(String method, Entity<RequestType> data) {
-//                     builder.method(method, data, Void.class);
-//             }
-//             
-//             public <ResponseType> ResponseType get(Class<ResponseType> type) {
-//                     return execute("GET", type);
-//             }
-//             
-//             public <ResponseType> ResponseType postJson(Object data, Class<ResponseType> type) {
-//                     return execute("POST", Entity.json(data), type);
-//             }
-//             
-//             public <ResponseType> ResponseType putJson(Object data, Class<ResponseType> type) {
-//                     return execute("PUT", Entity.json(data), type);
-//             }
-//             
-//             public <ResponseType> ResponseType patchJson(Object data, Class<ResponseType> type) {
-//                     return execute("PATCH", Entity.json(data), type);
-//             }
-//             
-//             public void delete() {
-//                     execute("DELETE", Void.class);
-//             }
-//     }
+//    /**
+//     * @param token the token to set
+//     */
+//    public void setToken(String token) {
+//        this.token = token;
+//    }
+//    
+//    public OpenStackRequest request(String uri, String... mediaTypes) {
+//        WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
+//        if(token != null) {
+//            endpoint.register(tokenFilter);
+//        }
+//        return new OpenStackRequest(endpoint.path(uri).request(mediaTypes));
+//    }
+//    
+//    public OpenStackRequest request(String uri) {
+//        return request(uri, MediaType.APPLICATION_JSON);
+//    }
+//    
+//    protected WebTarget create(String endpoint) {
+//        WebTarget target = OpenStack.CLIENT.target(endpoint);
+//        if(loggingFilter != null) {
+//            target.register(loggingFilter);
+//        }
+//        if(token != null) {
+//            target.register(tokenFilter);
+//        }
+//        return target;
+//    }
+//    
+//    public void enableLogging(Logger logger, int entitySize) {
+//        loggingFilter = new LoggingFilter(logger, entitySize);
+//    }
+//    
+//    public void disableLogging() {
+//        loggingFilter = null;
+//    }
+//    
+//    public static class OpenStackRequest {
+//        
+//        private Builder builder;
+//        
+//        private OpenStackRequest(Builder builder) {
+//            this.builder = builder;
+//        }
+//        
+//        public <ResponseType> ResponseType execute(String method, Class<ResponseType> type) {
+//            return builder.method(method, type);
+//        }
+//        
+//        public <RequestType, ResponseType> ResponseType execute(String method, Entity<RequestType> data, Class<ResponseType> type) {
+//            return builder.method(method, data, type);
+//        }
+//        
+//        public void execute(String method) {
+//            builder.method(method);
+//        }
+//        
+//        public <RequestType> void execute(String method, Entity<RequestType> data) {
+//            builder.method(method, data, Void.class);
+//        }
+//        
+//        public <ResponseType> ResponseType get(Class<ResponseType> type) {
+//            return execute("GET", type);
+//        }
+//        
+//        public <ResponseType> ResponseType postJson(Object data, Class<ResponseType> type) {
+//            return execute("POST", Entity.json(data), type);
+//        }
+//        
+//        public <ResponseType> ResponseType putJson(Object data, Class<ResponseType> type) {
+//            return execute("PUT", Entity.json(data), type);
+//        }
+//        
+//        public <ResponseType> ResponseType patchJson(Object data, Class<ResponseType> type) {
+//            return execute("PATCH", Entity.json(data), type);
+//        }
+//        
+//        public void delete() {
+//            execute("DELETE", Void.class);
+//        }
+//    }
 //
 //}

diff --git a/openstack-client/src/main/java/com/woorea/openstack/common/session/OpenStackSession.java b/openstack-client/src/main/java/com/woorea/openstack/common/session/OpenStackSession.java
index c466e9e..e149b95 100644 (file)
--- a/openstack-client/src/main/java/com/woorea/openstack/common/session/OpenStackSession.java
+++ b/openstack-client/src/main/java/com/woorea/openstack/common/session/OpenStackSession.java
@@ -23,101 +23,101 @@ package com.woorea.openstack.common.session;
 //import org.openstack.keystone.model.Authentication;
 //
 //public class OpenStackSession implements Serializable {
-//     
-//     private String authenticationURL;
-//     
-//     private Authentication authentication;
-//     
-//     private String identityAdministrationURL;
-//     
-//     private String identityAdministrationToken;
-//     
-//     private Access access;
-//     
-//     private boolean admin;
-//
-//     /**
-//      * @return the authenticationURL
-//      */
-//     public String getAuthenticationURL() {
-//             return authenticationURL;
-//     }
-//
-//     /**
-//      * @param authenticationURL the authenticationURL to set
-//      */
-//     public void setAuthenticationURL(String authenticationURL) {
-//             this.authenticationURL = authenticationURL;
-//     }
-//
-//     /**
-//      * @return the authentication
-//      */
-//     public Authentication getAuthentication() {
-//             return authentication;
-//     }
-//
-//     /**
-//      * @param authentication the authentication to set
-//      */
-//     public void setAuthentication(Authentication authentication) {
-//             this.authentication = authentication;
-//     }
-//
-//     /**
-//      * @return the identityAdministrationURL
-//      */
-//     public String getIdentityAdministrationURL() {
-//             return identityAdministrationURL;
-//     }
-//
-//     /**
-//      * @param identityAdministrationURL the identityAdministrationURL to set
-//      */
-//     public void setIdentityAdministrationURL(String identityAdministrationURL) {
-//             this.identityAdministrationURL = identityAdministrationURL;
-//     }
-//
-//     /**
-//      * @return the identityAdministrationToken
-//      */
-//     public String getIdentityAdministrationToken() {
-//             return identityAdministrationToken;
-//     }
-//
-//     /**
-//      * @param identityAdministrationToken the identityAdministrationToken to set
-//      */
-//     public void setIdentityAdministrationToken(String identityAdministrationToken) {
-//             this.identityAdministrationToken = identityAdministrationToken;
-//     }
-//
-//     /**
-//      * @return the access
-//      */
-//     public Access getAccess() {
-//             return access;
-//     }
-//
-//     /**
-//      * @param access the access to set
-//      */
-//     public void setAccess(Access access) {
-//             this.access = access;
-//     }
-//
-//     /**
-//      * @return the admin
-//      */
-//     public boolean isAdmin() {
-//             return admin;
-//     }
-//
-//     /**
-//      * @param admin the admin to set
-//      */
-//     public void setAdmin(boolean admin) {
-//             this.admin = admin;
-//     }
+//    
+//    private String authenticationURL;
+//    
+//    private Authentication authentication;
+//    
+//    private String identityAdministrationURL;
+//    
+//    private String identityAdministrationToken;
+//    
+//    private Access access;
+//    
+//    private boolean admin;
+//
+//    /**
+//     * @return the authenticationURL
+//     */
+//    public String getAuthenticationURL() {
+//        return authenticationURL;
+//    }
+//
+//    /**
+//     * @param authenticationURL the authenticationURL to set
+//     */
+//    public void setAuthenticationURL(String authenticationURL) {
+//        this.authenticationURL = authenticationURL;
+//    }
+//
+//    /**
+//     * @return the authentication
+//     */
+//    public Authentication getAuthentication() {
+//        return authentication;
+//    }
+//
+//    /**
+//     * @param authentication the authentication to set
+//     */
+//    public void setAuthentication(Authentication authentication) {
+//        this.authentication = authentication;
+//    }
+//
+//    /**
+//     * @return the identityAdministrationURL
+//     */
+//    public String getIdentityAdministrationURL() {
+//        return identityAdministrationURL;
+//    }
+//
+//    /**
+//     * @param identityAdministrationURL the identityAdministrationURL to set
+//     */
+//    public void setIdentityAdministrationURL(String identityAdministrationURL) {
+//        this.identityAdministrationURL = identityAdministrationURL;
+//    }
+//
+//    /**
+//     * @return the identityAdministrationToken
+//     */
+//    public String getIdentityAdministrationToken() {
+//        return identityAdministrationToken;
+//    }
+//
+//    /**
+//     * @param identityAdministrationToken the identityAdministrationToken to set
+//     */
+//    public void setIdentityAdministrationToken(String identityAdministrationToken) {
+//        this.identityAdministrationToken = identityAdministrationToken;
+//    }
+//
+//    /**
+//     * @return the access
+//     */
+//    public Access getAccess() {
+//        return access;
+//    }
+//
+//    /**
+//     * @param access the access to set
+//     */
+//    public void setAccess(Access access) {
+//        this.access = access;
+//    }
+//
+//    /**
+//     * @return the admin
+//     */
+//    public boolean isAdmin() {
+//        return admin;
+//    }
+//
+//    /**
+//     * @param admin the admin to set
+//     */
+//    public void setAdmin(boolean admin) {
+//        this.admin = admin;
+//    }
 //
 //}

diff --git a/openstack-client/src/main/java/com/woorea/openstack/common/session/OpenStackSessionHolder.java b/openstack-client/src/main/java/com/woorea/openstack/common/session/OpenStackSessionHolder.java
index ddacf17..ec199e9 100644 (file)
--- a/openstack-client/src/main/java/com/woorea/openstack/common/session/OpenStackSessionHolder.java
+++ b/openstack-client/src/main/java/com/woorea/openstack/common/session/OpenStackSessionHolder.java
@@ -19,14 +19,14 @@ package com.woorea.openstack.common.session;
 //
 //public class OpenStackSessionHolder {
 //
-//     private static final ThreadLocal<OpenStackSession> HOLDER = new ThreadLocal<OpenStackSession>();
-//     
-//     public static OpenStackSession getSession() {
-//             return HOLDER.get();
-//     }
-//     
-//     public static void setSession(OpenStackSession session) {
-//             HOLDER.set(session);
-//     }
+//    private static final ThreadLocal<OpenStackSession> HOLDER = new ThreadLocal<OpenStackSession>();
+//    
+//    public static OpenStackSession getSession() {
+//        return HOLDER.get();
+//    }
+//    
+//    public static void setSession(OpenStackSession session) {
+//        HOLDER.set(session);
+//    }
 //
 //}