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/05/04 06:57:38 UTC
stratos git commit: Updating error messages returned from rest API
Repository: stratos
Updated Branches:
refs/heads/master 5168b2b59 -> 5ebb41e20
Updating error messages returned from rest API
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5ebb41e2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5ebb41e2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5ebb41e2
Branch: refs/heads/master
Commit: 5ebb41e2006463f1cf33933450d08432ff371f7e
Parents: 5168b2b
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon May 4 10:27:27 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon May 4 10:27:27 2015 +0530
----------------------------------------------------------------------
.../rest/endpoint/api/StratosApiV41.java | 37 +++++++++++---------
.../rest/endpoint/api/StratosApiV41Utils.java | 2 +-
2 files changed, 21 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5ebb41e2/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 40fb386..81c07b7 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
@@ -439,7 +439,8 @@ public class StratosApiV41 extends AbstractApi {
serviceGroupDefinition.getName()))).build();
} catch (RestAPIException e) {
if (e.getCause().getMessage().contains("already exists")) {
- return Response.status(Response.Status.CONFLICT).build();
+ return Response.status(Response.Status.CONFLICT).entity(new ErrorResponseBean(
+ Response.Status.CONFLICT.getStatusCode(), "Cartridge group not found")).build();
} else {
throw e;
}
@@ -461,14 +462,13 @@ public class StratosApiV41 extends AbstractApi {
public Response getServiceGroupDefinition(
@PathParam("groupDefinitionName") String groupDefinitionName) throws RestAPIException {
GroupBean serviceGroupDefinition = StratosApiV41Utils.getServiceGroupDefinition(groupDefinitionName);
- Response.ResponseBuilder rb;
+
if (serviceGroupDefinition != null) {
- rb = Response.ok().entity(serviceGroupDefinition);
+ return Response.ok().entity(serviceGroupDefinition).build();
} else {
- rb = Response.status(Response.Status.NOT_FOUND);
+ return Response.status(Response.Status.NOT_FOUND).entity(new ErrorResponseBean(
+ Response.Status.NOT_FOUND.getStatusCode(), "Cartridge group not found")).build();
}
-
- return rb.build();
}
/**
@@ -485,14 +485,13 @@ public class StratosApiV41 extends AbstractApi {
public Response getServiceGroups()
throws RestAPIException {
GroupBean[] serviceGroups = StratosApiV41Utils.getServiceGroupDefinitions();
- Response.ResponseBuilder rb;
+
if (serviceGroups != null) {
- rb = Response.ok().entity(serviceGroups);
+ return Response.ok().entity(serviceGroups).build();
} else {
- rb = Response.status(Response.Status.NOT_FOUND);
+ return Response.status(Response.Status.NOT_FOUND).entity(new ErrorResponseBean(
+ Response.Status.NOT_FOUND.getStatusCode(), "Cartridge group not found")).build();
}
-
- return rb.build();
}
/**
@@ -538,8 +537,8 @@ public class StratosApiV41 extends AbstractApi {
StratosApiV41Utils.addNetworkPartition(networkPartitionBean);
} catch (CloudControllerServiceNetworkPartitionAlreadyExistsExceptionException e) {
return Response.status(Response.Status.CONFLICT)
- .entity(new ErrorResponseBean(Response.Status.CONFLICT.getStatusCode(), e.getLocalizedMessage()))
- .build();
+ .entity(new ErrorResponseBean(Response.Status.CONFLICT.getStatusCode(), "Network partition already" +
+ "exists")).build();
}
URI url = uriInfo.getAbsolutePathBuilder().path(networkPartitionId).build();
return Response.created(url).entity(new SuccessResponseBean(Response.Status.CREATED.getStatusCode(),
@@ -562,7 +561,8 @@ public class StratosApiV41 extends AbstractApi {
throws RestAPIException {
NetworkPartitionBean[] networkPartitions = StratosApiV41Utils.getNetworkPartitions();
if (networkPartitions == null || networkPartitions.length == 0) {
- return Response.status(Response.Status.NOT_FOUND).build();
+ return Response.status(Response.Status.NOT_FOUND).entity(new ErrorResponseBean(
+ Response.Status.NOT_FOUND.getStatusCode(), "No network partitions found")).build();
}
return Response.ok(networkPartitions).build();
@@ -583,7 +583,8 @@ public class StratosApiV41 extends AbstractApi {
@PathParam("networkPartitionId") String networkPartitionId) throws RestAPIException {
NetworkPartitionBean networkPartition = StratosApiV41Utils.getNetworkPartition(networkPartitionId);
if (networkPartition == null) {
- return Response.status(Response.Status.NOT_FOUND).build();
+ return Response.status(Response.Status.NOT_FOUND).entity(new ErrorResponseBean(
+ Response.Status.NOT_FOUND.getStatusCode(), "Network partition is not found")).build();
}
return Response.ok(networkPartition).build();
@@ -605,7 +606,8 @@ public class StratosApiV41 extends AbstractApi {
try {
StratosApiV41Utils.removeNetworkPartition(networkPartitionId);
} catch (CloudControllerServiceNetworkPartitionNotExistsExceptionException e) {
- return Response.status(Response.Status.NOT_FOUND).build();
+ return Response.status(Response.Status.NOT_FOUND).entity(new ErrorResponseBean(
+ Response.Status.NOT_FOUND.getStatusCode(), "Network partition is not found")).build();
}
return Response.ok().entity(new SuccessResponseBean(Response.Status.OK.getStatusCode(),
String.format("Network Partition deleted successfully: [network-partition] %s",
@@ -636,7 +638,8 @@ public class StratosApiV41 extends AbstractApi {
applicationDefinition.getApplicationId()))).build();
} catch (ApplicationAlreadyExistException e) {
- return Response.status(Response.Status.CONFLICT).build();
+ return Response.status(Response.Status.CONFLICT).entity(new ErrorResponseBean(
+ Response.Status.CONFLICT.getStatusCode(), "Application already exists")).build();
} catch (RestAPIException e) {
throw e;
http://git-wip-us.apache.org/repos/asf/stratos/blob/5ebb41e2/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 1755178..bc4342d 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -827,7 +827,7 @@ public class StratosApiV41Utils {
try {
if (ccServiceClient.getCartridge(cartridgeType) == null) {
// cartridge is not deployed, can't continue
- log.error("invalid cartridge found in cartridge group " + cartridgeType);
+ log.error("Invalid cartridge found in cartridge group " + cartridgeType);
throw new RestAPIException("No Cartridge Definition found with type " + cartridgeType);
} else {
cartridgeNames[i] = cartridgeType;