diff options
2 files changed, 8 insertions, 14 deletions
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/ClustersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/ClustersResource.java index 6f2e51c4..45125513 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/ClustersResource.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/ClustersResource.java @@ -40,7 +40,6 @@ import javax.ws.rs.core.Response; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.gluster.storage.management.core.exceptions.GlusterRuntimeException; import com.gluster.storage.management.core.exceptions.GlusterValidationException; import com.gluster.storage.management.core.response.ClusterNameListResponse; import com.gluster.storage.management.server.data.ClusterInfo; @@ -73,21 +72,15 @@ public class ClustersResource extends AbstractResource { @POST public Response createCluster(@FormParam(FORM_PARAM_CLUSTER_NAME) String clusterName) { if(clusterName == null || clusterName.isEmpty()) { - return badRequestResponse("Parameter [" + FORM_PARAM_CLUSTER_NAME + "] is missing in request!"); + throw new GlusterValidationException("Parameter [" + FORM_PARAM_CLUSTER_NAME + "] is missing in request!"); } if(clusterService.getCluster(clusterName) != null) { - return badRequestResponse("Cluster [" + clusterName + "] already exists!"); + throw new GlusterValidationException("Cluster [" + clusterName + "] already exists!"); } - try { - clusterService.createCluster(clusterName); - return createdResponse(clusterName); - } catch (Exception e) { - // TODO: Log the exception - return errorResponse("Exception while trying to save cluster [" + clusterName + "]: [" + e.getMessage() - + "]"); - } + clusterService.createCluster(clusterName); + return createdResponse(clusterName); } @PUT diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/services/ClusterService.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/services/ClusterService.java index aa5630ae..59cb185b 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/services/ClusterService.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/services/ClusterService.java @@ -145,7 +145,7 @@ public class ClusterService { return servers.get(0).getCluster(); } - public void createCluster(@FormParam(FORM_PARAM_CLUSTER_NAME) String clusterName) { + public void createCluster(String clusterName) { EntityTransaction txn = clusterDao.startTransaction(); ClusterInfo cluster = new ClusterInfo(); cluster.setName(clusterName); @@ -155,12 +155,12 @@ public class ClusterService { txn.commit(); } catch (RuntimeException e) { txn.rollback(); + logger.error("Exception while trying to save cluster [" + clusterName + "] : [" + e.getMessage() + "]", e); throw e; } } - public void registerCluster(@FormParam(FORM_PARAM_CLUSTER_NAME) String clusterName, - @FormParam(FORM_PARAM_SERVER_NAME) String knownServer) { + public void registerCluster(String clusterName, String knownServer) { EntityTransaction txn = clusterDao.startTransaction(); ClusterInfo cluster = new ClusterInfo(); cluster.setName(clusterName); @@ -185,6 +185,7 @@ public class ClusterService { } catch(RuntimeException e) { logger.error("Error in registering cluster [" + clusterName + "] : " + e.getMessage(), e); txn.rollback(); + logger.error("Error in registering cluster [" + clusterName + "] : " + e.getMessage(), e); throw e; } } |