Update Glance client to utilize head

Issue-ID: SO-2906
Change-Id: Ife2dfaa58eab1d2588aaef9b7d912102a5c65458
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

diff --git a/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java b/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java
index a34980d..3ff062a 100644 (file)
--- a/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java
+++ b/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java
@@ -16,6 +16,10 @@
 
 package com.woorea.openstack.glance;
 
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.woorea.openstack.base.client.Entity;
 import com.woorea.openstack.base.client.HttpMethod;
@@ -28,10 +32,6 @@ import com.woorea.openstack.glance.model.ImageMember;
 import com.woorea.openstack.glance.model.ImageMembers;
 import com.woorea.openstack.glance.model.ImageUpload;
 import com.woorea.openstack.glance.model.Images;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 
 public class ImagesResource {
 
@@ -126,13 +126,7 @@ public class ImagesResource {
     public class Show extends OpenStackRequest<Image> {
 
         public Show(String id) {
-            super(client, HttpMethod.HEAD, new StringBuilder(IMAGES).append(id).toString(), null, Image.class);
-        }
-
-        @Override
-        public Image execute() {
-            // custom parsing here
-            return parse(client.request(this).headers());
+            super(client, HttpMethod.GET, new StringBuilder(IMAGES).append(id).toString(), null, Image.class);
         }
     }
 

diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
index b4b4c41..7078edc 100644 (file)
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
@@ -23,9 +23,8 @@ import java.util.List;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonRootName;
 
-@JsonRootName("image")
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Image implements Serializable {
 

diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageTest.java
index d6a2d8d..45d33f7 100644 (file)
--- a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageTest.java
+++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageTest.java
@@ -20,36 +20,34 @@
 
 package com.woorea.openstack.glance.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
 import java.util.Calendar;
 import java.util.Map;
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 
 public class ImageTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL + "  \"image\" : {" + EOL + "    \"id\" : \"id\"," + EOL
-            + "    \"uri\" : \"uri\"," + EOL + "    \"name\" : \"name\"," + EOL + "    \"size\" : 43," + EOL
-            + "    \"checksum\" : \"checksum\"," + EOL + "    \"status\" : \"status\"," + EOL
-            + "    \"owner\" : \"owner\"," + EOL + "    \"properties\" : {" + EOL
+    private static final String JSON_FULL = "{" + EOL + "    \"id\" : \"id\"," + EOL + "    \"uri\" : \"uri\"," + EOL
+            + "    \"name\" : \"name\"," + EOL + "    \"size\" : 43," + EOL + "    \"checksum\" : \"checksum\"," + EOL
+            + "    \"status\" : \"status\"," + EOL + "    \"owner\" : \"owner\"," + EOL + "    \"properties\" : {" + EOL
             + "      \"properties-k1\" : \"properties-v1\"," + EOL + "      \"properties-k2\" : \"properties-v2\"" + EOL
             + "    }," + EOL + "    \"public\" : false," + EOL + "    \"deleted\" : false," + EOL
             + "    \"protected\" : true," + EOL + "    \"disk_format\" : \"diskformat\"," + EOL
             + "    \"container_format\" : \"containerformat\"," + EOL + "    \"virtual_size\" : 18," + EOL
             + "    \"created_at\" : 1486296000000," + EOL + "    \"updated_at\" : 1487592000000," + EOL
             + "    \"deleted_at\" : 1486209600000," + EOL + "    \"is_public\" : false," + EOL + "    \"min_ram\" : 62,"
-            + EOL + "    \"min_disk\" : 69" + EOL + "  }" + EOL + "}";
+            + EOL + "    \"min_disk\" : 69" + EOL + "  }";
 
     private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL)
-            .enable(SerializationFeature.INDENT_OUTPUT).enable(SerializationFeature.WRAP_ROOT_VALUE)
-            .enable(DeserializationFeature.UNWRAP_ROOT_VALUE).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .enable(SerializationFeature.INDENT_OUTPUT).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
             .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test