diff options
Diffstat (limited to 'glance-model')
17 files changed, 335 insertions, 213 deletions
diff --git a/glance-model/pom.xml b/glance-model/pom.xml index d207b66..94111ea 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -1,25 +1,26 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.so.libs</groupId> - <artifactId>openstack-java-sdk</artifactId> - <version>1.4.0-SNAPSHOT</version> - </parent> - <groupId>org.onap.so.libs.openstack-java-sdk</groupId> - <artifactId>glance-model</artifactId> - <name>OpenStack Glance Model</name> - <description>OpenStack Glance Model</description> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.so.libs</groupId> + <artifactId>openstack-java-sdk</artifactId> + <version>1.4.0-SNAPSHOT</version> + </parent> + <groupId>org.onap.so.libs.openstack-java-sdk</groupId> + <artifactId>glance-model</artifactId> + <name>OpenStack Glance Model</name> + <description>OpenStack Glance Model</description> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.skyscreamer</groupId> - <artifactId>jsonassert</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.skyscreamer</groupId> + <artifactId>jsonassert</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> 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 aa7be87..b4b4c41 100644 --- 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 @@ -19,8 +19,8 @@ package com.woorea.openstack.glance.model; import java.io.Serializable; import java.util.Calendar; import java.util.HashMap; +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; @@ -29,6 +29,7 @@ import com.fasterxml.jackson.annotation.JsonRootName; @JsonIgnoreProperties(ignoreUnknown = true) public class Image implements Serializable { + @JsonProperty("id") private String id; private String uri; @@ -46,6 +47,7 @@ public class Image implements Serializable { @JsonProperty("virtual_size") private Long virtualSize; + @JsonProperty("checksum") private String checksum; @JsonProperty("created_at") @@ -68,6 +70,7 @@ public class Image implements Serializable { @JsonProperty("min_disk") private Integer minDisk; + @JsonProperty("owner") private String owner; @JsonProperty("deleted") @@ -76,8 +79,174 @@ public class Image implements Serializable { @JsonProperty("protected") private boolean isProtected; + @JsonProperty("visibility") + private String visibility; + + @JsonProperty("file") + private String file; + + @JsonProperty("schema") + private String schema; + + @JsonProperty("self") + private String self; + + @JsonProperty("hw_cdrom_bus") + private String hwCDROMBus; + + @JsonProperty("hw_disk_bus") + private String hwDiskBus; + + @JsonProperty("hw_vif_mode") + private String hwVIFMode; + + @JsonProperty("post_processing_networking") + private String postProcessingNetworking; + + @JsonProperty("post_processing_tools") + private String postProccesingTools; + + @JsonProperty("bypass_meta_validation") + private String bypassMetaValidation; + + @JsonProperty("application_name") + private String applicationName; + + @JsonProperty("application_type") + private String applicationType; + + @JsonProperty("application_version") + private String applicationVersion; + + @JsonProperty("application_vendor") + private String applicationVendor; + + @JsonProperty("hw_scsi_model") + private String hwSCSIModel; + + @JsonProperty("description") + private String description; + + @JsonProperty("meta") + private String meta; + + @JsonProperty("tags") + private List<String> tags; + private Map<String, Object> properties; + public String getHwCDROMBus() { + return hwCDROMBus; + } + + public void setHwCDROMBus(String hwCDROMBus) { + this.hwCDROMBus = hwCDROMBus; + } + + public String getHwDiskBus() { + return hwDiskBus; + } + + public void setHwDiskBus(String hwDiskBus) { + this.hwDiskBus = hwDiskBus; + } + + public String getHwVIFMode() { + return hwVIFMode; + } + + public void setHwVIFMode(String hwVIFMode) { + this.hwVIFMode = hwVIFMode; + } + + public String getPostProcessingNetworking() { + return postProcessingNetworking; + } + + public void setPostProcessingNetworking(String postProcessingNetworking) { + this.postProcessingNetworking = postProcessingNetworking; + } + + public String getPostProccesingTools() { + return postProccesingTools; + } + + public void setPostProccesingTools(String postProccesingTools) { + this.postProccesingTools = postProccesingTools; + } + + public String getBypassMetaValidation() { + return bypassMetaValidation; + } + + public void setBypassMetaValidation(String bypassMetaValidation) { + this.bypassMetaValidation = bypassMetaValidation; + } + + public String getApplicationName() { + return applicationName; + } + + public void setApplicationName(String applicationName) { + this.applicationName = applicationName; + } + + public String getApplicationVersion() { + return applicationVersion; + } + + public void setApplicationVersion(String applicationVersion) { + this.applicationVersion = applicationVersion; + } + + public String getApplicationVendor() { + return applicationVendor; + } + + public void setApplicationVendor(String applicationVendor) { + this.applicationVendor = applicationVendor; + } + + public String getVisibility() { + return visibility; + } + + public void setVisibility(String visibility) { + this.visibility = visibility; + } + + public String getFile() { + return file; + } + + public void setFile(String file) { + this.file = file; + } + + public String getSchema() { + return schema; + } + + public void setSchema(String schema) { + this.schema = schema; + } + + public String getSelf() { + return self; + } + + public void setSelf(String self) { + this.self = self; + } + + public List<String> getTags() { + return tags; + } + + public void setTags(List<String> tags) { + this.tags = tags; + } + /** * @return the id */ @@ -340,16 +509,17 @@ public class Image implements Serializable { return properties; } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see java.lang.Object#toString() */ @Override public String toString() { return String.format("Image [id=%s, uri=%s, name=%s, diskFormat=%s containerFormat=%s, size=%d, checksum=%s," + " createdAt=%s, updatedAt=%s, deletedAt=%s, status=%s, isPublic=%s, minRam=%d, minDisk=%d, owner=%s," - + " isDeleted=%s, isProtected=%s, properties=%s]", - id, uri, name, diskFormat, containerFormat, size, checksum, - createdAt, updatedAt, deletedAt, status, isPublic, minRam, minDisk, owner, - isDeleted, isProtected, properties); + + " isDeleted=%s, isProtected=%s, properties=%s]", id, uri, name, diskFormat, containerFormat, size, + checksum, createdAt, updatedAt, deletedAt, status, isPublic, minRam, minDisk, owner, isDeleted, + isProtected, properties); } } diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageDownload.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageDownload.java index eb286ff..83935f8 100644 --- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageDownload.java +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageDownload.java @@ -19,9 +19,9 @@ package com.woorea.openstack.glance.model; import java.io.InputStream; public class ImageDownload { - + private Image image; - + private InputStream inputStream; /** diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java index 8cecda9..e4b89d5 100644 --- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMember.java @@ -17,19 +17,18 @@ package com.woorea.openstack.glance.model; import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonProperty; public class ImageMember implements Serializable { @JsonProperty("can_share") private boolean canShare; - + @JsonProperty("member_id") private String memberId; public ImageMember() { - + } public ImageMember(boolean canShare, String memberId) { diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java index fd977ed..750b196 100644 --- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageMembers.java @@ -19,7 +19,6 @@ package com.woorea.openstack.glance.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; public class ImageMembers implements Iterable<ImageMember>, Serializable { @@ -38,5 +37,5 @@ public class ImageMembers implements Iterable<ImageMember>, Serializable { public Iterator<ImageMember> iterator() { return list.iterator(); } - + } diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageUpload.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageUpload.java index 428a5d2..a384214 100644 --- a/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageUpload.java +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/ImageUpload.java @@ -60,7 +60,7 @@ public class ImageUpload { * @return the properties */ public Map<String, Object> getProperties() { - if(properties == null) { + if (properties == null) { properties = new HashMap<>(); } return properties; diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java index b3b278c..baedb22 100644 --- a/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/Images.java @@ -19,7 +19,6 @@ package com.woorea.openstack.glance.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; public class Images implements Iterable<Image>, Serializable { @@ -27,6 +26,15 @@ public class Images implements Iterable<Image>, Serializable { @JsonProperty("images") private List<Image> list; + @JsonProperty("next") + private String next; + + @JsonProperty("first") + private String first; + + @JsonProperty("schema") + private String schema; + /** * @return the list */ @@ -34,9 +42,33 @@ public class Images implements Iterable<Image>, Serializable { return list; } + public String getNext() { + return next; + } + + public void setNext(String next) { + this.next = next; + } + + public String getFirst() { + return first; + } + + public void setFirst(String first) { + this.first = first; + } + + public String getSchema() { + return schema; + } + + public void setSchema(String schema) { + this.schema = schema; + } + @Override public Iterator<Image> iterator() { return list.iterator(); } - + } diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImage.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImage.java index b16897c..c4ddfdd 100644 --- a/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImage.java +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImage.java @@ -17,5 +17,5 @@ package com.woorea.openstack.glance.model; public class SharedImage { - -}
\ No newline at end of file + +} diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java index 6239a2b..be3f77f 100644 --- a/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java +++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/SharedImages.java @@ -19,7 +19,6 @@ package com.woorea.openstack.glance.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; public class SharedImages implements Iterable<SharedImage>, Serializable { @@ -38,5 +37,5 @@ public class SharedImages implements Iterable<SharedImage>, Serializable { public Iterator<SharedImage> iterator() { return list.iterator(); } - + } diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageDownloadTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageDownloadTest.java index 15120ce..acfb6d6 100644 --- a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageDownloadTest.java +++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageDownloadTest.java @@ -20,7 +20,6 @@ package com.woorea.openstack.glance.model; import org.junit.Test; - import java.io.IOException; import java.io.InputStream; @@ -53,4 +52,4 @@ public class ImageDownloadTest { }); } -}
\ No newline at end of file +} diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMemberTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMemberTest.java index e8323d9..acb55d6 100644 --- a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMemberTest.java +++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMemberTest.java @@ -24,7 +24,6 @@ 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 org.junit.Assert; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; @@ -34,16 +33,12 @@ public class ImageMemberTest { private static final String EOL = System.lineSeparator(); - private static final String JSON_FULL = "{" + EOL - + " \"can_share\" : false," + EOL - + " \"member_id\" : \"memberid\"" + EOL - + "}"; + private static final String JSON_FULL = + "{" + EOL + " \"can_share\" : false," + EOL + " \"member_id\" : \"memberid\"" + EOL + "}"; - private ObjectMapper objectMapper = new ObjectMapper() - .setSerializationInclusion(Include.NON_NULL) - .enable(SerializationFeature.INDENT_OUTPUT) - .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) - .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); + private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL) + .enable(SerializationFeature.INDENT_OUTPUT).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); @Test public void testSerialization() throws Exception { @@ -59,7 +54,7 @@ public class ImageMemberTest { public void testMethods() throws Exception { ImageMember imagemember = objectMapper.readValue(JSON_FULL, ImageMember.class); imagemember.toString(); - + String memberId = imagemember.getMemberId(); Assert.assertNotNull(memberId); imagemember.setMemberId(memberId); diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMembersTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMembersTest.java index 513791a..22fd432 100644 --- a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMembersTest.java +++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageMembersTest.java @@ -24,9 +24,7 @@ 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.List; - import org.junit.Assert; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; @@ -36,21 +34,13 @@ public class ImageMembersTest { private static final String EOL = System.lineSeparator(); - private static final String JSON_FULL = "{" + EOL - + " \"members\" : [ {" + EOL - + " \"can_share\" : false," + EOL - + " \"member_id\" : \"memberid\"" + EOL - + " }, {" + EOL - + " \"can_share\" : false," + EOL - + " \"member_id\" : \"memberid\"" + EOL - + " } ]" + EOL - + "}"; + private static final String JSON_FULL = "{" + EOL + " \"members\" : [ {" + EOL + " \"can_share\" : false," + EOL + + " \"member_id\" : \"memberid\"" + EOL + " }, {" + EOL + " \"can_share\" : false," + EOL + + " \"member_id\" : \"memberid\"" + EOL + " } ]" + EOL + "}"; - private ObjectMapper objectMapper = new ObjectMapper() - .setSerializationInclusion(Include.NON_NULL) - .enable(SerializationFeature.INDENT_OUTPUT) - .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) - .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); + private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL) + .enable(SerializationFeature.INDENT_OUTPUT).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); @Test public void testSerialization() throws Exception { @@ -66,13 +56,14 @@ public class ImageMembersTest { public void testMethods() throws Exception { ImageMembers imagemembers = objectMapper.readValue(JSON_FULL, ImageMembers.class); imagemembers.toString(); - + List<ImageMember> list = imagemembers.getList(); Assert.assertNotNull(list); Assert.assertEquals(2, list.size()); - + int cnt = 0; - for (@SuppressWarnings("unused") ImageMember x : imagemembers) { + for (@SuppressWarnings("unused") + ImageMember x : imagemembers) { ++cnt; } Assert.assertEquals(2, cnt); 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 8e8914c..d6a2d8d 100644 --- 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 @@ -24,10 +24,8 @@ 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; @@ -37,41 +35,22 @@ 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 - + " \"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 - + "}"; - - 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(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); + 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 + + " \"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 + "}"; + + 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(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); @Test public void testSerialization() throws Exception { @@ -87,67 +66,67 @@ public class ImageTest { public void testMethods() throws Exception { Image image = objectMapper.readValue(JSON_FULL, Image.class); image.toString(); - + String owner = image.getOwner(); Assert.assertNotNull(owner); image.setOwner(owner); - + String containerFormat = image.getContainerFormat(); Assert.assertNotNull(containerFormat); image.setContainerFormat(containerFormat); - + String uri = image.getUri(); Assert.assertNotNull(uri); image.setUri(uri); - + Calendar createdAt = image.getCreatedAt(); Assert.assertNotNull(createdAt); image.setCreatedAt(createdAt); - + Calendar deletedAt = image.getDeletedAt(); Assert.assertNotNull(deletedAt); image.setDeletedAt(deletedAt); - + Long size = image.getSize(); Assert.assertNotNull(size); image.setSize(size); - + Integer minRam = image.getMinRam(); Assert.assertNotNull(minRam); image.setMinRam(minRam); - + String diskFormat = image.getDiskFormat(); Assert.assertNotNull(diskFormat); image.setDiskFormat(diskFormat); - + String checksum = image.getChecksum(); Assert.assertNotNull(checksum); image.setChecksum(checksum); - + String name = image.getName(); Assert.assertNotNull(name); image.setName(name); - + String id = image.getId(); Assert.assertNotNull(id); image.setId(id); - + Long virtualSize = image.getVirtualSize(); Assert.assertNotNull(virtualSize); image.setVirtualSize(virtualSize); - - Map<String,Object> properties = image.getProperties(); + + Map<String, Object> properties = image.getProperties(); Assert.assertNotNull(properties); Assert.assertEquals(2, properties.size()); - + Integer minDisk = image.getMinDisk(); Assert.assertNotNull(minDisk); image.setMinDisk(minDisk); - + String status = image.getStatus(); Assert.assertNotNull(status); image.setStatus(status); - + Calendar updatedAt = image.getUpdatedAt(); Assert.assertNotNull(updatedAt); image.setUpdatedAt(updatedAt); diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageUploadTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageUploadTest.java index d18fee9..dd97040 100644 --- a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageUploadTest.java +++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImageUploadTest.java @@ -20,7 +20,6 @@ package com.woorea.openstack.glance.model; import org.junit.Test; - import java.io.IOException; import java.io.InputStream; @@ -68,4 +67,4 @@ public class ImageUploadTest { }); } -}
\ No newline at end of file +} diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImagesTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImagesTest.java index 1ba0907..f72e1cf 100644 --- a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImagesTest.java +++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImagesTest.java @@ -24,9 +24,7 @@ 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.List; - import org.junit.Assert; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; @@ -36,63 +34,31 @@ public class ImagesTest { private static final String EOL = System.lineSeparator(); - private static final String JSON_FULL = "{" + EOL - + " \"images\" : [ {" + 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 - + " \"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 - + "}"; + private static final String JSON_FULL = "{" + EOL + " \"images\" : [ {" + 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 + " \"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 + "}"; - private ObjectMapper objectMapper = new ObjectMapper() - .setSerializationInclusion(Include.NON_NULL) - .enable(SerializationFeature.INDENT_OUTPUT) - .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) - .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); + private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL) + .enable(SerializationFeature.INDENT_OUTPUT).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); @Test public void testSerialization() throws Exception { @@ -108,13 +74,14 @@ public class ImagesTest { public void testMethods() throws Exception { Images images = objectMapper.readValue(JSON_FULL, Images.class); images.toString(); - + List<Image> list = images.getList(); Assert.assertNotNull(list); Assert.assertEquals(2, list.size()); - + int cnt = 0; - for (@SuppressWarnings("unused") Image x : images) { + for (@SuppressWarnings("unused") + Image x : images) { ++cnt; } Assert.assertEquals(2, cnt); diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java index 41805cb..d758165 100644 --- a/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java +++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java @@ -24,7 +24,6 @@ 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 org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; import org.skyscreamer.jsonassert.JSONCompareMode; @@ -34,12 +33,10 @@ public class SharedImageTest { private static final String JSON_FULL = "{ }"; // FAIL_ON_EMPTY_BEANS set to false to conform to legacy behavior - private ObjectMapper objectMapper = new ObjectMapper() - .setSerializationInclusion(Include.NON_NULL) - .enable(SerializationFeature.INDENT_OUTPUT) - .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) - .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS) - .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); + private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL) + .enable(SerializationFeature.INDENT_OUTPUT).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); @Test public void testSerialization() throws Exception { diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImagesTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImagesTest.java index 7695f54..1f8fd9e 100644 --- a/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImagesTest.java +++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImagesTest.java @@ -24,9 +24,7 @@ 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.List; - import org.junit.Assert; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; @@ -36,17 +34,13 @@ public class SharedImagesTest { private static final String EOL = System.lineSeparator(); - private static final String JSON_FULL = "{" + EOL - + " \"shared_images\" : [ { }, { } ]" + EOL - + "}"; + private static final String JSON_FULL = "{" + EOL + " \"shared_images\" : [ { }, { } ]" + EOL + "}"; // FAIL_ON_EMPTY_BEANS set to false to conform to legacy behavior - private ObjectMapper objectMapper = new ObjectMapper() - .setSerializationInclusion(Include.NON_NULL) - .enable(SerializationFeature.INDENT_OUTPUT) - .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) - .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS) - .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); + private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL) + .enable(SerializationFeature.INDENT_OUTPUT).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); @Test public void testSerialization() throws Exception { @@ -62,13 +56,14 @@ public class SharedImagesTest { public void testMethods() throws Exception { SharedImages sharedimages = objectMapper.readValue(JSON_FULL, SharedImages.class); sharedimages.toString(); - + List<SharedImage> list = sharedimages.getList(); Assert.assertNotNull(list); Assert.assertEquals(2, list.size()); - + int cnt = 0; - for (@SuppressWarnings("unused") SharedImage x : sharedimages) { + for (@SuppressWarnings("unused") + SharedImage x : sharedimages) { ++cnt; } Assert.assertEquals(2, cnt); |