-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Accept filters in list containers #262
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.
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
marcuslinke
merged 3 commits into
docker-java:master
from
carlossg:list-containers-filters
Jul 11, 2015
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
src/main/java/com/github/dockerjava/api/model/Filters.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package com.github.dockerjava.api.model; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import javax.ws.rs.core.MediaType; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonProcessingException; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; | ||
|
|
||
| /** | ||
| * Representation of Docker filters. | ||
| * | ||
| * @author Carlos Sanchez <[email protected]> | ||
| * | ||
| */ | ||
| public class Filters { | ||
|
|
||
| private static ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class, | ||
| MediaType.APPLICATION_JSON_TYPE); | ||
|
|
||
| private Map<String, List<String>> filters = new HashMap<String, List<String>>(); | ||
|
|
||
| public Filters() { | ||
| } | ||
|
|
||
| /** | ||
| * Constructor. | ||
| * | ||
| * @param image | ||
| * image to filter | ||
| * @param container | ||
| * container to filter | ||
| */ | ||
| public Filters(String image, String container) { | ||
| withImage(image); | ||
| withContainer(container); | ||
| } | ||
|
|
||
| public Filters withFilter(String key, String... value) { | ||
| filters.put(key, Arrays.asList(value)); | ||
| return this; | ||
| } | ||
|
|
||
| public List<String> getFilter(String key) { | ||
| return filters.get(key); | ||
| } | ||
|
|
||
| public Filters withImage(String... image) { | ||
| filters.put("image", Arrays.asList(image)); | ||
| return this; | ||
| } | ||
|
|
||
| public List<String> getImage() { | ||
| return getFilter("image"); | ||
| } | ||
|
|
||
| public Filters withContainer(String... container) { | ||
| filters.put("container", Arrays.asList(container)); | ||
| return this; | ||
| } | ||
|
|
||
| public List<String> getContainer() { | ||
| return getFilter("container"); | ||
| } | ||
|
|
||
| /** | ||
| * Filter by labels | ||
| * | ||
| * @param labels | ||
| * string array in the form ["key"] or ["key=value"] or a mix of both | ||
| * @return | ||
| */ | ||
| public Filters withLabel(String... labels) { | ||
| filters.put("label", Arrays.asList(labels)); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| try { | ||
| return OBJECT_MAPPER.writeValueAsString(filters); | ||
| } catch (JsonProcessingException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This specific test doesn't work in my local test env (docker api 1.18). The is no filtering when passing label filter without 'label' keyword.