Merge branch 'KostyaSha-since't push origin master

Marcus Linke · Marcus Linke · commit 53a184ea0ad0 · 2015-07-11T14:02:59.000+02:00
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -43,6 +43,26 @@ public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateCon
 
     public int getCpuShares();
 
+    /**
+     * @since 1.19
+     */
+    public Integer getCpuPeriod();
+
+    /**
+     * @since 1.19
+     */
+    public String getCpusetMems();
+
+    /**
+     * @since 1.19
+     */
+    public Integer getBlkioWeight();
+
+    /**
+     * @since 1.19
+     */
+    public Boolean isOomKillDisable();
+
     public Device[] getDevices();
 
     public String[] getDns();
@@ -139,6 +159,26 @@ public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateCon
 
     public CreateContainerCmd withCpuShares(int cpuShares);
 
+    /**
+     * @since 1.19
+     */
+    public CreateContainerCmd withCpuPeriod(Integer cpuPeriod);
+
+    /**
+     * @since 1.19
+     */
+    public CreateContainerCmd withCpusetMems(String cpusetMems);
+
+    /**
+     * @since 1.19
+     */
+    public CreateContainerCmd withBlkioWeight(Integer blkioWeight);
+
+    /**
+     * @since 1.19
+     */
+    public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable);
+
     /**
      * Add host devices to the container
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/Filters.java b/src/main/java/com/github/dockerjava/api/model/Filters.java
@@ -83,8 +83,7 @@ public Filters withLabels(Map<String, String> labels) {
     private static List<String> labelsMapToList(Map<String, String> labels) {
         List<String> result = new ArrayList<String>();
         for (Entry<String, String> entry : labels.entrySet()) {
-            String rest = (entry.getValue() != null & !entry.getValue().isEmpty()) ? "=" + entry.getValue()
-                    : "";
+            String rest = (entry.getValue() != null & !entry.getValue().isEmpty()) ? "=" + entry.getValue() : "";
 
             String label = entry.getKey() + rest;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -55,6 +55,9 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("CpuShares")
     private int cpuShares = 0;
 
+    @JsonProperty("CpuPeriod")
+    private Integer cpuPeriod;
+
     @JsonProperty("Cpuset")
     private String cpuset;
 
@@ -112,6 +115,15 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("Labels")
     private Map<String, String> labels;
 
+    @JsonProperty("CpusetMems")
+    private String cpusetMems;
+
+    @JsonProperty("BlkioWeight")
+    private Integer blkioWeight;
+
+    @JsonProperty("OomKillDisable")
+    private Boolean oomKillDisable;
+
     public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
         super(exec);
         checkNotNull(image, "image was not specified");
@@ -160,6 +172,26 @@ public int getCpuShares() {
         return cpuShares;
     }
 
+    @Override
+    public Integer getCpuPeriod() {
+        return cpuPeriod;
+    }
+
+    @Override
+    public String getCpusetMems() {
+        return cpusetMems;
+    }
+
+    @Override
+    public Integer getBlkioWeight() {
+        return blkioWeight;
+    }
+
+    @Override
+    public Boolean isOomKillDisable() {
+        return oomKillDisable;
+    }
+
     @Override
     @JsonIgnore
     public Device[] getDevices() {
@@ -409,6 +441,30 @@ public CreateContainerCmdImpl withCpuShares(int cpuShares) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withCpuPeriod(Integer cpuPeriod) {
+        this.cpuPeriod = cpuPeriod;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withCpusetMems(String cpusetMems) {
+        this.cpusetMems = cpusetMems;
+        return null;
+    }
+
+    @Override
+    public CreateContainerCmd withBlkioWeight(Integer blkioWeight) {
+        this.blkioWeight = blkioWeight;
+        return null;
+    }
+
+    @Override
+    public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
+        this.oomKillDisable = oomKillDisable;
+        return null;
+    }
+
     @Override
     public CreateContainerCmd withDevices(Device... devices) {
         this.hostConfig.setDevices(devices);
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -148,12 +148,10 @@ public void testListContainersWithLabelsFilter() throws DockerException {
         assertThat(container2.getCommand(), not(isEmptyString()));
         assertThat(container2.getImage(), startsWith(testImage));
 
-
         Map<String, String> labels = ImmutableMap.of("test", "docker-java");
 
         // list with filter by label
-        dockerClient.createContainerCmd(testImage).withCmd("echo").withLabels(labels)
-                .exec();
+        dockerClient.createContainerCmd(testImage).withCmd("echo").withLabels(labels).exec();
         filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
                 .withFilters(new Filters().withLabels(labels)).exec();
         assertThat(filteredContainers.size(), is(equalTo(1)));
