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/18 10:10:59 UTC
[4/5] stratos git commit: Fix exception handling issue in adding the
network partition
Fix exception handling issue in adding the network partition
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c7ece53f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c7ece53f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c7ece53f
Branch: refs/heads/master
Commit: c7ece53f5df04d18e9d1289cf4cbc810a51d9f5c
Parents: a8dc8c1
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon May 18 07:46:14 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon May 18 12:17:58 2015 +0530
----------------------------------------------------------------------
.../exception/InvalidPartitionException.java | 2 +-
.../services/CloudControllerService.java | 2 +-
.../impl/CloudControllerServiceImpl.java | 4 +-
.../client/CloudControllerServiceClient.java | 3 +-
.../rest/endpoint/api/StratosApiV41.java | 6 +
.../rest/endpoint/api/StratosApiV41Utils.java | 3 +-
.../main/resources/CloudControllerService.wsdl | 1146 +++++++++---------
7 files changed, 598 insertions(+), 568 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7ece53f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java
index 9a37ca7..bc9fdd3 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java
@@ -20,7 +20,7 @@ package org.apache.stratos.cloud.controller.exception;
/**
- * Throws when a {@link Partition} is evaluated to be invalid.
+ * Throws when a {@link org.apache.stratos.cloud.controller.domain.Partition} is evaluated to be invalid.
*/
public class InvalidPartitionException extends Exception {
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7ece53f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
index 00a067a..0542a19 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
@@ -346,7 +346,7 @@ public interface CloudControllerService {
* @param networkPartition
* @throws NetworkPartitionAlreadyExistsException
*/
- public boolean addNetworkPartition(NetworkPartition networkPartition) throws NetworkPartitionAlreadyExistsException;
+ public boolean addNetworkPartition(NetworkPartition networkPartition) throws NetworkPartitionAlreadyExistsException, InvalidNetworkPartitionException;
/**
* Remove network partition
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7ece53f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index 6846177..fda0420 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -819,7 +819,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
ClusterContext ctxt = CloudControllerContext.getInstance().getClusterContext(clusterId_);
if (ctxt == null) {
String msg = String.format("Service unregistration failed. Cluster not found: [cluster-id] %s " +
- "[application-id] %s " , clusterId_, ctxt.getApplicationId());
+ "[application-id] %s ", clusterId_, ctxt.getApplicationId());
log.error(msg);
return;
}
@@ -864,7 +864,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
} catch (Exception ignore) {
if (log.isErrorEnabled()) {
log.error((String.format("Error while deleting volume [id] %s " +
- "[application-id]", volume.getId(), ctxt.getApplicationId())),
+ "[application-id]", volume.getId(), ctxt.getApplicationId())),
ignore);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7ece53f/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
index 91a2c53..4a2e5e0 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
@@ -221,7 +221,8 @@ public class CloudControllerServiceClient {
}
public void addNetworkPartition(NetworkPartition networkPartition) throws RemoteException,
- CloudControllerServiceNetworkPartitionAlreadyExistsExceptionException {
+ CloudControllerServiceNetworkPartitionAlreadyExistsExceptionException,
+ CloudControllerServiceInvalidNetworkPartitionExceptionException {
stub.addNetworkPartition(networkPartition);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7ece53f/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 64feff5..f0f9321 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
@@ -593,10 +593,16 @@ public class StratosApiV41 extends AbstractApi {
try {
StratosApiV41Utils.addNetworkPartition(networkPartitionBean);
} catch (CloudControllerServiceNetworkPartitionAlreadyExistsExceptionException e) {
+
return Response.status(Response.Status.CONFLICT)
.entity(new ResponseMessageBean(ResponseMessageBean.ERROR, e.getMessage()))
.build();
+ } catch (CloudControllerServiceInvalidNetworkPartitionExceptionException e) {
+
+ return Response.status(Response.Status.BAD_REQUEST)
+ .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, e.getMessage()))
+ .build();
}
URI url = uriInfo.getAbsolutePathBuilder().path(networkPartitionId).build();
return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS,
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7ece53f/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 705aec5..1b23b29 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
@@ -2553,7 +2553,8 @@ public class StratosApiV41Utils {
* @param networkPartitionBean NetworkPartitionBean
*/
public static void addNetworkPartition(NetworkPartitionBean networkPartitionBean) throws RestAPIException,
- CloudControllerServiceNetworkPartitionAlreadyExistsExceptionException {
+ CloudControllerServiceNetworkPartitionAlreadyExistsExceptionException,
+ CloudControllerServiceInvalidNetworkPartitionExceptionException {
try {
CloudControllerServiceClient serviceClient = CloudControllerServiceClient.getInstance();
serviceClient.addNetworkPartition(