Skip to content

Commit f6e9e84

Browse files
rishabhdaimRishabh Kumar
andauthored
OAK-11751 : removed usage of Guava's Sets (#2324)
Co-authored-by: Rishabh Kumar <diam@adobe.com>
1 parent 4485148 commit f6e9e84

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
import org.apache.jackrabbit.oak.spi.state.NodeState;
3434
import org.jetbrains.annotations.NotNull;
3535

36-
import org.apache.jackrabbit.guava.common.collect.Sets;
37-
3836
/**
3937
* The {@code RepMembersConflictHandler} takes care of merging the {@code rep:members} property
4038
* during parallel updates.
@@ -162,13 +160,13 @@ private static void mergeChange(@NotNull NodeBuilder parent, @NotNull PropertySt
162160
Set<String> ourMembers = Collections.unmodifiableSet(SetUtils.toLinkedSet(ours.getValue(Type.STRINGS)));
163161

164162
// merge ours and theirs to a de-duplicated set
165-
Set<String> combined = new LinkedHashSet<>(Sets.intersection(ourMembers, theirMembers));
166-
for (String m : Sets.difference(ourMembers, theirMembers)) {
163+
Set<String> combined = new LinkedHashSet<>(SetUtils.intersection(ourMembers, theirMembers));
164+
for (String m : SetUtils.difference(ourMembers, theirMembers)) {
167165
if (!base.contains(m)) {
168166
combined.add(m);
169167
}
170168
}
171-
for (String m : Sets.difference(theirMembers, ourMembers)) {
169+
for (String m : SetUtils.difference(theirMembers, ourMembers)) {
172170
if (!base.contains(m)) {
173171
combined.add(m);
174172
}

0 commit comments

Comments
 (0)