http://git-wip-us.apache.org/repos/asf/stratos/blob/f74d428e/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 9639970..c48bf09 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
@@ -86,8 +86,7 @@ public class StratosApiV41 extends AbstractApi {
     @GET
     @Path("/init")
     @AuthorizationAction("/permission/admin/login")
-    public Response initialize()
-            throws RestAPIException {
+    public Response initialize() throws RestAPIException {
         ResponseMessageBean response = new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
                 "Successfully authenticated");
         return Response.ok(response).build();
@@ -129,19 +128,18 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/deploymentPolicies/manage")
-    public Response addDeploymentPolicy(
-            DeploymentPolicyBean deploymentPolicyDefinitionBean) throws 
RestAPIException {
-
+    public Response addDeploymentPolicy(DeploymentPolicyBean 
deploymentPolicyDefinitionBean) throws RestAPIException {
         String deploymentPolicyID = deploymentPolicyDefinitionBean.getId();
         try {
             
StratosApiV41Utils.addDeploymentPolicy(deploymentPolicyDefinitionBean);
         } catch (AutoscalerServiceInvalidDeploymentPolicyExceptionException e) 
{
             String backendErrorMessage = 
e.getFaultMessage().getInvalidDeploymentPolicyException().getMessage();
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, backendErrorMessage)).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
backendErrorMessage)).build();
         } catch 
(AutoscalerServiceDeploymentPolicyAlreadyExistsExceptionException e) {
-            return Response.status(Response.Status.CONFLICT).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Deployment policy already 
exists")).build();
+            return Response.status(Response.Status.CONFLICT)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Deployment policy already exists"))
+                    .build();
         }
         URI url = 
uriInfo.getAbsolutePathBuilder().path(deploymentPolicyID).build();
         return Response.created(url).entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
@@ -160,12 +158,12 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/deploymentPolicies/view")
-    public Response getDeploymentPolicy(
-            @PathParam("deploymentPolicyId") String deploymentPolicyId) throws 
RestAPIException {
+    public Response getDeploymentPolicy(@PathParam("deploymentPolicyId") 
String deploymentPolicyId)
+            throws RestAPIException {
         DeploymentPolicyBean deploymentPolicyBean = 
StratosApiV41Utils.getDeployementPolicy(deploymentPolicyId);
         if (deploymentPolicyBean == null) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Deployment policy not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Deployment policy not found")).build();
         }
         return Response.ok(deploymentPolicyBean).build();
     }
@@ -181,12 +179,11 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/deploymentPolicies/view")
-    public Response getDeploymentPolicies()
-            throws RestAPIException {
+    public Response getDeploymentPolicies() throws RestAPIException {
         DeploymentPolicyBean[] deploymentPolicies = 
StratosApiV41Utils.getDeployementPolicies();
         if (deploymentPolicies == null || deploymentPolicies.length == 0) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "No deployment policies 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"No deployment policies found")).build();
         }
 
         return Response.ok(deploymentPolicies).build();
@@ -204,9 +201,8 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/deploymentPolicies/manage")
-    public Response updateDeploymentPolicy(
-            DeploymentPolicyBean deploymentPolicyDefinitionBean) throws 
RestAPIException {
-
+    public Response updateDeploymentPolicy(DeploymentPolicyBean 
deploymentPolicyDefinitionBean)
+            throws RestAPIException {
         String deploymentPolicyID = deploymentPolicyDefinitionBean.getId();
         // TODO :: Deployment policy validation
 
@@ -216,15 +212,15 @@ public class StratosApiV41 extends AbstractApi {
 
         } catch (AutoscalerServiceInvalidPolicyExceptionException e) {
             String backendErrorMessage = 
e.getFaultMessage().getInvalidPolicyException().getMessage();
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, backendErrorMessage)).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
backendErrorMessage)).build();
         } catch (AutoscalerServiceInvalidDeploymentPolicyExceptionException e) 
{
             String backendErrorMessage = 
e.getFaultMessage().getInvalidDeploymentPolicyException().getMessage();
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, backendErrorMessage)).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
backendErrorMessage)).build();
         } catch (AutoscalerServiceDeploymentPolicyNotExistsExceptionException 
e) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Deployment policy not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Deployment policy not found")).build();
         }
         URI url = 
uriInfo.getAbsolutePathBuilder().path(deploymentPolicyID).build();
         return Response.ok(url).entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
@@ -244,16 +240,16 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/deploymentPolicies/manage")
-    public Response removeDeploymentPolicy(
-            @PathParam("deploymentPolicyId") String deploymentPolicyId) throws 
RestAPIException {
+    public Response removeDeploymentPolicy(@PathParam("deploymentPolicyId") 
String deploymentPolicyId)
+            throws RestAPIException {
         try {
             StratosApiV41Utils.removeDeploymentPolicy(deploymentPolicyId);
         } catch (AutoscalerServiceDeploymentPolicyNotExistsExceptionException 
e) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Deployment policy not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Deployment policy not found")).build();
         } catch (AutoscalerServiceUnremovablePolicyExceptionException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Deployment policy is in 
use")).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Deployment policy is in use")).build();
         }
         URI url = 
uriInfo.getAbsolutePathBuilder().path(deploymentPolicyId).build();
         return Response.ok(url).entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
