Merge "modify array declare, removed unused import"

2 files changed, 14 insertions, 15 deletions

diff --git a/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/MetersResource.java b/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/MetersResource.java
index df17c82..ae8f085 100644
--- a/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/MetersResource.java
+++ b/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/MetersResource.java
@@ -18,16 +18,15 @@ package com.woorea.openstack.ceilometer.v2.api;
 
 
 import com.woorea.openstack.base.client.OpenStackClient;
-import com.woorea.openstack.base.client.OpenStackRequest;
 import com.woorea.openstack.ceilometer.QueriableCeilometerCommand;
 import com.woorea.openstack.ceilometer.v2.model.Sample;
 
 public class MetersResource {
 
-    private final OpenStackClient CLIENT;
+    private final OpenStackClient client;
 
     public MetersResource(OpenStackClient client) {
-        CLIENT = client;
+        this.client = client;
     }
 
     public List list() {
@@ -52,30 +51,30 @@ public class MetersResource {
 
         private String name;
 
+        public Show() {
+
+        }
+
         public Show name(String name) {
             this.name = name;
             return this;
         }
 
-        public Show() {
-
-        }
-
     }
 
     public class Statistics extends QueriableCeilometerCommand<Statistics, java.util.List<Statistics>> {
 
         private String name;
 
+        public Statistics() {
+
+        }
+
         public Statistics name(String name) {
             this.name = name;
             return this;
         }
 
-        public Statistics() {
-
-        }
-
     }
 
 }
\ No newline at end of file
diff --git a/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientResponse.java b/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientResponse.java
index 99421b8..f1c8c78 100644
--- a/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientResponse.java
+++ b/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientResponse.java
@@ -34,7 +34,7 @@ import java.util.Map;
 
 public class HttpClientResponse implements OpenStackResponse {
 
-    private static Logger LOGGER = LoggerFactory.getLogger(HttpClientConnector.class);
+    private static Logger logger = LoggerFactory.getLogger(HttpClientConnector.class);
 
     private HttpResponse response = null;
     private String entityBody = null;
@@ -46,7 +46,7 @@ public class HttpClientResponse implements OpenStackResponse {
         // Read the body so InputStream can be closed
         if (response.getEntity() == null) {
             // No body
-            LOGGER.debug ("No Response Body");
+            logger.debug ("No Response Body");
             return;
         }
 
@@ -57,7 +57,7 @@ public class HttpClientResponse implements OpenStackResponse {
             throw new HttpClientException ("Error Reading Response Body", e);
         }
         entityBody = responseBody.toString();
-        LOGGER.debug (entityBody);
+        logger.debug (entityBody);
     }
 
 
@@ -94,7 +94,7 @@ public class HttpClientResponse implements OpenStackResponse {
     public Map<String, String> headers() {
         Map<String, String> headers = new HashMap<>();
 
-        Header responseHeaders[] = response.getAllHeaders();
+        Header[] responseHeaders = response.getAllHeaders();
         for (Header h : responseHeaders) {
             headers.put(h.getName(), h.getValue());
         }