Cleanup: prefer unmodifiable collections, and several toList stragglers

* Change collectors to use unmodifiable Set, Map, etc. where appropriate * Fix a few stragglers to use toList instead of collect(toList())
kiwiproject · Jun 3, 2024 · 3c52b9b · 3c52b9b
1 parent e4d91ae
commit 3c52b9b
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 25 deletions.
diff --git a/src/main/java/org/kiwiproject/beans/BeanConverter.java b/src/main/java/org/kiwiproject/beans/BeanConverter.java
@@ -3,7 +3,7 @@
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.isNull;
 import static java.util.function.Predicate.not;
-import static java.util.stream.Collectors.toSet;
+import static java.util.stream.Collectors.toUnmodifiableSet;
 
 import com.google.common.collect.Sets;
 import lombok.Getter;
@@ -106,7 +106,7 @@ protected Set<String> getPropertySet(T input, BeanWrapper inputWrapper) {
         // remove exclusions
         return propertyNames.stream()
                 .filter(not(prop -> exclusions.contains(prop)))
-                .collect(toSet());
+                .collect(toUnmodifiableSet());
     }
 
     @SuppressWarnings({"unchecked", "rawtypes"})
@@ -117,7 +117,7 @@ private static <T> Set<String> getPropertyNamesAsSet(T input, BeanWrapper inputW
 
         return Stream.of(inputWrapper.getPropertyDescriptors())
                 .map(PropertyDescriptor::getName)
-                .collect(toSet());
+                .collect(toUnmodifiableSet());
     }
 
     /**

diff --git a/src/main/java/org/kiwiproject/jaxrs/exception/JaxrsException.java b/src/main/java/org/kiwiproject/jaxrs/exception/JaxrsException.java
@@ -3,7 +3,7 @@
 import static com.google.common.base.Verify.verify;
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
-import static java.util.stream.Collectors.toSet;
+import static java.util.stream.Collectors.toUnmodifiableSet;
 import static org.kiwiproject.base.KiwiStrings.format;
 import static org.kiwiproject.collect.KiwiLists.first;
 import static org.kiwiproject.collect.KiwiLists.hasOneElement;
@@ -254,7 +254,7 @@ public int getRollUpStatus() {
         }
 
         verify(errors.size() > 1, "Expecting more than one error at this point");
-        var uniqueStatusCodes = errors.stream().map(ErrorMessage::getCode).collect(toSet());
+        var uniqueStatusCodes = errors.stream().map(ErrorMessage::getCode).collect(toUnmodifiableSet());
         if (KiwiSets.hasOneElement(uniqueStatusCodes)) {
             return uniqueStatusCodes.iterator().next();
         }

diff --git a/src/main/java/org/kiwiproject/retry/RetryResult.java b/src/main/java/org/kiwiproject/retry/RetryResult.java
@@ -2,7 +2,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.nonNull;
-import static java.util.stream.Collectors.toSet;
+import static java.util.stream.Collectors.toUnmodifiableSet;
 import static org.kiwiproject.collect.KiwiLists.isNullOrEmpty;
 import static org.kiwiproject.collect.KiwiLists.last;
 
@@ -172,6 +172,6 @@ public Optional<Exception> getLastErrorIfPresent() {
     public Set<String> getUniqueErrorTypes() {
         return errors.stream()
                 .map(e -> e.getClass().getName())
-                .collect(toSet());
+                .collect(toUnmodifiableSet());
     }
 }
diff --git a/src/main/java/org/kiwiproject/retry/SimpleRetries.java b/src/main/java/org/kiwiproject/retry/SimpleRetries.java
@@ -317,7 +317,7 @@ public static <T> RetryResult<T> tryGetObjectCollectingErrors(int maxAttempts,
      *
      * return StreamEx.of(resultStream)
      *     .takeWhileInclusive(result -> isNull(result.getLeft())
-     *     .collect(toList());
+     *     .toList();
      * </pre>
      */
     private static <T> List<Pair<T, Exception>> collectResults(int maxAttempts,

diff --git a/src/main/java/org/kiwiproject/spring/context/MongoRepositoryContext.java b/src/main/java/org/kiwiproject/spring/context/MongoRepositoryContext.java
@@ -1,6 +1,6 @@
 package org.kiwiproject.spring.context;
 
-import static java.util.stream.Collectors.toSet;
+import static java.util.stream.Collectors.toUnmodifiableSet;
 import static org.kiwiproject.spring.data.KiwiMongoConverters.addCustomConverters;
 import static org.kiwiproject.spring.data.KiwiMongoConverters.newBsonUndefinedToNullObjectConverter;
 
@@ -95,7 +95,7 @@ public void attachListeners(ApplicationListener<?>... listeners) {
         Set<String> registeredListenerClassNames = springContext.getApplicationListeners()
                 .stream()
                 .map(listener -> listener.getClass().getName())
-                .collect(toSet());
+                .collect(toUnmodifiableSet());
 
         Stream.of(listeners).forEach(listener -> {
             var listenerClassName = listener.getClass().getName();

diff --git a/src/main/java/org/kiwiproject/validation/KiwiConstraintViolations.java b/src/main/java/org/kiwiproject/validation/KiwiConstraintViolations.java
@@ -2,7 +2,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toUnmodifiableMap;
 import static org.kiwiproject.base.KiwiPreconditions.checkArgumentNotNull;
 import static org.kiwiproject.collect.KiwiSets.isNotNullOrEmpty;
 import static org.kiwiproject.collect.KiwiSets.isNullOrEmpty;
@@ -274,7 +274,7 @@ public static <T> Map<String, String> combineErrorMessagesIntoMap(Set<Constraint
         }
 
         return violations.stream()
-                .collect(toMap(
+                .collect(toUnmodifiableMap(
                         violation -> pathTransformer.apply(violation.getPropertyPath()),
                         ConstraintViolation::getMessage,
                         (accumulatedMessage, newErrorMessage) -> accumulatedMessage + ", " + newErrorMessage));

diff --git a/src/test/java/org/kiwiproject/ansible/vault/VaultConfigurationTest.java b/src/test/java/org/kiwiproject/ansible/vault/VaultConfigurationTest.java
@@ -1,6 +1,6 @@
 package org.kiwiproject.ansible.vault;
 
-import static java.util.stream.Collectors.toSet;
+import static java.util.stream.Collectors.toUnmodifiableSet;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
@@ -109,7 +109,7 @@ void shouldRequireProperties() {
             var invalidProperties = violations.stream()
                     .map(ConstraintViolation::getPropertyPath)
                     .map(Object::toString)
-                    .collect(toSet());
+                    .collect(toUnmodifiableSet());
 
             assertThat(invalidProperties).containsExactlyInAnyOrder(
                     "ansibleVaultPath",

diff --git a/src/test/java/org/kiwiproject/collect/KiwiCollectorsTest.java b/src/test/java/org/kiwiproject/collect/KiwiCollectorsTest.java
@@ -1,7 +1,6 @@
 package org.kiwiproject.collect;
 
 import static java.util.Map.entry;
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -49,7 +48,7 @@ void shouldCombineFromParallelStream() {
         }
 
         private void assertListContents(ImmutableList<Integer> list) {
-            var expectedList = firstFiftyEvenIntegers().collect(toList());
+            var expectedList = firstFiftyEvenIntegers().toList();
 
             assertThat(list).isEqualTo(expectedList);
         }

diff --git a/src/test/java/org/kiwiproject/collect/KiwiEvictingQueuesTest.java b/src/test/java/org/kiwiproject/collect/KiwiEvictingQueuesTest.java
@@ -1,6 +1,5 @@
 package org.kiwiproject.collect;
 
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.DisplayName;
@@ -30,7 +29,7 @@ void shouldEvictLeastRecentItems() {
             IntStream.rangeClosed(1, 150).forEach(queue::add);
 
             var queueItems = new ArrayList<>(queue);
-            var expectedItems = IntStream.rangeClosed(51, 150).boxed().collect(toList());
+            var expectedItems = IntStream.rangeClosed(51, 150).boxed().toList();
             assertThat(queueItems).containsExactlyElementsOf(expectedItems);
         }
     }

diff --git a/src/test/java/org/kiwiproject/collect/KiwiStreamsTest.java b/src/test/java/org/kiwiproject/collect/KiwiStreamsTest.java
@@ -1,6 +1,5 @@
 package org.kiwiproject.collect;
 
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
@@ -85,8 +84,8 @@ private Stream<? extends Number> newNumberStream() {
         return Stream.of(24, 42L, 64, 84.0, 96L, 256.0);
     }
 
-    private List<Number> newNumberList() {
-        return newNumberStream().collect(toList());
+    private List<? extends Number> newNumberList() {
+        return newNumberStream().toList();
     }
 
     @Value

diff --git a/src/test/java/org/kiwiproject/json/PropertyMaskingSafePropertyWriterTest.java b/src/test/java/org/kiwiproject/json/PropertyMaskingSafePropertyWriterTest.java
@@ -1,6 +1,6 @@
 package org.kiwiproject.json;
 
-import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toUnmodifiableList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.entry;
@@ -179,7 +179,7 @@ public List<BeanPropertyWriter> changeProperties(SerializationConfig config,
                 return beanProperties.stream()
                         .map(beanPropertyWriter ->
                                 new PropertyMaskingSafePropertyWriter(beanPropertyWriter, maskedFields))
-                        .collect(toList());
+                        .collect(toUnmodifiableList());
             }
         };
     }

diff --git a/src/test/java/org/kiwiproject/spring/context/MongoRepositoryContextTest.java b/src/test/java/org/kiwiproject/spring/context/MongoRepositoryContextTest.java
@@ -1,6 +1,6 @@
 package org.kiwiproject.spring.context;
 
-import static java.util.stream.Collectors.toSet;
+import static java.util.stream.Collectors.toUnmodifiableSet;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 
@@ -98,7 +98,7 @@ void shouldBeAbleToUseRepository() {
             var people = quoteDocRepository.findAll()
                     .stream()
                     .map(SampleQuoteDoc::getName)
-                    .collect(toSet());
+                    .collect(toUnmodifiableSet());
 
             assertThat(people).containsExactlyInAnyOrder("Adam Smith", "Blaise Pascal");
         }