@@ -273,9 +269,7 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/cartridges/manage")
-    public Response addCartridge(
-            CartridgeBean cartridgeDefinitionBean) throws RestAPIException {
-
+    public Response addCartridge(CartridgeBean cartridgeDefinitionBean) throws 
RestAPIException {
         String cartridgeType = cartridgeDefinitionBean.getType();
         CartridgeBean cartridgeBean = null;
         try {
@@ -308,9 +302,7 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/cartridges/manage")
-    public Response updateCartridge(CartridgeBean cartridgeDefinitionBean)
-            throws RestAPIException {
-
+    public Response updateCartridge(CartridgeBean cartridgeDefinitionBean) 
throws RestAPIException {
         String cartridgeType = cartridgeDefinitionBean.getType();
         StratosApiV41Utils.updateCartridge(cartridgeDefinitionBean);
         URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeType).build();
@@ -329,14 +321,12 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/cartridges/view")
-    public Response getCartridges()
-            throws RestAPIException {
-
+    public Response getCartridges() throws RestAPIException {
         //We pass null to searching string and multi-tenant parameter since we 
do not need to do any filtering
         List<CartridgeBean> cartridges = 
StratosApiV41Utils.getAvailableCartridges(null, null, getConfigContext());
         if (cartridges == null || cartridges.isEmpty()) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "No cartridges found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"No cartridges found")).build();
         }
         CartridgeBean[] cartridgeArray = cartridges.toArray(new 
CartridgeBean[cartridges.size()]);
         return Response.ok().entity(cartridgeArray).build();
@@ -354,15 +344,14 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/cartridges/view")
-    public Response getCartridge(
-            @PathParam("cartridgeType") String cartridgeType) throws 
RestAPIException {
+    public Response getCartridge(@PathParam("cartridgeType") String 
cartridgeType) throws RestAPIException {
         CartridgeBean cartridge;
         try {
             cartridge = StratosApiV41Utils.getCartridge(cartridgeType);
             return Response.ok().entity(cartridge).build();
         } catch (RestAPIException e) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Cartridge not found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Cartridge not found")).build();
         }
     }
 
@@ -379,14 +368,13 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/cartridges/view")
-    public Response getCartridgesByFilter(
-            @DefaultValue("") @PathParam("filter") String filter, 
@QueryParam("criteria") String criteria)
-            throws RestAPIException {
+    public Response getCartridgesByFilter(@DefaultValue("") 
@PathParam("filter") String filter,
+            @QueryParam("criteria") String criteria) throws RestAPIException {
         List<CartridgeBean> cartridges = StratosApiV41Utils.
                 getCartridgesByFilter(filter, criteria, getConfigContext());
         if (cartridges == null || cartridges.isEmpty()) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "No cartridges found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"No cartridges found")).build();
         }
 
         CartridgeBean[] cartridgeArray = cartridges.toArray(new 
CartridgeBean[cartridges.size()]);
@@ -406,15 +394,14 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/cartridges/view")
-    public Response getCartridgeByFilter(
-            @PathParam("cartridgeType") String cartridgeType, 
@DefaultValue("") @PathParam("filter") String filter)
-            throws RestAPIException {
+    public Response getCartridgeByFilter(@PathParam("cartridgeType") String 
cartridgeType,
+            @DefaultValue("") @PathParam("filter") String filter) throws 
RestAPIException {
         CartridgeBean cartridge;
-
         cartridge = StratosApiV41Utils.getCartridgeByFilter(filter, 
cartridgeType, getConfigContext());
         if (cartridge == null) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "No cartridges found for this 
filter")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"No cartridges found for this filter"))
+                    .build();
         }
         return Response.ok().entity(cartridge).build();
 
@@ -432,8 +419,7 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/cartridges/manage")
-    public Response removeCartridge(
-            @PathParam("cartridgeType") String cartridgeType) throws 
RestAPIException {
+    public Response removeCartridge(@PathParam("cartridgeType") String 
cartridgeType) throws RestAPIException {
         try {
             StratosApiV41Utils.removeCartridge(cartridgeType);
             return Response.ok().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
@@ -441,13 +427,13 @@ public class StratosApiV41 extends AbstractApi {
         } catch (RemoteException e) {
             throw new RestAPIException(e.getMessage());
         } catch (CloudControllerServiceInvalidCartridgeTypeExceptionException 
e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, 
e.getFaultMessage().getInvalidCartridgeTypeException().getMessage()))
-                    .build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
+                            
e.getFaultMessage().getInvalidCartridgeTypeException().getMessage())).build();
         } catch (CloudControllerServiceCartridgeNotFoundExceptionException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR,
-                    
e.getFaultMessage().getCartridgeNotFoundException().getMessage())).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
+                            
e.getFaultMessage().getCartridgeNotFoundException().getMessage())).build();
         }
     }
 
@@ -465,8 +451,7 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/cartridgeGroups/manage")
-    public Response addCartridgeGroup(
-            CartridgeGroupBean cartridgeGroupBean) throws RestAPIException {
+    public Response addCartridgeGroup(CartridgeGroupBean cartridgeGroupBean) 
throws RestAPIException {
         try {
             StratosApiV41Utils.addCartridgeGroup(cartridgeGroupBean);
             URI url = 
uriInfo.getAbsolutePathBuilder().path(cartridgeGroupBean.getName()).build();
@@ -475,19 +460,19 @@ public class StratosApiV41 extends AbstractApi {
                     String.format("Cartridge Group added successfully: 
[cartridge-group] %s",
                             cartridgeGroupBean.getName()))).build();
         } catch (InvalidCartridgeGroupDefinitionException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, e.getMessage())).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
e.getMessage())).build();
         } catch (ServiceGroupDefinitionException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, e.getMessage())).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
e.getMessage())).build();
         } catch (AutoscalerServiceInvalidServiceGroupExceptionException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR,
-                    
e.getFaultMessage().getInvalidServiceGroupException().getMessage())).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
+                            
e.getFaultMessage().getInvalidServiceGroupException().getMessage())).build();
         } catch (CloudControllerServiceCartridgeNotFoundExceptionException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR,
-                    
e.getFaultMessage().getCartridgeNotFoundException().getMessage())).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
+                            
e.getFaultMessage().getCartridgeNotFoundException().getMessage())).build();
         }
     }
 
@@ -503,9 +488,7 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/cartridgeGroups/manage")
-    public Response updateCartridgeGroup(
-            CartridgeGroupBean cartridgeGroupBean) throws RestAPIException {
-
+    public Response updateCartridgeGroup(CartridgeGroupBean 
cartridgeGroupBean) throws RestAPIException {
         try {
             StratosApiV41Utils.updateServiceGroup(cartridgeGroupBean);
             URI url = 
uriInfo.getAbsolutePathBuilder().path(cartridgeGroupBean.getName()).build();
@@ -515,15 +498,15 @@ public class StratosApiV41 extends AbstractApi {
                             cartridgeGroupBean.getName()))).build();
 
         } catch (InvalidCartridgeGroupDefinitionException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Invalid cartridge group 
definition")).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Invalid cartridge group definition"))
+                    .build();
         } catch (RestAPIException e) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Cartridge group not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Cartridge group not found")).build();
         }
     }
 
