Skip to content

Commit 486b783

Browse files
author
Rishabh Kumar
committed
OAK-11348 : removed usage of Guava's MapS.unmodifiableNavigableMap
1 parent 0c77da0 commit 486b783

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
import org.jetbrains.annotations.NotNull;
3030
import org.jetbrains.annotations.Nullable;
3131

32-
import org.apache.jackrabbit.guava.common.collect.Maps;
33-
3432
/**
3533
* A document corresponds to a node stored in the DocumentNodeStore. A document
3634
* contains all the revisions of a node stored in the {@link DocumentStore}.
@@ -210,7 +208,7 @@ public int getMemory() {
210208
}
211209
}
212210
if (map instanceof NavigableMap) {
213-
return Maps.unmodifiableNavigableMap((NavigableMap<Object, Object>) map);
211+
return Collections.unmodifiableNavigableMap((NavigableMap<Object, Object>) map);
214212
} else {
215213
return Collections.unmodifiableMap(map);
216214
}

oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
import org.apache.jackrabbit.guava.common.cache.Cache;
5656
import org.apache.jackrabbit.guava.common.collect.AbstractIterator;
5757
import org.apache.jackrabbit.guava.common.collect.Iterables;
58-
import org.apache.jackrabbit.guava.common.collect.Maps;
5958
import org.apache.jackrabbit.guava.common.collect.Ordering;
6059
import org.apache.jackrabbit.oak.api.PropertyState;
6160
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -144,8 +143,7 @@ public final class NodeDocument extends Document {
144143
*/
145144
static final int MODIFIED_IN_SECS_RESOLUTION = 5;
146145

147-
private static final NavigableMap<Revision, Range> EMPTY_RANGE_MAP =
148-
Maps.unmodifiableNavigableMap(new TreeMap<Revision, Range>(REVERSE));
146+
private static final NavigableMap<Revision, Range> EMPTY_RANGE_MAP = Collections.unmodifiableNavigableMap(new TreeMap<>(REVERSE));
149147

150148
/**
151149
* The list of revision to root commit depth mappings to find out if a
@@ -1360,7 +1358,7 @@ private NavigableMap<Revision, Range> createPreviousRanges(boolean includeStale)
13601358
}
13611359
transformed.put(r.high, r);
13621360
}
1363-
ranges = Maps.unmodifiableNavigableMap(transformed);
1361+
ranges = Collections.unmodifiableNavigableMap(transformed);
13641362
}
13651363
return ranges;
13661364
}

0 commit comments

Comments
 (0)