fixed public_ip address

Author: synapticloop

src/main/java/synapticloop/scaleway/api/model/IP.java

@@ -17,7 +17,6 @@
  */
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonSetter;
 
 public class IP {
 	@JsonProperty("id")            private String id;
@@ -29,9 +28,6 @@ public class IP {
 
 	public String getId() { return id; }
 
-	@JsonSetter("public_ip")
-	private void setPublicIP(String publicIp) { this.ipAddress = publicIp; }
-
 	public String getIpAddress() { return ipAddress; }
 
 	public String getOrganizationId() { return this.organizationId; }

src/main/java/synapticloop/scaleway/api/model/Server.java

@@ -24,6 +24,7 @@
 public class Server extends ServerBase {
 
 	@JsonProperty("id")                 private String id;
+	@JsonProperty("public_ip")          private IP publicIp;
 	@JsonProperty("private_ip")         private String privateIp;
 	@JsonProperty("extra_networks")     private String[] extraNetworks;
 	@JsonProperty("state")              private State state;
@@ -108,7 +109,7 @@ public void setLocation(Location location) {
 		this.location = location;
 	}
 
-	public IPv6 getIpv6() { return ipv6; }
+	public IPv6 getIPv6() { return ipv6; }
 
 	public String getArch() {
 		return arch;

src/main/java/synapticloop/scaleway/api/model/ServerBase.java

@@ -30,7 +30,7 @@ public class ServerBase {
 	@JsonProperty("commercial_type")     private ServerType serverType;
 	@JsonProperty("dynamic_ip_required") private boolean dynamicIpRequired;
 	@JsonProperty("enable_ipv6")         private boolean ipv6Enabled;
-	@JsonProperty("public_ip")           private String publicIP;
+	@JsonProperty("public_ip")           private IP publicIP;
 	@JsonProperty("security_group")      private SecurityGroup securityGroup;
 	@JsonProperty("bootscript")          private BootScript bootscript;
 
@@ -91,11 +91,11 @@ public void setIpv6Enabled(boolean ipv6Enabled) {
 		this.ipv6Enabled = ipv6Enabled;
 	}
 
-	public String getPublicIP() {
+	public IP getPublicIP() {
 		return publicIP;
 	}
 
-	public void setPublicIP(String publicIP) {
+	public void setPublicIP(IP publicIP) {
 		this.publicIP = publicIP;
 	}
 

src/test/java/synapticloop/scaleway/api/ServerTest.java

@@ -33,7 +33,7 @@ public void testCreateAndDeleteServer() throws ScalewayApiException {
 		assertEquals(server.getCreationDate(), returnedServer.getCreationDate());
 		assertEquals(server.getHostname(), returnedServer.getHostname());
 		assertEquals(server.getId(), returnedServer.getId());
-		assertEquals(server.getIpv6(), returnedServer.getIpv6());
+		assertEquals(server.getIPv6(), returnedServer.getIPv6());
 		assertEquals(server.getModificationDate(), returnedServer.getModificationDate());
 		assertEquals(server.getName(), returnedServer.getName());
 		assertEquals(server.getOrganization(), returnedServer.getOrganization());
@@ -113,7 +113,10 @@ public void testPowerCycleServer() throws ScalewayApiException {
 		boolean isStarted = false;
 		while(!isStarted) {
 			ServerTask taskStatus = scalewayApiClient.getTaskStatus(powerOnServerTask.getId());
-			LOGGER.debug("Server task with id '{}' is in current state '{}' (progress '{}')", taskStatus.getId(), taskStatus.getStatus(), taskStatus.getProgress());
+			LOGGER.debug("Server task with id '{}' is in current state '{}' (progress '{}')", 
+					taskStatus.getId(), 
+					taskStatus.getStatus(), 
+					taskStatus.getProgress());
 			try {
 				Thread.sleep(10000);
 			} catch (InterruptedException ex) {