You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/11/30 20:14:13 UTC
svn commit: r1415795 - in /airavata/trunk/modules:
airavata-client/src/main/java/org/apache/airavata/client/
registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/
rest/client/src/main/java/org/apache/airavata/r...
Author: chathuri
Date: Fri Nov 30 19:14:11 2012
New Revision: 1415795
URL: http://svn.apache.org/viewvc?rev=1415795&view=rev
Log:
updating REST service and client
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/ClientConstant.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java
Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java?rev=1415795&r1=1415794&r2=1415795&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java Fri Nov 30 19:14:11 2012
@@ -408,7 +408,6 @@ public class AiravataClient extends Obse
String worflowoutput = null;
try {
builder.setUserIdentifier(getCurrentUser());
- System.out.println("**********CURRENT USER **************" + getCurrentUser());
WorkflowInterpretorStub stub = new WorkflowInterpretorStub(
getClientConfiguration().getXbayaServiceURL().toString());
OMElement omElement = AXIOMUtil.stringToOM(XMLUtil
@@ -502,8 +501,6 @@ public class AiravataClient extends Obse
//TODO - fix user passing
builder.setUserIdentifier(getCurrentUser());
- System.out.println("**********CURRENT USER1 **************" + getCurrentUser());
-
try {
runPreWorkflowExecutionTasks(topic, user, metadata, experimentName);
} catch (RegistryException e) {
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=1415795&r1=1415794&r2=1415795&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 Fri Nov 30 19:14:11 2012
@@ -361,7 +361,6 @@ public class AiravataJPARegistry extends
public ServiceDescription getServiceDescriptor(String serviceName) throws DescriptorDoesNotExistsException, MalformedDescriptorException {
GatewayResource gateway = jpa.getGateway();
- System.out.println("AAA");
if (!gateway.isServiceDescriptorExists(serviceName)){
return null;
}
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java?rev=1415795&r1=1415794&r2=1415795&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java Fri Nov 30 19:14:11 2012
@@ -93,6 +93,10 @@ public class ConfigurationResourceClient
response = builder.get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
+
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -104,6 +108,7 @@ public class ConfigurationResourceClient
}
public List<Object> getConfigurationList(String configKey) {
+ List<Object> configurationValueList = new ArrayList<Object>();
webResource = getConfigurationBaseResource().path(ResourcePathConstants.ConfigResourcePathConstants.GET_CONFIGURATION_LIST);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("key", configKey);
@@ -119,6 +124,9 @@ public class ConfigurationResourceClient
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return configurationValueList;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -126,7 +134,6 @@ public class ConfigurationResourceClient
}
}
ConfigurationList configurationList = response.getEntity(ConfigurationList.class);
- List<Object> configurationValueList = new ArrayList<Object>();
Object[] configValList = configurationList.getConfigValList();
for (Object configVal : configValList) {
configurationValueList.add(configVal);
@@ -259,6 +266,10 @@ public class ConfigurationResourceClient
response = builder.get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return uriList;
+ }
+
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -295,6 +306,10 @@ public class ConfigurationResourceClient
response = builder.get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return uriList;
+ }
+
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -329,6 +344,10 @@ public class ConfigurationResourceClient
response = builder.get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
+
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -359,6 +378,10 @@ public class ConfigurationResourceClient
response = builder.get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
+
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java?rev=1415795&r1=1415794&r2=1415795&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java Fri Nov 30 19:14:11 2012
@@ -224,6 +224,7 @@ public class DescriptorResourceClient {
}
public List<HostDescription> getHostDescriptors() {
+ List<HostDescription> hostDescriptions = new ArrayList<HostDescription>();
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.GET_HOST_DESCS);
ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
@@ -239,6 +240,10 @@ public class DescriptorResourceClient {
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return hostDescriptions;
+ }
+
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -247,7 +252,7 @@ public class DescriptorResourceClient {
}
HostDescriptionList hostDescriptionList = response.getEntity(HostDescriptionList.class);
HostDescriptor[] hostDescriptors = hostDescriptionList.getHostDescriptions();
- List<HostDescription> hostDescriptions = new ArrayList<HostDescription>();
+
for (HostDescriptor hostDescriptor : hostDescriptors) {
HostDescription hostDescription = DescriptorUtil.createHostDescription(hostDescriptor);
hostDescriptions.add(hostDescription);
@@ -271,6 +276,9 @@ public class DescriptorResourceClient {
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return new ArrayList<String>();
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
@@ -418,6 +426,7 @@ public class DescriptorResourceClient {
}
public List<ServiceDescription> getServiceDescriptors() {
+ List<ServiceDescription> serviceDescriptions = new ArrayList<ServiceDescription>();
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.GET_SERVICE_DESCS);
ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
@@ -433,16 +442,21 @@ public class DescriptorResourceClient {
status = response.getStatus();
- if (status != ClientConstant.HTTP_OK) {
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return serviceDescriptions;
+ }
+ if (status != ClientConstant.HTTP_OK ) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
+ status);
}
+
+
}
ServiceDescriptionList serviceDescriptionList = response.getEntity(ServiceDescriptionList.class);
ServiceDescriptor[] serviceDescriptors = serviceDescriptionList.getServiceDescriptions();
- List<ServiceDescription> serviceDescriptions = new ArrayList<ServiceDescription>();
+
for (ServiceDescriptor serviceDescriptor : serviceDescriptors) {
ServiceDescription serviceDescription = DescriptorUtil.createServiceDescription(serviceDescriptor);
serviceDescriptions.add(serviceDescription);
@@ -669,6 +683,10 @@ public class DescriptorResourceClient {
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
+
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -683,6 +701,7 @@ public class DescriptorResourceClient {
public Map<String, ApplicationDeploymentDescription> getApplicationDescriptors(String serviceName) {
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.APP_DESC_ALL_DESCS_SERVICE);
+ Map<String, ApplicationDeploymentDescription> applicationDeploymentDescriptionMap = new HashMap<String, ApplicationDeploymentDescription>();
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("serviceName", serviceName);
ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
@@ -699,6 +718,10 @@ public class DescriptorResourceClient {
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return applicationDeploymentDescriptionMap;
+ }
+
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -708,7 +731,7 @@ public class DescriptorResourceClient {
ApplicationDescriptorList applicationDescriptorList = response.getEntity(ApplicationDescriptorList.class);
ApplicationDescriptor[] applicationDescriptors = applicationDescriptorList.getApplicationDescriptors();
- Map<String, ApplicationDeploymentDescription> applicationDeploymentDescriptionMap = new HashMap<String, ApplicationDeploymentDescription>();
+
for (ApplicationDescriptor applicationDescriptor : applicationDescriptors) {
ApplicationDeploymentDescription applicationDeploymentDescription = DescriptorUtil.createApplicationDescription(applicationDescriptor);
applicationDeploymentDescriptionMap.put(applicationDescriptor.getHostdescName(), applicationDeploymentDescription);
@@ -733,6 +756,10 @@ public class DescriptorResourceClient {
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
+
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -764,6 +791,10 @@ public class DescriptorResourceClient {
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return new ArrayList<String>();
+ }
+
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java?rev=1415795&r1=1415794&r2=1415795&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java Fri Nov 30 19:14:11 2012
@@ -130,6 +130,7 @@ public class ExperimentResourceClient {
}
public List<AiravataExperiment> getExperiments() {
+ List<AiravataExperiment> airavataExperiments = new ArrayList<AiravataExperiment>();
webResource = getExperimentRegistryBaseResource().path(ResourcePathConstants.ExperimentResourcePathConstants.GET_ALL_EXPS);
ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
@@ -143,6 +144,10 @@ public class ExperimentResourceClient {
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return airavataExperiments;
+ }
+
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -152,7 +157,6 @@ public class ExperimentResourceClient {
ExperimentList experimentList = response.getEntity(ExperimentList.class);
AiravataExperiment[] experiments = experimentList.getExperiments();
- List<AiravataExperiment> airavataExperiments = new ArrayList<AiravataExperiment>();
for (AiravataExperiment airavataExperiment : experiments) {
airavataExperiments.add(airavataExperiment);
}
@@ -161,6 +165,7 @@ public class ExperimentResourceClient {
public List<AiravataExperiment> getExperiments(String projectName) {
webResource = getExperimentRegistryBaseResource().path(ResourcePathConstants.ExperimentResourcePathConstants.GET_EXPS_BY_PROJECT);
+ List<AiravataExperiment> airavataExperiments = new ArrayList<AiravataExperiment>();
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("projectName", projectName);
@@ -176,6 +181,10 @@ public class ExperimentResourceClient {
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return airavataExperiments;
+ }
+
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -186,7 +195,6 @@ public class ExperimentResourceClient {
ExperimentList experimentList = response.getEntity(ExperimentList.class);
AiravataExperiment[] experiments = experimentList.getExperiments();
- List<AiravataExperiment> airavataExperiments = new ArrayList<AiravataExperiment>();
for (AiravataExperiment airavataExperiment : experiments) {
airavataExperiments.add(airavataExperiment);
}
@@ -194,6 +202,7 @@ public class ExperimentResourceClient {
}
public List<AiravataExperiment> getExperiments(Date from, Date to) {
+ List<AiravataExperiment> airavataExperiments = new ArrayList<AiravataExperiment>();
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String fromDate = dateFormat.format(from);
String toDate = dateFormat.format(to);
@@ -214,6 +223,10 @@ public class ExperimentResourceClient {
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return airavataExperiments;
+ }
+
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -224,7 +237,7 @@ public class ExperimentResourceClient {
ExperimentList experimentList = response.getEntity(ExperimentList.class);
AiravataExperiment[] experiments = experimentList.getExperiments();
- List<AiravataExperiment> airavataExperiments = new ArrayList<AiravataExperiment>();
+
for (AiravataExperiment airavataExperiment : experiments) {
airavataExperiments.add(airavataExperiment);
}
@@ -232,6 +245,7 @@ public class ExperimentResourceClient {
}
public List<AiravataExperiment> getExperiments(String projectName, Date from, Date to) {
+ List<AiravataExperiment> airavataExperiments = new ArrayList<AiravataExperiment>();
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String fromDate = dateFormat.format(from);
String toDate = dateFormat.format(to);
@@ -253,6 +267,10 @@ public class ExperimentResourceClient {
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return airavataExperiments;
+ }
+
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -263,7 +281,7 @@ public class ExperimentResourceClient {
ExperimentList experimentList = response.getEntity(ExperimentList.class);
AiravataExperiment[] experiments = experimentList.getExperiments();
- List<AiravataExperiment> airavataExperiments = new ArrayList<AiravataExperiment>();
+
for (AiravataExperiment airavataExperiment : experiments) {
airavataExperiments.add(airavataExperiment);
}
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java?rev=1415795&r1=1415794&r2=1415795&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java Fri Nov 30 19:14:11 2012
@@ -218,6 +218,9 @@ public class ProjectResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -229,6 +232,7 @@ public class ProjectResourceClient {
}
public List<WorkspaceProject> getWorkspaceProjects() {
+ List<WorkspaceProject> workspaceProjectsList = new ArrayList<WorkspaceProject>();
webResource = getProjectRegistryBaseResource().path(ResourcePathConstants.ProjectResourcePathConstants.GET_PROJECTS);
ClientResponse response = webResource.get(ClientResponse.class);
int status = response.getStatus();
@@ -241,6 +245,9 @@ public class ProjectResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, null, userName, callback.getPassword(userName));
response = builder.get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return workspaceProjectsList;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -250,7 +257,7 @@ public class ProjectResourceClient {
WorkspaceProjectList workspaceProjectList = response.getEntity(WorkspaceProjectList.class);
WorkspaceProject[] workspaceProjects = workspaceProjectList.getWorkspaceProjects();
- List<WorkspaceProject> workspaceProjectsList = new ArrayList<WorkspaceProject>();
+
for (WorkspaceProject workspaceProject : workspaceProjects) {
workspaceProjectsList.add(workspaceProject);
}
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java?rev=1415795&r1=1415794&r2=1415795&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java Fri Nov 30 19:14:11 2012
@@ -119,7 +119,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
status = response.getStatus();
-
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -171,6 +173,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -221,6 +226,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -269,6 +277,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -305,6 +316,7 @@ public class ProvenanceResourceClient {
}
public List<WorkflowInstance> getExperimentWorkflowInstances(String experimentId) {
+ List<WorkflowInstance> workflowInstanceList = new ArrayList<WorkflowInstance>();
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENTWORKFLOWINSTANCES);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("experimentId", experimentId);
@@ -318,6 +330,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return workflowInstanceList;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -327,7 +342,7 @@ public class ProvenanceResourceClient {
WorkflowInstancesList workflowInstancesList = response.getEntity(WorkflowInstancesList.class);
WorkflowInstance[] workflowInstances = workflowInstancesList.getWorkflowInstances();
- List<WorkflowInstance> workflowInstanceList = new ArrayList<WorkflowInstance>();
+
for (WorkflowInstance workflowInstance : workflowInstances) {
workflowInstanceList.add(workflowInstance);
@@ -455,6 +470,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -530,6 +548,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -554,6 +575,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -566,6 +590,7 @@ public class ProvenanceResourceClient {
}
public List<ExperimentData> getAllExperimentMetaInformation(String user) {
+ List<ExperimentData> experimentDatas = new ArrayList<ExperimentData>();
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_ALL_EXPERIMENT_METAINFORMATION);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("user", user);
@@ -579,6 +604,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return experimentDatas;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -588,7 +616,7 @@ public class ProvenanceResourceClient {
ExperimentDataList experimentDataList = response.getEntity(ExperimentDataList.class);
List<ExperimentDataImpl> dataList = experimentDataList.getExperimentDataList();
- List<ExperimentData> experimentDatas = new ArrayList<ExperimentData>();
+
for (ExperimentDataImpl experimentData : dataList) {
experimentDatas.add(experimentData);
}
@@ -596,6 +624,7 @@ public class ProvenanceResourceClient {
}
public List<ExperimentData> searchExperiments(String user, String experimentNameRegex) {
+ List<ExperimentData> experimentDatas = new ArrayList<ExperimentData>();
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.SEARCH_EXPERIMENTS);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("user", user);
@@ -610,6 +639,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return experimentDatas;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -619,7 +651,7 @@ public class ProvenanceResourceClient {
ExperimentDataList experimentDataList = response.getEntity(ExperimentDataList.class);
List<ExperimentDataImpl> dataList = experimentDataList.getExperimentDataList();
- List<ExperimentData> experimentDatas = new ArrayList<ExperimentData>();
+
for (ExperimentDataImpl experimentData : dataList) {
experimentDatas.add(experimentData);
}
@@ -640,6 +672,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return new ArrayList<String>();
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -653,6 +688,7 @@ public class ProvenanceResourceClient {
}
public List<ExperimentData> getExperimentByUser(String user) {
+ List<ExperimentData> experimentDatas = new ArrayList<ExperimentData>();
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENT_USER);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("username", user);
@@ -666,6 +702,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return experimentDatas;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -674,7 +713,7 @@ public class ProvenanceResourceClient {
}
ExperimentDataList experimentDataList = response.getEntity(ExperimentDataList.class);
List<ExperimentDataImpl> dataList = experimentDataList.getExperimentDataList();
- List<ExperimentData> experimentDatas = new ArrayList<ExperimentData>();
+
for (ExperimentDataImpl experimentData : dataList) {
experimentDatas.add(experimentData);
}
@@ -771,6 +810,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -797,6 +839,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -829,6 +874,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -881,6 +929,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -962,6 +1013,9 @@ public class ProvenanceResourceClient {
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java?rev=1415795&r1=1415794&r2=1415795&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java Fri Nov 30 19:14:11 2012
@@ -43,6 +43,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriBuilder;
import java.net.URI;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -166,7 +167,9 @@ public class PublishedWorkflowResourceCl
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_FORM_URLENCODED).get(ClientResponse.class);
status = response.getStatus();
-
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -191,7 +194,9 @@ public class PublishedWorkflowResourceCl
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, null, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
-
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return new ArrayList<String>();
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -205,6 +210,7 @@ public class PublishedWorkflowResourceCl
}
public Map<String, String> getPublishedWorkflows() {
+ Map<String, String> publishWFmap = new HashMap<String, String>();
webResource = getPublishedWFRegistryBaseResource().path(ResourcePathConstants.PublishedWFConstants.GET_PUBLISHWORKFLOWS);
ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
@@ -217,7 +223,9 @@ public class PublishedWorkflowResourceCl
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, null, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
-
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return publishWFmap;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -225,7 +233,6 @@ public class PublishedWorkflowResourceCl
}
}
- Map<String, String> publishWFmap = new HashMap<String, String>();
WorkflowList workflowList = response.getEntity(WorkflowList.class);
List<Workflow> workflows = workflowList.getWorkflowList();
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java?rev=1415795&r1=1415794&r2=1415795&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java Fri Nov 30 19:14:11 2012
@@ -165,7 +165,9 @@ public class UserWorkflowResourceClient
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_FORM_URLENCODED).get(ClientResponse.class);
status = response.getStatus();
-
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return null;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -178,6 +180,7 @@ public class UserWorkflowResourceClient
}
public Map<String, String> getWorkflows() {
+ Map<String, String> userWFMap = new HashMap<String, String>();
webResource = getUserWFRegistryBaseResource().path(ResourcePathConstants.UserWFConstants.GET_WORKFLOWS);
ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
@@ -190,7 +193,9 @@ public class UserWorkflowResourceClient
WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, null, userName, callback.getPassword(userName));
response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
-
+ if(status == ClientConstant.HTTP_NO_CONTENT){
+ return userWFMap;
+ }
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
@@ -198,7 +203,6 @@ public class UserWorkflowResourceClient
}
}
- Map<String, String> userWFMap = new HashMap<String, String>();
WorkflowList workflowList = response.getEntity(WorkflowList.class);
List<Workflow> workflows = workflowList.getWorkflowList();
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/ClientConstant.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/ClientConstant.java?rev=1415795&r1=1415794&r2=1415795&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/ClientConstant.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/ClientConstant.java Fri Nov 30 19:14:11 2012
@@ -26,4 +26,5 @@ public class ClientConstant {
public static final int HTTP_OK = 200;
public static final int HTTP_UNAUTHORIZED = 401;
public static final int HTTP_BAD_REQUEST = 400;
+ public static final int HTTP_NO_CONTENT = 204;
}
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java?rev=1415795&r1=1415794&r2=1415795&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java Fri Nov 30 19:14:11 2012
@@ -53,7 +53,6 @@ public class BasicRegistryResouce {
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Gateway does not exist...");
return builder.build();
}
} catch (Exception e) {
@@ -80,7 +79,6 @@ public class BasicRegistryResouce {
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Airavata User does not exist...");
return builder.build();
}
} catch (Exception e) {
@@ -151,7 +149,6 @@ public class BasicRegistryResouce {
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Cannot retrieve Airavata version...");
return builder.build();
}
} catch (Exception e) {
@@ -178,7 +175,6 @@ public class BasicRegistryResouce {
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Cannot retrieve registry connection URL...");
return builder.build();
}
} catch (Exception e) {
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java?rev=1415795&r1=1415794&r2=1415795&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java Fri Nov 30 19:14:11 2012
@@ -69,7 +69,6 @@ public class ConfigurationRegistryResour
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Configuration does not exist...");
return builder.build();
}
} catch (Exception e) {
@@ -110,7 +109,6 @@ public class ConfigurationRegistryResour
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No configuration available with given config key...");
return builder.build();
}
} catch (Exception e) {
@@ -271,7 +269,6 @@ public class ConfigurationRegistryResour
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No GFac URIs available...");
return builder.build();
}
} catch (Exception e) {
@@ -309,7 +306,6 @@ public class ConfigurationRegistryResour
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No Workflow Interpreter URIs available...");
return builder.build();
}
} catch (Exception e) {
@@ -341,7 +337,6 @@ public class ConfigurationRegistryResour
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No eventing URI available...");
return builder.build();
}
} catch (Exception e) {
@@ -373,7 +368,6 @@ public class ConfigurationRegistryResour
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No message box URI available...");
return builder.build();
}
} catch (Exception e) {
@@ -485,7 +479,7 @@ public class ConfigurationRegistryResour
try {
URI msgBoxURI = new URI(uri);
airavataRegistry.setMessageBoxURI(msgBoxURI);
- Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
+ Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("MessageBox URI set successfully...");
return builder.build();
} catch (Exception e) {
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java?rev=1415795&r1=1415794&r2=1415795&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java Fri Nov 30 19:14:11 2012
@@ -208,7 +208,7 @@ public class DescriptorRegistryResource
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.removeHostDescriptor(hostName);
- Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
+ Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Host descriptor deleted successfully...");
return builder.build();
} catch (DescriptorDoesNotExistsException e) {
@@ -252,7 +252,6 @@ public class DescriptorRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No host descriptors available...");
return builder.build();
}
} catch (RegistryException e) {
@@ -290,7 +289,6 @@ public class DescriptorRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No host descriptors available...");
return builder.build();
}
} catch (RegistryException e) {
@@ -497,7 +495,6 @@ public class DescriptorRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No service descriptors available...");
return builder.build();
}
} catch (RegistryException e) {
@@ -786,7 +783,6 @@ public class DescriptorRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Application descriptor does not exist...");
return builder.build();
}
} catch (MalformedDescriptorException e) {
@@ -840,7 +836,6 @@ public class DescriptorRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No application descriptors available...");
return builder.build();
}
} catch (MalformedDescriptorException e) {
@@ -883,7 +878,6 @@ public class DescriptorRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No application descriptors available...");
return builder.build();
}
} catch (MalformedDescriptorException e) {
@@ -919,7 +913,7 @@ public class DescriptorRegistryResource
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.removeApplicationDescriptor(serviceName, hostName, appName);
- Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
+ Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Application descriptor deleted successfully...");
return builder.build();
} catch (DescriptorDoesNotExistsException e) {
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java?rev=1415795&r1=1415794&r2=1415795&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java Fri Nov 30 19:14:11 2012
@@ -109,7 +109,6 @@ public class ExperimentRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No experiments found...");
return builder.build();
}
} catch (RegistryException e) {
@@ -148,7 +147,6 @@ public class ExperimentRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No experiments available...");
return builder.build();
}
} catch (RegistryException e) {
@@ -193,7 +191,6 @@ public class ExperimentRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No experiments available...");
return builder.build();
}
} catch (RegistryException e) {
@@ -244,7 +241,6 @@ public class ExperimentRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No experiments available...");
return builder.build();
}
} catch (RegistryException e) {
@@ -297,7 +293,7 @@ public class ExperimentRegistryResource
builder.entity(e.getMessage());
return builder.build();
} catch (WorkspaceProjectDoesNotExistsException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
builder.entity(e.getMessage());
return builder.build();
} catch (RegistryException e) {
@@ -329,7 +325,7 @@ public class ExperimentRegistryResource
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.isExperimentExists(experimentId);
- Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
+ Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("True");
return builder.build();
} catch (ExperimentDoesNotExistsException e) {
@@ -337,7 +333,7 @@ public class ExperimentRegistryResource
builder.entity("False");
return builder.build();
} catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
builder.entity("Exprtiment does not exist...");
return builder.build();
} finally {
@@ -364,11 +360,11 @@ public class ExperimentRegistryResource
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.isExperimentExists(experimentId, createIfNotPresentStatus);
- Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
+ Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("New experiment created...");
return builder.build();
} catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
builder.entity(e.getMessage());
return builder.build();
} finally {
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java?rev=1415795&r1=1415794&r2=1415795&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java Fri Nov 30 19:14:11 2012
@@ -68,7 +68,7 @@ public class ProjectRegistryResource {
builder.entity("True");
return builder.build();
} else {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("False");
return builder.build();
}
@@ -105,7 +105,7 @@ public class ProjectRegistryResource {
builder.entity("True");
return builder.build();
} else {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("False");
return builder.build();
}
@@ -230,7 +230,6 @@ public class ProjectRegistryResource {
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
- builder.entity("No workspace projects available...");
return builder.build();
}
} catch (WorkspaceProjectDoesNotExistsException e) {
@@ -271,7 +270,6 @@ public class ProjectRegistryResource {
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No workspace projects available...");
return builder.build();
}
} catch (RegistryException e) {
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=1415795&r1=1415794&r2=1415795&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 Fri Nov 30 19:14:11 2012
@@ -76,7 +76,7 @@ public class ProvenanceRegistryResource
builder.entity("Experiment execution user updated successfully...");
return builder.build();
} catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
builder.entity(e.getMessage());
return builder.build();
} finally {
@@ -104,8 +104,7 @@ public class ProvenanceRegistryResource
builder.entity(user);
return builder.build();
} else {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_MODIFIED);
- builder.entity("Could not get experiment execution user...");
+ Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
return builder.build();
}
} catch (RegistryException e) {
@@ -137,8 +136,7 @@ public class ProvenanceRegistryResource
builder.entity(result);
return builder.build();
} else {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_MODIFIED);
- builder.entity("Experiment name not available...");
+ Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
return builder.build();
}
} catch (RegistryException e) {
@@ -171,7 +169,7 @@ public class ProvenanceRegistryResource
builder.entity("Experiment Name updated successfully...");
return builder.build();
} catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
builder.entity(e.getMessage());
return builder.build();
} finally {
@@ -200,7 +198,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Experiment metadata not available...");
return builder.build();
}
} catch (RegistryException e) {
@@ -233,7 +230,7 @@ public class ProvenanceRegistryResource
builder.entity("Experiment metadata updated successfully...");
return builder.build();
} catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
builder.entity(e.getMessage());
return builder.build();
} finally {
@@ -263,7 +260,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Workflow template name not available...");
return builder.build();
}
} catch (RegistryException e) {
@@ -296,7 +292,7 @@ public class ProvenanceRegistryResource
builder.entity("Workflow template name updated successfully...");
return builder.build();
} catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
builder.entity(e.getMessage());
return builder.build();
} finally {
@@ -331,7 +327,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No workflow instances available...");
return builder.build();
}
} catch (RegistryException e) {
@@ -363,12 +358,12 @@ public class ProvenanceRegistryResource
builder.entity("True");
return builder.build();
} else {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("False");
return builder.build();
}
} catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
builder.entity(e.getMessage());
return builder.build();
} finally {
@@ -400,12 +395,12 @@ public class ProvenanceRegistryResource
builder.entity("True");
return builder.build();
} else {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("False");
return builder.build();
}
} catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
builder.entity(e.getMessage());
return builder.build();
} finally {
@@ -435,7 +430,7 @@ public class ProvenanceRegistryResource
builder.entity("Workflow instance status updated successfully...");
return builder.build();
} catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
builder.entity(e.getMessage());
return builder.build();
} finally {
@@ -471,11 +466,11 @@ public class ProvenanceRegistryResource
builder.entity("Workflow instance status updated successfully...");
return builder.build();
} catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
+ 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.NOT_FOUND);
+ Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
builder.entity(e.getMessage());
return builder.build();
} finally {
@@ -504,7 +499,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Could not get workflow instance status...");
return builder.build();
}
} catch (RegistryException e) {
@@ -770,7 +764,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No experiments available...");
return builder.build();
}
} catch (RegistryException e) {
@@ -805,7 +798,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No experiments available...");
return builder.build();
}
} catch (RegistryException e) {
@@ -844,7 +836,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No experiments available...");
return builder.build();
}
} catch (RegistryException e) {
@@ -913,7 +904,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Could not retrieve workflow node status...");
return builder.build();
}
} catch (RegistryException e) {
@@ -950,7 +940,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Could not retrieve workflow node started time...");
return builder.build();
}
} catch (RegistryException e) {
@@ -985,7 +974,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Could not retrieve workflow start time...");
return builder.build();
}
} catch (RegistryException e) {
@@ -1047,7 +1035,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Could not retrieve workflow instance data...");
return builder.build();
}
} catch (RegistryException e) {
@@ -1081,7 +1068,7 @@ public class ProvenanceRegistryResource
builder.entity("True");
return builder.build();
} else {
- Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
+ Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("False");
return builder.build();
}
@@ -1120,7 +1107,7 @@ public class ProvenanceRegistryResource
builder.entity("True");
return builder.build();
} else {
- Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
+ Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("False");
return builder.build();
}
@@ -1158,7 +1145,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Could not retrieve workflow instance node data...");
return builder.build();
}
} catch (RegistryException e) {
@@ -1194,7 +1180,7 @@ public class ProvenanceRegistryResource
builder.entity("Workflow instance added successfully...");
return builder.build();
} catch (RegistryException e) {
- Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
+ Response.ResponseBuilder builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
builder.entity(e.getMessage());
return builder.build();
} finally {
@@ -1291,7 +1277,7 @@ public class ProvenanceRegistryResource
builder.entity("True");
return builder.build();
} else {
- Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
+ Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("False");
return builder.build();
}
@@ -1328,7 +1314,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Could not retrieve experiment meta information...");
return builder.build();
}
} catch (RegistryException e) {
@@ -1367,7 +1352,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No experiment data available...");
return builder.build();
}
} catch (RegistryException e) {
@@ -1409,7 +1393,6 @@ public class ProvenanceRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No experiment data available...");
return builder.build();
}
} catch (RegistryException e) {
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=1415795&r1=1415794&r2=1415795&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 Fri Nov 30 19:14:11 2012
@@ -71,7 +71,7 @@ public class PublishWorkflowRegistryReso
builder.entity("True");
return builder.build();
} else {
- Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
+ Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("False");
return builder.build();
}
@@ -177,7 +177,6 @@ public class PublishWorkflowRegistryReso
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Could not find workflow graph...");
return builder.build();
}
} catch (PublishedWorkflowDoesNotExistsException e) {
@@ -215,7 +214,6 @@ public class PublishWorkflowRegistryReso
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("No published workflows available...");
return builder.build();
}
} catch (RegistryException e) {
@@ -256,7 +254,6 @@ public class PublishWorkflowRegistryReso
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Publish workflows does not exists...");
return builder.build();
}
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=1415795&r1=1415794&r2=1415795&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 Fri Nov 30 19:14:11 2012
@@ -69,7 +69,7 @@ public class UserWorkflowRegistryResourc
builder.entity("True");
return builder.build();
} else {
- Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
+ Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("False");
return builder.build();
}
@@ -171,7 +171,6 @@ public class UserWorkflowRegistryResourc
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Could not get workflow graph...");
return builder.build();
}
} catch (UserWorkflowDoesNotExistsException e) {
@@ -216,7 +215,6 @@ public class UserWorkflowRegistryResourc
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("User workflows do not exists...");
return builder.build();
}