From 8f212ba60a83c5c9a85f08a4fc049bad2abd91e2 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Sat, 4 May 2024 07:27:29 -0700 Subject: [PATCH] Add missing `@since` tag for `merge` in `TreeRangeMap` and `ImmutableRangeMap`. RELNOTES=n/a PiperOrigin-RevId: 630655296 --- .../guava-tests/test/com/google/common/base/OptionalTest.java | 1 + guava/src/com/google/common/collect/ImmutableRangeMap.java | 1 + guava/src/com/google/common/collect/TreeRangeMap.java | 3 +++ 3 files changed, 5 insertions(+) diff --git a/android/guava-tests/test/com/google/common/base/OptionalTest.java b/android/guava-tests/test/com/google/common/base/OptionalTest.java index 0541d4d6ce50..5d94ab6126ab 100644 --- a/android/guava-tests/test/com/google/common/base/OptionalTest.java +++ b/android/guava-tests/test/com/google/common/base/OptionalTest.java @@ -40,6 +40,7 @@ @ElementTypesAreNonnullByDefault @GwtCompatible(emulated = true) public final class OptionalTest extends TestCase { + public void testAbsent() { Optional optionalName = Optional.absent(); assertFalse(optionalName.isPresent()); diff --git a/guava/src/com/google/common/collect/ImmutableRangeMap.java b/guava/src/com/google/common/collect/ImmutableRangeMap.java index 0d4d23976639..2ab707714eb6 100644 --- a/guava/src/com/google/common/collect/ImmutableRangeMap.java +++ b/guava/src/com/google/common/collect/ImmutableRangeMap.java @@ -294,6 +294,7 @@ public final void remove(Range range) { * * @throws UnsupportedOperationException always * @deprecated Unsupported operation. + * @since 28.1 */ @Deprecated @Override diff --git a/guava/src/com/google/common/collect/TreeRangeMap.java b/guava/src/com/google/common/collect/TreeRangeMap.java index a4c26cb6ae78..dbcb82ea2e55 100644 --- a/guava/src/com/google/common/collect/TreeRangeMap.java +++ b/guava/src/com/google/common/collect/TreeRangeMap.java @@ -264,6 +264,9 @@ private void split(Cut cut) { putRangeMapEntry(cut, rangeMapEntry.getUpperBound(), rangeMapEntry.getValue()); } + /** + * @since 28.1 + */ @Override public void merge( Range range,