changed constructor order, getter and setter

changed constructor order, getter and setter for ResourcesResource and Router classes

Issue-ID: SO-1490

Change-Id: I287bb602e817dbb8b01a446ff5a678c6268b4263
Signed-off-by: Sindhuri.A <arcot.sindhuri@huawei.com>

3 files changed, 13 insertions, 13 deletions

diff --git a/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/ResourcesResource.java b/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/ResourcesResource.java
index 9d392f7..3fac7b8 100644
--- a/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/ResourcesResource.java
+++ b/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/ResourcesResource.java
@@ -25,10 +25,10 @@ import com.woorea.openstack.ceilometer.v2.model.Resource;
 
 public class ResourcesResource {
 
-    private final OpenStackClient CLIENT;
+    private final OpenStackClient client;
 
     public ResourcesResource(OpenStackClient client) {
-        CLIENT = client;
+        this.client = client;
     }
 
     public class ResourceList extends QueriableCeilometerCommand<ResourceList, List<Resource>> {
@@ -44,15 +44,15 @@ public class ResourcesResource {
 
         private String id;
 
+        public ResourceShow(OpenStackClient client) {
+
+        }
+
         public ResourceShow id(String id) {
             this.id = id;
             return this;
         }
 
-        public ResourceShow(OpenStackClient client) {
-
-        }
-
     }
 
 }
\ No newline at end of file
diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java
index 722bb0d..d180a12 100644
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java
@@ -36,7 +36,7 @@ public class Router implements Serializable {
     private String name;
 
     @JsonProperty("admin_state_up")
-    private String admin_state_up;
+    private String adminStateUp;
 
     @JsonProperty("tenant_id")
     private String tenantId;
@@ -59,11 +59,11 @@ public class Router implements Serializable {
     public void setRoutes(List<HostRoute> routes) {
         this.routes = routes;
     }
-    public String getAdmin_state_up() {
-        return admin_state_up;
+    public String getAdminStateUp() {
+        return adminStateUp;
     }
-    public void setAdmin_state_up(String admin_state_up) {
-        this.admin_state_up = admin_state_up;
+    public void setAdminStateUp(String adminStateUp) {
+        this.adminStateUp = adminStateUp;
     }
     public String getStatus() {
         return status;
diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterTest.java
index b75cac8..81573df 100644
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RouterTest.java
@@ -84,9 +84,9 @@ public class RouterTest {
         Assert.assertEquals(2, routes.size());
         router.setRoutes(routes);
         
-        String admin_state_up = router.getAdmin_state_up();
+        String admin_state_up = router.getAdminStateUp();
         Assert.assertNotNull(admin_state_up);
-        router.setAdmin_state_up(admin_state_up);
+        router.setAdminStateUp(admin_state_up);
         
         String name = router.getName();
         Assert.assertNotNull(name);