Author: samindaw
Date: Sat Jun 8 05:48:07 2013
New Revision: 1490922
URL: http://svn.apache.org/r1490922
Log:
fixing 406 error for application job data retrieval
Modified:
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
Modified:
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java?rev=1490922&r1=1490921&r2=1490922&view=diff
==============================================================================
---
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
(original)
+++
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
Sat Jun 8 05:48:07 2013
@@ -429,8 +429,8 @@ public class BaseCaseIT {
verifyOutput(experimentId, "echo_output=Airavata_Test");
log.info("Verifying application jobs ....");
- //List<ApplicationJob> applicationJobs =
airavataAPI.getProvenanceManager().getApplicationJobs(experimentId, null, null);
- //Assert.assertEquals(applicationJobs.size(), 1);
+ List<ApplicationJob> applicationJobs =
airavataAPI.getProvenanceManager().getApplicationJobs(experimentId, null, null);
+ Assert.assertEquals(applicationJobs.size(), 1);
}
protected void verifyOutput(String experimentId, String
outputVerifyingString) throws Exception {
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=1490922&r1=1490921&r2=1490922&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
Sat Jun 8 05:48:07 2013
@@ -2609,7 +2609,7 @@ public class ProvenanceResourceClient {
builder = BasicAuthHeaderUtil.getBuilder(
webResource, queryParams, userName, null, cookie, gateway);
ClientResponse response = builder.accept(
- MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status == ClientConstant.HTTP_OK) {
@@ -2620,7 +2620,7 @@ public class ProvenanceResourceClient {
} else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
builder = BasicAuthHeaderUtil.getBuilder(
webResource, queryParams, userName,
callback.getPassword(userName), null, gateway);
- response =
builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ response =
builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
if (status == ClientConstant.HTTP_NO_CONTENT) {
return null;
@@ -2659,7 +2659,7 @@ public class ProvenanceResourceClient {
builder = BasicAuthHeaderUtil.getBuilder(
webResource, queryParams, userName, null, cookie, gateway);
ClientResponse response = builder.accept(
- MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status == ClientConstant.HTTP_OK) {
@@ -2670,7 +2670,7 @@ public class ProvenanceResourceClient {
} else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
builder = BasicAuthHeaderUtil.getBuilder(
webResource, queryParams, userName,
callback.getPassword(userName), null, gateway);
- response =
builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ response =
builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
if (status == ClientConstant.HTTP_NO_CONTENT) {
return null;
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=1490922&r1=1490921&r2=1490922&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
Sat Jun 8 05:48:07 2013
@@ -1807,14 +1807,9 @@ public class ProvenanceRegistryResource
GFacJobList gFacJobList = new GFacJobList();
List<ApplicationJob> gFacJobsForDescriptors =
airavataRegistry.getApplicationJobsForDescriptors(serviceDescriptionId,
hostDescriptionId, applicationDescriptionId);
gFacJobList.setJobList(gFacJobsForDescriptors);
- if (gFacJobsForDescriptors.size() != 0) {
- Response.ResponseBuilder builder =
Response.status(Response.Status.OK);
- builder.entity(gFacJobList);
- return builder.build();
- } else {
- Response.ResponseBuilder builder =
Response.status(Response.Status.NO_CONTENT);
- return builder.build();
- }
+ Response.ResponseBuilder builder =
Response.status(Response.Status.OK);
+ builder.entity(gFacJobList);
+ return builder.build();
} catch (Throwable e) {
return
WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_APPLICATION_JOBS_FOR_DESCRIPTORS,
e);
} finally {
@@ -1835,14 +1830,9 @@ public class ProvenanceRegistryResource
GFacJobList gFacJobList = new GFacJobList();
List<ApplicationJob> gFacJobsForDescriptors =
airavataRegistry.getApplicationJobsForDescriptors(experimentID,
workflowInstanceID, nodeID);
gFacJobList.setJobList(gFacJobsForDescriptors);
- if (gFacJobsForDescriptors.size() != 0) {
- Response.ResponseBuilder builder =
Response.status(Response.Status.OK);
- builder.entity(gFacJobList);
- return builder.build();
- } else {
- Response.ResponseBuilder builder =
Response.status(Response.Status.NO_CONTENT);
- return builder.build();
- }
+ Response.ResponseBuilder builder =
Response.status(Response.Status.OK);
+ builder.entity(gFacJobList);
+ return builder.build();
} catch (Throwable e) {
return
WebAppUtil.reportInternalServerError(ResourcePathConstants.ProvenanceResourcePathConstants.GET_APPLICATION_JOBS_FOR_DESCRIPTORS,
e);
} finally {
