12:05 a.m.
Author: adietish
Date: 2011-01-06 18:05:13 -0500 (Thu, 06 Jan 2011)
New Revision: 27961
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java
Log:
[JBIDE-7935] moved instance unmarshalling to its own class, removed from client, added
tests
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-06
23:04:43 UTC (rev 27960)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-06
23:05:13 UTC (rev 27961)
@@ -10,9 +10,7 @@
*******************************************************************************/
package org.jboss.tools.deltacloud.core.client;
-import java.io.BufferedInputStream;
import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -63,6 +61,7 @@
import org.jboss.tools.deltacloud.core.client.request.PerformInstanceActionRequest;
import org.jboss.tools.deltacloud.core.client.request.TypeRequest;
import org.jboss.tools.deltacloud.core.client.unmarshal.InstanceUnmarshaller;
+import org.jboss.tools.deltacloud.core.client.unmarshal.InstancesUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.KeyUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.KeysUnmarshaller;
import org.w3c.dom.Document;
@@ -423,8 +422,10 @@
@Override
public List<Instance> listInstances() throws DeltaCloudClientException {
- return listDeltaCloudObjects(Instance.class,
- new ListInstancesRequest(baseUrl), "instance");
+ InputStream inputStream = request(new ListInstancesRequest(baseUrl));
+ List<Instance> instances = new ArrayList<Instance>();
+ new InstancesUnmarshaller().unmarshall(inputStream, instances);
+ return instances;
}
@Override
@@ -525,11 +526,6 @@
return updateInstance(inputStream, new Instance());
}
- private Instance buildInstance(String response) throws Exception {
- InputStream inputStream = new BufferedInputStream(new
ByteArrayInputStream(response.getBytes()));
- return buildInstance(inputStream);
- }
-
private HardwareProfile buildHardwareProfile(String xml)
throws DeltaCloudClientException {
try {
@@ -629,9 +625,7 @@
@SuppressWarnings("unchecked")
private <T extends Object> T buildDeltaCloudObject(Class<T> clazz, String
node) throws Exception {
- if (clazz.equals(Instance.class)) {
- return (T) buildInstance(node);
- } else if (clazz.equals(HardwareProfile.class)) {
+ if (clazz.equals(HardwareProfile.class)) {
return (T) buildHardwareProfile(node);
} else {
return JAXB.unmarshal(new StringReader(node), clazz);
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java 2011-01-06
23:04:43 UTC (rev 27960)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java 2011-01-06
23:05:13 UTC (rev 27961)
@@ -31,7 +31,7 @@
private String storage;
public CreateInstanceRequest(URL baseUrl, String imageId) {
- this(baseUrl, imageId, null, null, null, null, null, null);
+ this(baseUrl, null, imageId, null, null, null, null, null);
}
public CreateInstanceRequest(URL baseUrl, String name, String imageId, String profileId,
String realmId,