Skip to content
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

Jump to bottom

Override ArrayTagSet::spliterator to return Spliterator with exact size #989

Merged
merged 1 commit into from Sep 12, 2022
Merged

Override ArrayTagSet::spliterator to return Spliterator with exact size #989

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions spectator-api/src/main/java/com/netflix/spectator/api/ArrayTagSet.java
View file
Open in desktop
Expand Up @@ -23,6 +23,8 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Spliterator;
import java.util.Spliterators;
import java.util.concurrent.ConcurrentMap;
import java.util.function.BiPredicate;
import java.util.function.Predicate;
Expand Down Expand Up @@ -482,4 +484,11 @@ private static int dedupInPlace(String[] data, int len) {
}
return builder.toString();
}

@Override
public Spliterator<Tag> spliterator() {
return Spliterators.spliterator(iterator(), size(),
(Spliterator.ORDERED | Spliterator.SORTED | Spliterator.NONNULL
| Spliterator.DISTINCT | Spliterator.IMMUTABLE));
}
}
13 changes: 13 additions & 0 deletions spectator-api/src/test/java/com/netflix/spectator/api/ArrayTagSetTest.java
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Spliterator;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;

Expand Down Expand Up @@ -573,4 +574,16 @@ public int size() {

Assertions.assertSame(tags, updated);
}

@Test
public void spliteratorSizeAndCharacteristics() {
ArrayTagSet tags = ArrayTagSet.create("k1", "v1", "k2", "v2", "k3", "v3");
Spliterator<Tag> spliterator = tags.spliterator();
Assertions.assertTrue(spliterator.hasCharacteristics(Spliterator.IMMUTABLE));
Assertions.assertTrue(spliterator.hasCharacteristics(Spliterator.ORDERED));
Assertions.assertTrue(spliterator.hasCharacteristics(Spliterator.SORTED));
Assertions.assertTrue(spliterator.hasCharacteristics(Spliterator.NONNULL));
Assertions.assertTrue(spliterator.hasCharacteristics(Spliterator.SIZED));
Assertions.assertEquals(3L, spliterator.getExactSizeIfKnown());
}
}