You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/10/26 03:47:41 UTC
[1/2] git commit: Fixing method comments, unused import statements,
spelling & code analysis findings in kubernetes client api
Repository: stratos
Updated Branches:
refs/heads/master e2815f679 -> f3653d32e
Fixing method comments, unused import statements, spelling & code analysis findings in kubernetes client api
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4c48d896
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4c48d896
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4c48d896
Branch: refs/heads/master
Commit: 4c48d89680088a367848f8b292eb96ae576e2839
Parents: 004dd52
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Oct 26 08:17:11 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Oct 26 08:17:11 2014 +0530
----------------------------------------------------------------------
.../kubernetes/client/KubernetesApiClient.java | 39 +++++-------------
.../KubernetesAPIClientInterface.java | 4 +-
.../stratos/kubernetes/client/model/State.java | 14 +++----
.../client/rest/KubernetesResponseHandler.java | 10 ++---
.../kubernetes/client/rest/RestClient.java | 42 ++++----------------
5 files changed, 30 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4c48d896/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java
index 4ee6e06..39f8c02 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java
@@ -20,31 +20,19 @@
*/
package org.apache.stratos.kubernetes.client;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.SocketException;
-import java.net.URI;
-
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.client.utils.URIBuilder;
import org.apache.stratos.kubernetes.client.exceptions.KubernetesClientException;
import org.apache.stratos.kubernetes.client.interfaces.KubernetesAPIClientInterface;
-import org.apache.stratos.kubernetes.client.model.Label;
-import org.apache.stratos.kubernetes.client.model.Pod;
-import org.apache.stratos.kubernetes.client.model.PodList;
-import org.apache.stratos.kubernetes.client.model.ReplicationController;
-import org.apache.stratos.kubernetes.client.model.ReplicationControllerList;
-import org.apache.stratos.kubernetes.client.model.Service;
-import org.apache.stratos.kubernetes.client.model.ServiceList;
+import org.apache.stratos.kubernetes.client.model.*;
import org.apache.stratos.kubernetes.client.rest.KubernetesResponse;
import org.apache.stratos.kubernetes.client.rest.RestClient;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import java.net.URI;
public class KubernetesApiClient implements KubernetesAPIClientInterface {
@@ -75,9 +63,7 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface {
GsonBuilder gsonBuilder = new GsonBuilder();
Gson gson = gsonBuilder.create();
- Pod pod = gson.fromJson(content, Pod.class);
-
- return pod;
+ return gson.fromJson(content, Pod.class);
} catch (KubernetesClientException e) {
throw e;
} catch (Exception e) {
@@ -201,8 +187,7 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface {
GsonBuilder gsonBuilder = new GsonBuilder();
Gson gson = gsonBuilder.create();
- ReplicationController controller = gson.fromJson(content, ReplicationController.class);
- return controller;
+ return gson.fromJson(content, ReplicationController.class);
} catch (KubernetesClientException e) {
throw e;
} catch (Exception e) {
@@ -281,13 +266,11 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface {
@Override
public void updateReplicationController(String controllerId, int replicas)
throws KubernetesClientException {
- ReplicationController controller = null;
-
+
// gets the current controller
- controller = getReplicationController(controllerId);
+ ReplicationController controller = getReplicationController(controllerId);
try {
-
// update the number of replicas
controller.getDesiredState().setReplicas(replicas);
@@ -375,9 +358,7 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface {
GsonBuilder gsonBuilder = new GsonBuilder();
Gson gson = gsonBuilder.create();
- Service service = gson.fromJson(content, Service.class);
- return service;
-
+ return gson.fromJson(content, Service.class);
} catch (Exception e) {
String msg = "Error while retrieving Service info with Service ID: "+serviceId;
log.error(msg, e);
@@ -519,7 +500,7 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface {
private void handleNullResponse(String message, KubernetesResponse res)
throws KubernetesClientException {
if (res == null) {
- log.error(message+ " Null response receieved.");
+ log.error(message+ " Null response received.");
throw new KubernetesClientException(message);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4c48d896/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java
index e67c256..d27fb98 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java
@@ -45,7 +45,7 @@ public interface KubernetesAPIClientInterface {
/**
* Run a label query and retrieve a sub set of Pods.
- * @param array of labels for the label query
+ * @param label of labels for the label query
* @return Pods selected Pods by executing the label query.
* @throws KubernetesClientException
*/
@@ -99,7 +99,7 @@ public interface KubernetesAPIClientInterface {
/**
* Delete a Replication Controller.
- * @param replication controller id controller id to be deleted.
+ * @param controllerId controller id controller id to be deleted.
* @throws KubernetesClientException
*/
public void deleteReplicationController(String controllerId) throws KubernetesClientException;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4c48d896/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 571b79d..756246a 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
@@ -30,7 +30,7 @@ public class State {
private int replicas;
private Selector replicaSelector;
private Pod podTemplate;
- private Policy restartpolicy;
+ private Policy restartPolicy;
private Object info;
public Manifest getManifest() {
@@ -57,11 +57,11 @@ public class State {
public void setHostIP(String hostIP) {
this.hostIP = hostIP;
}
- public Policy getRestartpolicy() {
- return restartpolicy;
+ public Policy getRestartPolicy() {
+ return restartPolicy;
}
- public void setRestartpolicy(Policy restartpolicy) {
- this.restartpolicy = restartpolicy;
+ public void setRestartPolicy(Policy restartPolicy) {
+ this.restartPolicy = restartPolicy;
}
public String getPodIP() {
return podIP;
@@ -100,8 +100,6 @@ public class State {
+ host + ", hostIP=" + hostIP + ", podIP=" + podIP
+ ", replicas=" + replicas + ", replicaSelector="
+ replicaSelector + ", podTemplate=" + podTemplate
- + ", restartpolicy=" + restartpolicy + ", info=" + info + "]";
+ + ", restartPolicy=" + restartPolicy + ", info=" + info + "]";
}
-
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4c48d896/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java
index 828d996..ab93e0e 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java
@@ -20,16 +20,16 @@
*/
package org.apache.stratos.kubernetes.client.rest;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpResponseException;
import org.apache.http.client.ResponseHandler;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
/**
* Handles a HttpResponse and returns a {@link KubernetesResponse}
*/
@@ -61,6 +61,4 @@ public class KubernetesResponseHandler implements ResponseHandler<KubernetesResp
return kubResponse;
}
-
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4c48d896/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
index 7d55c70..3af3203 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
@@ -46,19 +46,10 @@ public class RestClient {
/**
* Handle http post request. Return String
*
- * @param httpClient
- * This should be httpClient which used to connect to rest endpoint
- * @param resourcePath
- * This should be REST endpoint
- * @param jsonParamString
- * The json string which should be executed from the post request
- * @param username
- * User name for basic auth
- * @param password
- * Password for basic auth
+ * @param resourcePath This should be REST endpoint
+ * @param jsonParamString The json string which should be executed from the post request
* @return The HttpResponse
- * @throws Exception
- * if any errors occur when executing the request
+ * @throws Exception if any errors occur when executing the request
*/
public KubernetesResponse doPost(URI resourcePath, String jsonParamString) throws Exception{
HttpPost postRequest = null;
@@ -69,9 +60,7 @@ public class RestClient {
input.setContentType("application/json");
postRequest.setEntity(input);
- KubernetesResponse response = httpClient.execute(postRequest, new KubernetesResponseHandler());
-
- return response;
+ return httpClient.execute(postRequest, new KubernetesResponseHandler());
} finally {
releaseConnection(postRequest);
}
@@ -80,14 +69,7 @@ public class RestClient {
/**
* Handle http get request. Return String
*
- * @param httpClient
- * This should be httpClient which used to connect to rest endpoint
- * @param resourcePath
- * This should be REST endpoint
- * @param username
- * User name for basic auth
- * @param password
- * Password for basic auth
+ * @param resourcePath This should be REST endpoint
* @return The HttpResponse
* @throws org.apache.http.client.ClientProtocolException and IOException
* if any errors occur when executing the request
@@ -98,8 +80,7 @@ public class RestClient {
getRequest = new HttpGet(resourcePath);
getRequest.addHeader("Content-Type", "application/json");
- KubernetesResponse response = httpClient.execute(getRequest, new KubernetesResponseHandler());
- return response;
+ return httpClient.execute(getRequest, new KubernetesResponseHandler());
} finally {
releaseConnection(getRequest);
}
@@ -111,10 +92,7 @@ public class RestClient {
httpDelete = new HttpDelete(resourcePath);
httpDelete.addHeader("Content-Type", "application/json");
- KubernetesResponse response = httpClient.execute(httpDelete, new KubernetesResponseHandler());
-
- return response;
-
+ return httpClient.execute(httpDelete, new KubernetesResponseHandler());
} finally {
releaseConnection(httpDelete);
}
@@ -130,10 +108,7 @@ public class RestClient {
input.setContentType("application/json");
putRequest.setEntity(input);
- KubernetesResponse response = httpClient.execute(putRequest, new KubernetesResponseHandler());
-
- return response;
-
+ return httpClient.execute(putRequest, new KubernetesResponseHandler());
} finally {
releaseConnection(putRequest);
}
@@ -144,5 +119,4 @@ public class RestClient {
request.releaseConnection();
}
}
-
}
\ No newline at end of file
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f3653d32
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f3653d32
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f3653d32
Branch: refs/heads/master
Commit: f3653d32eb1cf18b8983b10ee616d2444790d013
Parents: 4c48d89 e2815f6
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Oct 26 08:17:32 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Oct 26 08:17:32 2014 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/PartitionContext.java | 23 +--
.../KubernetesServiceClusterMonitor.java | 4 +-
.../autoscaler/monitor/VMLbClusterMonitor.java | 4 +-
.../monitor/VMServiceClusterMonitor.java | 4 +-
.../autoscaler/util/AutoScalerConstants.java | 6 +-
.../impl/CloudControllerServiceImpl.java | 172 +++++--------------
.../common/constants/StratosConstants.java | 6 +-
.../distribution/src/main/conf/autoscaler.xml | 21 ++-
.../lib/puppet/parser/functions/difference.rb | 17 ++
9 files changed, 108 insertions(+), 149 deletions(-)
----------------------------------------------------------------------