Skip to content

not only filter out optional strings but also notted strings #1975

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

Open
DarioViva42 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

not only filter out optional strings but also notted strings #1975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions mockserver-core/src/main/java/org/mockserver/collections/ImmutableEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ public boolean isNotOptional() {
return !isOptional();
}

public boolean isNotNotted() {
return !isNotted();
}

@Override
public NottableString getLeft() {
return key;
Expand Down
7 changes: 5 additions & 2 deletions mockserver-core/src/main/java/org/mockserver/collections/SubSetMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@ static boolean containsSubset(MockServerLogger mockServerLogger, MatchDifference
}

if (result) {
long subsetNonOptionalSize = subset.stream().filter(ImmutableEntry::isNotOptional).count();
long subsetRequiredSize = subset.stream()
.filter(ImmutableEntry::isNotOptional)
.filter(ImmutableEntry::isNotNotted)
.count();
// this prevents multiple items in the subset from being matched by a single item in the superset
result = matchingIndexes.size() >= subsetNonOptionalSize;
result = matchingIndexes.size() >= subsetRequiredSize;
}
return result;
}
Expand Down