You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/04/13 08:15:50 UTC
[1/2] stratos git commit: Formatting mock iaas client code
Repository: stratos
Updated Branches:
refs/heads/master ab7498bd7 -> 367f91a13
Formatting mock iaas client code
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5ab8819b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5ab8819b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5ab8819b
Branch: refs/heads/master
Commit: 5ab8819bc012823ff08ee02c5b21faa4b679a4f8
Parents: ab7498b
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Apr 13 11:45:21 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Apr 13 11:45:21 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.mock.iaas.client/pom.xml | 2 +-
.../mock/iaas/client/MockIaasApiClient.java | 18 +++++++++---------
.../mock/iaas/client/rest/HttpResponse.java | 5 +++++
.../iaas/client/rest/HttpResponseHandler.java | 2 +-
4 files changed, 16 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5ab8819b/components/org.apache.stratos.mock.iaas.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.client/pom.xml b/components/org.apache.stratos.mock.iaas.client/pom.xml
index 4b8a49e..689c54e 100644
--- a/components/org.apache.stratos.mock.iaas.client/pom.xml
+++ b/components/org.apache.stratos.mock.iaas.client/pom.xml
@@ -93,7 +93,7 @@
org.apache.stratos.mock.iaas.client.*,
</Export-Package>
<Private-Package>
- org.apache.stratos.mock.iaas.client.internal;
+ org.apache.stratos.mock.iaas.client.internal;
</Private-Package>
<Import-Package>
!org.apache.commons.logging,
http://git-wip-us.apache.org/repos/asf/stratos/blob/5ab8819b/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java b/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java
index eec6783..2b6add6 100644
--- a/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java
+++ b/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java
@@ -58,12 +58,12 @@ public class MockIaasApiClient {
}
URI uri = new URIBuilder(endpoint + INSTANCES_CONTEXT).build();
HttpResponse response = restClient.doPost(uri, content);
- if(response != null) {
- if((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
+ if (response != null) {
+ if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return gson.fromJson(response.getContent(), MockInstanceMetadata.class);
} else {
ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if(errorResponse != null) {
+ if (errorResponse != null) {
throw new RuntimeException(errorResponse.getErrorMessage());
}
}
@@ -82,14 +82,14 @@ public class MockIaasApiClient {
}
URI uri = new URIBuilder(endpoint + INSTANCES_CONTEXT + instanceId).build();
HttpResponse response = restClient.doDelete(uri);
- if(response != null) {
- if((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
+ if (response != null) {
+ if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return;
} else {
GsonBuilder gsonBuilder = new GsonBuilder();
Gson gson = gsonBuilder.create();
ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if(errorResponse != null) {
+ if (errorResponse != null) {
throw new RuntimeException(errorResponse.getErrorMessage());
}
}
@@ -108,15 +108,15 @@ public class MockIaasApiClient {
}
URI uri = new URIBuilder(endpoint + INSTANCES_CONTEXT + instanceId + "/allocateIpAddress").build();
HttpResponse response = restClient.doPost(uri, new String());
- if(response != null) {
+ if (response != null) {
GsonBuilder gsonBuilder = new GsonBuilder();
Gson gson = gsonBuilder.create();
- if((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
+ if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) {
return gson.fromJson(response.getContent(), MockInstanceMetadata.class);
} else {
ErrorResponse errorResponse = gson.fromJson(response.getContent(), ErrorResponse.class);
- if(errorResponse != null) {
+ if (errorResponse != null) {
throw new RuntimeException(errorResponse.getErrorMessage());
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5ab8819b/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/rest/HttpResponse.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/rest/HttpResponse.java b/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/rest/HttpResponse.java
index db571bd..b8aca4a 100644
--- a/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/rest/HttpResponse.java
+++ b/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/rest/HttpResponse.java
@@ -30,18 +30,23 @@ public class HttpResponse {
public int getStatusCode() {
return statusCode;
}
+
public void setStatusCode(int statusCode) {
this.statusCode = statusCode;
}
+
public String getContent() {
return content;
}
+
public void setContent(String content) {
this.content = content;
}
+
public String getReason() {
return reason;
}
+
public void setReason(String reason) {
this.reason = reason;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5ab8819b/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/rest/HttpResponseHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/rest/HttpResponseHandler.java b/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/rest/HttpResponseHandler.java
index 0d554af..c717fca 100644
--- a/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/rest/HttpResponseHandler.java
+++ b/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/rest/HttpResponseHandler.java
@@ -32,7 +32,7 @@ import java.io.InputStreamReader;
/**
* Handles a HttpResponse and returns a {@link HttpResponse}
*/
-public class HttpResponseHandler implements ResponseHandler<HttpResponse>{
+public class HttpResponseHandler implements ResponseHandler<HttpResponse> {
private static final Log log = LogFactory.getLog(HttpResponseHandler.class);
[2/2] stratos git commit: Organize imports of mock iaas client
component
Posted by la...@apache.org.
Organize imports of mock iaas client component
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/367f91a1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/367f91a1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/367f91a1
Branch: refs/heads/master
Commit: 367f91a1308da0749df1f20da3f806bec6e916c0
Parents: 5ab8819
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Apr 13 11:45:40 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Apr 13 11:45:40 2015 +0530
----------------------------------------------------------------------
.../org/apache/stratos/mock/iaas/client/MockIaasApiClient.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/367f91a1/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java b/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java
index 2b6add6..b76bc14 100644
--- a/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java
+++ b/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java
@@ -24,11 +24,11 @@ import com.google.gson.GsonBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.client.utils.URIBuilder;
+import org.apache.stratos.mock.iaas.client.rest.HttpResponse;
+import org.apache.stratos.mock.iaas.client.rest.RestClient;
import org.apache.stratos.mock.iaas.domain.ErrorResponse;
import org.apache.stratos.mock.iaas.domain.MockInstanceContext;
import org.apache.stratos.mock.iaas.domain.MockInstanceMetadata;
-import org.apache.stratos.mock.iaas.client.rest.HttpResponse;
-import org.apache.stratos.mock.iaas.client.rest.RestClient;
import java.net.URI;