You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/07/12 09:04:59 UTC
git commit: format POST APIs
Repository: stratos
Updated Branches:
refs/heads/master e28aabd76 -> 061a2359c
format POST APIs
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/061a2359
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/061a2359
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/061a2359
Branch: refs/heads/master
Commit: 061a2359c053addba93881b3e1858a9d05d2f57e
Parents: e28aabd
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sat Jul 12 12:34:19 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sat Jul 12 12:34:19 2014 +0530
----------------------------------------------------------------------
.../rest/endpoint/services/ServiceUtils.java | 36 ++--------
.../rest/endpoint/services/StratosAdmin.java | 69 ++++++++++++--------
2 files changed, 46 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/061a2359/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
index dc8de32..21cf22b 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
@@ -166,7 +166,7 @@ public class ServiceUtils {
}
- public static StratosAdminResponse deployPartition(Partition partitionBean) throws RestAPIException {
+ public static void deployPartition(Partition partitionBean) throws RestAPIException {
//log.info("***** " + cartridgeDefinitionBean.toString() + " *****");
@@ -188,13 +188,9 @@ public class ServiceUtils {
}
}
-
- StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
- stratosAdminResponse.setMessage("Successfully deployed partition definition with id " + partitionBean.id);
- return stratosAdminResponse;
}
- public static StratosAdminResponse deployAutoscalingPolicy(AutoscalePolicy autoscalePolicyBean) throws RestAPIException {
+ public static void deployAutoscalingPolicy(AutoscalePolicy autoscalePolicyBean) throws RestAPIException {
//log.info("***** " + cartridgeDefinitionBean.toString() + " *****");
@@ -218,13 +214,9 @@ public class ServiceUtils {
}
}
-
- StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
- stratosAdminResponse.setMessage("Successfully deployed autoscaling policy definition with id " + autoscalePolicyBean.getId());
- return stratosAdminResponse;
}
- public static StratosAdminResponse deployDeploymentPolicy(
+ public static void deployDeploymentPolicy(
org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy deploymentPolicyBean)
throws RestAPIException {
@@ -249,10 +241,6 @@ public class ServiceUtils {
}
}
-
- StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
- stratosAdminResponse.setMessage("Successfully deployed deployment policy definition with type " + deploymentPolicyBean.id);
- return stratosAdminResponse;
}
private static CloudControllerServiceClient getCloudControllerServiceClient() throws RestAPIException {
@@ -1104,7 +1092,7 @@ public class ServiceUtils {
return cartridgeSubscription.getClusterDomain();
} */
- static StratosAdminResponse unsubscribe(String alias, String tenantDomain) throws RestAPIException {
+ static void unsubscribe(String alias, String tenantDomain) throws RestAPIException {
try {
cartridgeSubsciptionManager.unsubscribeFromCartridge(tenantDomain, alias);
@@ -1118,10 +1106,6 @@ public class ServiceUtils {
log.error(e.getMessage(), e);
throw new RestAPIException(e.getMessage(), e);
}
-
- StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
- stratosAdminResponse.setMessage("Successfully terminated the subscription with alias " + alias);
- return stratosAdminResponse;
}
/**
@@ -1132,7 +1116,7 @@ public class ServiceUtils {
* @param clusterDomain
* @param clusterSubdomain
*/
- static StratosAdminResponse deployService(String cartridgeType, String alias, String autoscalingPolicy, String deploymentPolicy,
+ static void deployService(String cartridgeType, String alias, String autoscalingPolicy, String deploymentPolicy,
String tenantDomain, String tenantUsername, int tenantId, String clusterDomain, String clusterSubdomain, String tenantRange) throws RestAPIException {
log.info("Deploying service..");
try {
@@ -1143,10 +1127,6 @@ public class ServiceUtils {
log.error(msg, e);
throw new RestAPIException(msg, e);
}
-
- StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
- stratosAdminResponse.setMessage("Successfully deployed service cluster definition with type " + cartridgeType);
- return stratosAdminResponse;
}
static StratosAdminResponse undeployService(String serviceType) throws RestAPIException {
@@ -1178,7 +1158,7 @@ public class ServiceUtils {
}
}
- static StratosAdminResponse synchronizeRepository(CartridgeSubscription cartridgeSubscription) throws RestAPIException {
+ static void synchronizeRepository(CartridgeSubscription cartridgeSubscription) throws RestAPIException {
try {
RepositoryNotification repoNotification = new RepositoryNotification();
repoNotification.updateRepository(cartridgeSubscription);
@@ -1187,10 +1167,6 @@ public class ServiceUtils {
log.error(msg, e);
throw new RestAPIException(msg, e);
}
-
- StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
- stratosAdminResponse.setMessage("Successfully sent the repository synchronization request for " + cartridgeSubscription.getAlias());
- return stratosAdminResponse;
}
public static StratosAdminResponse addSubscriptionDomains(ConfigurationContext configurationContext, String cartridgeType,
http://git-wip-us.apache.org/repos/asf/stratos/blob/061a2359/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
index 194c510..313c71a 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
@@ -65,7 +65,9 @@ import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@@ -77,6 +79,9 @@ public class StratosAdmin extends AbstractAdmin {
private static Log log = LogFactory.getLog(StratosAdmin.class);
@Context
HttpServletRequest httpServletRequest;
+ @Context
+ UriInfo uriInfo;
+
@POST
@Path("/init")
@@ -122,7 +127,8 @@ public class StratosAdmin extends AbstractAdmin {
ServiceUtils.deployCartridge(cartridgeDefinitionBean, getConfigContext(), getUsername(),
getTenantDomain());
- return Response.noContent().build();
+ URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeDefinitionBean.type).build();
+ return Response.created(url).build();
}
@@ -143,10 +149,12 @@ public class StratosAdmin extends AbstractAdmin {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public StratosAdminResponse deployPartition (Partition partition)
+ public Response deployPartition (Partition partition)
throws RestAPIException {
- return ServiceUtils.deployPartition(partition);
+ ServiceUtils.deployPartition(partition);
+ URI url = uriInfo.getAbsolutePathBuilder().path(partition.id).build();
+ return Response.created(url).build();
}
@POST
@@ -155,10 +163,12 @@ public class StratosAdmin extends AbstractAdmin {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public StratosAdminResponse deployAutoscalingPolicyDefintion (AutoscalePolicy autoscalePolicy)
+ public Response deployAutoscalingPolicyDefintion (AutoscalePolicy autoscalePolicy)
throws RestAPIException {
- return ServiceUtils.deployAutoscalingPolicy(autoscalePolicy);
+ ServiceUtils.deployAutoscalingPolicy(autoscalePolicy);
+ URI url = uriInfo.getAbsolutePathBuilder().path(autoscalePolicy.getId()).build();
+ return Response.created(url).build();
}
@POST
@@ -167,10 +177,12 @@ public class StratosAdmin extends AbstractAdmin {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public StratosAdminResponse deployDeploymentPolicyDefinition (DeploymentPolicy deploymentPolicy)
+ public Response deployDeploymentPolicyDefinition (DeploymentPolicy deploymentPolicy)
throws RestAPIException {
- return ServiceUtils.deployDeploymentPolicy(deploymentPolicy);
+ ServiceUtils.deployDeploymentPolicy(deploymentPolicy);
+ URI url = uriInfo.getAbsolutePathBuilder().path(deploymentPolicy.id).build();
+ return Response.created(url).build();
}
@GET
@@ -368,12 +380,13 @@ public class StratosAdmin extends AbstractAdmin {
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public SubscriptionInfo subscribe(CartridgeInfoBean cartridgeInfoBean) throws RestAPIException {
+ public Response subscribe(CartridgeInfoBean cartridgeInfoBean) throws RestAPIException {
- return ServiceUtils.subscribe(cartridgeInfoBean,
+ SubscriptionInfo subscriptionInfo= ServiceUtils.subscribe(cartridgeInfoBean,
getConfigContext(),
getUsername(),
getTenantDomain());
+ return Response.ok(subscriptionInfo).build();
}
@GET
@@ -439,8 +452,9 @@ public class StratosAdmin extends AbstractAdmin {
@Path("/cartridge/unsubscribe")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public StratosAdminResponse unsubscribe(String alias) throws RestAPIException {
- return ServiceUtils.unsubscribe(alias, getTenantDomain());
+ public Response unsubscribe(String alias) throws RestAPIException {
+ ServiceUtils.unsubscribe(alias, getTenantDomain());
+ return Response.noContent().build();
}
@POST
@@ -449,7 +463,7 @@ public class StratosAdmin extends AbstractAdmin {
@Produces("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public StratosAdminResponse addTenant(TenantInfoBean tenantInfoBean) throws RestAPIException {
+ public Response addTenant(TenantInfoBean tenantInfoBean) throws RestAPIException {
try {
CommonUtil.validateEmail(tenantInfoBean.getEmail());
} catch (Exception e) {
@@ -524,9 +538,8 @@ public class StratosAdmin extends AbstractAdmin {
throw new RestAPIException(msg);
}
- StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
- stratosAdminResponse.setMessage("Successfully added new tenant with domain " + tenantInfoBean.getTenantDomain());
- return stratosAdminResponse;
+ URI url = uriInfo.getAbsolutePathBuilder().path(tenant.getDomain()).build();
+ return Response.created(url).build();
}
@PUT
@@ -805,7 +818,7 @@ public class StratosAdmin extends AbstractAdmin {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public StratosAdminResponse activateTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException {
+ public Response activateTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException {
TenantManager tenantManager = ServiceHolder.getTenantManager();
int tenantId;
try {
@@ -821,8 +834,6 @@ public class StratosAdmin extends AbstractAdmin {
throw new RestAPIException( e);
}
- StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
-
try {
TenantMgtUtil.activateTenant(tenantDomain, tenantManager, tenantId);
@@ -839,8 +850,7 @@ public class StratosAdmin extends AbstractAdmin {
throw new RestAPIException(msg, e);
}
- stratosAdminResponse.setMessage("Successfully activated tenant " + tenantDomain);
- return stratosAdminResponse;
+ return Response.noContent().build();
}
@POST
@@ -864,7 +874,7 @@ public class StratosAdmin extends AbstractAdmin {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public StratosAdminResponse deactivateTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException {
+ public Response deactivateTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException {
TenantManager tenantManager = ServiceHolder.getTenantManager();
int tenantId;
@@ -882,8 +892,6 @@ public class StratosAdmin extends AbstractAdmin {
throw new RestAPIException( e);
}
- StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
-
try {
TenantMgtUtil.deactivateTenant(tenantDomain, tenantManager, tenantId);
} catch (Exception e) {
@@ -899,8 +907,7 @@ public class StratosAdmin extends AbstractAdmin {
throw new RestAPIException(msg, e);
}
- stratosAdminResponse.setMessage("Successfully deactivated tenant " + tenantDomain);
- return stratosAdminResponse;
+ return Response.noContent().build();
}
@POST
@@ -909,16 +916,19 @@ public class StratosAdmin extends AbstractAdmin {
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
- public StratosAdminResponse deployService (ServiceDefinitionBean serviceDefinitionBean)
+ public Response deployService (ServiceDefinitionBean serviceDefinitionBean)
throws RestAPIException {
log.info("Service definition request.. : " + serviceDefinitionBean.getServiceName());
// super tenant Deploying service (MT)
// here an alias is generated
- return ServiceUtils.deployService(serviceDefinitionBean.getCartridgeType(), UUID.randomUUID().toString(), serviceDefinitionBean.getAutoscalingPolicyName(),
+ ServiceUtils.deployService(serviceDefinitionBean.getCartridgeType(), UUID.randomUUID().toString(), serviceDefinitionBean.getAutoscalingPolicyName(),
serviceDefinitionBean.getDeploymentPolicyName(), getTenantDomain(), getUsername(), getTenantId(),
serviceDefinitionBean.getClusterDomain(), serviceDefinitionBean.getClusterSubDomain(),
serviceDefinitionBean.getTenantRange());
+
+ URI url = uriInfo.getAbsolutePathBuilder().path(serviceDefinitionBean.getServiceName()).build();
+ return Response.created(url).build();
}
@GET
@@ -978,7 +988,7 @@ public class StratosAdmin extends AbstractAdmin {
@Path("/cartridge/sync")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public StratosAdminResponse synchronizeRepository(String alias) throws RestAPIException {
+ public Response synchronizeRepository(String alias) throws RestAPIException {
if (log.isDebugEnabled()) {
log.debug(String.format("Synchronizing Git repository for alias '%s'", alias));
}
@@ -987,7 +997,8 @@ public class StratosAdmin extends AbstractAdmin {
log.debug(String.format("Found subscription for '%s'. Git repository: %s", alias, cartridgeSubscription
.getRepository().getUrl()));
}
- return ServiceUtils.synchronizeRepository(cartridgeSubscription);
+ ServiceUtils.synchronizeRepository(cartridgeSubscription);
+ return Response.noContent().build();
}
private List<TenantInfoBean> getAllTenants() throws RestAPIException {