Skip to content

Commit

Permalink
unmodifiable: Add stream collectors to Sets and Lists
Browse files Browse the repository at this point in the history 
Signed-off-by: BJ Hargrave <bj@hargrave.dev>
  • Loading branch information
@bjhargrave
bjhargrave committed Jul 19, 2022
1 parent f7aaf0d commit 038f0b8
Show file tree
Hide file tree
Showing 7 changed files with 78 additions and 24 deletions.
10 changes: 10 additions & 0 deletions biz.aQute.bnd.util/src/aQute/bnd/unmodifiable/Lists.java
View file
@@ -1,8 +1,11 @@
package aQute.bnd.unmodifiable;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.function.Supplier;
import java.util.stream.Collector;

@SuppressWarnings("unchecked")
public class Lists {
Expand Down Expand Up @@ -71,4 +74,11 @@ public static <E> List<E> copyOf(Collection<? extends E> collection) {
}
return new ImmutableList<E>(collection.toArray());
}

public static <E> Collector<E, ?, List<E>> toList() {
return Collector.of((Supplier<List<E>>) ArrayList::new, List::add, (l, r) -> {
l.addAll(r);
return l;
}, Lists::copyOf);
}
}
10 changes: 10 additions & 0 deletions biz.aQute.bnd.util/src/aQute/bnd/unmodifiable/Sets.java
View file
Expand Up @@ -2,7 +2,10 @@

import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.function.Supplier;
import java.util.stream.Collector;

@SuppressWarnings("unchecked")
public class Sets {
Expand Down Expand Up @@ -76,4 +79,11 @@ public static <E> Set<E> copyOf(Collection<? extends E> collection) {
.distinct()
.toArray());
}

public static <E> Collector<E, ?, Set<E>> toSet() {
return Collector.of((Supplier<Set<E>>) LinkedHashSet::new, Set::add, (l, r) -> {
l.addAll(r);
return l;
}, Sets::copyOf);
}
}
2 changes: 1 addition & 1 deletion biz.aQute.bnd.util/src/aQute/bnd/unmodifiable/package-info.java
View file
@@ -1,4 +1,4 @@
@Version("2.0.0")
@Version("2.1.0")
package aQute.bnd.unmodifiable;

import org.osgi.annotation.versioning.Version;
19 changes: 19 additions & 0 deletions biz.aQute.bnd.util/test/aQute/bnd/unmodifiable/ListsTest.java
View file
Expand Up @@ -550,4 +550,23 @@ public void spliterator() throws Exception {
Spliterator.SUBSIZED, Spliterator.NONNULL);
}

