Skip to content

Fix for duplicate key violation for exposed ports #1392

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
ctoestreich wants to merge 3 commits into from
Closed

Fix for duplicate key violation for exposed ports #1392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
faf6625
Fix for duplicate key violation for exposed ports #1391
May 14, 2020
24ff522
Merge branch 'master' into master
ctoestreich May 24, 2020
aaa9735
Merge branch 'master' into master
ctoestreich May 25, 2020
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
4 changes: 3 additions & 1 deletion docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ public static ExposedPorts fromPrimitive(Map<String, Object> object) {

@JsonValue
public Map<String, Object> toPrimitive() {
return Stream.of(exposedPorts).collect(Collectors.toMap(
return Stream.of(exposedPorts)
.distinct()

@bsideup bsideup May 24, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of distinct(), we can use a merge strategy (3rd argument of toMap) that does not throw, but uses the previously set value

.collect(Collectors.toMap(
ExposedPort::toString,
__ -> new Object()
));
Expand Down
17 changes: 17 additions & 0 deletions docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@
import org.junit.Test;

import java.util.List;
import java.util.Map;
import java.util.Map.Entry;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.aMapWithSize;
import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
import static org.hamcrest.Matchers.arrayWithSize;
import static org.hamcrest.Matchers.notNullValue;

public class ExposedPortsTest {
Expand Down Expand Up @@ -46,4 +49,18 @@ public void usesFromJson() throws Exception {
new ExposedPort(3868, InternetProtocol.SCTP)
));
}

@Test
public void usesFromJsonWithDuplicate() throws Exception {
ExposedPorts ports = new ExposedPorts(
new ExposedPort(80, InternetProtocol.UDP),
new ExposedPort(80),
new ExposedPort(80));

assertThat(ports, notNullValue());
assertThat(ports.getExposedPorts(), arrayWithSize(3));

Map<String, Object> map = ports.toPrimitive();
assertThat(map, aMapWithSize(2));
}
}