Skip to content

Change OomScoreAdj type to Integer #911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dreambrother wants to merge 1 commit into from
Closed

Change OomScoreAdj type to Integer #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/com/github/dockerjava/api/model/HostConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public class HostConfig implements Serializable {
* @since {@link RemoteApiVersion#VERSION_1_22}
*/
@JsonProperty("OomScoreAdj")
private Boolean oomScoreAdj;
private Integer oomScoreAdj;

@JsonProperty("PortBindings")
private Ports portBindings;
Expand Down Expand Up @@ -345,7 +345,7 @@ public List<Object> getBlkioWeightDevice() {
* @see #oomScoreAdj
*/
@CheckForNull
public Boolean getOomScoreAdj() {
public Integer getOomScoreAdj() {
return oomScoreAdj;
}

Expand Down Expand Up @@ -692,7 +692,7 @@ public HostConfig withOomKillDisable(Boolean oomKillDisable) {
/**
* @see #oomScoreAdj
*/
public HostConfig withOomScoreAdj(Boolean oomScoreAdj) {
public HostConfig withOomScoreAdj(Integer oomScoreAdj) {
this.oomScoreAdj = oomScoreAdj;
return this;
}
Expand Down
17 changes: 17 additions & 0 deletions src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import static com.github.dockerjava.api.model.Capability.MKNOD;
import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
Expand Down Expand Up @@ -827,4 +828,20 @@ public void createContainerWithNetworkID() {
}
assertThat(containerNetwork, notNullValue());
}

@Test
public void createContainerWithOomScoreAdj() {
assumeThat("API version should be >= 1.22", dockerRule, isGreaterOrEqual(VERSION_1_22));

Integer oomScoreAdj = 100;
HostConfig hostConfig = new HostConfig().withOomScoreAdj(oomScoreAdj);
CreateContainerResponse createResponse = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
.withHostConfig(hostConfig)
.withCmd("true")
.exec();
String containerId = createResponse.getId();
InspectContainerResponse inspectResponse = dockerRule.getClient().inspectContainerCmd(containerId).exec();
Integer oomScoreAdjResult = inspectResponse.getHostConfig().getOomScoreAdj();
assertThat(oomScoreAdjResult, equalTo(oomScoreAdj));
}
}