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/19 09:15:46 UTC
[3/3] stratos git commit: Fixing CLI issue when adding Network
Partions
Fixing CLI issue when adding Network Partions
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0031beb8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0031beb8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0031beb8
Branch: refs/heads/master
Commit: 0031beb87909562e5662e0d0d48d07de306388be
Parents: 44dd865
Author: anuruddhal <an...@gmail.com>
Authored: Tue May 19 10:36:27 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Tue May 19 12:45:38 2015 +0530
----------------------------------------------------------------------
.../NetworkPartitionAlreadyExistsException.java | 19 +-
.../rest/endpoint/api/StratosApiV41.java | 6 +-
.../main/resources/CloudControllerService.wsdl | 1084 +++++++++---------
3 files changed, 564 insertions(+), 545 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0031beb8/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionAlreadyExistsException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionAlreadyExistsException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionAlreadyExistsException.java
index 7bb5416..8369d70 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionAlreadyExistsException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionAlreadyExistsException.java
@@ -19,8 +19,23 @@
package org.apache.stratos.cloud.controller.exception;
public class NetworkPartitionAlreadyExistsException extends Exception {
+ private String message;
- public NetworkPartitionAlreadyExistsException(String message) {
- super(message);
+ public NetworkPartitionAlreadyExistsException(String msg) {
+ super(msg);
+ this.setMessage(msg);
+ }
+
+ public NetworkPartitionAlreadyExistsException(String msg, Exception ex) {
+ super(msg, ex);
+ this.setMessage(msg);
+ }
+
+ private void setMessage(String msg) {
+ this.message = msg;
+ }
+
+ public String getMessage() {
+ return this.message;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0031beb8/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 c68ffb3..670e38b 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
@@ -595,13 +595,15 @@ public class StratosApiV41 extends AbstractApi {
try {
StratosApiV41Utils.addNetworkPartition(networkPartitionBean);
} catch (CloudControllerServiceNetworkPartitionAlreadyExistsExceptionException e) {
+ String backendErrorMessage = e.getFaultMessage().getNetworkPartitionAlreadyExistsException().getMessage();
return Response.status(Response.Status.CONFLICT)
- .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, e.getMessage()))
+ .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, backendErrorMessage))
.build();
} catch (CloudControllerServiceInvalidNetworkPartitionExceptionException e) {
+ String backendErrorMessage = e.getFaultMessage().getInvalidNetworkPartitionException().getMessage();
return Response.status(Response.Status.BAD_REQUEST)
- .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, e.getMessage()))
+ .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, backendErrorMessage))
.build();
}
URI url = uriInfo.getAbsolutePathBuilder().path(networkPartitionId).build();