Skip to content

Fix: Second execution of a docker command in Netty implementation always fails #630

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
marcuslinke merged 2 commits into from
Jul 9, 2016
Merged

Fix: Second execution of a docker command in Netty implementation always fails #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69c33d9
Fix for #625
tejksat Jul 7, 2016
4fd6623
Checkstyle errors fixed
tejksat Jul 7, 2016
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
63 changes: 50 additions & 13 deletions src/main/java/com/github/dockerjava/netty/WebTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.apache.commons.lang.StringUtils;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;

/**
* This class is basically a replacement of javax.ws.rs.client.WebTarget to allow simpler migration of JAX-RS code to a netty based
* implementation.
Expand All @@ -16,32 +18,40 @@
*/
public class WebTarget {

private ChannelProvider channelProvider;
private final ChannelProvider channelProvider;

private List<String> path = new ArrayList<String>();
private final ImmutableList<String> path;

private Map<String, String> queryParams = new HashMap<String, String>();
private final ImmutableMap<String, String> queryParams;

private static final String PATH_SEPARATOR = "/";

public WebTarget(ChannelProvider channelProvider) {
this(channelProvider, ImmutableList.<String>of(), ImmutableMap.<String, String>of());
}

private WebTarget(ChannelProvider channelProvider,
ImmutableList<String> path,
ImmutableMap<String, String> queryParams) {
this.channelProvider = channelProvider;
this.path = path;
this.queryParams = queryParams;
}

public WebTarget path(String... components) {
ImmutableList.Builder<String> newPath = ImmutableList.<String>builder().addAll(this.path);

for (String component : components) {

path.addAll(Arrays.asList(StringUtils.split(component, PATH_SEPARATOR)));
newPath.addAll(Arrays.asList(StringUtils.split(component, PATH_SEPARATOR)));
}

return this;
return new WebTarget(channelProvider, newPath.build(), queryParams);
}

public InvocationBuilder request() {
String resource = PATH_SEPARATOR + StringUtils.join(path, PATH_SEPARATOR);

List<String> params = new ArrayList<String>();
List<String> params = new ArrayList<>();
for (Map.Entry<String, String> entry : queryParams.entrySet()) {
params.add(entry.getKey() + "=" + entry.getValue());
}
Expand All @@ -54,20 +64,47 @@ public InvocationBuilder request() {
}

public WebTarget resolveTemplate(String name, Object value) {
List<String> newPath = new ArrayList<String>();
ImmutableList.Builder<String> newPath = ImmutableList.builder();
for (String component : path) {
component = component.replaceAll("\\{" + name + "\\}", value.toString());
newPath.add(component);
}
path = newPath;
return this;
return new WebTarget(channelProvider, newPath.build(), queryParams);
}

public WebTarget queryParam(String name, Object value) {
ImmutableMap.Builder<String, String> builder = ImmutableMap.<String, String>builder().putAll(queryParams);
if (value != null) {
queryParams.put(name, value.toString());
builder.put(name, value.toString());
}
return this;
return new WebTarget(channelProvider, path, builder.build());
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}

WebTarget webTarget = (WebTarget) o;

if (channelProvider != null ? !channelProvider.equals(webTarget.channelProvider) : webTarget.channelProvider != null) {
return false;
}
if (path != null ? !path.equals(webTarget.path) : webTarget.path != null) {
return false;
}
return queryParams != null ? queryParams.equals(webTarget.queryParams) : webTarget.queryParams == null;
}

@Override
public int hashCode() {
int result = channelProvider != null ? channelProvider.hashCode() : 0;
result = 31 * result + (path != null ? path.hashCode() : 0);
result = 31 * result + (queryParams != null ? queryParams.hashCode() : 0);
return result;
}
}
39 changes: 39 additions & 0 deletions src/test/java/com/github/dockerjava/netty/WebTargetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.github.dockerjava.netty;

import static org.testng.Assert.assertEquals;

import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;

/**
* @author Alexander Koshevoy
*/
public class WebTargetTest {
@Mock private ChannelProvider channelProvider;

@BeforeMethod
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
}

@Test
public void verifyImmutability() throws Exception {
WebTarget emptyWebTarget = new WebTarget(channelProvider);

WebTarget initWebTarget = emptyWebTarget.path("/containers/{id}/attach").resolveTemplate("id", "d03da378b592")
.queryParam("logs", "true");

WebTarget anotherWebTarget = emptyWebTarget.path("/containers/{id}/attach")
.resolveTemplate("id", "2cfada4e3c07").queryParam("stdin", "true");

assertEquals(new WebTarget(channelProvider), emptyWebTarget);

assertEquals(new WebTarget(channelProvider).path("/containers/d03da378b592/attach")
.queryParam("logs", "true"), initWebTarget);

assertEquals(new WebTarget(channelProvider).path("/containers/2cfada4e3c07/attach")
.queryParam("stdin", "true"), anotherWebTarget);
}
}