diff --git a/src/main/java/com/myjeeva/digitalocean/pojo/Image.java b/src/main/java/com/myjeeva/digitalocean/pojo/Image.java index 6dc43bd..acd6530 100644 --- a/src/main/java/com/myjeeva/digitalocean/pojo/Image.java +++ b/src/main/java/com/myjeeva/digitalocean/pojo/Image.java @@ -20,13 +20,15 @@ */ package com.myjeeva.digitalocean.pojo; +import java.util.Date; +import java.util.List; + +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; + import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.myjeeva.digitalocean.common.ImageStatus; import com.myjeeva.digitalocean.common.ImageType; -import java.util.Date; -import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; /** * Represents Droplet Image (also public images aka Distribution) attributes of DigitalOcean @@ -38,7 +40,7 @@ public class Image extends Base { private static final long serialVersionUID = 1321111459154107563L; - private Integer id; + private String id; @Expose private String name; @@ -82,14 +84,10 @@ public Image() { // Default constructor } - public Image(Integer id) { + public Image(String id) { this.id = id; } - public Image(String slug) { - this.slug = slug; - } - public Image(String name, String url, String region) { this.name = name; this.url = url; @@ -112,12 +110,12 @@ public boolean isBackup() { } /** @return the id */ - public Integer getId() { + public String getId() { return id; } /** @param id the id to set */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } diff --git a/src/test/java/com/myjeeva/digitalocean/DigitalOceanIntegrationTest.java b/src/test/java/com/myjeeva/digitalocean/DigitalOceanIntegrationTest.java index b8ca41c..273d592 100644 --- a/src/test/java/com/myjeeva/digitalocean/DigitalOceanIntegrationTest.java +++ b/src/test/java/com/myjeeva/digitalocean/DigitalOceanIntegrationTest.java @@ -24,6 +24,17 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.myjeeva.digitalocean.common.ActionType; import com.myjeeva.digitalocean.common.Environment; import com.myjeeva.digitalocean.common.LoadBalancingAlgorithm; @@ -70,15 +81,6 @@ import com.myjeeva.digitalocean.pojo.Tag; import com.myjeeva.digitalocean.pojo.Volume; import com.myjeeva.digitalocean.pojo.Volumes; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Junit Integration Test case for DigitalOcean API client wrapper methods @@ -110,6 +112,9 @@ public class DigitalOceanIntegrationTest { private final String firewallIdForInfo = "190ceeb7-779a-4b04-9091-4dd175de65ec"; // to be placed before use + private final String imageIdForDropletCreation = "1601"; // to be placed before use. Same is used for updating the + // image info + private final String domainName = ""; private String projectId; @@ -175,7 +180,7 @@ public void testCreateDropletByImageId() Droplet droplet = new Droplet(); droplet.setName("api-client-test-host-byid"); droplet.setSize("512mb"); - droplet.setImage(new Image(1601)); + droplet.setImage(new Image(imageIdForDropletCreation)); droplet.setRegion(new Region("sgp1")); droplet.setEnableBackup(Boolean.TRUE); droplet.setEnableIpv6(Boolean.TRUE); @@ -574,7 +579,7 @@ public void testCreateCustomImage() throws DigitalOceanException, RequestUnsucce public void testUpdateImageInfo() throws DigitalOceanException, RequestUnsuccessfulException { Image input = new Image(); - input.setId(3897539); + input.setId(imageIdForDropletCreation); input.setName("test-myjeeva.com-before-wp-upgrade"); Image image = apiClient.updateImage(input);