-
     /**
      * Gets the cartridge group definition.
      *
@@ -536,15 +519,13 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/cartridgeGroups/view")
-    public Response getCartridgeGroup(
-            @PathParam("name") String name) throws RestAPIException {
+    public Response getCartridgeGroup(@PathParam("name") String name) throws 
RestAPIException {
         CartridgeGroupBean serviceGroupDefinition = 
StratosApiV41Utils.getServiceGroupDefinition(name);
-
         if (serviceGroupDefinition != null) {
             return Response.ok().entity(serviceGroupDefinition).build();
         } else {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Cartridge group not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Cartridge group not found")).build();
         }
     }
 
@@ -559,15 +540,13 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/cartridgeGroups/view")
-    public Response getCartridgeGroups()
-            throws RestAPIException {
+    public Response getCartridgeGroups() throws RestAPIException {
         CartridgeGroupBean[] serviceGroups = 
StratosApiV41Utils.getServiceGroupDefinitions();
-
         if (serviceGroups != null) {
             return Response.ok().entity(serviceGroups).build();
         } else {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Cartridge group not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Cartridge group not found")).build();
         }
     }
 
@@ -583,17 +562,15 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/cartridgeGroups/manage")
-    public Response removeServiceGroup(
-            @PathParam("name") String name) throws RestAPIException {
+    public Response removeServiceGroup(@PathParam("name") String name) throws 
RestAPIException {
         try {
             StratosApiV41Utils.removeServiceGroup(name);
         } catch (AutoscalerServiceCartridgeGroupNotFoundExceptionException e) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Cartridge group not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Cartridge group not found")).build();
         }
         return Response.ok().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
-                String.format("Cartridge Group deleted successfully: 
[cartridge-group] %s", name)))
-                .build();
+                String.format("Cartridge Group deleted successfully: 
[cartridge-group] %s", name))).build();
     }
 
     // API methods for network partitions
@@ -610,22 +587,19 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/networkPartitions/manage")
-    public Response addNetworkPartition(
-            NetworkPartitionBean networkPartitionBean) throws RestAPIException 
{
+    public Response addNetworkPartition(NetworkPartitionBean 
networkPartitionBean) throws RestAPIException {
         String networkPartitionId = networkPartitionBean.getId();
         try {
             StratosApiV41Utils.addNetworkPartition(networkPartitionBean);
         } catch 
(CloudControllerServiceNetworkPartitionAlreadyExistsExceptionException e) {
             String backendErrorMessage = 
e.getFaultMessage().getNetworkPartitionAlreadyExistsException().getMessage();
             return Response.status(Response.Status.CONFLICT)
-                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
backendErrorMessage))
-                    .build();
+                    .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, 
backendErrorMessage))
-                    .build();
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
backendErrorMessage)).build();
         }
         URI url = 
uriInfo.getAbsolutePathBuilder().path(networkPartitionId).build();
         return Response.created(url).entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
@@ -644,12 +618,11 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/networkPartitions/view")
-    public Response getNetworkPartitions()
-            throws RestAPIException {
+    public Response getNetworkPartitions() throws RestAPIException {
         NetworkPartitionBean[] networkPartitions = 
StratosApiV41Utils.getNetworkPartitions();
         if (networkPartitions == null || networkPartitions.length == 0) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "No network partitions 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"No network partitions found")).build();
         }
         return Response.ok(networkPartitions).build();
     }
@@ -665,12 +638,13 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/networkPartitions/view")
-    public Response getNetworkPartition(
-            @PathParam("networkPartitionId") String networkPartitionId) throws 
RestAPIException {
+    public Response getNetworkPartition(@PathParam("networkPartitionId") 
String networkPartitionId)
+            throws RestAPIException {
         NetworkPartitionBean networkPartition = 
StratosApiV41Utils.getNetworkPartition(networkPartitionId);
         if (networkPartition == null) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Network partition is not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Network partition is not found"))
+                    .build();
         }
 
         return Response.ok(networkPartition).build();
@@ -688,14 +662,12 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/networkPartitions/manage")
-    public Response updateNetworkPartition(
-            NetworkPartitionBean networkPartition) throws RestAPIException {
-
+    public Response updateNetworkPartition(NetworkPartitionBean 
networkPartition) throws RestAPIException {
         try {
             StratosApiV41Utils.updateNetworkPartition(networkPartition);
         } catch 
(CloudControllerServiceNetworkPartitionNotExistsExceptionException e) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Network partition not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Network partition not found")).build();
         }
         return Response.ok().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
                 String.format("Network Partition updated successfully: 
[network-partition] %s",
@@ -712,18 +684,18 @@ public class StratosApiV41 extends AbstractApi {
     @DELETE
     @Path("/networkPartitions/{networkPartitionId}")
     @AuthorizationAction("/permission/admin/stratos/networkPartitions/manage")
-    public Response removeNetworkPartition(
-            @PathParam("networkPartitionId") String networkPartitionId) throws 
RestAPIException {
-
+    public Response removeNetworkPartition(@PathParam("networkPartitionId") 
String networkPartitionId)
+            throws RestAPIException {
         try {
             StratosApiV41Utils.removeNetworkPartition(networkPartitionId);
         } catch 
(CloudControllerServiceNetworkPartitionNotExistsExceptionException e) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Network partition is not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Network partition is not found"))
+                    .build();
         }
         return Response.ok().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
-                String.format("Network partition deleted successfully: 
[network-partition] %s",
-                        networkPartitionId))).build();
+                String.format("Network partition deleted successfully: 
[network-partition] %s", networkPartitionId)))
+                .build();
     }
 
     // API methods for applications
@@ -742,27 +714,26 @@ public class StratosApiV41 extends AbstractApi {
     @AuthorizationAction("/permission/admin/stratos/applications/manage")
     public Response addApplication(ApplicationBean applicationDefinition) 
throws RestAPIException {
         try {
-            StratosApiV41Utils.addApplication(applicationDefinition, 
getConfigContext(),
-                    getUsername(), getTenantDomain());
-
+            StratosApiV41Utils
+                    .addApplication(applicationDefinition, getConfigContext(), 
getUsername(), getTenantDomain());
 
             URI url = 
uriInfo.getAbsolutePathBuilder().path(applicationDefinition.getApplicationId()).build();
             return Response.created(url).entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
                     String.format("Application added successfully: 
[application] %s",
                             
applicationDefinition.getApplicationId()))).build();
         } catch (ApplicationAlreadyExistException e) {
-            return Response.status(Response.Status.CONFLICT).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Application already 
exists")).build();
+            return Response.status(Response.Status.CONFLICT)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Application already exists")).build();
         } catch (AutoscalerServiceCartridgeNotFoundExceptionException e) {
             String backendErrorMessage = 
e.getFaultMessage().getCartridgeNotFoundException().
                     getMessage();
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, backendErrorMessage)).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
backendErrorMessage)).build();
         } catch (AutoscalerServiceCartridgeGroupNotFoundExceptionException e) {
             String backendErrorMessage = 
e.getFaultMessage().getCartridgeGroupNotFoundException().
                     getMessage();
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, backendErrorMessage)).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
backendErrorMessage)).build();
         } catch (RestAPIException e) {
             throw e;
         }
@@ -781,10 +752,9 @@ public class StratosApiV41 extends AbstractApi {
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applications/manage")
     public Response updateApplication(ApplicationBean applicationDefinition) 
throws RestAPIException {
-
         try {
-            StratosApiV41Utils.updateApplication(applicationDefinition, 
getConfigContext(),
-                    getUsername(), getTenantDomain());
+            StratosApiV41Utils
+                    .updateApplication(applicationDefinition, 
getConfigContext(), getUsername(), getTenantDomain());
             URI url = 
uriInfo.getAbsolutePathBuilder().path(applicationDefinition.getApplicationId()).build();
             return Response.created(url).entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
                     String.format("Application updated successfully: 
[application] %s",
@@ -792,15 +762,14 @@ public class StratosApiV41 extends AbstractApi {
         } catch (AutoscalerServiceCartridgeNotFoundExceptionException e) {
             String backendErrorMessage = 
e.getFaultMessage().getCartridgeNotFoundException().
                     getMessage();
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, backendErrorMessage)).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
backendErrorMessage)).build();
         } catch (AutoscalerServiceCartridgeGroupNotFoundExceptionException e) {
             String backendErrorMessage = 
e.getFaultMessage().getCartridgeGroupNotFoundException().
                     getMessage();
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, backendErrorMessage)).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
backendErrorMessage)).build();
         }
-
     }
 
     /**
@@ -817,10 +786,9 @@ public class StratosApiV41 extends AbstractApi {
     public Response getApplications() throws RestAPIException {
         List<ApplicationBean> applicationDefinitions = 
StratosApiV41Utils.getApplications();
         if (applicationDefinitions == null || 
applicationDefinitions.isEmpty()) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "No applications 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"No applications found")).build();
         }
-
         ApplicationBean[] applicationDefinitionsArray = applicationDefinitions
                 .toArray(new ApplicationBean[applicationDefinitions.size()]);
         return Response.ok(applicationDefinitionsArray).build();
@@ -838,12 +806,11 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applications/view")
-    public Response getApplication(
-            @PathParam("applicationId") String applicationId) throws 
RestAPIException {
+    public Response getApplication(@PathParam("applicationId") String 
applicationId) throws RestAPIException {
         ApplicationBean applicationDefinition = 
StratosApiV41Utils.getApplication(applicationId);
         if (applicationDefinition == null) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Application not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Application not found")).build();
         }
         return Response.ok(applicationDefinition).build();
     }
@@ -861,20 +828,20 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applications/manage")
-    public Response deployApplication(
-            @PathParam("applicationId") String applicationId,
+    public Response deployApplication(@PathParam("applicationId") String 
applicationId,
             @PathParam("applicationPolicyId") String applicationPolicyId) 
throws RestAPIException {
         try {
             StratosApiV41Utils.deployApplication(applicationId, 
applicationPolicyId);
             return Response.accepted().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
                     String.format("Application deployed successfully: 
[application] %s", applicationId))).build();
         } catch (ApplicationAlreadyDeployedException e) {
-            return Response.status(Response.Status.CONFLICT).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Application policy already 
deployed")).build();
+            return Response.status(Response.Status.CONFLICT)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Application policy already deployed"))
+                    .build();
         } catch (RestAPIException e) {
             if (e.getMessage().contains("Application not found")) {
-                return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                        ResponseMessageBean.ERROR, e.getMessage())).build();
+                return Response.status(Response.Status.BAD_REQUEST)
+                        .entity(new 
ResponseMessageBean(ResponseMessageBean.ERROR, e.getMessage())).build();
             } else {
                 throw e;
             }
@@ -893,8 +860,7 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     
@AuthorizationAction("/permission/admin/stratos/applicationPolicies/manage")
-    public Response addApplicationPolicy(
-            ApplicationPolicyBean applicationPolicy) throws RestAPIException {
+    public Response addApplicationPolicy(ApplicationPolicyBean 
applicationPolicy) throws RestAPIException {
         try {
             StratosApiV41Utils.addApplicationPolicy(applicationPolicy);
             URI url = 
uriInfo.getAbsolutePathBuilder().path(applicationPolicy.getId()).build();
@@ -903,17 +869,16 @@ public class StratosApiV41 extends AbstractApi {
                             applicationPolicy.getId()))).build();
         } catch (AutoscalerServiceInvalidApplicationPolicyExceptionException 
e) {
             String backendErrorMessage = 
e.getFaultMessage().getInvalidApplicationPolicyException().getMessage();
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, backendErrorMessage)).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
backendErrorMessage)).build();
         } catch 
(AutoscalerServiceApplicationPolicyAlreadyExistsExceptionException e) {
-            return Response.status(Response.Status.CONFLICT).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Application policy already 
exists")).build();
+            return Response.status(Response.Status.CONFLICT)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Application policy already exists"))
+                    .build();
 
         } catch (RestAPIException e) {
             throw e;
         }
-
-
     }
 
     /**
@@ -928,14 +893,14 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applicationPolicies/view")
-    public Response getApplicationPolicy(
-            @PathParam("applicationPolicyId") String applicationPolicyId) 
throws RestAPIException {
+    public Response getApplicationPolicy(@PathParam("applicationPolicyId") 
String applicationPolicyId)
+            throws RestAPIException {
         try {
             ApplicationPolicyBean applicationPolicyBean = 
StratosApiV41Utils.getApplicationPolicy(applicationPolicyId);
             if (applicationPolicyBean == null) {
-                return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                        ResponseMessageBean.ERROR, "Application policy not 
found: [application-policy] " +
-                        applicationPolicyId)).build();
+                return Response.status(Response.Status.NOT_FOUND)
+                        .entity(new 
ResponseMessageBean(ResponseMessageBean.ERROR,
+                                "Application policy not found: 
[application-policy] " + applicationPolicyId)).build();
             }
             return Response.ok(applicationPolicyBean).build();
         } catch (ApplicationPolicyIdIsEmptyException e) {
@@ -954,12 +919,12 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applicationPolicies/view")
-    public Response getApplicationPolicies()
-            throws RestAPIException {
+    public Response getApplicationPolicies() throws RestAPIException {
         ApplicationPolicyBean[] applicationPolicies = 
StratosApiV41Utils.getApplicationPolicies();
         if (applicationPolicies == null || applicationPolicies.length == 0) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "No application policies 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"No application policies found"))
+                    .build();
         }
         return Response.ok().entity(applicationPolicies).build();
     }
@@ -976,26 +941,25 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     
@AuthorizationAction("/permission/admin/stratos/applicationPolicies/manage")
-    public Response removeApplicationPolicy(
-            @PathParam("applicationPolicyId") String applicationPolicyId) 
throws RestAPIException {
+    public Response removeApplicationPolicy(@PathParam("applicationPolicyId") 
String applicationPolicyId)
+            throws RestAPIException {
         try {
             StratosApiV41Utils.removeApplicationPolicy(applicationPolicyId);
             return Response.ok().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
                     String.format("Application policy deleted successfully: 
[application-policy] %s",
                             applicationPolicyId))).build();
         } catch (ApplicationPolicyIdIsEmptyException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Application policy id is 
empty"))
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Application policy id is empty"))
                     .build();
         } catch (AutoscalerServiceInvalidPolicyExceptionException e) {
             String backendErrorMessage = 
e.getFaultMessage().getInvalidPolicyException().getMessage();
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, backendErrorMessage))
-                    .build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
backendErrorMessage)).build();
         } catch (AutoscalerServiceUnremovablePolicyExceptionException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "This application policy cannot 
be removed, since it is used in an " +
-                    "application"))
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
+                            "This application policy cannot be removed, since 
it is used in an " + "application"))
                     .build();
         }
     }
@@ -1012,20 +976,17 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     
@AuthorizationAction("/permission/admin/stratos/applicationPolicies/manage")
-    public Response updateApplicationPolicy(
-            ApplicationPolicyBean applicationPolicy) throws RestAPIException {
-
+    public Response updateApplicationPolicy(ApplicationPolicyBean 
applicationPolicy) throws RestAPIException {
         try {
             StratosApiV41Utils.updateApplicationPolicy(applicationPolicy);
         } catch (AutoscalerServiceInvalidApplicationPolicyExceptionException 
e) {
             String backendErrorMessage = 
e.getFaultMessage().getInvalidApplicationPolicyException().getMessage();
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, backendErrorMessage))
-                    .build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
backendErrorMessage)).build();
         } catch 
(AutoscalerServiceApplicatioinPolicyNotExistsExceptionException e) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, String.format("Application 
policy not found: [application-policy] %s",
-                    applicationPolicy.getId()))).build();
+            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(ResponseMessageBean.ERROR,
+                    String.format("Application policy not found: 
[application-policy] %s", applicationPolicy.getId())))
+                    .build();
         }
         return Response.ok().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
                 String.format("Application policy updated successfully: 
[application-policy] %s",
@@ -1043,17 +1004,15 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applications/view")
-    public Response getApplicationNetworkPartitions(
-            @PathParam("applicationId") String applicationId) throws 
RestAPIException {
+    public Response 
getApplicationNetworkPartitions(@PathParam("applicationId") String 
applicationId)
+            throws RestAPIException {
         ApplicationNetworkPartitionIdListBean appNetworkPartitionsBean = 
StratosApiV41Utils
                 .getApplicationNetworkPartitions(applicationId);
-        if (appNetworkPartitionsBean == null ||
-                (appNetworkPartitionsBean.getNetworkPartitionIds().size() == 1 
&&
-                        
appNetworkPartitionsBean.getNetworkPartitionIds().get(0) == null)) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "No network partitions found in 
the application")).build();
+        if (appNetworkPartitionsBean == null || 
(appNetworkPartitionsBean.getNetworkPartitionIds().size() == 1
+                && appNetworkPartitionsBean.getNetworkPartitionIds().get(0) == 
null)) {
+            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(ResponseMessageBean.ERROR,
+                    "No network partitions found in the application")).build();
         }
-
         return Response.ok(appNetworkPartitionsBean).build();
     }
 
@@ -1070,10 +1029,10 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applicationSignUps/manage")
-    public Response addApplicationSignUp(
-            @PathParam("applicationId") String applicationId, 
ApplicationSignUpBean applicationSignUpBean)
-            throws RestAPIException {
-        StratosApiV41Utils.addApplicationSignUp(applicationId, 
applicationSignUpBean, 
CarbonContext.getThreadLocalCarbonContext().getTenantId());
+    public Response addApplicationSignUp(@PathParam("applicationId") String 
applicationId,
+            ApplicationSignUpBean applicationSignUpBean) throws 
RestAPIException {
+        StratosApiV41Utils.addApplicationSignUp(applicationId, 
applicationSignUpBean,
+                CarbonContext.getThreadLocalCarbonContext().getTenantId());
         URI url = uriInfo.getAbsolutePathBuilder().path(applicationId).build();
         return Response.created(url).entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
                 String.format("Successfully signed up for: [application] %s", 
applicationId))).build();
@@ -1091,21 +1050,21 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applicationSignUps/view")
-    public Response getApplicationSignUp(
-            @PathParam("applicationId") String applicationId) throws 
RestAPIException,
-            StratosManagerServiceApplicationSignUpExceptionException {
+    public Response getApplicationSignUp(@PathParam("applicationId") String 
applicationId)
+            throws RestAPIException, 
StratosManagerServiceApplicationSignUpExceptionException {
         ApplicationSignUpBean applicationSignUpBean;
         try {
             applicationSignUpBean = 
StratosApiV41Utils.getApplicationSignUp(applicationId);
             if (applicationSignUpBean == null) {
-                return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                        ResponseMessageBean.ERROR, "No application signups 
found for application: [application]" +
-                        applicationId)).build();
+                return Response.status(Response.Status.NOT_FOUND)
+                        .entity(new 
ResponseMessageBean(ResponseMessageBean.ERROR,
+                                "No application signups found for application: 
[application]" + applicationId)).build();
             }
             return Response.ok(applicationSignUpBean).build();
         } catch (ApplicationSignUpRestAPIException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Invalid request to get 
application signups")).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
+                            "Invalid request to get application 
signups")).build();
         }
     }
 
@@ -1121,9 +1080,9 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applicationSignUps/manage")
-    public Response removeApplicationSignUp(
-            @PathParam("applicationId") String applicationId) throws 
RestAPIException {
-        StratosApiV41Utils.removeApplicationSignUp(applicationId, 
CarbonContext.getThreadLocalCarbonContext().getTenantId());
+    public Response removeApplicationSignUp(@PathParam("applicationId") String 
applicationId) throws RestAPIException {
+        StratosApiV41Utils
+                .removeApplicationSignUp(applicationId, 
CarbonContext.getThreadLocalCarbonContext().getTenantId());
         return Response.ok().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
                 String.format("Application sign up removed successfully: 
[application] %s", applicationId))).build();
     }
@@ -1142,8 +1101,8 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applicationSignUps/manage")
-    public Response addApplicationSignUpForTenant(
-            @PathParam("applicationId") String applicationId, 
ApplicationSignUpBean applicationSignUpBean, @PathParam("tenantDomain") String 
tenantDomain)
+    public Response addApplicationSignUpForTenant(@PathParam("applicationId") 
String applicationId,
+            ApplicationSignUpBean applicationSignUpBean, 
@PathParam("tenantDomain") String tenantDomain)
             throws RestAPIException {
         int contextTenantId = 
CarbonContext.getThreadLocalCarbonContext().getTenantId();
         if (contextTenantId == -1234) {
@@ -1153,13 +1112,11 @@ public class StratosApiV41 extends AbstractApi {
             return Response.created(url).entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
                     String.format("Successfully signed up for: [application] 
%s", applicationId))).build();
         } else {
-            return 
Response.status(Response.Status.METHOD_NOT_ALLOWED).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "This method not 
allowed")).build();
+            return Response.status(Response.Status.METHOD_NOT_ALLOWED)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"This method not allowed")).build();
         }
-
     }
 
-
     /**
      * Removes the application sign up on behalf of tenant.
      *
@@ -1173,17 +1130,18 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applicationSignUps/manage")
-    public Response removeApplicationSignUpForTenant(
-            @PathParam("applicationId") String applicationId, 
@PathParam("tenantDomain") String tenantDomain) throws RestAPIException {
+    public Response 
removeApplicationSignUpForTenant(@PathParam("applicationId") String 
applicationId,
+            @PathParam("tenantDomain") String tenantDomain) throws 
RestAPIException {
         int contextTenantId = 
CarbonContext.getThreadLocalCarbonContext().getTenantId();
         if (contextTenantId == -1234) {
             TenantInfoBean tenantInfo = 
StratosApiV41Utils.getTenantByDomain(tenantDomain);
             StratosApiV41Utils.removeApplicationSignUp(applicationId, 
tenantInfo.getTenantId());
             return Response.ok().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
-                    String.format("Application sign up removed successfully: 
[application] %s", applicationId))).build();
+                    String.format("Application sign up removed successfully: 
[application] %s", applicationId)))
+                    .build();
         } else {
-            return 
Response.status(Response.Status.METHOD_NOT_ALLOWED).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "This method not 
allowed")).build();
+            return Response.status(Response.Status.METHOD_NOT_ALLOWED)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"This method not allowed")).build();
         }
     }
 
@@ -1200,15 +1158,14 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/domainMappings/manage")
-    public Response addDomainMappings(
-            @PathParam("applicationId") String applicationId, 
ApplicationDomainMappingsBean domainMappingsBean)
-            throws RestAPIException {
+    public Response addDomainMappings(@PathParam("applicationId") String 
applicationId,
+            ApplicationDomainMappingsBean domainMappingsBean) throws 
RestAPIException {
         try {
             StratosApiV41Utils.addApplicationDomainMappings(applicationId, 
domainMappingsBean);
         } catch (StratosManagerServiceDomainMappingExceptionException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Incorrect request to add 
domain mapping for " +
-                    "application")).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
+                            "Incorrect request to add domain mapping for " + 
"application")).build();
         }
         List<DomainMappingBean> mappings = 
domainMappingsBean.getDomainMappings();
         List<String> domainMappingList = new ArrayList<String>();
@@ -1217,8 +1174,7 @@ public class StratosApiV41 extends AbstractApi {
         }
         URI url = uriInfo.getAbsolutePathBuilder().path(applicationId).build();
         return Response.created(url).entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
-                String.format("Domain mappings added successfully: 
[domain-mappings] %s", domainMappingList)))
-                .build();
+                String.format("Domain mappings added successfully: 
[domain-mappings] %s", domainMappingList))).build();
     }
 
     /**
@@ -1234,15 +1190,14 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/domainMappings/manage")
-    public Response removeDomainMappings(
-            @PathParam("applicationId") String applicationId, 
@PathParam("domainName") String domainName)
-            throws RestAPIException {
+    public Response removeDomainMappings(@PathParam("applicationId") String 
applicationId,
+            @PathParam("domainName") String domainName) throws 
RestAPIException {
         try {
             StratosApiV41Utils.removeApplicationDomainMapping(applicationId, 
domainName);
         } catch (StratosManagerServiceDomainMappingExceptionException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Incorrect request to delete 
domain mapping of " +
-                    "application")).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
+                            "Incorrect request to delete domain mapping of " + 
"application")).build();
         }
         return Response.ok().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
                 String.format("Domain mapping deleted successfully: 
[domain-mappings] %s", domainName))).build();
@@ -1260,21 +1215,21 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/domainMappings/view")
-    public Response getDomainMappings(
-            @PathParam("applicationId") String applicationId) throws 
RestAPIException {
+    public Response getDomainMappings(@PathParam("applicationId") String 
applicationId) throws RestAPIException {
         List<DomainMappingBean> domainMappingsBeanList = null;
         try {
             domainMappingsBeanList = 
StratosApiV41Utils.getApplicationDomainMappings(applicationId);
             if (domainMappingsBeanList == null || 
domainMappingsBeanList.isEmpty()) {
-                return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                        ResponseMessageBean.ERROR, "No domain mappings found 
for the application: [application-id] " +
-                        applicationId)).build();
+                return Response.status(Response.Status.NOT_FOUND)
+                        .entity(new 
ResponseMessageBean(ResponseMessageBean.ERROR,
+                                "No domain mappings found for the application: 
[application-id] " + applicationId))
+                        .build();
             }
         } catch (StratosManagerServiceDomainMappingExceptionException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Incorrect request to get 
domain mappings of application: " +
-                    "[application-id] " + applicationId))
-                    .build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
+                            "Incorrect request to get domain mappings of 
application: " +
+                                    "[application-id] " + 
applicationId)).build();
         }
 
         DomainMappingBean[] domainMappingsBeans = domainMappingsBeanList
@@ -1295,37 +1250,35 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applications/manage")
-    public Response undeployApplication(
-            @PathParam("applicationId") String applicationId, 
@QueryParam("force") @DefaultValue("false") boolean force)
-            throws RestAPIException {
-
+    public Response undeployApplication(@PathParam("applicationId") String 
applicationId,
+            @QueryParam("force") @DefaultValue("false") boolean force) throws 
RestAPIException {
         ApplicationBean applicationDefinition = 
StratosApiV41Utils.getApplication(applicationId);
         int tenantId = 
CarbonContext.getThreadLocalCarbonContext().getTenantId();
         if (applicationDefinition == null) {
             String message = String.format("Application does not exist 
[application-id] %s", applicationId);
             log.error(message);
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, message)).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
message)).build();
         }
         if (applicationDefinition.isMultiTenant() && (tenantId != -1234)) {
-            String message = String.format(
-                    "Multi-tenant applications can only be deployed by super 
tenant: [application-id] %s",
-                    applicationId);
+            String message = String
+                    .format("Multi-tenant applications can only be deployed by 
super tenant: [application-id] %s",
+                            applicationId);
             log.error(message);
             throw new RestAPIException(message);
         }
         if 
(applicationDefinition.getStatus().equalsIgnoreCase(StratosApiV41Utils.APPLICATION_STATUS_CREATED))
 {
-            String message = String.format("Could not undeploy since 
application is not in DEPLOYED status " +
-                    "[application-id] %s [current status] %S", applicationId, 
applicationDefinition.getStatus());
+            String message = String.format("Could not undeploy since 
application is not in DEPLOYED status "
+                    + "[application-id] %s [current status] %S", 
applicationId, applicationDefinition.getStatus());
             log.error(message);
-            return Response.status(Response.Status.CONFLICT).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, message)).build();
+            return Response.status(Response.Status.CONFLICT)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
message)).build();
         }
 
         StratosApiV41Utils.undeployApplication(applicationId, force);
         return Response.accepted().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
-                String.format("Application undeploy process started 
successfully: [application-id] %s",
-                        applicationId))).build();
+                String.format("Application undeploy process started 
successfully: [application-id] %s", applicationId)))
+                .build();
     }
 
     /**
@@ -1341,14 +1294,12 @@ public class StratosApiV41 extends AbstractApi {
     @Path("/applications/{applicationId}/runtime")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applications/view")
-    public Response getApplicationRuntime(
-            @PathParam("applicationId") String applicationId) throws 
RestAPIException {
-
-
+    public Response getApplicationRuntime(@PathParam("applicationId") String 
applicationId) throws RestAPIException {
         ApplicationInfoBean applicationRuntime = 
StratosApiV41Utils.getApplicationRuntime(applicationId);
         if (applicationRuntime == null) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Application runtime not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Application runtime not found"))
+                    .build();
         } else {
             return Response.ok().entity(applicationRuntime).build();
         }
@@ -1367,18 +1318,17 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applications/manage")
-    public Response removeApplication(
-            @PathParam("applicationId") String applicationId) throws 
RestAPIException {
+    public Response removeApplication(@PathParam("applicationId") String 
applicationId) throws RestAPIException {
         ApplicationBean applicationDefinition = 
StratosApiV41Utils.getApplication(applicationId);
         if (applicationDefinition == null) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Application not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Application not found")).build();
         }
 
         if 
(!applicationDefinition.getStatus().equalsIgnoreCase(StratosApiV41Utils.APPLICATION_STATUS_CREATED))
 {
             return Response.status(Response.Status.CONFLICT).entity(new 
ResponseMessageBean(ResponseMessageBean.ERROR,
-                    String.format("Could not delete since application is not 
in CREATED state :" +
-                                    " [application] %s [current-status] %S", 
applicationId,
+                    String.format("Could not delete since application is not 
in CREATED state :"
+                                    + " [application] %s [current-status] %S", 
applicationId,
                             applicationDefinition.getStatus()))).build();
         }
 
@@ -1400,12 +1350,12 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/autoscalingPolicies/view")
-    public Response getAutoscalingPolicies()
-            throws RestAPIException {
+    public Response getAutoscalingPolicies() throws RestAPIException {
         AutoscalePolicyBean[] autoScalePolicies = 
StratosApiV41Utils.getAutoScalePolicies();
         if (autoScalePolicies == null || autoScalePolicies.length == 0) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "No autoscaling policies 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"No autoscaling policies found"))
+                    .build();
         }
         return Response.ok().entity(autoScalePolicies).build();
     }
@@ -1422,12 +1372,12 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/autoscalingPolicies/view")
-    public Response getAutoscalingPolicy(
-            @PathParam("autoscalePolicyId") String autoscalePolicyId) throws 
RestAPIException {
+    public Response getAutoscalingPolicy(@PathParam("autoscalePolicyId") 
String autoscalePolicyId)
+            throws RestAPIException {
         AutoscalePolicyBean autoScalePolicy = 
StratosApiV41Utils.getAutoScalePolicy(autoscalePolicyId);
         if (autoScalePolicy == null) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Autoscaling policy not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Autoscaling policy not found")).build();
         }
         return Response.ok().entity(autoScalePolicy).build();
     }
@@ -1444,9 +1394,7 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     
@AuthorizationAction("/permission/admin/stratos/autoscalingPolicies/manage")
-    public Response addAutoscalingPolicy(
-            AutoscalePolicyBean autoscalePolicy) throws RestAPIException {
-
+    public Response addAutoscalingPolicy(AutoscalePolicyBean autoscalePolicy) 
throws RestAPIException {
         try {
             StratosApiV41Utils.addAutoscalingPolicy(autoscalePolicy);
             URI url = 
uriInfo.getAbsolutePathBuilder().path(autoscalePolicy.getId()).build();
@@ -1454,11 +1402,13 @@ public class StratosApiV41 extends AbstractApi {
                     String.format("Autoscaling policy added successfully: 
[autoscale-policy] %s",
                             autoscalePolicy.getId()))).build();
         } catch (AutoscalerServiceInvalidPolicyExceptionException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Provided Autoscaling policy is 
invalid")).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
+                            "Provided Autoscaling policy is invalid")).build();
         } catch 
(AutoscalerServiceAutoScalingPolicyAlreadyExistExceptionException e) {
-            return Response.status(Response.Status.CONFLICT).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Autoscaling policy already 
exists")).build();
+            return Response.status(Response.Status.CONFLICT)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Autoscaling policy already exists"))
+                    .build();
         } catch (RestAPIException e) {
             throw e;
         }
@@ -1476,14 +1426,13 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     
@AuthorizationAction("/permission/admin/stratos/autoscalingPolicies/manage")
-    public Response updateAutoscalingPolicy(
-            AutoscalePolicyBean autoscalePolicy) throws RestAPIException {
-
+    public Response updateAutoscalingPolicy(AutoscalePolicyBean 
autoscalePolicy) throws RestAPIException {
         try {
             StratosApiV41Utils.updateAutoscalingPolicy(autoscalePolicy);
         } catch (AutoscalerServiceInvalidPolicyExceptionException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Autoscaling policy is 
invalid")).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Autoscaling policy is invalid"))
+                    .build();
         }
         return Response.ok().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
                 String.format("Autoscaling policy updated successfully: 
[autoscale-policy] %s",
@@ -1502,24 +1451,22 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     
@AuthorizationAction("/permission/admin/stratos/autoscalingPolicies/manage")
-    public Response removeAutoscalingPolicy(
-            @PathParam("autoscalingPolicyId") String autoscalingPolicyId) 
throws RestAPIException {
-
+    public Response removeAutoscalingPolicy(@PathParam("autoscalingPolicyId") 
String autoscalingPolicyId)
+            throws RestAPIException {
         try {
             StratosApiV41Utils.removeAutoscalingPolicy(autoscalingPolicyId);
         } catch (AutoscalerServiceUnremovablePolicyExceptionException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Autoscaling policy is in 
use")).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Autoscaling policy is in use")).build();
         } catch (AutoscalerServicePolicyDoesNotExistExceptionException e) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Autoscaling policy not 
found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Autoscaling policy not found")).build();
         }
         return Response.ok().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
-                String.format("Autoscaling policy deleted successfully: 
[autoscale-policy] %s",
-                        autoscalingPolicyId))).build();
+                String.format("Autoscaling policy deleted successfully: 
[autoscale-policy] %s", autoscalingPolicyId)))
+                .build();
     }
 
-
     /**
      * Get cluster for a given cluster id
      *
@@ -1532,13 +1479,12 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @Consumes("application/json")
     @AuthorizationAction("/permission/admin/stratos/applications/view")
-    public Response getCluster(
-            @PathParam("clusterId") String clusterId) throws RestAPIException {
+    public Response getCluster(@PathParam("clusterId") String clusterId) 
throws RestAPIException {
         try {
             ClusterBean clusterBean = 
StratosApiV41Utils.getClusterInfo(clusterId);
             if (clusterBean == null) {
-                return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                        ResponseMessageBean.ERROR, "Cluster not 
found")).build();
+                return Response.status(Response.Status.NOT_FOUND)
+                        .entity(new 
ResponseMessageBean(ResponseMessageBean.ERROR, "Cluster not found")).build();
             } else {
                 return Response.ok().entity(clusterBean).build();
             }
@@ -1547,7 +1493,6 @@ public class StratosApiV41 extends AbstractApi {
         }
     }
 
-
     // API methods for tenants
 
     /**
@@ -1563,26 +1508,22 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @AuthorizationAction("/permission/protected")
     @SuperTenantService(true)
-    public Response addTenant(
-            org.apache.stratos.common.beans.TenantInfoBean tenantInfoBean) 
throws RestAPIException {
-
+    public Response addTenant(org.apache.stratos.common.beans.TenantInfoBean 
tenantInfoBean) throws RestAPIException {
         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();
+            return Response.created(url).entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
+                    String.format("Tenant added successfully: [tenant] %s", 
tenantInfoBean.getTenantDomain()))).build();
 
         } catch (InvalidEmailException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, String.format("Invalid email: 
[email] %s",
-                    tenantInfoBean.getEmail()))).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) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, String.format("Invalid domain: 
[domain] %s",
-                    tenantInfoBean.getTenantDomain()))).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
+                            String.format("Invalid domain: [domain] %s", 
tenantInfoBean.getTenantDomain()))).build();
         }
-
     }
 
     /**
@@ -1597,31 +1538,29 @@ public class StratosApiV41 extends AbstractApi {
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected")
     @SuperTenantService(true)
-    public Response updateTenant(
-            org.apache.stratos.common.beans.TenantInfoBean tenantInfoBean) 
throws RestAPIException {
-
+    public Response 
updateTenant(org.apache.stratos.common.beans.TenantInfoBean tenantInfoBean)
+            throws RestAPIException {
         try {
             StratosApiV41Utils.updateExistingTenant(tenantInfoBean);
             return Response.ok().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
-                    String.format("Tenant updated successfully: [tenant] %s",
-                            tenantInfoBean.getTenantDomain()))).build();
+                    String.format("Tenant updated successfully: [tenant] %s", 
tenantInfoBean.getTenantDomain())))
+                    .build();
         } catch (TenantNotFoundException ex) {
-            return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, "Tenant not found")).build();
+            return Response.status(Response.Status.NOT_FOUND)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Tenant not found")).build();
         } catch (InvalidEmailException e) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, String.format("Invalid email 
[email] %s",
-                    tenantInfoBean.getEmail()))).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) {
-            return Response.status(Response.Status.BAD_REQUEST).entity(new 
ResponseMessageBean(
-                    ResponseMessageBean.ERROR, String.format("Invalid Domain 
[Domain] %s",
-                    tenantInfoBean.getTenantDomain()))).build();
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
+                            String.format("Invalid Domain [Domain] %s", 
tenantInfoBean.getTenantDomain()))).build();
         } catch (Exception e) {
             String msg = "Error in updating tenant " + 
tenantInfoBean.getTenantDomain();
             log.error(msg, e);
             throw new RestAPIException(msg);
         }
-
     }
 
     /**
@@ -1637,14 +1576,13 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @AuthorizationAction("/permission/protected")
     @SuperTenantService(true)
-    public Response getTenantForDomain(
-            @PathParam("tenantDomain") String tenantDomain) throws 
RestAPIException {
-
+    public Response getTenantForDomain(@PathParam("tenantDomain") String 
tenantDomain) throws RestAPIException {
         try {
             TenantInfoBean tenantInfo = 
StratosApiV41Utils.getTenantByDomain(tenantDomain);
             if (tenantInfo == null) {
-                return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                        ResponseMessageBean.ERROR, "Tenant information not 
found")).build();
+                return Response.status(Response.Status.NOT_FOUND)
+                        .entity(new 
ResponseMessageBean(ResponseMessageBean.ERROR, "Tenant information not found"))
+                        .build();
             }
             return Response.ok().entity(tenantInfo).build();
         } catch (Exception e) {
@@ -1667,12 +1605,10 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @AuthorizationAction("/permission/protected")
     @SuperTenantService(true)
-    public Response removeTenant(
-            @PathParam("tenantDomain") String tenantDomain) throws 
RestAPIException {
-
+    public Response removeTenant(@PathParam("tenantDomain") String 
tenantDomain) throws RestAPIException {
         return Response.status(Response.Status.NOT_ACCEPTABLE)
-                .entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
-                        "Please use the tenant deactivate method")).build();
+                .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, 
"Please use the tenant deactivate method"))
+                .build();
     }
 
     /**
@@ -1686,17 +1622,16 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @AuthorizationAction("/permission/protected")
     @SuperTenantService(true)
-    public Response getTenants()
-            throws RestAPIException {
+    public Response getTenants() throws RestAPIException {
         try {
             List<org.apache.stratos.common.beans.TenantInfoBean> tenantList = 
StratosApiV41Utils.getAllTenants();
             if (tenantList == null || tenantList.isEmpty()) {
-                return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                        ResponseMessageBean.ERROR, "No tenants 
found")).build();
+                return Response.status(Response.Status.NOT_FOUND)
+                        .entity(new 
ResponseMessageBean(ResponseMessageBean.ERROR, "No tenants found")).build();
             }
-
-            return Response.ok().entity(tenantList.toArray(
-                    new 
org.apache.stratos.common.beans.TenantInfoBean[tenantList.size()])).build();
+            return Response.ok()
+                    .entity(tenantList.toArray(new 
org.apache.stratos.common.beans.TenantInfoBean[tenantList.size()]))
+                    .build();
         } catch (Exception e) {
             String msg = "Error in retrieving tenants";
             log.error(msg, e);
@@ -1704,7 +1639,6 @@ public class StratosApiV41 extends AbstractApi {
         }
     }
 
-
     /**
      * Gets the partial search tenants.
      *
@@ -1718,19 +1652,17 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @AuthorizationAction("/permission/protected")
     @SuperTenantService(true)
-    public Response getPartialSearchTenants(
-            @PathParam("tenantDomain") String tenantDomain) throws 
RestAPIException {
-
+    public Response getPartialSearchTenants(@PathParam("tenantDomain") String 
tenantDomain) throws RestAPIException {
         try {
-            List<org.apache.stratos.common.beans.TenantInfoBean> tenantList =
-                    
StratosApiV41Utils.searchPartialTenantsDomains(tenantDomain);
+            List<org.apache.stratos.common.beans.TenantInfoBean> tenantList = 
StratosApiV41Utils
+                    .searchPartialTenantsDomains(tenantDomain);
             if (tenantList == null || tenantList.isEmpty()) {
-                return Response.status(Response.Status.NOT_FOUND).entity(new 
ResponseMessageBean(
-                        ResponseMessageBean.ERROR, "No tenants 
found")).build();
+                return Response.status(Response.Status.NOT_FOUND)
+                        .entity(new 
ResponseMessageBean(ResponseMessageBean.ERROR, "No tenants found")).build();
             }
-
-            return Response.ok().entity(tenantList.toArray(
-                    new 
org.apache.stratos.common.beans.TenantInfoBean[tenantList.size()])).build();
+            return Response.ok()
+                    .entity(tenantList.toArray(new 
org.apache.stratos.common.beans.TenantInfoBean[tenantList.size()]))
+                    .build();
         } catch (Exception e) {
             String msg = "Error in getting information for tenant " + 
tenantDomain;
             log.error(msg, e);
@@ -1738,7 +1670,6 @@ public class StratosApiV41 extends AbstractApi {
         }
     }
 
-
     /**
      * Activate tenant.
      *
@@ -1752,14 +1683,12 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @AuthorizationAction("/permission/protected")
     @SuperTenantService(true)
-    public Response activateTenant(
-            @PathParam("tenantDomain") String tenantDomain) throws 
RestAPIException {
-
+    public Response activateTenant(@PathParam("tenantDomain") String 
tenantDomain) throws RestAPIException {
         try {
             StratosApiV41Utils.activateTenant(tenantDomain);
         } catch (InvalidDomainException e) {
-            return 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, 
"Invalid domain")).build();
         }
 
         return Response.ok().entity(new 
ResponseMessageBean(ResponseMessageBean.SUCCESS,
@@ -1779,16 +1708,13 @@ public class StratosApiV41 extends AbstractApi {
     @Produces("application/json")
     @AuthorizationAction("/permission/protected")
     @SuperTenantService(true)
-    public Response deactivateTenant

<TRUNCATED>

Reply via email to