Skip to content

Commit aa4a35f

Browse files
KostyaShaKostyaSha
committed
Unify utils. Remove deprecated class.
1 parent c552bb0 commit aa4a35f

22 files changed

+77
-163
lines changed

‎src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import com.github.dockerjava.core.InvocationBuilder;
1010
import com.github.dockerjava.core.MediaType;
1111
import com.github.dockerjava.core.WebTarget;
12-
import com.github.dockerjava.core.util.CacheFromEncoder;
1312
import org.slf4j.Logger;
1413
import org.slf4j.LoggerFactory;
1514

15+
import static com.github.dockerjava.core.util.JsonUtils.jsonEncode;
1616
import static org.apache.commons.lang.StringUtils.isNotBlank;
1717

1818
public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
@@ -59,7 +59,7 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
5959
}
6060

6161
if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) {
62-
webTarget = webTarget.queryParam("cachefrom", CacheFromEncoder.jsonEncode(command.getCacheFrom()));
62+
webTarget = webTarget.queryParam("cachefrom", jsonEncode(command.getCacheFrom()));
6363
}
6464

6565
if (command.getRemote() != null) {

‎src/main/java/com/github/dockerjava/core/exec/EventsCmdExec.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.github.dockerjava.api.command.EventsCmd;
99
import com.github.dockerjava.api.model.Event;
1010
import com.github.dockerjava.core.DockerClientConfig;
11-
import com.github.dockerjava.core.util.FiltersEncoder;
11+
import com.github.dockerjava.core.util.JsonUtils;
1212
import com.github.dockerjava.core.WebTarget;
1313

1414
public class EventsCmdExec extends AbstrAsyncDockerCmdExec<EventsCmd, Event> implements EventsCmd.Exec {
@@ -27,7 +27,7 @@ protected Void execute0(EventsCmd command, ResultCallback<Event> resultCallback)
2727

2828
if (command.getFilters() != null && !command.getFilters().isEmpty()) {
2929
webTarget = webTarget
30-
.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
30+
.queryParam("filters", JsonUtils.jsonEncode(command.getFilters()));
3131
}
3232

3333
LOGGER.trace("GET: {}", webTarget);

‎src/main/java/com/github/dockerjava/core/exec/ListContainersCmdExec.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.github.dockerjava.api.command.ListContainersCmd;
55
import com.github.dockerjava.api.model.Container;
66
import com.github.dockerjava.core.DockerClientConfig;
7-
import com.github.dockerjava.core.util.FiltersEncoder;
7+
import com.github.dockerjava.core.util.JsonUtils;
88
import com.github.dockerjava.core.MediaType;
99
import com.github.dockerjava.core.WebTarget;
1010
import org.slf4j.Logger;
@@ -35,7 +35,7 @@ protected List<Container> execute(ListContainersCmd command) {
3535

3636
if (command.getFilters() != null && !command.getFilters().isEmpty()) {
3737
webTarget = webTarget
38-
.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
38+
.queryParam("filters", JsonUtils.jsonEncode(command.getFilters()));
3939
}
4040

4141
LOGGER.trace("GET: {}", webTarget);

‎src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.github.dockerjava.api.command.ListImagesCmd;
1010
import com.github.dockerjava.api.model.Image;
1111
import com.github.dockerjava.core.DockerClientConfig;
12-
import com.github.dockerjava.core.util.FiltersEncoder;
12+
import com.github.dockerjava.core.util.JsonUtils;
1313
import com.github.dockerjava.core.MediaType;
1414
import com.github.dockerjava.core.WebTarget;
1515

@@ -28,7 +28,7 @@ protected List<Image> execute(ListImagesCmd command) {
2828
webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled());
2929

3030
if (command.getFilters() != null && !command.getFilters().isEmpty()) {
31-
webTarget = webTarget.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
31+
webTarget = webTarget.queryParam("filters", JsonUtils.jsonEncode(command.getFilters()));
3232
}
3333

3434
if (command.getImageNameFilter() != null) {

‎src/main/java/com/github/dockerjava/core/exec/ListNetworksCmdExec.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.github.dockerjava.api.command.ListNetworksCmd;
55
import com.github.dockerjava.api.model.Network;
66
import com.github.dockerjava.core.DockerClientConfig;
7-
import com.github.dockerjava.core.util.FiltersEncoder;
7+
import com.github.dockerjava.core.util.JsonUtils;
88
import com.github.dockerjava.core.MediaType;
99
import com.github.dockerjava.core.WebTarget;
1010

@@ -27,7 +27,7 @@ protected List<Network> execute(ListNetworksCmd command) {
2727
WebTarget webTarget = getBaseResource().path("/networks");
2828

2929
if (command.getFilters() != null && !command.getFilters().isEmpty()) {
30-
webTarget = webTarget.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
30+
webTarget = webTarget.queryParam("filters", JsonUtils.jsonEncode(command.getFilters()));
3131
}
3232

3333
LOGGER.trace("GET: {}", webTarget);

‎src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.github.dockerjava.api.command.ListServicesCmd;
55
import com.github.dockerjava.api.model.Service;
66
import com.github.dockerjava.core.DockerClientConfig;
7-
import com.github.dockerjava.core.util.FiltersEncoder;
7+
import com.github.dockerjava.core.util.JsonUtils;
88
import com.github.dockerjava.core.MediaType;
99
import com.github.dockerjava.core.WebTarget;
1010
import org.slf4j.Logger;
@@ -27,7 +27,7 @@ protected List<Service> execute(ListServicesCmd command) {
2727

2828
if (command.getFilters() != null && !command.getFilters().isEmpty()) {
2929
webTarget = webTarget
30-
.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
30+
.queryParam("filters", JsonUtils.jsonEncode(command.getFilters()));
3131
}
3232

3333
LOGGER.trace("GET: {}", webTarget);

‎src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.github.dockerjava.api.command.ListSwarmNodesCmd;
55
import com.github.dockerjava.api.model.SwarmNode;
66
import com.github.dockerjava.core.DockerClientConfig;
7-
import com.github.dockerjava.core.util.FiltersEncoder;
7+
import com.github.dockerjava.core.util.JsonUtils;
88
import com.github.dockerjava.core.MediaType;
99
import com.github.dockerjava.core.WebTarget;
1010
import org.slf4j.Logger;
@@ -28,7 +28,7 @@ protected List<SwarmNode> execute(ListSwarmNodesCmd command) {
2828

2929
if (command.getFilters() != null && !command.getFilters().isEmpty()) {
3030
webTarget = webTarget
31-
.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
31+
.queryParam("filters", JsonUtils.jsonEncode(command.getFilters()));
3232
}
3333

3434
LOGGER.trace("GET: {}", webTarget);

‎src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.github.dockerjava.api.command.ListTasksCmd;
55
import com.github.dockerjava.api.model.Task;
66
import com.github.dockerjava.core.DockerClientConfig;
7-
import com.github.dockerjava.core.util.FiltersEncoder;
7+
import com.github.dockerjava.core.util.JsonUtils;
88
import com.github.dockerjava.core.MediaType;
99
import com.github.dockerjava.core.WebTarget;
1010
import org.slf4j.Logger;
@@ -27,7 +27,7 @@ protected List<Task> execute(ListTasksCmd command) {
2727

2828
if (command.getFilters() != null && !command.getFilters().isEmpty()) {
2929
webTarget = webTarget
30-
.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
30+
.queryParam("filters", JsonUtils.jsonEncode(command.getFilters()));
3131
}
3232

3333
LOGGER.trace("GET: {}", webTarget);

‎src/main/java/com/github/dockerjava/core/exec/ListVolumesCmdExec.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.github.dockerjava.api.command.ListVolumesCmd;
88
import com.github.dockerjava.api.command.ListVolumesResponse;
99
import com.github.dockerjava.core.DockerClientConfig;
10-
import com.github.dockerjava.core.util.FiltersEncoder;
10+
import com.github.dockerjava.core.util.JsonUtils;
1111
import com.github.dockerjava.core.MediaType;
1212
import com.github.dockerjava.core.WebTarget;
1313

@@ -25,7 +25,7 @@ protected ListVolumesResponse execute(ListVolumesCmd command) {
2525
WebTarget webTarget = getBaseResource().path("/volumes");
2626

2727
if (command.getFilters() != null && !command.getFilters().isEmpty()) {
28-
webTarget = webTarget.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
28+
webTarget = webTarget.queryParam("filters", JsonUtils.jsonEncode(command.getFilters()));
2929
}
3030

3131
LOGGER.trace("GET: {}", webTarget);

‎src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)