@Test
public void collector() {
List<String> source = new ArrayList<>();
source.add("e1");
source.add("e2");
source.add("e1");
List<String> list = source.stream()
.collect(Lists.toList());
source.set(0, "changed");
assertThat(list).hasSize(3)
.containsExactly("e1", "e2", "e1");
assertThat(list.stream()).hasSize(3)
.containsExactly("e1", "e2", "e1");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> list.add("a"));
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> list.remove("a"));
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> list.remove("e1"));
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> list.clear());
}

}
51 changes: 35 additions & 16 deletions biz.aQute.bnd.util/test/aQute/bnd/unmodifiable/SetsTest.java
View file
Expand Up @@ -40,7 +40,7 @@ public void zero() {
public void one() {
Set<String> set = Sets.of("e1");
assertThat(set).hasSize(1)
.containsExactlyInAnyOrder("e1");
.containsExactly("e1");
assertThat(set.stream()).hasSize(1)
.containsExactly("e1");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.add("a"));
Expand All @@ -53,7 +53,7 @@ public void one() {
public void two() {
Set<String> set = Sets.of("e1", "e2");
assertThat(set).hasSize(2)
.containsExactlyInAnyOrder("e1", "e2");
.containsExactly("e1", "e2");
assertThat(set.stream()).hasSize(2)
.containsExactly("e1", "e2");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.add("a"));
Expand All @@ -66,7 +66,7 @@ public void two() {
public void three() {
Set<String> set = Sets.of("e1", "e2", "e3");
assertThat(set).hasSize(3)
.containsExactlyInAnyOrder("e1", "e2", "e3");
.containsExactly("e1", "e2", "e3");
assertThat(set.stream()).hasSize(3)
.containsExactly("e1", "e2", "e3");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.add("a"));
Expand All @@ -79,7 +79,7 @@ public void three() {
public void four() {
Set<String> set = Sets.of("e1", "e2", "e3", "e4");
assertThat(set).hasSize(4)
.containsExactlyInAnyOrder("e1", "e2", "e3", "e4");
.containsExactly("e1", "e2", "e3", "e4");
assertThat(set.stream()).hasSize(4)
.containsExactly("e1", "e2", "e3", "e4");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.add("a"));
Expand All @@ -92,7 +92,7 @@ public void four() {
public void five() {
Set<String> set = Sets.of("e1", "e2", "e3", "e4", "e5");
assertThat(set).hasSize(5)
.containsExactlyInAnyOrder("e1", "e2", "e3", "e4", "e5");
.containsExactly("e1", "e2", "e3", "e4", "e5");
assertThat(set.stream()).hasSize(5)
.containsExactly("e1", "e2", "e3", "e4", "e5");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.add("a"));
Expand All @@ -105,7 +105,7 @@ public void five() {
public void six() {
Set<String> set = Sets.of("e1", "e2", "e3", "e4", "e5", "e6");
assertThat(set).hasSize(6)
.containsExactlyInAnyOrder("e1", "e2", "e3", "e4", "e5", "e6");
.containsExactly("e1", "e2", "e3", "e4", "e5", "e6");
assertThat(set.stream()).hasSize(6)
.containsExactly("e1", "e2", "e3", "e4", "e5", "e6");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.add("a"));
Expand All @@ -118,7 +118,7 @@ public void six() {
public void seven() {
Set<String> set = Sets.of("e1", "e2", "e3", "e4", "e5", "e6", "e7");
assertThat(set).hasSize(7)
.containsExactlyInAnyOrder("e1", "e2", "e3", "e4", "e5", "e6", "e7");
.containsExactly("e1", "e2", "e3", "e4", "e5", "e6", "e7");
assertThat(set.stream()).hasSize(7)
.containsExactly("e1", "e2", "e3", "e4", "e5", "e6", "e7");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.add("a"));
Expand All @@ -131,7 +131,7 @@ public void seven() {
public void eight() {
Set<String> set = Sets.of("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8");
assertThat(set).hasSize(8)
.containsExactlyInAnyOrder("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8");
.containsExactly("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8");
assertThat(set.stream()).hasSize(8)
.containsExactly("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.add("a"));
Expand All @@ -144,7 +144,7 @@ public void eight() {
public void nine() {
Set<String> set = Sets.of("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9");
assertThat(set).hasSize(9)
.containsExactlyInAnyOrder("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9");
.containsExactly("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9");
assertThat(set.stream()).hasSize(9)
.containsExactly("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.add("a"));
Expand All @@ -157,7 +157,7 @@ public void nine() {
public void ten() {
Set<String> set = Sets.of("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9", "e10");
assertThat(set).hasSize(10)
.containsExactlyInAnyOrder("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9", "e10");
.containsExactly("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9", "e10");
assertThat(set.stream()).hasSize(10)
.containsExactly("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9", "e10");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.add("a"));
Expand All @@ -174,7 +174,7 @@ public void entries() {
Set<String> set = Sets.of(entries);
entries[0] = "changed";
assertThat(set).hasSize(11)
.containsExactlyInAnyOrder("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9", "e10", "e11");
.containsExactly("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9", "e10", "e11");
assertThat(set.stream()).hasSize(11)
.containsExactly("e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9", "e10", "e11");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.add("a"));
Expand Down Expand Up @@ -209,7 +209,7 @@ public void copy() {
Set<String> set = Sets.copyOf(source);
source.set(0, "changed");
assertThat(set).hasSize(2)
.containsExactlyInAnyOrder("e1", "e2");
.containsExactly("e1", "e2");
assertThat(set.stream()).hasSize(2)
.containsExactly("e1", "e2");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.add("a"));
Expand All @@ -230,7 +230,7 @@ public void array() {
Set<String> source = Sets.of("e1", "e2", "e3", "e4", "e5");
Object[] array = source.toArray();
assertThat(array).hasSize(5)
.containsExactlyInAnyOrder("e1", "e2", "e3", "e4", "e5");
.containsExactly("e1", "e2", "e3", "e4", "e5");
}

@Test
Expand All @@ -240,12 +240,12 @@ public void array_string() {
String[] array = source.toArray(target);
assertThat(array).isNotSameAs(target)
.hasSize(5)
.containsExactlyInAnyOrder("e1", "e2", "e3", "e4", "e5");
.containsExactly("e1", "e2", "e3", "e4", "e5");

target = new String[source.size() + 1];
array = source.toArray(target);
assertThat(array).isSameAs(target)
.containsExactlyInAnyOrder("e1", "e2", "e3", "e4", "e5", null);
.containsExactly("e1", "e2", "e3", "e4", "e5", null);
assertThat(array[target.length - 1]).isNull();
}

Expand Down Expand Up @@ -295,7 +295,7 @@ public void hash_min_value() {

Set<String> set = Sets.of("e1", "polygenelubricants", "GydZG_", "DESIGNING WORKHOUSES", "e5");

assertThat(set).containsExactlyInAnyOrder("e5", "polygenelubricants", "GydZG_", "DESIGNING WORKHOUSES", "e1");
assertThat(set).containsExactly("e1", "polygenelubricants", "GydZG_", "DESIGNING WORKHOUSES", "e5");
}

@Test
Expand Down Expand Up @@ -393,4 +393,23 @@ public void iterator_empty() {
assertThat(holder.set).isFalse();
}

@Test
public void collector() {
List<String> source = new ArrayList<>();
source.add("e1");
source.add("e2");
source.add("e1");
Set<String> set = source.stream()
.collect(Sets.toSet());
source.set(0, "changed");
assertThat(set).hasSize(2)
.containsExactly("e1", "e2");
assertThat(set.stream()).hasSize(2)
.containsExactly("e1", "e2");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.add("a"));
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.remove("a"));
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.remove("e1"));
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> set.clear());
}

}
6 changes: 2 additions & 4 deletions biz.aQute.bndlib/src/aQute/bnd/osgi/resource/ResourceImpl.java
View file
@@ -1,9 +1,7 @@
package aQute.bnd.osgi.resource;

import static aQute.lib.collections.Logic.retain;
import static java.util.stream.Collectors.collectingAndThen;
import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.toList;

import java.io.InputStream;
import java.net.URI;
Expand Down Expand Up @@ -34,7 +32,7 @@ class ResourceImpl implements Resource, Comparable<Resource>, RepositoryContent
void setCapabilities(List<Capability> capabilities) {
allCapabilities = Lists.copyOf(capabilities);
capabilityMap = capabilities.stream()
.collect(groupingBy(Capability::getNamespace, collectingAndThen(toList(), Lists::copyOf)));
.collect(groupingBy(Capability::getNamespace, Lists.toList()));

locations = null; // clear so equals/hashCode can recompute
}
Expand All @@ -50,7 +48,7 @@ public List<Capability> getCapabilities(String namespace) {
void setRequirements(List<Requirement> requirements) {
allRequirements = Lists.copyOf(requirements);
requirementMap = requirements.stream()
.collect(groupingBy(Requirement::getNamespace, collectingAndThen(toList(), Lists::copyOf)));
.collect(groupingBy(Requirement::getNamespace, Lists.toList()));
}

@Override
Expand Down
4 changes: 1 addition & 3 deletions biz.aQute.repository/src/aQute/bnd/repository/maven/provider/MavenBndRepository.java
View file
@@ -1,8 +1,6 @@
package aQute.bnd.repository.maven.provider;

import static aQute.bnd.osgi.Constants.BSN_SOURCE_SUFFIX;
import static java.util.stream.Collectors.collectingAndThen;
import static java.util.stream.Collectors.toSet;

import java.io.Closeable;
import java.io.File;
Expand Down Expand Up @@ -594,7 +592,7 @@ synchronized boolean init() {
source = source.replaceAll("(\\s|,|;|\n|\r)+", "\n");
}
Set<String> multi = Strings.splitAsStream(configuration.multi())
.collect(collectingAndThen(toSet(), Sets::copyOf));
.collect(Sets.toSet());
this.index = new IndexFile(domain, reporter, indexFile, source, storage, client.promiseFactory(), multi);
this.index.open();

Expand Down

0 comments on commit 038f0b8

Please sign in to comment.