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 2015/05/18 14:58:58 UTC
[1/2] stratos git commit: This closes #333 on GitHub
Repository: stratos
Updated Branches:
refs/heads/master d24237b39 -> 5baf9bc55
This closes #333 on GitHub
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5baf9bc5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5baf9bc5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5baf9bc5
Branch: refs/heads/master
Commit: 5baf9bc55718babbbe69318307518c7b5b9408ab
Parents: 1938c89
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon May 18 18:28:50 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon May 18 18:28:50 2015 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/2] stratos git commit: Fixing Issues with addTenant from CLI
Posted by im...@apache.org.
Fixing Issues with addTenant from CLI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1938c894
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1938c894
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1938c894
Branch: refs/heads/master
Commit: 1938c894885e0e3eff96827196d8cb65ed851cd6
Parents: d24237b
Author: anuruddhal <an...@gmail.com>
Authored: Mon May 18 17:56:58 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon May 18 18:28:50 2015 +0530
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 9 ++++--
.../rest/endpoint/api/StratosApiV41.java | 31 ++++++++++----------
2 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1938c894/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index a6c1fcc..007b030 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -35,6 +35,7 @@ import org.apache.stratos.cli.exception.ExceptionMapper;
import org.apache.stratos.cli.utils.CliConstants;
import org.apache.stratos.cli.utils.CliUtils;
import org.apache.stratos.cli.utils.RowMapper;
+import org.apache.stratos.common.beans.ResponseMessageBean;
import org.apache.stratos.common.beans.TenantInfoBean;
import org.apache.stratos.common.beans.UserInfoBean;
import org.apache.stratos.common.beans.application.ApplicationBean;
@@ -507,10 +508,12 @@ public class RestCommandLineService {
+ ENDPOINT_ADD_TENANT, jsonString);
int responseCode = response.getStatusLine().getStatusCode();
- if (responseCode < 200 || responseCode >= 300) {
- CliUtils.printError(response);
- } else {
+ if (responseCode ==201) {
System.out.println("Tenant added successfully: " + domain);
+ } else {
+ String resultString = CliUtils.getHttpResponseString(response);
+ String errorMsg= gson.fromJson(resultString, ResponseMessageBean.class).getMessage();
+ System.out.println(errorMsg);
}
} catch (Exception e) {
String message = "Could not add tenant: " + domain;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1938c894/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index b7e9983..4ffb2a9 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -824,11 +824,11 @@ public class StratosApiV41 extends AbstractApi {
} catch (AutoscalerServiceInvalidApplicationPolicyExceptionException e) {
return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
ResponseMessageBean.ERROR, "Invalid application policy")).build();
- } catch(AutoscalerServiceApplicationPolicyAlreadyExistsExceptionException e){
+ } catch (AutoscalerServiceApplicationPolicyAlreadyExistsExceptionException e) {
return Response.status(Response.Status.CONFLICT).entity(new ResponseMessageBean(
ResponseMessageBean.ERROR, "Application policy already exists")).build();
- }catch (RestAPIException e) {
+ } catch (RestAPIException e) {
throw e;
}
@@ -1435,18 +1435,19 @@ public class StratosApiV41 extends AbstractApi {
try {
StratosApiV41Utils.addTenant(tenantInfoBean);
+ URI url = uriInfo.getAbsolutePathBuilder().path(tenantInfoBean.getTenantDomain()).build();
+ return Response.created(url).entity(
+ new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format(
+ "Tenant added successfully: [tenant] %s", tenantInfoBean.getTenantDomain()))).build();
} catch (InvalidEmailException e) {
- Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, "Invalid email")).build();
+ return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
+ ResponseMessageBean.ERROR, String.format("Invalid email: [email] %s", tenantInfoBean.getEmail()))).build();
} catch (InvalidDomainException e) {
- Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, "Invalid domain")).build();
+ return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
+ ResponseMessageBean.ERROR, String.format("Invalid domain: [domain] %s", tenantInfoBean.getTenantDomain()))).build();
}
- URI url = uriInfo.getAbsolutePathBuilder().path(tenantInfoBean.getTenantDomain()).build();
- return Response.created(url).entity(
- new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format(
- "Tenant added successfully: [tenant] %s", tenantInfoBean.getTenantDomain()))).build();
+
}
/**
@@ -1466,20 +1467,20 @@ public class StratosApiV41 extends AbstractApi {
try {
StratosApiV41Utils.updateExistingTenant(tenantInfoBean);
+ return Response.ok().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS,
+ String.format("Tenant updated successfully: [tenant] %s", tenantInfoBean.getTenantDomain()))).build();
} catch (TenantNotFoundException ex) {
- Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean(
+ return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean(
ResponseMessageBean.ERROR, "Tenant not found")).build();
} catch (InvalidEmailException e) {
- Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
- ResponseMessageBean.ERROR, "Invalid email")).build();
+ return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean(
+ ResponseMessageBean.ERROR, String.format("Invalid email [email] %s", tenantInfoBean.getEmail()))).build();
} catch (Exception e) {
String msg = "Error in updating tenant " + tenantInfoBean.getTenantDomain();
log.error(msg, e);
throw new RestAPIException(msg);
}
- return Response.ok().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS,
- String.format("Tenant updated successfully: [tenant] %s", tenantInfoBean.getTenantDomain()))).build();
}
/**