Remove unnecessary annotations and imports.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dc2947bc Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dc2947bc Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dc2947bc Branch: refs/heads/docker-integration Commit: dc2947bc0cfa668e99873bb22e9f26463ad30d32 Parents: 0ffacbc Author: Nirmal Fernando <[email protected]> Authored: Fri Sep 19 15:53:23 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Fri Sep 19 16:03:19 2014 +0530 ---------------------------------------------------------------------- .../pojo/KubernetesClusterContext.java | 23 +++++----- .../pom.xml | 44 +++++++------------- .../kubernetes/client/model/Container.java | 3 -- .../stratos/kubernetes/client/model/Label.java | 3 -- .../kubernetes/client/model/Manifest.java | 3 -- .../stratos/kubernetes/client/model/Pod.java | 3 -- .../kubernetes/client/model/PodList.java | 3 -- .../stratos/kubernetes/client/model/Policy.java | 3 -- .../stratos/kubernetes/client/model/Port.java | 3 -- .../client/model/ReplicationController.java | 3 -- .../client/model/ReplicationControllerList.java | 3 -- .../kubernetes/client/model/Service.java | 3 -- .../kubernetes/client/model/ServiceList.java | 3 -- .../stratos/kubernetes/client/model/State.java | 4 -- .../stratos/kubernetes/client/model/Volume.java | 3 -- .../kubernetes/client/model/VolumeMount.java | 3 -- 16 files changed, 28 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/KubernetesClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/KubernetesClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/KubernetesClusterContext.java index c67d61a..6d1a973 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/KubernetesClusterContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/KubernetesClusterContext.java @@ -45,14 +45,15 @@ public class KubernetesClusterContext implements Serializable { // available list of ports private List<Integer> availableHostPorts; // kubernetes client API instance - private KubernetesApiClient kubernetesApiClient; + private transient KubernetesApiClient kubApi; public KubernetesClusterContext(String id, String portRange, String masterIp) { availableHostPorts = new ArrayList<Integer>(); this.kubernetesClusterId = id; this.hostPortRange = portRange; this.masterIp = masterIp; - kubernetesApiClient = new KubernetesApiClient(getEndpoint(masterIp)); + this.setKubApi(new KubernetesApiClient(getEndpoint(masterIp))); + } private String getEndpoint(String ip) { @@ -116,14 +117,6 @@ public class KubernetesClusterContext implements Serializable { } } - public KubernetesApiClient getKubernetesApiClient() { - return kubernetesApiClient; - } - - public void setKubernetesApiClient(KubernetesApiClient kubernetesApiClient) { - this.kubernetesApiClient = kubernetesApiClient; - } - public String getMasterIp() { return masterIp; } @@ -132,6 +125,14 @@ public class KubernetesClusterContext implements Serializable { this.masterIp = masterIp; } + public KubernetesApiClient getKubApi() { + return kubApi; + } + + public void setKubApi(KubernetesApiClient kubApi) { + this.kubApi = kubApi; + } + @Override public int hashCode() { final int prime = 31; @@ -173,5 +174,5 @@ public class KubernetesClusterContext implements Serializable { return false; return true; } - + } http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/pom.xml b/components/org.apache.stratos.kubernetes.client/pom.xml index 9c45def..ccb0cd8 100644 --- a/components/org.apache.stratos.kubernetes.client/pom.xml +++ b/components/org.apache.stratos.kubernetes.client/pom.xml @@ -35,42 +35,30 @@ <dependencies> <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jaxrs</artifactId> - <version>2.2.0.GA</version> - <!-- filter out unwanted jars --> - <exclusions> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.3</version> </dependency> <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jaxb-provider</artifactId> - <version>2.2.0.GA</version> + <groupId>org.apache.httpcomponents.wso2</groupId> + <artifactId>httpcore</artifactId> + <version>4.3.0.wso2v1</version> </dependency> <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> + <groupId>org.apache.httpcomponents.wso2</groupId> + <artifactId>httpclient</artifactId> + <version>4.1.1.wso2v1</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.3</version> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.2.4</version> </dependency> <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jackson-provider</artifactId> - <version>2.2.0.GA</version> - </dependency> - + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + </dependencies> <build> http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java index 0670727..383ed4e 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java @@ -22,9 +22,6 @@ package org.apache.stratos.kubernetes.client.model; import java.util.Arrays; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown=true) public class Container { private String name; http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Label.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Label.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Label.java index ecf84bc..873e882 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Label.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Label.java @@ -20,9 +20,6 @@ */ package org.apache.stratos.kubernetes.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown=true) public class Label { private String name; http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java index 4fde5c7..628e328 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java @@ -22,14 +22,11 @@ package org.apache.stratos.kubernetes.client.model; import java.util.Arrays; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - /** * https://github.com/GoogleCloudPlatform/kubernetes/blob/master/api/doc/manifest-schema.json * @author nirmal * */ -@JsonIgnoreProperties(ignoreUnknown=true) public class Manifest { private String version; http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java index f5497a0..3ebae54 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java @@ -22,15 +22,12 @@ package org.apache.stratos.kubernetes.client.model; import javax.xml.bind.annotation.XmlRootElement; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - /** * https://github.com/GoogleCloudPlatform/kubernetes/blob/master/api/doc/pod-schema.json * @author nirmal * */ @XmlRootElement -@JsonIgnoreProperties(ignoreUnknown=true) public class Pod { private String kind; http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java index 85067ef..34127aa 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java @@ -24,10 +24,7 @@ import java.util.Arrays; import javax.xml.bind.annotation.XmlRootElement; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - @XmlRootElement -@JsonIgnoreProperties(ignoreUnknown=true) public class PodList { private String kind; http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java index 0b12e64..9b43c2f 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java @@ -20,9 +20,6 @@ */ package org.apache.stratos.kubernetes.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown=true) public class Policy { private String type; http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java index 2e3c39f..b59ad15 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java @@ -20,9 +20,6 @@ */ package org.apache.stratos.kubernetes.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown=true) public class Port { private String name; http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java index 9bd166f..91a2a5f 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java @@ -22,14 +22,11 @@ package org.apache.stratos.kubernetes.client.model; import javax.xml.bind.annotation.XmlRootElement; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - /** * @author nirmal * */ @XmlRootElement -@JsonIgnoreProperties(ignoreUnknown=true) public class ReplicationController { private String kind; http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java index 00979c1..7751d92 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java @@ -24,10 +24,7 @@ import java.util.Arrays; import javax.xml.bind.annotation.XmlRootElement; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - @XmlRootElement -@JsonIgnoreProperties(ignoreUnknown=true) public class ReplicationControllerList { private String kind; http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java index 11d2c38..c46fb63 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java @@ -22,15 +22,12 @@ package org.apache.stratos.kubernetes.client.model; import javax.xml.bind.annotation.XmlRootElement; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - /** * https://github.com/GoogleCloudPlatform/kubernetes/blob/master/api/doc/service-schema.json * @author nirmal * */ @XmlRootElement -@JsonIgnoreProperties(ignoreUnknown=true) public class Service { private String kind; http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java index 90035bd..01697e5 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java @@ -24,10 +24,7 @@ import java.util.Arrays; import javax.xml.bind.annotation.XmlRootElement; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - @XmlRootElement -@JsonIgnoreProperties(ignoreUnknown=true) public class ServiceList { private String kind; http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java index a6b077f..571b79d 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java @@ -19,10 +19,7 @@ * */ package org.apache.stratos.kubernetes.client.model; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -@JsonIgnoreProperties(ignoreUnknown=true) public class State { private Manifest manifest; @@ -34,7 +31,6 @@ public class State { private Selector replicaSelector; private Pod podTemplate; private Policy restartpolicy; - @JsonIgnore private Object info; public Manifest getManifest() { http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java index b6f208e..fd389c1 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java @@ -20,9 +20,6 @@ */ package org.apache.stratos.kubernetes.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown=true) public class Volume { private String name; http://git-wip-us.apache.org/repos/asf/stratos/blob/dc2947bc/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java index 0a1a892..098d03e 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java @@ -20,9 +20,6 @@ */ package org.apache.stratos.kubernetes.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown=true) public class VolumeMount { private String name;
