Repository: stratos Updated Branches: refs/heads/master 10b52cc4a -> 617e454a9
http://git-wip-us.apache.org/repos/asf/stratos/blob/617e454a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java index f3997c5..0d4857b 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/BadRequestExceptionMapper.java @@ -19,7 +19,7 @@ package org.apache.stratos.rest.endpoint.handlers;/* import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.common.beans.StatusResponseBean; +import org.apache.stratos.common.beans.ResponseMessageBean; import javax.ws.rs.BadRequestException; import javax.ws.rs.core.MediaType; @@ -40,6 +40,6 @@ public class BadRequestExceptionMapper implements ExceptionMapper<BadRequestExce String errorMsg = badRequestException.getMessage() != null ? badRequestException.getMessage() : "please check" + "your input format"; return Response.status(Response.Status.BAD_REQUEST).type(MediaType.APPLICATION_JSON). - entity(new StatusResponseBean(Response.Status.BAD_REQUEST.getStatusCode(), errorMsg)).build(); + entity(new ResponseMessageBean(ResponseMessageBean.ERROR, errorMsg)).build(); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/617e454a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java index 807ff8a..ba4c8fd 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java @@ -23,7 +23,7 @@ import org.apache.cxf.jaxrs.ext.RequestHandler; import org.apache.cxf.jaxrs.model.ClassResourceInfo; import org.apache.cxf.message.Message; import org.apache.stratos.common.Component; -import org.apache.stratos.common.beans.ApiResponseBean; +import org.apache.stratos.common.beans.ResponseMessageBean; import org.apache.stratos.common.services.ComponentStartUpSynchronizer; import org.apache.stratos.manager.internal.ServiceReferenceHolder; @@ -38,7 +38,7 @@ public class ComponentSynchronizerHandler implements RequestHandler { ComponentStartUpSynchronizer componentStartUpSynchronizer = ServiceReferenceHolder.getInstance().getComponentStartUpSynchronizer(); if (!componentStartUpSynchronizer.isComponentActive(Component.StratosManager)) { - ApiResponseBean responseBean = new ApiResponseBean(); + ResponseMessageBean responseBean = new ResponseMessageBean(); responseBean.setMessage("Stratos manager component is not active"); return Response.status(Response.Status.NOT_ACCEPTABLE).entity(responseBean).build(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/617e454a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java index dbba25e..909ef3e 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.cxf.jaxrs.ext.RequestHandler; import org.apache.cxf.jaxrs.model.ClassResourceInfo; import org.apache.cxf.message.Message; -import org.apache.stratos.common.beans.StatusResponseBean; +import org.apache.stratos.common.beans.ResponseMessageBean; import org.apache.stratos.rest.endpoint.context.AuthenticationContext; import org.wso2.carbon.context.PrivilegedCarbonContext; @@ -67,8 +67,7 @@ public class CookieBasedAuthenticationHandler implements RequestHandler { } return Response.status(Response.Status.FORBIDDEN). type(MediaType.APPLICATION_JSON).entity( - new StatusResponseBean(Response.Status.FORBIDDEN.getStatusCode(), - "The endpoint requires authentication")).build(); + new ResponseMessageBean(ResponseMessageBean.ERROR, "The endpoint requires authentication")).build(); } /* http://git-wip-us.apache.org/repos/asf/stratos/blob/617e454a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java index 20cc9b7..2635d5f 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomExceptionMapper.java @@ -20,7 +20,7 @@ package org.apache.stratos.rest.endpoint.handlers; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.common.beans.StatusResponseBean; +import org.apache.stratos.common.beans.ResponseMessageBean; import org.apache.stratos.rest.endpoint.exception.RestAPIException; import javax.ws.rs.core.MediaType; @@ -47,6 +47,6 @@ public class CustomExceptionMapper implements ExceptionMapper<RestAPIException> log.error(errorMessage, restAPIException); return Response.status(httpStatus.getStatusCode()).type(MediaType.APPLICATION_JSON). - entity(new StatusResponseBean(httpStatus.getStatusCode(), errorMessage)).build(); + entity(new ResponseMessageBean(ResponseMessageBean.ERROR, errorMessage)).build(); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/617e454a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java index ed50f71..27c66fe 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CustomThrowableExceptionMapper.java @@ -19,7 +19,7 @@ package org.apache.stratos.rest.endpoint.handlers;/* import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.common.beans.StatusResponseBean; +import org.apache.stratos.common.beans.ResponseMessageBean; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -28,12 +28,11 @@ import javax.ws.rs.ext.ExceptionMapper; public class CustomThrowableExceptionMapper implements ExceptionMapper<Throwable> { private static Log log = LogFactory.getLog(CustomThrowableExceptionMapper.class); - public Response toResponse(Throwable throwable) { + public Response toResponse(Throwable t) { if (log.isErrorEnabled()) { - log.error("Internal server error", throwable); + log.error("Internal server error", t); } - return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON). - entity(new StatusResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), "Internal server error")).build(); + entity(new ResponseMessageBean(ResponseMessageBean.ERROR, "Internal server error")).build(); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/617e454a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java index fd992ab..4ab34fc 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/GenericExceptionMapper.java @@ -20,7 +20,7 @@ package org.apache.stratos.rest.endpoint.handlers; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.common.beans.StatusResponseBean; +import org.apache.stratos.common.beans.ResponseMessageBean; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; @@ -33,14 +33,13 @@ import javax.ws.rs.ext.ExceptionMapper; public class GenericExceptionMapper implements ExceptionMapper<WebApplicationException> { private static Log log = LogFactory.getLog(GenericExceptionMapper.class); - public Response toResponse(WebApplicationException webApplicationException) { + public Response toResponse(WebApplicationException e) { if (log.isDebugEnabled()) { - log.debug("Internal server error", webApplicationException); + log.debug("Internal server error", e); } // if no specific error message specified, spitting out a generaic error message - String errorMessage = (webApplicationException.getMessage() != null) ? - webApplicationException.getMessage() : "Internal server error"; + String errorMessage = (e.getMessage() != null) ? e.getMessage() : "Internal server error"; return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON). - entity(new StatusResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), errorMessage)).build(); + entity(new ResponseMessageBean(ResponseMessageBean.ERROR, errorMessage)).build(); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/617e454a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java index 4414bc5..ac6e61b 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthenticationHandler.java @@ -26,7 +26,7 @@ import org.apache.cxf.jaxrs.ext.RequestHandler; import org.apache.cxf.jaxrs.model.ClassResourceInfo; import org.apache.cxf.message.Message; import org.apache.cxf.security.SecurityContext; -import org.apache.stratos.common.beans.StatusResponseBean; +import org.apache.stratos.common.beans.ResponseMessageBean; import org.apache.stratos.rest.endpoint.ServiceHolder; import org.apache.stratos.rest.endpoint.context.AuthenticationContext; import org.apache.stratos.rest.endpoint.security.StratosSecurityContext; @@ -80,14 +80,12 @@ public class StratosAuthenticationHandler extends AbstractAuthenticationAuthoriz log.error("username is seen as null/empty values"); return Response.status(Response.Status.UNAUTHORIZED) .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON) - .entity(new StatusResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(), - "Username cannot be null")).build(); + .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, "Username cannot be null")).build(); } else if (certObject == null && (StringUtils.isEmpty(password))) { log.error("password is seen as null/empty values"); return Response.status(Response.Status.UNAUTHORIZED) .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON) - .entity(new StatusResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(), - "password cannot be null")).build(); + .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, "password cannot be null")).build(); } try { @@ -103,7 +101,8 @@ public class StratosAuthenticationHandler extends AbstractAuthenticationAuthoriz log.error("Invalid domain or unactivated tenant login"); // is this the correct HTTP code for this scenario ? (401) return Response.status(Response.Status.UNAUTHORIZED).header("WWW-Authenticate", "Basic"). - type(MediaType.APPLICATION_JSON).entity(new StatusResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(), "Tenant not found")).build(); + type(MediaType.APPLICATION_JSON).entity( + new ResponseMessageBean(ResponseMessageBean.ERROR, "Tenant not found")).build(); } } username = MultitenantUtils.getTenantAwareUsername(username); @@ -129,14 +128,14 @@ public class StratosAuthenticationHandler extends AbstractAuthenticationAuthoriz log.warn(String.format("Unable to authenticate the request: [message-id] %s", message.getId())); // authentication failed, request the authetication, add the realm name if needed to the value of WWW-Authenticate return Response.status(Response.Status.UNAUTHORIZED).header("WWW-Authenticate", "Basic"). - type(MediaType.APPLICATION_JSON).entity(new StatusResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(), + type(MediaType.APPLICATION_JSON).entity(new ResponseMessageBean(ResponseMessageBean.ERROR, "Authentication failed. Please check your username/password")).build(); } } catch (Exception exception) { log.error(String.format("Authentication failed: [message-id] %s", message.getId()), exception); // server error in the eyes of the client. Hence 5xx HTTP code. return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON). - entity(new StatusResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), + entity(new ResponseMessageBean(ResponseMessageBean.ERROR, "Unexpected error. Please contact the system admin")).build(); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/617e454a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java index 32b2972..e7f6da4 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosAuthorizingHandler.java @@ -28,7 +28,7 @@ import org.apache.cxf.jaxrs.model.ClassResourceInfo; import org.apache.cxf.message.Message; import org.apache.cxf.service.Service; import org.apache.cxf.service.model.BindingOperationInfo; -import org.apache.stratos.common.beans.StatusResponseBean; +import org.apache.stratos.common.beans.ResponseMessageBean; import org.apache.stratos.rest.endpoint.context.AuthenticationContext; import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext; @@ -84,15 +84,16 @@ public class StratosAuthorizingHandler implements RequestHandler { log.warn("User :" + userName + "trying to perform unauthrorized action" + " against the resource :" + targetMethod); return Response.status(Response.Status.FORBIDDEN).type(MediaType.APPLICATION_JSON). - entity(new StatusResponseBean(Response.Status.FORBIDDEN.getStatusCode(), "The user does not have required permissions to " + + entity(new ResponseMessageBean(ResponseMessageBean.ERROR, + "The user does not have required permissions to " + "perform this operation")).build(); } return null; - } catch (Exception exception) { - log.error("Unexpected error occured while REST api, authorization process", exception); + } catch (Exception e) { + log.error("Unexpected error occured while REST api, authorization process", e); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON). - entity(new StatusResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), + entity(new ResponseMessageBean(ResponseMessageBean.ERROR, "Unexpected error. Please contact the system admin")).build(); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/617e454a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java index 930cc33..986ba5c 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java @@ -24,7 +24,7 @@ import org.apache.cxf.configuration.security.AuthorizationPolicy; import org.apache.cxf.jaxrs.ext.RequestHandler; import org.apache.cxf.jaxrs.model.ClassResourceInfo; import org.apache.cxf.message.Message; -import org.apache.stratos.common.beans.StatusResponseBean; +import org.apache.stratos.common.beans.ResponseMessageBean; import org.wso2.carbon.context.PrivilegedCarbonContext; import javax.servlet.http.HttpServletRequest; @@ -66,13 +66,13 @@ public class StratosMockHandler extends AbstractAuthenticationAuthorizationHandl log.error("username is seen as null/empty values."); return Response.status(Response.Status.UNAUTHORIZED) .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON) - .entity(new StatusResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(), + .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, "Username cannot be null")).build(); } else if (certObject == null && ((password == null) || password.equals(""))) { log.error("password is seen as null/empty values."); return Response.status(Response.Status.UNAUTHORIZED) .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON) - .entity(new StatusResponseBean(Response.Status.UNAUTHORIZED.getStatusCode(), + .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, "password cannot be null")).build(); } @@ -86,9 +86,8 @@ public class StratosMockHandler extends AbstractAuthenticationAuthorizationHandl log.error("Authentication failed", exception); // server error in the eyes of the client. Hence 5xx HTTP code. return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON). - entity(new StatusResponseBean(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), + entity(new ResponseMessageBean(ResponseMessageBean.ERROR, "Unexpected error. Please contact the system admin")).build(); } - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/617e454a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java index b153745..9996af6 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java @@ -18,7 +18,7 @@ */ package org.apache.stratos.rest.endpoint.mock; -import org.apache.stratos.common.beans.ApiResponseBean; +import org.apache.stratos.common.beans.ResponseMessageBean; import org.apache.stratos.common.beans.TenantInfoBean; import org.apache.stratos.common.beans.UserInfoBean; import org.apache.stratos.common.beans.cartridge.CartridgeBean; @@ -59,7 +59,7 @@ public class MockContext { return mockContext; } - public ApiResponseBean addCartirdgeDefinition(CartridgeBean cartridgeDefinitionBean) { + public ResponseMessageBean addCartirdgeDefinition(CartridgeBean cartridgeDefinitionBean) { int tenantId = getTenantId(); List<CartridgeBean> tenantCartridges; @@ -131,7 +131,7 @@ public class MockContext { System.out.println(cartridges.size()); } - ApiResponseBean stratosApiResponse = new ApiResponseBean(); + ResponseMessageBean stratosApiResponse = new ResponseMessageBean(); stratosApiResponse.setMessage("Successfully deployed cartridge definition with type "); return stratosApiResponse; } @@ -244,7 +244,7 @@ public class MockContext { return cartridges.toArray(new CartridgeBean[cartridges.size()]); } - public ApiResponseBean unsubscribe(String alias) throws RestAPIException { + public ResponseMessageBean unsubscribe(String alias) throws RestAPIException { int tenantId = getTenantId(); if (subscribedCartridges.containsKey(tenantId)) { if ((subscribedCartridges.get(tenantId)).containsKey(alias)) { @@ -253,7 +253,7 @@ public class MockContext { } else { throw new RestAPIException(Status.NO_CONTENT, "Unable to un-subscribe"); } - ApiResponseBean stratosApiResponse = new ApiResponseBean(); + ResponseMessageBean stratosApiResponse = new ResponseMessageBean(); stratosApiResponse.setMessage("Successfully un-subscribed"); return stratosApiResponse; } @@ -303,11 +303,11 @@ public class MockContext { return (availableMultiTenantCartridges.get(tenantId)).get(cartridgeType); } - public ApiResponseBean deleteCartridgeDefinition(String cartridgeType) throws RestAPIException { + public ResponseMessageBean deleteCartridgeDefinition(String cartridgeType) throws RestAPIException { if (!deleteFromAvailableSingleTenantCartridgeDefinitions(cartridgeType) && !deleteFromAvailableMultiTenantCartridgeDefinitions(cartridgeType)) { throw new RestAPIException(Status.NO_CONTENT, "No cartridges defined for tenant"); } - ApiResponseBean stratosApiResponse = new ApiResponseBean(); + ResponseMessageBean stratosApiResponse = new ResponseMessageBean(); stratosApiResponse.setMessage("Successfully delete cartridge definition"); return stratosApiResponse; } @@ -350,7 +350,7 @@ public class MockContext { return true; } - public ApiResponseBean addTenant(TenantInfoBean tenantInfoBean) throws RestAPIException { + public ResponseMessageBean addTenant(TenantInfoBean tenantInfoBean) throws RestAPIException { try { tenantMap.put(tenantInfoBean.getTenantDomain(), tenantInfoBean); tenantInfoBean.setTenantId(tenantIdCount); @@ -358,7 +358,7 @@ public class MockContext { } catch (Exception e) { throw new RestAPIException(Status.INTERNAL_SERVER_ERROR, e.getMessage()); } - ApiResponseBean stratosApiResponse = new ApiResponseBean(); + ResponseMessageBean stratosApiResponse = new ResponseMessageBean(); stratosApiResponse.setMessage("Successfully added new Tenant"); return stratosApiResponse; } @@ -370,14 +370,14 @@ public class MockContext { return tenantMap.get(tenantDomain); } - public ApiResponseBean deleteTenant(String tenantDomain) { + public ResponseMessageBean deleteTenant(String tenantDomain) { if (tenantMap.containsKey(tenantDomain)) { TenantInfoBean tenant = tenantMap.get(tenantDomain); tenantMap.remove(tenantDomain); tenantIdMap.remove(tenant.getTenantId()); } - ApiResponseBean stratosApiResponse = new ApiResponseBean(); + ResponseMessageBean stratosApiResponse = new ResponseMessageBean(); stratosApiResponse.setMessage("Successfully deleted tenant"); return stratosApiResponse; } @@ -397,29 +397,29 @@ public class MockContext { return searchResult.toArray(new TenantInfoBean[searchResult.size()]); } - public ApiResponseBean activateTenant(String tenantDomain) throws RestAPIException { + public ResponseMessageBean activateTenant(String tenantDomain) throws RestAPIException { if (tenantMap.containsKey(tenantDomain)) { tenantMap.get(tenantDomain).setActive(true); } else { throw new RestAPIException(Status.BAD_REQUEST, "Invalid tenant domain"); } - ApiResponseBean stratosApiResponse = new ApiResponseBean(); + ResponseMessageBean stratosApiResponse = new ResponseMessageBean(); stratosApiResponse.setMessage("Successfully activated Tenant"); return stratosApiResponse; } - public ApiResponseBean deactivateTenant(String tenantDomain) throws RestAPIException { + public ResponseMessageBean deactivateTenant(String tenantDomain) throws RestAPIException { if (tenantMap.containsKey(tenantDomain)) { tenantMap.get(tenantDomain).setActive(false); } else { throw new RestAPIException(Status.BAD_REQUEST, "Invalid tenant domain"); } - ApiResponseBean stratosApiResponse = new ApiResponseBean(); + ResponseMessageBean stratosApiResponse = new ResponseMessageBean(); stratosApiResponse.setMessage("Successfully deactivated Tenant"); return stratosApiResponse; } - public ApiResponseBean addPartition(PartitionBean partition) { + public ResponseMessageBean addPartition(PartitionBean partition) { int tenantId = getTenantId(); Map<String, PartitionBean> partitions; @@ -440,12 +440,12 @@ public class MockContext { } partitions.put(partition.getId(), partition); - ApiResponseBean stratosApiResponse = new ApiResponseBean(); + ResponseMessageBean stratosApiResponse = new ResponseMessageBean(); stratosApiResponse.setMessage("Successfully deployed partition"); return stratosApiResponse; } - public ApiResponseBean addAutoScalingPolicyDefinition(AutoscalePolicyBean autoscalePolicy) { + public ResponseMessageBean addAutoScalingPolicyDefinition(AutoscalePolicyBean autoscalePolicy) { int tenantId = getTenantId(); Map<String, AutoscalePolicyBean> policies; @@ -466,12 +466,12 @@ public class MockContext { } policies.put(autoscalePolicy.getId(), autoscalePolicy); - ApiResponseBean stratosApiResponse = new ApiResponseBean(); + ResponseMessageBean stratosApiResponse = new ResponseMessageBean(); stratosApiResponse.setMessage("Successfully deployed auto scaling policy definition"); return stratosApiResponse; } - public ApiResponseBean addDeploymentPolicyDefinition(String applicationId, DeploymentPolicyBean deploymentPolicy) { + public ResponseMessageBean addDeploymentPolicyDefinition(String applicationId, DeploymentPolicyBean deploymentPolicy) { int tenantId = getTenantId(); Map<String, DeploymentPolicyBean> policies; @@ -485,7 +485,7 @@ public class MockContext { policies.put(applicationId + UUID.randomUUID().getLeastSignificantBits(), deploymentPolicy); - ApiResponseBean stratosApiResponse = new ApiResponseBean(); + ResponseMessageBean stratosApiResponse = new ResponseMessageBean(); stratosApiResponse.setMessage("Successfully deployed deployment policy definition"); return stratosApiResponse; } @@ -643,7 +643,7 @@ public class MockContext { } } - public ApiResponseBean deployService(Object serviceDefinitionBean) { + public ResponseMessageBean deployService(Object serviceDefinitionBean) { // int tenantId = getTenantId(); // Map<String,ServiceDefinitionBean> serviceDefinitions; // @@ -667,7 +667,7 @@ public class MockContext { // } // // serviceDefinitions.put(serviceDefinitionBean.getCartridgeType(),serviceDefinitionBean); - ApiResponseBean stratosApiResponse = new ApiResponseBean(); + ResponseMessageBean stratosApiResponse = new ResponseMessageBean(); stratosApiResponse.setMessage("Successfully deployed service"); return stratosApiResponse; http://git-wip-us.apache.org/repos/asf/stratos/blob/617e454a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java index e22131c..ff2e699 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java @@ -20,7 +20,7 @@ package org.apache.stratos.rest.endpoint.mock; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.common.beans.ApiResponseBean; +import org.apache.stratos.common.beans.ResponseMessageBean; import org.apache.stratos.common.beans.TenantInfoBean; import org.apache.stratos.common.beans.UserInfoBean; import org.apache.stratos.common.beans.cartridge.CartridgeBean; @@ -56,10 +56,10 @@ public class StratosApiV40Mock { @POST @Path("/init") @AuthorizationAction("/permission/protected/manage/monitor/tenants") - public ApiResponseBean initialize() + public ResponseMessageBean initialize() throws RestAPIException { - ApiResponseBean stratosApiResponse = new ApiResponseBean(); + ResponseMessageBean stratosApiResponse = new ResponseMessageBean(); stratosApiResponse.setMessage("Successfully logged in"); return stratosApiResponse; } @@ -137,7 +137,7 @@ public class StratosApiV40Mock { @Path("/cartridge/unsubscribe") @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") - public ApiResponseBean unsubscribe(String alias) throws RestAPIException { + public ResponseMessageBean unsubscribe(String alias) throws RestAPIException { return MockContext.getInstance().unsubscribe(alias); } @@ -147,7 +147,7 @@ public class StratosApiV40Mock { @Produces("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) - public ApiResponseBean addTenant(TenantInfoBean tenantInfoBean) throws RestAPIException { + public ResponseMessageBean addTenant(TenantInfoBean tenantInfoBean) throws RestAPIException { return MockContext.getInstance().addTenant(tenantInfoBean); } @@ -157,7 +157,7 @@ public class StratosApiV40Mock { @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) - public ApiResponseBean updateTenant(TenantInfoBean tenantInfoBean) throws RestAPIException { + public ResponseMessageBean updateTenant(TenantInfoBean tenantInfoBean) throws RestAPIException { return MockContext.getInstance().addTenant(tenantInfoBean); } @@ -177,7 +177,7 @@ public class StratosApiV40Mock { @Produces("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) - public ApiResponseBean deleteTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException { + public ResponseMessageBean deleteTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException { return MockContext.getInstance().deleteTenant(tenantDomain); } @@ -216,7 +216,7 @@ public class StratosApiV40Mock { @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) - public ApiResponseBean deactivateTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException { + public ResponseMessageBean deactivateTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException { return MockContext.getInstance().deactivateTenant(tenantDomain); } @@ -226,7 +226,7 @@ public class StratosApiV40Mock { @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) - public ApiResponseBean deployService(Object serviceDefinitionBean) + public ResponseMessageBean deployService(Object serviceDefinitionBean) throws RestAPIException { throw new RestAPIException("Not implemented"); } @@ -237,7 +237,7 @@ public class StratosApiV40Mock { @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) - public ApiResponseBean deployCartridgeDefinition(CartridgeBean cartridgeDefinitionBean) + public ResponseMessageBean deployCartridgeDefinition(CartridgeBean cartridgeDefinitionBean) throws RestAPIException { return MockContext.getInstance().addCartirdgeDefinition(cartridgeDefinitionBean); } @@ -278,7 +278,7 @@ public class StratosApiV40Mock { @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) - public ApiResponseBean deployPartition(PartitionBean partition) + public ResponseMessageBean deployPartition(PartitionBean partition) throws RestAPIException { return MockContext.getInstance().addPartition(partition); } @@ -289,7 +289,7 @@ public class StratosApiV40Mock { @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) - public ApiResponseBean deployAutoscalingPolicyDefintion(AutoscalePolicyBean autoscalePolicy) + public ResponseMessageBean deployAutoscalingPolicyDefintion(AutoscalePolicyBean autoscalePolicy) throws RestAPIException { return MockContext.getInstance().addAutoScalingPolicyDefinition(autoscalePolicy); @@ -301,7 +301,7 @@ public class StratosApiV40Mock { @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) - public ApiResponseBean deployDeploymentPolicyDefinition(DeploymentPolicyBean deploymentPolicy) + public ResponseMessageBean deployDeploymentPolicyDefinition(DeploymentPolicyBean deploymentPolicy) throws RestAPIException { throw new RestAPIException("Not supported"); }
