Skip to content

OAK-11751 : removed usage of Guava's Sets #2324

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
rishabhdaim merged 1 commit into from
Jun 6, 2025
Merged

OAK-11751 : removed usage of Guava's Sets #2324

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
8 changes: 3 additions & 5 deletions ...core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;

import org.apache.jackrabbit.guava.common.collect.Sets;

/**
* The {@code RepMembersConflictHandler} takes care of merging the {@code rep:members} property
* during parallel updates.
Expand Down Expand Up @@ -162,13 +160,13 @@ private static void mergeChange(@NotNull NodeBuilder parent, @NotNull PropertySt
Set<String> ourMembers = Collections.unmodifiableSet(SetUtils.toLinkedSet(ours.getValue(Type.STRINGS)));

// merge ours and theirs to a de-duplicated set
Set<String> combined = new LinkedHashSet<>(Sets.intersection(ourMembers, theirMembers));
for (String m : Sets.difference(ourMembers, theirMembers)) {
Set<String> combined = new LinkedHashSet<>(SetUtils.intersection(ourMembers, theirMembers));
for (String m : SetUtils.difference(ourMembers, theirMembers)) {
if (!base.contains(m)) {
combined.add(m);
}
}
for (String m : Sets.difference(theirMembers, ourMembers)) {
for (String m : SetUtils.difference(theirMembers, ourMembers)) {
if (!base.contains(m)) {
combined.add(m);
}
Expand Down
Loading