basic code refactoring of woorea

Issue-ID: SO-729

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

1 files changed, 66 insertions, 66 deletions

diff --git a/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java b/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java
index 2ec564c..22ba5e4 100644
--- a/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java
+++ b/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java
@@ -35,21 +35,21 @@ import org.glassfish.jersey.jackson.JacksonFeature;
 
 public class OpenStack {
 
-	public static Client CLIENT;
-	
-	public static ObjectMapper DEFAULT_MAPPER;
-	
-	public static ObjectMapper WRAPPED_MAPPER;
-	
-	static {
-		initialize();
-	}
-	
-	private static void initialize() {
-		
-		/*
-		//class MyX509TrustManager implements X509TrustManager
-		TrustManager mytm[] = null;
+    public static Client CLIENT;
+    
+    public static ObjectMapper DEFAULT_MAPPER;
+    
+    public static ObjectMapper WRAPPED_MAPPER;
+    
+    static {
+        initialize();
+    }
+    
+    private static void initialize() {
+        
+        /*
+        //class MyX509TrustManager implements X509TrustManager
+        TrustManager mytm[] = null;
         KeyManager mykm[] = null;
 
         try {
@@ -58,71 +58,71 @@ public class OpenStack {
         } catch (Exception ex) {
 
         }
-		
-		SSLContext context = null;
+        
+        SSLContext context = null;
         context = SSLContext.getInstance("SSL");
         context.init(mykm, mytm, null);
-		
-		*/
-		
-		try {
-			
-			SSLContext context;
+        
+        */
+        
+        try {
+            
+            SSLContext context;
             context = SSLContext.getInstance("SSL");
             context.init(null, null, null);
             
             SslConfigurator sslConfig = SslConfigurator.newInstance();
-            		/*
+                    /*
                     .trustStoreFile("./truststore_client")
                     .trustStorePassword("asdfgh")
 
                     .keyStoreFile("./keystore_client")
                     .keyPassword("asdfgh");
                     */
-            		//old: CLIENT.property(ClientProperties.SSL_CONFIG, new SslConfig(context));
+                    //old: CLIENT.property(ClientProperties.SSL_CONFIG, new SslConfig(context));
             
             CLIENT = ClientBuilder.newBuilder().sslContext(sslConfig.createSSLContext()).build();
-			
-			DEFAULT_MAPPER = new ObjectMapper();
-			
-			DEFAULT_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
-			DEFAULT_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
-			DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
-			DEFAULT_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
-			DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
-			
-			WRAPPED_MAPPER = new ObjectMapper();
-			
-			WRAPPED_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
-			WRAPPED_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
-			WRAPPED_MAPPER.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
-			WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
-			WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
-			WRAPPED_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
-			WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
-			
-			CLIENT.register(new JacksonFeature()).register(new ContextResolver<ObjectMapper>() {
+            
+            DEFAULT_MAPPER = new ObjectMapper();
+            
+            DEFAULT_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
+            DEFAULT_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
+            DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+            DEFAULT_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
+            DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+            
+            WRAPPED_MAPPER = new ObjectMapper();
+            
+            WRAPPED_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
+            WRAPPED_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
+            WRAPPED_MAPPER.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
+            WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+            WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+            WRAPPED_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
+            WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+            
+            CLIENT.register(new JacksonFeature()).register(new ContextResolver<ObjectMapper>() {
 
-				@Override
-				public ObjectMapper getContext(Class<?> type) {
-					return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER;
-				}
-				
-			});
-			
-			CLIENT.register(new ClientRequestFilter() {
-				
-				@Override
-				public void filter(ClientRequestContext requestContext) throws IOException {
-					requestContext.getHeaders().remove("Content-Language");
-					requestContext.getHeaders().remove("Content-Encoding");
-				}
-			});
-			
-		} catch(Exception e) {
-			throw new RuntimeException(e.getMessage(), e);
-		}
-		
-	}
+                @Override
+                public ObjectMapper getContext(Class<?> type) {
+                    return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER;
+                }
+                
+            });
+            
+            CLIENT.register(new ClientRequestFilter() {
+                
+                @Override
+                public void filter(ClientRequestContext requestContext) throws IOException {
+                    requestContext.getHeaders().remove("Content-Language");
+                    requestContext.getHeaders().remove("Content-Encoding");
+                }
+            });
+            
+        } catch(Exception e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+        
+    }
 
 }