[COMMON] Use toList instead of Collectors.toUnmodifiableList (#1817)

opensource4you · Jun 17, 2023 · cdde1b0 · cdde1b0
1 parent b1c11a2
commit cdde1b0
Show file tree

Hide file tree

Showing 37 changed files with 94 additions and 190 deletions.
diff --git a/common/src/main/java/org/astraea/common/DataUnit.java b/common/src/main/java/org/astraea/common/DataUnit.java
@@ -20,7 +20,6 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * Utility related to data and unit, this class dedicated to easing the pain of converting and
@@ -131,5 +130,5 @@ public DataSize of(long measurement) {
       Arrays.stream(DataUnit.values())
           .filter(x -> x.candidateUnitForToString)
           .sorted(Comparator.comparing(x -> x.bits))
-          .collect(Collectors.toUnmodifiableList());
+          .toList();
 }
diff --git a/common/src/main/java/org/astraea/common/admin/Admin.java b/common/src/main/java/org/astraea/common/admin/Admin.java
@@ -80,7 +80,7 @@ default CompletionStage<Set<String>> topicNames(List<TopicChecker> checkers) {
                 FutureUtils.sequence(
                         checkers.stream()
                             .map(checker -> checker.test(this, topicNames).toCompletableFuture())
-                            .collect(Collectors.toUnmodifiableList()))
+                            .toList())
                     .thenApply(
                         all ->
                             all.stream()

diff --git a/common/src/main/java/org/astraea/common/admin/ClusterInfo.java b/common/src/main/java/org/astraea/common/admin/ClusterInfo.java
@@ -169,10 +169,7 @@ static Map<TopicPartition, Long> leaderSize(ClusterInfo clusterInfo) {
    * @return A list of {@link Replica}.
    */
   default List<Replica> replicaLeaders() {
-    return replicaStream()
-        .filter(Replica::isLeader)
-        .filter(Replica::isOnline)
-        .collect(Collectors.toUnmodifiableList());
+    return replicaStream().filter(Replica::isLeader).filter(Replica::isOnline).toList();
   }
 
   /**
@@ -182,10 +179,7 @@ default List<Replica> replicaLeaders() {
    * @return A list of {@link Replica}.
    */
   default List<Replica> replicaLeaders(String topic) {
-    return replicaStream(topic)
-        .filter(Replica::isLeader)
-        .filter(Replica::isOnline)
-        .collect(Collectors.toUnmodifiableList());
+    return replicaStream(topic).filter(Replica::isLeader).filter(Replica::isOnline).toList();
   }
 
   /**
@@ -195,10 +189,7 @@ default List<Replica> replicaLeaders(String topic) {
    * @return A list of {@link Replica}.
    */
   default List<Replica> replicaLeaders(int broker) {
-    return replicaStream(broker)
-        .filter(Replica::isLeader)
-        .filter(Replica::isOnline)
-        .collect(Collectors.toUnmodifiableList());
+    return replicaStream(broker).filter(Replica::isLeader).filter(Replica::isOnline).toList();
   }
 
   /**
@@ -207,10 +198,7 @@ default List<Replica> replicaLeaders(int broker) {
    * @return A list of {@link Replica}.
    */
   default List<Replica> replicaLeaders(BrokerTopic brokerTopic) {
-    return replicaStream(brokerTopic)
-        .filter(Replica::isLeader)
-        .filter(Replica::isOnline)
-        .collect(Collectors.toUnmodifiableList());
+    return replicaStream(brokerTopic).filter(Replica::isLeader).filter(Replica::isOnline).toList();
   }
 
   /**
@@ -235,7 +223,7 @@ default Optional<Replica> replicaLeader(TopicPartition topicPartition) {
    * @return A list of {@link Replica}.
    */
   default List<Replica> availableReplicas(String topic) {
-    return replicaStream(topic).filter(Replica::isOnline).collect(Collectors.toUnmodifiableList());
+    return replicaStream(topic).filter(Replica::isOnline).toList();
   }
 
   // ---------------------[for replicas]---------------------//
@@ -244,7 +232,7 @@ default List<Replica> availableReplicas(String topic) {
    * @return all replicas cached by this cluster info.
    */
   default List<Replica> replicas() {
-    return replicaStream().collect(Collectors.toUnmodifiableList());
+    return replicaStream().toList();
   }
 
   /**
@@ -254,7 +242,7 @@ default List<Replica> replicas() {
    * @return A list of {@link Replica}.
    */
   default List<Replica> replicas(String topic) {
-    return replicaStream(topic).collect(Collectors.toUnmodifiableList());
+    return replicaStream(topic).toList();
   }
 
   /**
@@ -265,15 +253,15 @@ default List<Replica> replicas(String topic) {
    * @return A list of {@link Replica}.
    */
   default List<Replica> replicas(TopicPartition topicPartition) {
-    return replicaStream(topicPartition).collect(Collectors.toUnmodifiableList());
+    return replicaStream(topicPartition).toList();
   }
 
   /**
    * @param replica to search
    * @return the replica matched to input replica
    */
   default List<Replica> replicas(TopicPartitionReplica replica) {
-    return replicaStream(replica).collect(Collectors.toUnmodifiableList());
+    return replicaStream(replica).toList();
   }
 
   // ---------------------[others]---------------------//

diff --git a/common/src/main/java/org/astraea/common/admin/TransactionState.java b/common/src/main/java/org/astraea/common/admin/TransactionState.java
@@ -18,7 +18,6 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.stream.Collectors;
 import org.astraea.common.EnumInfo;
 
 public enum TransactionState implements EnumInfo {
@@ -63,6 +62,6 @@ public static TransactionState of(String value) {
   }
 
   public static Collection<TransactionState> all() {
-    return Arrays.stream(TransactionState.values()).collect(Collectors.toUnmodifiableList());
+    return Arrays.stream(TransactionState.values()).toList();
   }
 }
diff --git a/common/src/main/java/org/astraea/common/assignor/SubscriptionInfo.java b/common/src/main/java/org/astraea/common/assignor/SubscriptionInfo.java
@@ -72,9 +72,7 @@ public static SubscriptionInfo from(ConsumerPartitionAssignor.Subscription subsc
     var ownPartitions =
         subscription.ownedPartitions() == null
             ? List.<TopicPartition>of()
-            : subscription.ownedPartitions().stream()
-                .map(TopicPartition::from)
-                .collect(Collectors.toUnmodifiableList());
+            : subscription.ownedPartitions().stream().map(TopicPartition::from).toList();
 
     var kafkaUserData = subscription.userData();
     // convert ByteBuffer into Map<String,String>

diff --git a/common/src/main/java/org/astraea/common/backup/RecordWriterBuilder.java b/common/src/main/java/org/astraea/common/backup/RecordWriterBuilder.java
@@ -24,7 +24,6 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.LongAdder;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 import java.util.zip.GZIPOutputStream;
 import org.astraea.common.ByteUtils;
 import org.astraea.common.DataSize;
@@ -70,7 +69,7 @@ public void append(Record<byte[], byte[]> record) {
                                                       ? ByteString.EMPTY
                                                       : ByteString.copyFrom(header.value()))
                                               .build())
-                                  .collect(Collectors.toUnmodifiableList()))
+                                  .toList())
                           .build()
                           .writeDelimitedTo(outputStream));
               count.incrementAndGet();

diff --git a/common/src/main/java/org/astraea/common/cost/NetworkCost.java b/common/src/main/java/org/astraea/common/cost/NetworkCost.java
@@ -92,7 +92,7 @@ void noMetricCheck(ClusterBean clusterBean) {
         clusterBean.all().entrySet().stream()
             .filter(e -> e.getValue().size() == 0)
             .map(Map.Entry::getKey)
-            .collect(Collectors.toUnmodifiableList());
+            .toList();
     if (!noMetricBrokers.isEmpty())
       throw new NoSufficientMetricsException(
           this,

diff --git a/common/src/main/java/org/astraea/common/cost/Normalizer.java b/common/src/main/java/org/astraea/common/cost/Normalizer.java
@@ -56,13 +56,10 @@ static Normalizer minMax(boolean positive) {
       double max = values.stream().max(comparator).orElse(0.0);
       double min = values.stream().min(comparator).orElse(0.0);
       // there is nothing to rescale, so we just all same values
-      if (max == min)
-        return IntStream.range(0, values.size())
-            .mapToObj(ignored -> 1.0)
-            .collect(Collectors.toUnmodifiableList());
+      if (max == min) return IntStream.range(0, values.size()).mapToObj(ignored -> 1.0).toList();
       return values.stream()
           .map(value -> (positive ? value - min : max - value) / (max - min))
-          .collect(Collectors.toUnmodifiableList());
+          .toList();
     };
   }
 
@@ -76,7 +73,7 @@ static Normalizer minMax(boolean positive) {
   static Normalizer proportion() {
     return values -> {
       var sum = values.stream().mapToDouble(i -> i).sum();
-      return values.stream().map(v -> v / sum).collect(Collectors.toUnmodifiableList());
+      return values.stream().map(v -> v / sum).toList();
     };
   }
 
@@ -105,7 +102,7 @@ static Normalizer TScore() {
                 }
                 return Math.round(score * 100) / 100.0;
               })
-          .collect(Collectors.toUnmodifiableList());
+          .toList();
     };
   }
 

