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:11:00 UTC

[5/5] stratos git commit: Getting message using e.getFaultMessage and improve the end user message

Getting message using e.getFaultMessage and improve the end user message


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7629f869
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7629f869
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7629f869

Branch: refs/heads/master
Commit: 7629f86916296b40cd852a9b2eacc8755dc40b64
Parents: c236078
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon May 18 13:26:05 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon May 18 13:26:05 2015 +0530

----------------------------------------------------------------------
 .../controller/services/impl/CloudControllerServiceImpl.java    | 5 +++--
 .../org/apache/stratos/rest/endpoint/api/StratosApiV41.java     | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/7629f869/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 f6bb350..daa4d2b4 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
@@ -1432,8 +1432,9 @@ public class CloudControllerServiceImpl implements CloudControllerService {
                     try {
                         validatePartition(partition);
                     } catch (InvalidPartitionException e) {
-                        throw new InvalidNetworkPartitionException(String.format("Invalid network partition " +
-                                        "[network-partition-id] %s, due to invalid partition [partition-id] %s ",
+                        //Following message is shown to the end user in all the the API clients(GUI/CLI/Rest API)
+                        throw new InvalidNetworkPartitionException(String.format("Network partition " +
+                                        " %s, is invalid since the partition %s is invalid",
                                 networkPartition.getId(), partition.getId()), e);
                     }
                     if (log.isInfoEnabled()) {

http://git-wip-us.apache.org/repos/asf/stratos/blob/7629f869/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 f0f9321..9360c40 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
@@ -600,8 +600,10 @@ public class StratosApiV41 extends AbstractApi {
 
         } catch (CloudControllerServiceInvalidNetworkPartitionExceptionException e) {
 
+            //This message is taken following way since the Axis2 does not return the message in e.getMessage method
+            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();