Author: chathuri
Date: Wed Oct 24 19:24:44 2012
New Revision: 1401834
URL: http://svn.apache.org/viewvc?rev=1401834&view=rev
Log:
removing boolean return types from update methods of registry API
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java?rev=1401834&r1=1401833&r2=1401834&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
Wed Oct 24 19:24:44 2012
@@ -187,7 +187,6 @@ public interface ProvenanceManager {
/**
* Update the metadata of the Workflow instance
* @param experimentId
- * @param workflowInstanceId
* @param metadata
* @throws AiravataAPIInvocationException
*/
@@ -295,9 +294,7 @@ public interface ProvenanceManager {
/**
* Retrieve all the experiment data run by the given owner with paging
* @deprecated
- * @param user
- * @param pageSize
- * @param pageNo
+ * @param experimentId
* @return
* @throws AiravataAPIInvocationException
*/
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java?rev=1401834&r1=1401833&r2=1401834&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
Wed Oct 24 19:24:44 2012
@@ -862,7 +862,7 @@ public class AiravataJPARegistry extends
@Override
- public boolean updateExperimentName(String experimentId,
+ public void updateExperimentName(String experimentId,
String experimentName) throws RegistryException {
if (!isExperimentExists(experimentId, true)){
throw new
ExperimentDoesNotExistsException(experimentId);
@@ -871,7 +871,6 @@ public class AiravataJPARegistry extends
ExperimentDataResource data = experiment.getData();
data.setExpName(experimentName);
data.save();
- return false;
}
@@ -977,7 +976,7 @@ public class AiravataJPARegistry extends
@Override
- public boolean updateWorkflowInstanceStatus(String instanceId,
+ public void updateWorkflowInstanceStatus(String instanceId,
ExecutionStatus status) throws RegistryException {
if (!isWorkflowInstanceExists(instanceId, true)){
throw new
WorkflowInstanceDoesNotExistsException(instanceId);
@@ -990,12 +989,11 @@ public class AiravataJPARegistry extends
}
wi.setLastUpdatedTime(currentTime);
wi.save();
- return true;
}
@Override
- public boolean updateWorkflowInstanceStatus(WorkflowInstanceStatus
status)
+ public void updateWorkflowInstanceStatus(WorkflowInstanceStatus status)
throws RegistryException {
if
(!isWorkflowInstanceExists(status.getWorkflowInstance().getWorkflowInstanceId(),
true)){
throw new
WorkflowInstanceDoesNotExistsException(status.getWorkflowInstance().getWorkflowInstanceId());
@@ -1008,7 +1006,6 @@ public class AiravataJPARegistry extends
}
wi.setLastUpdatedTime(currentTime);
wi.save();
- return true;
}
@@ -1024,7 +1021,7 @@ public class AiravataJPARegistry extends
@Override
- public boolean updateWorkflowNodeInput(WorkflowInstanceNode node,
String data)
+ public void updateWorkflowNodeInput(WorkflowInstanceNode node, String
data)
throws RegistryException {
if
(!isWorkflowInstanceNodePresent(node.getWorkflowInstance().getWorkflowInstanceId(),node.getNodeId(),true)){
throw new
WorkflowInstanceNodeDoesNotExistsException(node.getWorkflowInstance().getWorkflowInstanceId(),
node.getNodeId());
@@ -1033,12 +1030,11 @@ public class AiravataJPARegistry extends
NodeDataResource nodeData = wi.getNodeData(node.getNodeId());
nodeData.setInputs(data);
nodeData.save();
- return true;
}
@Override
- public boolean updateWorkflowNodeOutput(WorkflowInstanceNode node,
String data) throws RegistryException {
+ public void updateWorkflowNodeOutput(WorkflowInstanceNode node, String
data) throws RegistryException {
try {
if
(!isWorkflowInstanceNodePresent(node.getWorkflowInstance().getWorkflowInstanceId(),node.getNodeId(),true)){
throw new
WorkflowInstanceNodeDoesNotExistsException(node.getWorkflowInstance().getWorkflowInstanceId(),
node.getNodeId());
@@ -1051,7 +1047,6 @@ public class AiravataJPARegistry extends
e.printStackTrace();
throw e;
}
- return true;
}
@@ -1089,17 +1084,14 @@ public class AiravataJPARegistry extends
@Deprecated
@Override
- public boolean saveWorkflowExecutionOutput(String experimentId,
+ public void saveWorkflowExecutionOutput(String experimentId,
String outputNodeName, String output) throws
RegistryException {
- return false;
}
@Deprecated
@Override
- public boolean saveWorkflowExecutionOutput(String experimentId,
+ public void saveWorkflowExecutionOutput(String experimentId,
WorkflowIOData data) throws RegistryException {
- // TODO Auto-generated method stub
- return false;
}
@@ -1179,7 +1171,7 @@ public class AiravataJPARegistry extends
@Override
- public boolean updateWorkflowNodeStatus(
+ public void updateWorkflowNodeStatus(
WorkflowInstanceNodeStatus workflowStatusNode)
throws RegistryException {
WorkflowInstance workflowInstance =
workflowStatusNode.getWorkflowInstanceNode().getWorkflowInstance();
@@ -1197,21 +1189,21 @@ public class AiravataJPARegistry extends
nodeData.save();
//Each time node status is updated the the time of update for
the workflow status is going to be the same
WorkflowInstanceStatus currentWorkflowInstanceStatus =
getWorkflowInstanceStatus(workflowInstance.getWorkflowInstanceId());
- return updateWorkflowInstanceStatus(new
WorkflowInstanceStatus(workflowInstance,
currentWorkflowInstanceStatus.getExecutionStatus(),t));
+ updateWorkflowInstanceStatus(new
WorkflowInstanceStatus(workflowInstance,
currentWorkflowInstanceStatus.getExecutionStatus(),t));
}
@Override
- public boolean updateWorkflowNodeStatus(String workflowInstanceId,
+ public void updateWorkflowNodeStatus(String workflowInstanceId,
String nodeId, ExecutionStatus status) throws
RegistryException {
- return updateWorkflowNodeStatus(new WorkflowInstanceNode(new
WorkflowInstance(workflowInstanceId, workflowInstanceId), nodeId), status);
+ updateWorkflowNodeStatus(new WorkflowInstanceNode(new
WorkflowInstance(workflowInstanceId, workflowInstanceId), nodeId), status);
}
@Override
- public boolean updateWorkflowNodeStatus(WorkflowInstanceNode
workflowNode,
+ public void updateWorkflowNodeStatus(WorkflowInstanceNode workflowNode,
ExecutionStatus status) throws RegistryException {
- return updateWorkflowNodeStatus(new
WorkflowInstanceNodeStatus(workflowNode, status,
Calendar.getInstance().getTime()));
+ updateWorkflowNodeStatus(new
WorkflowInstanceNodeStatus(workflowNode, status,
Calendar.getInstance().getTime()));
}
@@ -1255,7 +1247,7 @@ public class AiravataJPARegistry extends
@Override
- public boolean updateWorkflowNodeGramData(
+ public void updateWorkflowNodeGramData(
WorkflowNodeGramData workflowNodeGramData) throws
RegistryException {
if
(!isWorkflowInstanceNodePresent(workflowNodeGramData.getWorkflowInstanceId(),workflowNodeGramData.getNodeID(),
true)){
throw new
WorkflowInstanceNodeDoesNotExistsException(workflowNodeGramData.getWorkflowInstanceId(),workflowNodeGramData.getNodeID());
@@ -1271,7 +1263,6 @@ public class AiravataJPARegistry extends
gramData.setLocalJobID(workflowNodeGramData.getGramJobID());
gramData.setRsl(workflowNodeGramData.getRsl());
gramData.save();
- return true;
}
@@ -1333,7 +1324,7 @@ public class AiravataJPARegistry extends
@Override
- public boolean addWorkflowInstance(String experimentId,
+ public void addWorkflowInstance(String experimentId,
String workflowInstanceId, String templateName) throws
RegistryException {
if (!isExperimentExists(experimentId, true)){
throw new
ExperimentDoesNotExistsException(experimentId);
@@ -1346,12 +1337,11 @@ public class AiravataJPARegistry extends
WorkflowDataResource workflowInstanceResource =
data.createWorkflowInstanceResource(workflowInstanceId);
workflowInstanceResource.setTemplateName(templateName);
workflowInstanceResource.save();
- return true;
}
@Override
- public boolean updateWorkflowNodeType(WorkflowInstanceNode node,
WorkflowNodeType type)
+ public void updateWorkflowNodeType(WorkflowInstanceNode node,
WorkflowNodeType type)
throws RegistryException {
try {
if
(!isWorkflowInstanceNodePresent(node.getWorkflowInstance().getWorkflowInstanceId(),node.getNodeId(),
true)){
@@ -1364,19 +1354,17 @@ public class AiravataJPARegistry extends
e.printStackTrace();
throw e;
}
- return true;
}
@Override
- public boolean addWorkflowInstanceNode(String workflowInstanceId,
+ public void addWorkflowInstanceNode(String workflowInstanceId,
String nodeId) throws RegistryException {
if (isWorkflowInstanceNodePresent(workflowInstanceId, nodeId)){
throw new
WorkflowInstanceNodeAlreadyExistsException(workflowInstanceId, nodeId);
}
NodeDataResource nodeData =
jpa.getWorker().getWorkflowInstance(workflowInstanceId).createNodeData(nodeId);
nodeData.save();
- return true;
}
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java?rev=1401834&r1=1401833&r2=1401834&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java
Wed Oct 24 19:24:44 2012
@@ -91,7 +91,7 @@ public interface ProvenanceRegistry exte
* @return
* @throws RegistryException
*/
- public abstract boolean updateExperimentName(String experimentId,String
experimentName)throws RegistryException;
+ public abstract void updateExperimentName(String experimentId,String
experimentName)throws RegistryException;
/**
* Return the metadata information saved for the experiment
@@ -141,16 +141,15 @@ public interface ProvenanceRegistry exte
* @return
* @throws RegistryException
*/
- public abstract boolean updateWorkflowInstanceStatus(String
instanceId,ExecutionStatus status)throws RegistryException;
+ public abstract void updateWorkflowInstanceStatus(String
instanceId,ExecutionStatus status)throws RegistryException;
/**
* Save a status for this workflow execution
- * @param instanceId
* @param status - contains the status
* @return
* @throws RegistryException
*/
- public abstract boolean
updateWorkflowInstanceStatus(WorkflowInstanceStatus status)throws
RegistryException;
+ public abstract void
updateWorkflowInstanceStatus(WorkflowInstanceStatus status)throws
RegistryException;
/**
@@ -163,19 +162,20 @@ public interface ProvenanceRegistry exte
/**
* Save the input data of a node in the workflow instance of an
experiment
- * @param workflowInputData
+ * @param node
+ * @param data
* @return true if successfully saved
* @throws RegistryException
*/
- public abstract boolean updateWorkflowNodeInput(WorkflowInstanceNode
node, String data) throws RegistryException;
+ public abstract void updateWorkflowNodeInput(WorkflowInstanceNode node,
String data) throws RegistryException;
/**
* Save the output data of a node in the workflow instance of an experiment
- * @param workflowOutputData
+ * @param node
* @return true if successfully saved
* @throws RegistryException
*/
- public abstract boolean updateWorkflowNodeOutput(WorkflowInstanceNode
node, String data)throws RegistryException;
+ public abstract void updateWorkflowNodeOutput(WorkflowInstanceNode
node, String data)throws RegistryException;
/**
* Return a list of data passed as input for service node which regex
matched nodeId, workflow template id & experiment id
@@ -210,7 +210,7 @@ public interface ProvenanceRegistry exte
* @return
* @throws RegistryException
*/
- public abstract boolean saveWorkflowExecutionOutput(String
experimentId,String outputNodeName,String output) throws RegistryException;
+ public abstract void saveWorkflowExecutionOutput(String
experimentId,String outputNodeName,String output) throws RegistryException;
/**
* Saves the results of output nodes in a workflow
@@ -220,7 +220,7 @@ public interface ProvenanceRegistry exte
* @return
* @throws RegistryException
*/
- public abstract boolean saveWorkflowExecutionOutput(String
experimentId, WorkflowIOData data) throws RegistryException;
+ public abstract void saveWorkflowExecutionOutput(String experimentId,
WorkflowIOData data) throws RegistryException;
/**
* Get the output results of a output node of an experiment
@@ -291,15 +291,14 @@ public interface ProvenanceRegistry exte
/**
* This will update the workflowStatus for given
experimentID,workflowInstanceID combination.
- * @param workflowInstanceID
- * @param workflowStatus
+ * @param workflowStatusNode
* @return
*/
- public abstract boolean
updateWorkflowNodeStatus(WorkflowInstanceNodeStatus workflowStatusNode)throws
RegistryException;
+ public abstract void updateWorkflowNodeStatus(WorkflowInstanceNodeStatus
workflowStatusNode)throws RegistryException;
- public abstract boolean updateWorkflowNodeStatus(String
workflowInstanceId, String nodeId, ExecutionStatus status)throws
RegistryException;
+ public abstract void updateWorkflowNodeStatus(String workflowInstanceId,
String nodeId, ExecutionStatus status)throws RegistryException;
- public abstract boolean updateWorkflowNodeStatus(WorkflowInstanceNode
workflowNode, ExecutionStatus status)throws RegistryException;
+ public abstract void updateWorkflowNodeStatus(WorkflowInstanceNode
workflowNode, ExecutionStatus status)throws RegistryException;
public WorkflowInstanceNodeStatus
getWorkflowNodeStatus(WorkflowInstanceNode workflowNode)throws
RegistryException;
@@ -312,7 +311,7 @@ public interface ProvenanceRegistry exte
* @param workflowNodeGramData
* @return
*/
- public abstract boolean updateWorkflowNodeGramData(WorkflowNodeGramData
workflowNodeGramData)throws RegistryException;
+ public abstract void updateWorkflowNodeGramData(WorkflowNodeGramData
workflowNodeGramData)throws RegistryException;
public WorkflowInstanceData getWorkflowInstanceData(String
workflowInstanceId)throws RegistryException;
@@ -322,9 +321,9 @@ public interface ProvenanceRegistry exte
public WorkflowInstanceNodeData getWorkflowInstanceNodeData(String
workflowInstanceId, String nodeId)throws RegistryException;
- public boolean addWorkflowInstance(String experimentId, String
workflowInstanceId, String templateName) throws RegistryException;
+ public void addWorkflowInstance(String experimentId, String
workflowInstanceId, String templateName) throws RegistryException;
- public boolean updateWorkflowNodeType(WorkflowInstanceNode node,
WorkflowNodeType type) throws RegistryException;
+ public void updateWorkflowNodeType(WorkflowInstanceNode node,
WorkflowNodeType type) throws RegistryException;
- public boolean addWorkflowInstanceNode(String workflowInstance, String
nodeId) throws RegistryException;
+ public void addWorkflowInstanceNode(String workflowInstance, String
nodeId) throws RegistryException;
}
\ No newline at end of file