diff --git a/common/src/main/java/org/astraea/common/metrics/JndiClient.java b/common/src/main/java/org/astraea/common/metrics/JndiClient.java
@@ -166,7 +166,7 @@ public Collection<BeanObject> beans(
                           return Stream.empty();
                         }
                       })
-                  .collect(Collectors.toUnmodifiableList()));
+                  .toList());
     }
 
     /**

diff --git a/common/src/main/java/org/astraea/common/metrics/client/admin/AdminMetrics.java b/common/src/main/java/org/astraea/common/metrics/client/admin/AdminMetrics.java
@@ -17,7 +17,6 @@
 package org.astraea.common.metrics.client.admin;
 
 import java.util.Collection;
-import java.util.stream.Collectors;
 import org.astraea.common.Utils;
 import org.astraea.common.metrics.BeanQuery;
 import org.astraea.common.metrics.MBeanClient;
@@ -51,14 +50,10 @@ public class AdminMetrics {
    * @return key is broker id, and value is associated to broker metrics recorded by all consumers
    */
   public static Collection<HasNodeMetrics> node(MBeanClient mBeanClient) {
-    return mBeanClient.beans(NODE_QUERY).stream()
-        .map(b -> (HasNodeMetrics) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+    return mBeanClient.beans(NODE_QUERY).stream().map(b -> (HasNodeMetrics) () -> b).toList();
   }
 
   public static Collection<HasSelectorMetrics> admin(MBeanClient mBeanClient) {
-    return mBeanClient.beans(ADMIN_QUERY).stream()
-        .map(b -> (HasSelectorMetrics) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+    return mBeanClient.beans(ADMIN_QUERY).stream().map(b -> (HasSelectorMetrics) () -> b).toList();
   }
 }
diff --git a/common/src/main/java/org/astraea/common/metrics/client/consumer/ConsumerMetrics.java b/common/src/main/java/org/astraea/common/metrics/client/consumer/ConsumerMetrics.java
@@ -77,26 +77,24 @@ public static List<AppInfo> appInfo(MBeanClient client) {
    * @return key is broker id, and value is associated to broker metrics recorded by all consumers
    */
   public static Collection<HasNodeMetrics> node(MBeanClient mBeanClient) {
-    return mBeanClient.beans(NODE_QUERY).stream()
-        .map(b -> (HasNodeMetrics) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+    return mBeanClient.beans(NODE_QUERY).stream().map(b -> (HasNodeMetrics) () -> b).toList();
   }
 
   public static Collection<HasConsumerCoordinatorMetrics> coordinator(MBeanClient mBeanClient) {
     return mBeanClient.beans(COORDINATOR_QUERY).stream()
         .map(b -> (HasConsumerCoordinatorMetrics) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   public static Collection<HasConsumerFetchMetrics> fetch(MBeanClient mBeanClient) {
     return mBeanClient.beans(FETCH_QUERY).stream()
         .map(b -> (HasConsumerFetchMetrics) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   public static Collection<HasConsumerMetrics> consumer(MBeanClient mBeanClient) {
     return mBeanClient.beans(CONSUMER_QUERY).stream()
         .map(b -> (HasConsumerMetrics) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 }
diff --git a/common/src/main/java/org/astraea/common/metrics/client/producer/ProducerMetrics.java b/common/src/main/java/org/astraea/common/metrics/client/producer/ProducerMetrics.java
@@ -73,9 +73,7 @@ public static List<AppInfo> appInfo(MBeanClient client) {
    * @return key is broker id, and value is associated to broker metrics recorded by all producers
    */
   public static Collection<HasNodeMetrics> node(MBeanClient mBeanClient) {
-    return mBeanClient.beans(NODE_QUERY).stream()
-        .map(b -> (HasNodeMetrics) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+    return mBeanClient.beans(NODE_QUERY).stream().map(b -> (HasNodeMetrics) () -> b).toList();
   }
 
   /**
@@ -87,13 +85,13 @@ public static Collection<HasNodeMetrics> node(MBeanClient mBeanClient) {
   public static Collection<HasProducerTopicMetrics> topic(MBeanClient mBeanClient) {
     return mBeanClient.beans(TOPIC_QUERY).stream()
         .map(b -> (HasProducerTopicMetrics) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   public static Collection<HasProducerMetrics> producer(MBeanClient mBeanClient) {
     return mBeanClient.beans(PRODUCER_QUERY).stream()
         .map(b -> (HasProducerMetrics) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   private ProducerMetrics() {}

diff --git a/common/src/main/java/org/astraea/common/metrics/collector/BeanObjectClient.java b/common/src/main/java/org/astraea/common/metrics/collector/BeanObjectClient.java
@@ -87,7 +87,7 @@ public Collection<BeanObject> beans(
                                     && e.getValue()
                                         .matcher(storedEntry.properties().get(e.getKey()))
                                         .matches()))
-            .collect(Collectors.toUnmodifiableList());
+            .toList();
       }
     };
   }

diff --git a/common/src/main/java/org/astraea/common/metrics/connector/ConnectorMetrics.java b/common/src/main/java/org/astraea/common/metrics/connector/ConnectorMetrics.java
@@ -120,25 +120,21 @@ public class ConnectorMetrics {
   public static List<SourceTaskInfo> sourceTaskInfo(MBeanClient client) {
     return client.beans(SOURCE_TASK_INFO_QUERY).stream()
         .map(b -> (SourceTaskInfo) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   public static List<SinkTaskInfo> sinkTaskInfo(MBeanClient client) {
-    return client.beans(SINK_TASK_INFO_QUERY).stream()
-        .map(b -> (SinkTaskInfo) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+    return client.beans(SINK_TASK_INFO_QUERY).stream().map(b -> (SinkTaskInfo) () -> b).toList();
   }
 
   public static List<TaskError> taskError(MBeanClient client) {
-    return client.beans(TASK_ERROR_QUERY).stream()
-        .map(b -> (TaskError) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+    return client.beans(TASK_ERROR_QUERY).stream().map(b -> (TaskError) () -> b).toList();
   }
 
   public static List<ConnectorTaskInfo> connectorTaskInfo(MBeanClient client) {
     return client.beans(CONNECTOR_TASK_INFO_QUERY).stream()
         .map(b -> (ConnectorTaskInfo) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   public static List<AppInfo> appInfo(MBeanClient client) {
@@ -150,42 +146,34 @@ public static List<AppInfo> appInfo(MBeanClient client) {
   public static List<ConnectCoordinatorInfo> coordinatorInfo(MBeanClient client) {
     return client.beans(COORDINATOR_INFO_QUERY).stream()
         .map(b -> (ConnectCoordinatorInfo) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   public static List<ConnectorInfo> connectorInfo(MBeanClient client) {
-    return client.beans(CONNECTOR_INFO_QUERY).stream()
-        .map(b -> (ConnectorInfo) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+    return client.beans(CONNECTOR_INFO_QUERY).stream().map(b -> (ConnectorInfo) () -> b).toList();
   }
 
   public static List<ConnectWorkerRebalanceInfo> workerRebalanceInfo(MBeanClient client) {
     return client.beans(WORKER_REBALANCE_INFO_QUERY).stream()
         .map(b -> (ConnectWorkerRebalanceInfo) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   public static List<HasNodeMetrics> nodeInfo(MBeanClient client) {
-    return client.beans(NODE_INFO_QUERY).stream()
-        .map(b -> (HasNodeMetrics) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+    return client.beans(NODE_INFO_QUERY).stream().map(b -> (HasNodeMetrics) () -> b).toList();
   }
 
   public static List<ConnectWorkerInfo> workerInfo(MBeanClient client) {
-    return client.beans(WORKER_INFO_QUERY).stream()
-        .map(b -> (ConnectWorkerInfo) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+    return client.beans(WORKER_INFO_QUERY).stream().map(b -> (ConnectWorkerInfo) () -> b).toList();
   }
 
   public static List<ConnectWorkerConnectorInfo> workerConnectorInfo(MBeanClient client) {
     return client.beans(WORKER_CONNECTOR_INFO_QUERY).stream()
         .map(b -> (ConnectWorkerConnectorInfo) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
   public static List<HasSelectorMetrics> connector(MBeanClient client) {
-    return client.beans(CONNECTOR_QUERY).stream()
-        .map(b -> (HasSelectorMetrics) () -> b)
-        .collect(Collectors.toUnmodifiableList());
+    return client.beans(CONNECTOR_QUERY).stream().map(b -> (HasSelectorMetrics) () -> b).toList();
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -166,7 +166,7 @@ public Collection<BeanObject> beans( @@
                               return Stream.empty();
                             }
                           })
-                      .collect(Collectors.toUnmodifiableList()));
+                      .toList());
         }
         /**
@@ Expand Down @@