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/12 21:47:51 UTC
svn commit: r1408455 - in
/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client:
ConfigurationResourceClient.java DescriptorResourceClient.java
Author: chathuri
Date: Mon Nov 12 20:47:50 2012
New Revision: 1408455
URL: http://svn.apache.org/viewvc?rev=1408455&view=rev
Log:
updating configuration client methods
Modified:
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ConfigurationResourceClient.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ConfigurationResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ConfigurationResourceClient.java?rev=1408455&r1=1408454&r2=1408455&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ConfigurationResourceClient.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ConfigurationResourceClient.java Mon Nov 12 20:47:50 2012
@@ -90,13 +90,12 @@ public class ConfigurationResourceClient
throw new RuntimeException("Failed : HTTP error code : "
+ status);
}
+ ConfigurationList configurationList = response.getEntity(ConfigurationList.class);
List<Object> configurationValueList = new ArrayList<Object>();
- ConfigurationList entity = response.getEntity(ConfigurationList.class);
- Object[] configValList = entity.getConfigValList();
+ Object[] configValList = configurationList.getConfigValList();
for(Object configVal : configValList){
String[] strings = configVal.toString().split("=");
String configurationValue = strings[2].substring(0, strings[2].length() - 1);
- System.out.println(configurationValue);
configurationValueList.add(configurationValue);
}
@@ -264,7 +263,7 @@ public class ConfigurationResourceClient
MultivaluedMap formData = new MultivaluedMapImpl();
formData.add("uri", uri);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
if (status != 200) {
@@ -279,7 +278,7 @@ public class ConfigurationResourceClient
MultivaluedMap formData = new MultivaluedMapImpl();
formData.add("uri", uri);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
if (status != 200) {
@@ -294,7 +293,7 @@ public class ConfigurationResourceClient
MultivaluedMap formData = new MultivaluedMapImpl();
formData.add("uri", uri);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
if (status != 200) {
@@ -309,7 +308,7 @@ public class ConfigurationResourceClient
MultivaluedMap formData = new MultivaluedMapImpl();
formData.add("uri", uri);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
if (status != 200) {
@@ -325,7 +324,7 @@ public class ConfigurationResourceClient
formData.add("uri", uri);
formData.add("date", date);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
if (status != 200) {
@@ -341,7 +340,7 @@ public class ConfigurationResourceClient
formData.add("uri", uri);
formData.add("date", date);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
if (status != 200) {
@@ -357,7 +356,7 @@ public class ConfigurationResourceClient
formData.add("uri", uri);
formData.add("date", date);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
if (status != 200) {
@@ -373,7 +372,7 @@ public class ConfigurationResourceClient
formData.add("uri", uri);
formData.add("date", date);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
if (status != 200) {
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java?rev=1408455&r1=1408454&r2=1408455&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java Mon Nov 12 20:47:50 2012
@@ -84,7 +84,7 @@ public class DescriptorResourceClient {
public void addHostDescriptor (HostDescription hostDescription){
HostDescriptor hostDescriptor = DescriptorUtil.createHostDescriptor(hostDescription);
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.HOST_DESC_SAVE);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).post(ClientResponse.class, hostDescriptor);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).post(ClientResponse.class, hostDescriptor);
int status = response.getStatus();
@@ -98,7 +98,7 @@ public class DescriptorResourceClient {
public void updateHostDescriptor (HostDescription hostDescription){
HostDescriptor hostDescriptor = DescriptorUtil.createHostDescriptor(hostDescription);
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.HOST_DESC_UPDATE);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).post(ClientResponse.class, hostDescriptor);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).post(ClientResponse.class, hostDescriptor);
int status = response.getStatus();
@@ -113,7 +113,7 @@ public class DescriptorResourceClient {
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.HOST_DESC);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("hostName", hostName);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
@@ -144,7 +144,7 @@ public class DescriptorResourceClient {
public List<HostDescription> getHostDescriptors() {
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.GET_HOST_DESCS);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
@@ -167,7 +167,7 @@ public class DescriptorResourceClient {
public List<String> getHostDescriptorNames(){
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.GET_HOST_DESCS_NAMES);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
@@ -200,7 +200,7 @@ public class DescriptorResourceClient {
public void saveServiceDescriptor (ServiceDescription serviceDescription){
ServiceDescriptor serviceDescriptor = DescriptorUtil.createServiceDescriptor(serviceDescription);
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.SERVICE_DESC_SAVE);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).post(ClientResponse.class, serviceDescriptor);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).post(ClientResponse.class, serviceDescriptor);
int status = response.getStatus();
@@ -214,7 +214,7 @@ public class DescriptorResourceClient {
public void updateServiceDescriptor(ServiceDescription serviceDescription){
ServiceDescriptor serviceDescriptor = DescriptorUtil.createServiceDescriptor(serviceDescription);
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.SERVICE_DESC_UPDATE);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).post(ClientResponse.class, serviceDescriptor);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).post(ClientResponse.class, serviceDescriptor);
int status = response.getStatus();
@@ -229,7 +229,7 @@ public class DescriptorResourceClient {
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.SERVICE_DESC);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("serviceName", serviceName);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
@@ -260,7 +260,7 @@ public class DescriptorResourceClient {
public List<ServiceDescription> getServiceDescriptors (){
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.GET_SERVICE_DESCS);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
@@ -307,7 +307,7 @@ public class DescriptorResourceClient {
applicationDescriptor.setServiceDescriptor(serviceDescriptor);
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.APP_DESC_BUILD_SAVE);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).post(ClientResponse.class, applicationDescriptor);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).post(ClientResponse.class, applicationDescriptor);
int status = response.getStatus();
@@ -326,7 +326,7 @@ public class DescriptorResourceClient {
applicationDescriptor.setServiceDescriptor(serviceDescriptor);
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.APP_DESC_BUILD_SAVE);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).post(ClientResponse.class, applicationDescriptor);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).post(ClientResponse.class, applicationDescriptor);
int status = response.getStatus();
@@ -346,7 +346,7 @@ public class DescriptorResourceClient {
applicationDescriptor.setServiceDescriptor(serviceDescriptor);
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.APP_DESC_UPDATE);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).post(ClientResponse.class, applicationDescriptor);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).post(ClientResponse.class, applicationDescriptor);
int status = response.getStatus();
@@ -365,7 +365,7 @@ public class DescriptorResourceClient {
applicationDescriptor.setServiceDescriptor(serviceDescriptor);
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.APP_DESC_UPDATE);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).post(ClientResponse.class, applicationDescriptor);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).post(ClientResponse.class, applicationDescriptor);
int status = response.getStatus();
@@ -385,7 +385,7 @@ public class DescriptorResourceClient {
queryParams.add("hostName", hostname);
queryParams.add("applicationName", applicationName);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
@@ -406,7 +406,7 @@ public class DescriptorResourceClient {
queryParams.add("serviceName", serviceName);
queryParams.add("hostName", hostname);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
@@ -425,7 +425,7 @@ public class DescriptorResourceClient {
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.APP_DESC_ALL_DESCS_SERVICE);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("serviceName", serviceName);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
@@ -448,7 +448,7 @@ public class DescriptorResourceClient {
public Map<String[], ApplicationDeploymentDescription> getApplicationDescriptors(){
Map<String[], ApplicationDeploymentDescription> applicationDeploymentDescriptionMap = new HashMap<String[], ApplicationDeploymentDescription>();
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.APP_DESC_ALL_DESCRIPTORS);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
@@ -470,7 +470,7 @@ public class DescriptorResourceClient {
private List<String> getApplicationDescriptorNames (){
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.APP_DESC_NAMES);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {