You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by am...@apache.org on 2012/12/31 22:29:02 UTC
svn commit: r1427244 [2/2] - in /airavata/trunk/modules: integration-tests/
registry/airavata-jpa-registry/
registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/
rest/service/src/main/java/org/apache/airavata/servic...
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java?rev=1427244&r1=1427243&r2=1427244&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java Mon Dec 31 21:29:02 2012
@@ -22,9 +22,6 @@
package org.apache.airavata.services.registry.rest.resources;
import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException;
-import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
import org.apache.airavata.registry.api.impl.WorkflowExecutionDataImpl;
import org.apache.airavata.registry.api.workflow.*;
import org.apache.airavata.rest.mappings.resourcemappings.ExperimentDataList;
@@ -32,6 +29,7 @@ import org.apache.airavata.rest.mappings
import org.apache.airavata.rest.mappings.resourcemappings.WorkflowInstancesList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
import org.apache.airavata.rest.mappings.utils.RegPoolUtils;
+import org.apache.airavata.services.registry.rest.utils.WebAppUtil;
import javax.servlet.ServletContext;
import javax.ws.rs.*;
@@ -77,10 +75,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Experiment execution user updated successfully...");
return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_EXPERIMENT_EXECUTIONUSER, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -109,10 +105,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENT_EXECUTIONUSER, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -141,10 +135,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENT_NAME, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -170,10 +162,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Experiment Name updated successfully...");
return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_EXPERIMENTNAME, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -202,10 +192,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENTMETADATA, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -231,10 +219,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Experiment metadata updated successfully...");
return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_EXPERIMENTMETADATA, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -264,10 +250,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOWTEMPLATENAME, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -293,10 +277,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Workflow template name updated successfully...");
return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWINSTANCETEMPLATENAME, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -331,10 +313,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENTWORKFLOWINSTANCES, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -364,10 +344,8 @@ public class ProvenanceRegistryResource
builder.entity("False");
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.WORKFLOWINSTANCE_EXIST_CHECK, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -401,10 +379,8 @@ public class ProvenanceRegistryResource
builder.entity("False");
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.WORKFLOWINSTANCE_EXIST_CREATE, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -431,10 +407,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Workflow instance status updated successfully...");
return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWINSTANCESTATUS_INSTANCEID, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -460,7 +434,6 @@ public class ProvenanceRegistryResource
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date formattedDate = dateFormat.parse(statusUpdateTime);
- WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
WorkflowExecutionStatus.State status = WorkflowExecutionStatus.State.valueOf(executionStatus);
WorkflowExecutionStatus workflowInstanceStatus = new WorkflowExecutionStatus(workflowInstanceId, workflowInstanceId);
workflowInstanceStatus.setExecutionStatus(status);
@@ -469,14 +442,12 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Workflow instance status updated successfully...");
return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
} catch (ParseException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
+ Response.ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
builder.entity(e.getMessage());
return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWINSTANCESTATUS, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -505,10 +476,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOWINSTANCESTATUS, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -532,17 +501,14 @@ public class ProvenanceRegistryResource
@FormParam("data") String data) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceID);
WorkflowExecution workflowExecution = new WorkflowExecution(workflowInstanceID, workflowInstanceID);
WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(workflowExecution, nodeID);
airavataRegistry.updateWorkflowNodeInput(workflowInstanceNode, data);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Workflow node input saved successfully...");
return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWNODEINPUT, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -567,17 +533,14 @@ public class ProvenanceRegistryResource
@FormParam("data") String data) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceID);
WorkflowExecution workflowExecution = new WorkflowExecution(workflowInstanceID, workflowInstanceID);
WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(workflowExecution, nodeID);
airavataRegistry.updateWorkflowNodeOutput(workflowInstanceNode, data);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Workflow node output saved successfully...");
return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWNODEOUTPUT, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -772,10 +735,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENT, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -806,10 +767,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENT_ID_USER, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -832,8 +791,8 @@ public class ProvenanceRegistryResource
List<ExperimentData> experimentDataList = airavataRegistry.getExperimentByUser(username);
ExperimentDataList experimentData = new ExperimentDataList();
List<ExperimentData> experimentDatas = new ArrayList<ExperimentData>();
- for (int i = 0; i < experimentDataList.size(); i++) {
- experimentDatas.add(experimentDataList.get(i));
+ for (ExperimentData anExperimentDataList : experimentDataList) {
+ experimentDatas.add(anExperimentDataList);
}
experimentData.setExperimentDataList(experimentDatas);
if (experimentDataList.size() != 0) {
@@ -844,10 +803,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENT_USER, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -876,10 +833,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Workflow node status updated successfully...");
return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWNODE_STATUS, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -901,7 +856,6 @@ public class ProvenanceRegistryResource
@QueryParam("nodeId") String nodeId) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
WorkflowExecution workflowExecution = new WorkflowExecution(workflowInstanceId, workflowInstanceId);
WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(workflowExecution, nodeId);
NodeExecutionStatus workflowNodeStatus = airavataRegistry.getWorkflowNodeStatus(workflowInstanceNode);
@@ -913,10 +867,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOWNODE_STATUS, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -938,7 +890,6 @@ public class ProvenanceRegistryResource
@QueryParam("nodeId") String nodeId) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
WorkflowExecution workflowExecution = new WorkflowExecution(workflowInstanceId, workflowInstanceId);
WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(workflowExecution, nodeId);
Date workflowNodeStartTime = airavataRegistry.getWorkflowNodeStartTime(workflowInstanceNode);
@@ -950,10 +901,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOWNODE_STARTTIME, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -973,7 +922,6 @@ public class ProvenanceRegistryResource
public Response getWorkflowStartTime(@QueryParam("workflowInstanceId") String workflowInstanceId) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
WorkflowExecution workflowInstance = new WorkflowExecution(workflowInstanceId, workflowInstanceId);
Date workflowStartTime = airavataRegistry.getWorkflowStartTime(workflowInstance);
if (workflowStartTime != null) {
@@ -984,10 +932,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOW_STARTTIME, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1012,10 +958,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Workflow node Gram data updated successfully...");
return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWNODE_GRAMDATA, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1045,10 +989,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOWINSTANCEDATA, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1080,10 +1022,8 @@ public class ProvenanceRegistryResource
builder.entity("False");
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.WORKFLOWINSTANCE_NODE_EXIST, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1119,10 +1059,8 @@ public class ProvenanceRegistryResource
builder.entity("False");
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.WORKFLOWINSTANCE_NODE_EXIST_CREATE, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1155,10 +1093,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.WORKFLOWINSTANCE_NODE_DATA, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1187,10 +1123,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Workflow instance added successfully...");
return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.ADD_WORKFLOWINSTANCE, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1225,10 +1159,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Workflow instance node type updated successfully...");
return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWNODETYPE, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1255,10 +1187,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Workflow instance node added successfully...");
return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.ADD_WORKFLOWINSTANCENODE, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1290,10 +1220,8 @@ public class ProvenanceRegistryResource
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.EXPERIMENTNAME_EXISTS, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1325,10 +1253,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENT_METAINFORMATION, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1353,7 +1279,7 @@ public class ProvenanceRegistryResource
ExperimentDataList experimentDataList = new ExperimentDataList();
List<ExperimentData> experimentDatas = new ArrayList<ExperimentData>();
for (ExperimentData experimentData : allExperimentMetaInformation) {
- experimentDatas.add((ExperimentDataImpl) experimentData);
+ experimentDatas.add(experimentData);
}
experimentDataList.setExperimentDataList(experimentDatas);
if (allExperimentMetaInformation.size() != 0) {
@@ -1364,10 +1290,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_ALL_EXPERIMENT_METAINFORMATION, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -1406,10 +1330,8 @@ public class ProvenanceRegistryResource
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.SEARCH_EXPERIMENTS, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java?rev=1427244&r1=1427243&r2=1427244&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java Mon Dec 31 21:29:02 2012
@@ -31,6 +31,7 @@ import org.apache.airavata.rest.mappings
import org.apache.airavata.rest.mappings.resourcemappings.WorkflowList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
import org.apache.airavata.rest.mappings.utils.RegPoolUtils;
+import org.apache.airavata.services.registry.rest.utils.WebAppUtil;
import javax.servlet.ServletContext;
import javax.ws.rs.*;
@@ -75,10 +76,8 @@ public class PublishWorkflowRegistryReso
builder.entity("False");
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.PublishedWFConstants.PUBLISHWF_EXIST, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -105,17 +104,15 @@ public class PublishWorkflowRegistryReso
builder.entity("Workflow published successfully...");
return builder.build();
} catch (UserWorkflowDoesNotExistsException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
+ Response.ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
builder.entity(e.getMessage());
return builder.build();
} catch (PublishedWorkflowAlreadyExistsException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
+ Response.ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
builder.entity(e.getMessage());
return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.PublishedWFConstants.PUBLISH_WORKFLOW, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -140,17 +137,15 @@ public class PublishWorkflowRegistryReso
builder.entity("Workflow published successfully...");
return builder.build();
} catch (UserWorkflowDoesNotExistsException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
+ Response.ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
builder.entity(e.getMessage());
return builder.build();
} catch (PublishedWorkflowAlreadyExistsException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
+ Response.ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
builder.entity(e.getMessage());
return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.PublishedWFConstants.PUBLISH_DEFAULT_WORKFLOW, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -181,13 +176,11 @@ public class PublishWorkflowRegistryReso
return builder.build();
}
} catch (PublishedWorkflowDoesNotExistsException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
+ Response.ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
builder.entity(e.getMessage());
return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.PublishedWFConstants.GET_PUBLISHWORKFLOWGRAPH, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -217,10 +210,8 @@ public class PublishWorkflowRegistryReso
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.PublishedWFConstants.GET_PUBLISHWORKFLOWNAMES, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -258,10 +249,8 @@ public class PublishWorkflowRegistryReso
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.PublishedWFConstants.GET_PUBLISHWORKFLOWS, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -286,13 +275,11 @@ public class PublishWorkflowRegistryReso
builder.entity("Publish workflow removed successfully...");
return builder.build();
} catch (PublishedWorkflowDoesNotExistsException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
+ Response.ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
builder.entity(e.getMessage());
return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.PublishedWFConstants.REMOVE_PUBLISHWORKFLOW, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java?rev=1427244&r1=1427243&r2=1427244&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java Mon Dec 31 21:29:02 2012
@@ -22,13 +22,13 @@
package org.apache.airavata.services.registry.rest.resources;
import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.registry.api.exception.worker.UserWorkflowAlreadyExistsException;
import org.apache.airavata.registry.api.exception.worker.UserWorkflowDoesNotExistsException;
import org.apache.airavata.rest.mappings.resourcemappings.Workflow;
import org.apache.airavata.rest.mappings.resourcemappings.WorkflowList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
import org.apache.airavata.rest.mappings.utils.RegPoolUtils;
+import org.apache.airavata.services.registry.rest.utils.WebAppUtil;
import javax.servlet.ServletContext;
import javax.ws.rs.*;
@@ -73,10 +73,8 @@ public class UserWorkflowRegistryResourc
builder.entity("False");
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.UserWFConstants.WORKFLOW_EXIST, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -104,13 +102,11 @@ public class UserWorkflowRegistryResourc
builder.entity("Workflow added successfully...");
return builder.build();
} catch (UserWorkflowAlreadyExistsException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
+ Response.ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
builder.entity(e.getMessage());
return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.UserWFConstants.ADD_WORKFLOW, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -138,13 +134,11 @@ public class UserWorkflowRegistryResourc
builder.entity("Workflow updated successfully...");
return builder.build();
} catch (UserWorkflowAlreadyExistsException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
+ Response.ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
builder.entity(e.getMessage());
return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.UserWFConstants.UPDATE_WORKFLOW, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -174,13 +168,11 @@ public class UserWorkflowRegistryResourc
return builder.build();
}
} catch (UserWorkflowDoesNotExistsException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
+ Response.ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
builder.entity(e.getMessage());
return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.UserWFConstants.GET_WORKFLOWGRAPH, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -218,10 +210,8 @@ public class UserWorkflowRegistryResourc
return builder.build();
}
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.UserWFConstants.GET_WORKFLOWS, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
@@ -246,13 +236,11 @@ public class UserWorkflowRegistryResourc
builder.entity("Workflow removed successfully...");
return builder.build();
} catch (UserWorkflowDoesNotExistsException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
- builder.entity(e.getMessage());
- return builder.build();
- } catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
+ Response.ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
builder.entity(e.getMessage());
return builder.build();
+ } catch (Throwable e) {
+ return WebAppUtil.reportInternalServerError(ResourcePathConstants.UserWFConstants.REMOVE_WORKFLOW, e);
} finally {
if (airavataRegistry != null) {
RegPoolUtils.releaseRegistry(context, airavataRegistry);
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/WebAppUtil.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/WebAppUtil.java?rev=1427244&r1=1427243&r2=1427244&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/WebAppUtil.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/WebAppUtil.java Mon Dec 31 21:29:02 2012
@@ -5,6 +5,7 @@ import java.net.URL;
import java.util.Properties;
import javax.servlet.ServletContext;
+import javax.ws.rs.core.Response;
import org.apache.airavata.rest.mappings.utils.RestServicesConstants;
import org.slf4j.Logger;
@@ -17,6 +18,14 @@ public class WebAppUtil {
protected static Logger log = LoggerFactory.getLogger(WebAppUtil.class);
+ public static Response reportInternalServerError(String resourceMethod, Throwable t) {
+
+ log.error("Resource Method : " + resourceMethod + " : Internal Server Error ", t);
+ Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
+ builder.entity(t.getMessage());
+ return builder.build();
+ }
+
// public static Properties getAiravataProperties(ServletContext servletContext) throws IOException {
//
// URL url = WebAppUtil.class.getClassLoader().