[COMMON] apply Configuration#EMPTY to code base (opensource4you#1797)

garyparrot · May 31, 2023 · a556180 · a556180
1 parent 0118432
commit a556180
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 14 deletions.
diff --git a/common/src/main/java/org/astraea/common/cost/RecordSizeCost.java b/common/src/main/java/org/astraea/common/cost/RecordSizeCost.java
@@ -18,7 +18,6 @@
 
 import static org.astraea.common.cost.CostUtils.changedRecordSizeOverflow;
 
-import java.util.Map;
 import java.util.stream.Collectors;
 import org.astraea.common.Configuration;
 import org.astraea.common.DataSize;
@@ -33,7 +32,7 @@ public class RecordSizeCost
   public static final String MAX_MIGRATE_SIZE_KEY = "max.migrated.size";
 
   public RecordSizeCost() {
-    this.config = new Configuration(Map.of());
+    this.config = Configuration.EMPTY;
   }
 
   public RecordSizeCost(Configuration config) {

diff --git a/common/src/main/java/org/astraea/common/cost/ReplicaLeaderCost.java b/common/src/main/java/org/astraea/common/cost/ReplicaLeaderCost.java
@@ -34,7 +34,7 @@ public class ReplicaLeaderCost implements HasBrokerCost, HasClusterCost, HasMove
   public static final String MAX_MIGRATE_LEADER_KEY = "max.migrated.leader.number";
 
   public ReplicaLeaderCost() {
-    this.config = new Configuration(Map.of());
+    this.config = Configuration.EMPTY;
   }
 
   public ReplicaLeaderCost(Configuration config) {

diff --git a/common/src/main/java/org/astraea/common/cost/ReplicaLeaderSizeCost.java b/common/src/main/java/org/astraea/common/cost/ReplicaLeaderSizeCost.java
@@ -18,7 +18,6 @@
 
 import static org.astraea.common.cost.CostUtils.changedRecordSizeOverflow;
 
-import java.util.Map;
 import java.util.stream.Collectors;
 import org.astraea.common.Configuration;
 import org.astraea.common.DataSize;
@@ -39,7 +38,7 @@ public class ReplicaLeaderSizeCost
   public static final String MOVED_LEADER_SIZE = "moved leader size (bytes)";
 
   public ReplicaLeaderSizeCost() {
-    this.config = new Configuration(Map.of());
+    this.config = Configuration.EMPTY;
   }
 
   public ReplicaLeaderSizeCost(Configuration config) {

diff --git a/common/src/main/java/org/astraea/common/cost/ReplicaNumberCost.java b/common/src/main/java/org/astraea/common/cost/ReplicaNumberCost.java
@@ -18,7 +18,6 @@
 
 import static org.astraea.common.cost.MigrationCost.replicaNumChanged;
 
-import java.util.Map;
 import java.util.stream.Collectors;
 import org.astraea.common.Configuration;
 import org.astraea.common.admin.Broker;
@@ -32,7 +31,7 @@ public class ReplicaNumberCost implements HasClusterCost, HasMoveCost {
   private final Configuration config;
 
   public ReplicaNumberCost() {
-    this.config = new Configuration(Map.of());
+    this.config = Configuration.EMPTY;
   }
 
   public ReplicaNumberCost(Configuration config) {

diff --git a/common/src/test/java/org/astraea/common/UtilsTest.java b/common/src/test/java/org/astraea/common/UtilsTest.java
@@ -206,7 +206,7 @@ public int value() {
   @ParameterizedTest
   @ValueSource(classes = {TestCostFunction.class, TestConfigCostFunction.class})
   void testConstruct(Class<? extends CostFunction> aClass) {
-    var config = new Configuration(Map.of());
+    var config = Configuration.EMPTY;
 
     var costFunction = Utils.construct(aClass, config);
     Assertions.assertInstanceOf(CostFunction.class, costFunction);
@@ -226,7 +226,7 @@ void testConstruct(Class<? extends CostFunction> aClass) {
   void testConstructException() {
     // arrange
     var aClass = TestBadCostFunction.class;
-    var config = new Configuration(Map.of());
+    var config = Configuration.EMPTY;
 
     // act, assert
     Assertions.assertThrows(RuntimeException.class, () -> Utils.construct(aClass, config));

diff --git a/common/src/test/java/org/astraea/common/balancer/algorithms/GreedyBalancerTest.java b/common/src/test/java/org/astraea/common/balancer/algorithms/GreedyBalancerTest.java
@@ -58,7 +58,7 @@ void testConfig() {
 
   @Test
   void testJmx() {
-    var cost = new DecreasingCost(new Configuration(Map.of()));
+    var cost = new DecreasingCost(Configuration.EMPTY);
     var id = "TestJmx-" + UUID.randomUUID();
     var clusterInfo = FakeClusterInfo.of(5, 5, 5, 2);
     var balancer =

diff --git a/common/src/test/java/org/astraea/common/partitioner/StrictCostPartitionerTest.java b/common/src/test/java/org/astraea/common/partitioner/StrictCostPartitionerTest.java
@@ -49,7 +49,7 @@ public class StrictCostPartitionerTest {
   @Test
   void testJmxPort() {
     try (var partitioner = new StrictCostPartitioner()) {
-      partitioner.configure(new Configuration(Map.of()));
+      partitioner.configure(Configuration.EMPTY);
       Assertions.assertThrows(
           NoSuchElementException.class, () -> partitioner.jmxPortGetter.apply(0));
       partitioner.configure(new Configuration(Map.of(StrictCostPartitioner.JMX_PORT, "12345")));
@@ -208,7 +208,7 @@ void testReturnedPartition() {
   @Test
   void testDefaultFunction() {
     try (var partitioner = new StrictCostPartitioner()) {
-      partitioner.configure(new Configuration(Map.of()));
+      partitioner.configure(Configuration.EMPTY);
       Assertions.assertNotEquals(HasBrokerCost.EMPTY, partitioner.costFunction);
       Utils.waitFor(() -> partitioner.metricStore.sensors().size() == 1);
     }

diff --git a/connector/src/test/java/org/astraea/connector/ConnectorTest.java b/connector/src/test/java/org/astraea/connector/ConnectorTest.java
@@ -126,7 +126,7 @@ protected Class<? extends SourceTask> task() {
     @Override
     protected List<Configuration> takeConfiguration(int maxTasks) {
       return IntStream.range(0, maxTasks)
-          .mapToObj(i -> new Configuration(Map.of()))
+          .mapToObj(i -> Configuration.EMPTY)
           .collect(Collectors.toList());
     }
 
@@ -166,7 +166,7 @@ protected Class<? extends SinkTask> task() {
     @Override
     protected List<Configuration> takeConfiguration(int maxTasks) {
       return IntStream.range(0, maxTasks)
-          .mapToObj(i -> new Configuration(Map.of()))
+          .mapToObj(i -> Configuration.EMPTY)
           .collect(Collectors.toList());
     }