8000 Parse prefixed Capability values by Sigmonia · Pull Request #2418 · docker-java/docker-java · GitHub
[go: up one dir, main page]
Skip to content

Parse prefixed Capability values #2418

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

Merged
merged 5 commits into from
May 13, 2025
Merged

Parse prefixed Capability values #2418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0a39f0
Parse prefixed Capability values
Sigmonia Apr 4, 2025
ce2cdaf
Add a regression test
Sigmonia Apr 14, 2025
b0e6f8f
Move test case
Sigmonia Apr 14, 2025
a4068db
Apply suggestions from code review
eddumelendez May 13, 2025
8b40dc3
Merge branch 'main' into main
eddumelendez May 13, 2025
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
10 changes: 9 additions & 1 deletion docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.annotation.JsonCreator;

/**
* The Linux capabilities supported by Docker. The list of capabilities is defined in Docker's types.go, {@link #ALL} was added manually.
*
Expand Down Expand Up @@ -299,5 +301,11 @@ public enum Capability {
/**
* Trigger something that will wake up the system (set CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM timers).
*/
WAKE_ALARM
WAKE_ALARM;

@JsonCreator
public static Capability fromValue(String cap) {
String result = !cap.startsWith("CAP_") ? cap : cap.split("_", 2)[1];
return Capability.valueOf(result);
}
}
3 changes: 3 additions & 0 deletions docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ public void serializeCapability() throws Exception {
public void deserializeCapability() throws Exception {
Capability capability = JSONTestHelper.getMapper().readValue("\"ALL\"", Capability.class);
assertEquals(Capability.ALL, capability);

Capability compatibleCapability = JSONTestHelper.getMapper().readValue("\"CAP_ALL\"", Capability.class);
assertEquals(Capability.ALL, compatibleCapability);
}

@Test(expected = JsonMappingException.class)
Expand Down
0