summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/Ceilometer.java12
-rw-r--r--openstack-client/src/main/java/com/woorea/openstack/base/client/Entity.java12
-rw-r--r--quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java2
3 files changed, 12 insertions, 14 deletions
diff --git a/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/Ceilometer.java b/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/Ceilometer.java
index aa089df..6c18858 100644
--- a/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/Ceilometer.java
+++ b/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/Ceilometer.java
@@ -24,14 +24,14 @@ import com.woorea.openstack.ceilometer.v2.api.ResourcesResource;
public class Ceilometer extends OpenStackClient {
- private final MetersResource METERS;
+ private final MetersResource meters;
- private final ResourcesResource RESOURCES;
+ private final ResourcesResource resources;
public Ceilometer(String endpoint, OpenStackClientConnector connector) {
super(endpoint, connector);
- METERS = new MetersResource(this);
- RESOURCES = new ResourcesResource(this);
+ meters = new MetersResource(this);
+ resources = new ResourcesResource(this);
}
public Ceilometer(String endpoint) {
@@ -40,11 +40,11 @@ public class Ceilometer extends OpenStackClient {
}
public ResourcesResource resources() {
- return RESOURCES;
+ return resources;
}
public MetersResource meters() {
- return METERS;
+ return meters;
}
}
diff --git a/openstack-client/src/main/java/com/woorea/openstack/base/client/Entity.java b/openstack-client/src/main/java/com/woorea/openstack/base/client/Entity.java
index c68a308..1e2dfcc 100644
--- a/openstack-client/src/main/java/com/woorea/openstack/base/client/Entity.java
+++ b/openstack-client/src/main/java/com/woorea/openstack/base/client/Entity.java
@@ -24,6 +24,12 @@ public class Entity<T> {
private String contentType;
+ public Entity(T entity, String contentType) {
+ super();
+ this.entity = entity;
+ this.contentType = contentType;
+ }
+
public static <T> Entity<T> json(T entity) {
return new Entity<>(entity, "application/json");
}
@@ -32,12 +38,6 @@ public class Entity<T> {
return new Entity<>(entity, "application/octet-stream");
}
- public Entity(T entity, String contentType) {
- super();
- this.entity = entity;
- this.contentType = contentType;
- }
-
/**
* @return the entity
*/
diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java
index 9ef68ff..88fb6a4 100644
--- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java
+++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java
@@ -16,8 +16,6 @@
package com.woorea.openstack.quantum.model;
-import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;