Merge pull request #233 from igorspasic/fix-labels

marcuslinke · marcuslinke · commit deca72b7b08a · 2015-05-29T22:09:13.000+02:00
Labels are array of Strings (fixes #232)
diff --git a/src/main/java/com/github/dockerjava/api/model/Info.java b/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -60,7 +60,7 @@ public class Info {
 	private String kernelVersion;
 	
 	@JsonProperty("Labels")
-	private String Labels;
+	private String[] Labels;
 
 	@JsonProperty("MemoryLimit")
 	private boolean memoryLimit;
@@ -140,7 +140,7 @@ public String getKernelVersion() {
 		return kernelVersion;
 	}
 	
-	public String getLabels() {
+	public String[] getLabels() {
 		return Labels;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public class Info {`
`60`	`60`	`private String kernelVersion;`
`61`	`61`
`62`	`62`	`@JsonProperty("Labels")`
`63`		`- private String Labels;`
	`63`	`+ private String[] Labels;`
`64`	`64`
`65`	`65`	`@JsonProperty("MemoryLimit")`
`66`	`66`	`private boolean memoryLimit;`
`@@ -140,7 +140,7 @@ public String getKernelVersion() {`
`140`	`140`	`return kernelVersion;`
`141`	`141`	`}`
`142`	`142`
`143`		`- public String getLabels() {`
	`143`	`+ public String[] getLabels() {`
`144`	`144`	`return Labels;`
`145`	`145`	`}`
`146`	`146`