Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-1041: Fix NPE when deserializing Port in Docker 1.9.1

This commit is contained in:
Ignasi Barrera 2015-11-23 22:30:20 +01:00
parent 33522b8945
commit 29a8474ba0
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apis/docker/src/main/java/org/jclouds/docker/domain/Port.java
View File

@ -16,17 +16,18 @@
*/
package org.jclouds.docker.domain;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.json.SerializedNames;
import com.google.auto.value.AutoValue;
@AutoValue
public abstract class Port {
public abstract String ip();
@Nullable public abstract String ip();
public abstract int privatePort();
public abstract int publicPort();
@Nullable public abstract Integer publicPort();
public abstract String type();
@ -34,7 +35,7 @@ public abstract class Port {
}
@SerializedNames({ "IP", "PrivatePort", "PublicPort", "Type" })
public static Port create(String ip, int privatePort, int publicPort, String type) {
public static Port create(String ip, int privatePort, Integer publicPort, String type) {
return new AutoValue_Port(ip, privatePort, publicPort, type);
}
}

16
apis/docker/src/test/java/org/jclouds/docker/parse/ContainersParseTest.java
View File

@ -39,15 +39,13 @@ public class ContainersParseTest extends BaseDockerParseTest<List<ContainerSumma
@Override
@Consumes(MediaType.APPLICATION_JSON)
public List<ContainerSummary> expected() {
return ImmutableList.of(
ContainerSummary.create("6d35806c1bd2b25cd92bba2d2c2c5169dc2156f53ab45c2b62d76e2d2fee14a9",
ImmutableList.of("/hopeful_mclean"),
"1395472605",
"jclouds/ubuntu:latest",
"/usr/sbin/sshd -D",
ImmutableList.of(Port.create("0.0.0.0", 22, 49231, "tcp")),
"Up 55 seconds")
);
return ImmutableList.of(ContainerSummary.create(
"6d35806c1bd2b25cd92bba2d2c2c5169dc2156f53ab45c2b62d76e2d2fee14a9", ImmutableList.of("/hopeful_mclean"),
"1395472605", "jclouds/ubuntu:latest", "/usr/sbin/sshd -D",
ImmutableList.of(Port.create("0.0.0.0", 22, 49231, "tcp")), "Up 55 seconds"), ContainerSummary.create(
"6d35806c1bd2b25cd92bba2d2c2c5169dc2156f53ab45c2b62d76e2d2fee14a2", ImmutableList.of("/hopeful_mclean"),
"1395472605", "jclouds/ubuntu:latest", "/usr/sbin/sshd -D",
ImmutableList.of(Port.create(null, 22, null, "tcp")), "Up 55 seconds"));
}
}

16
apis/docker/src/test/resources/containers.json
View File

@ -16,5 +16,21 @@
}
],
"Status": "Up 55 seconds"
},
{
"Command": "/usr/sbin/sshd -D",
"Created": 1395472605,
"Id": "6d35806c1bd2b25cd92bba2d2c2c5169dc2156f53ab45c2b62d76e2d2fee14a2",
"Image": "jclouds/ubuntu:latest",
"Names": [
"/hopeful_mclean"
],
"Ports": [
{
"PrivatePort": 22,
"Type": "tcp"
}
],
"Status": "Up 55 seconds"
}
]