diff --git a/app/src/main/java/org/astraea/app/scenario/ScenarioMain.java b/app/src/main/java/org/astraea/app/scenario/ScenarioMain.java index 6801716ce0..3f69f9c992 100644 --- a/app/src/main/java/org/astraea/app/scenario/ScenarioMain.java +++ b/app/src/main/java/org/astraea/app/scenario/ScenarioMain.java @@ -19,10 +19,10 @@ import com.beust.jcommander.Parameter; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import org.astraea.common.Configuration; import org.astraea.common.Utils; import org.astraea.common.admin.Admin; import org.astraea.common.argument.Argument; -import org.astraea.common.cost.Configuration; import org.astraea.common.scenario.Scenario; public class ScenarioMain extends Argument { diff --git a/app/src/main/java/org/astraea/app/web/BalancerHandler.java b/app/src/main/java/org/astraea/app/web/BalancerHandler.java index 2b8332fd57..1320f07eb4 100644 --- a/app/src/main/java/org/astraea/app/web/BalancerHandler.java +++ b/app/src/main/java/org/astraea/app/web/BalancerHandler.java @@ -36,6 +36,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.astraea.common.Configuration; import org.astraea.common.DataSize; import org.astraea.common.FutureUtils; import org.astraea.common.Utils; @@ -51,7 +52,6 @@ import org.astraea.common.balancer.algorithms.GreedyBalancer; import org.astraea.common.balancer.executor.RebalancePlanExecutor; import org.astraea.common.balancer.executor.StraightPlanExecutor; -import org.astraea.common.cost.Configuration; import org.astraea.common.cost.HasClusterCost; import org.astraea.common.cost.HasMoveCost; import org.astraea.common.cost.MoveCost; diff --git a/app/src/test/java/org/astraea/app/web/BalancerHandlerTest.java b/app/src/test/java/org/astraea/app/web/BalancerHandlerTest.java index 4d6ba369e2..8e700cc689 100644 --- a/app/src/test/java/org/astraea/app/web/BalancerHandlerTest.java +++ b/app/src/test/java/org/astraea/app/web/BalancerHandlerTest.java @@ -38,6 +38,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.IntStream; +import org.astraea.common.Configuration; import org.astraea.common.DataSize; import org.astraea.common.Utils; import org.astraea.common.admin.Admin; @@ -53,7 +54,6 @@ import org.astraea.common.balancer.executor.StraightPlanExecutor; import org.astraea.common.balancer.log.ClusterLogAllocation; import org.astraea.common.cost.ClusterCost; -import org.astraea.common.cost.Configuration; import org.astraea.common.cost.HasClusterCost; import org.astraea.common.cost.HasMoveCost; import org.astraea.common.cost.MoveCost; diff --git a/common/src/main/java/org/astraea/common/cost/Configuration.java b/common/src/main/java/org/astraea/common/Configuration.java similarity index 99% rename from common/src/main/java/org/astraea/common/cost/Configuration.java rename to common/src/main/java/org/astraea/common/Configuration.java index eedebbe81c..9fc2b136ff 100644 --- a/common/src/main/java/org/astraea/common/cost/Configuration.java +++ b/common/src/main/java/org/astraea/common/Configuration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.astraea.common.cost; +package org.astraea.common; import java.util.Arrays; import java.util.Collections; diff --git a/common/src/main/java/org/astraea/common/Utils.java b/common/src/main/java/org/astraea/common/Utils.java index cf94fc72f5..f5c30d12ea 100644 --- a/common/src/main/java/org/astraea/common/Utils.java +++ b/common/src/main/java/org/astraea/common/Utils.java @@ -30,7 +30,6 @@ import java.util.function.Supplier; import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.astraea.common.cost.Configuration; public final class Utils { diff --git a/common/src/main/java/org/astraea/common/balancer/algorithms/AlgorithmConfig.java b/common/src/main/java/org/astraea/common/balancer/algorithms/AlgorithmConfig.java index bdaa37345a..d25f045033 100644 --- a/common/src/main/java/org/astraea/common/balancer/algorithms/AlgorithmConfig.java +++ b/common/src/main/java/org/astraea/common/balancer/algorithms/AlgorithmConfig.java @@ -25,10 +25,10 @@ import java.util.function.BiPredicate; import java.util.function.Predicate; import java.util.function.Supplier; +import org.astraea.common.Configuration; import org.astraea.common.admin.ClusterBean; import org.astraea.common.balancer.Balancer; import org.astraea.common.cost.ClusterCost; -import org.astraea.common.cost.Configuration; import org.astraea.common.cost.HasClusterCost; import org.astraea.common.cost.HasMoveCost; import org.astraea.common.cost.MoveCost; diff --git a/common/src/main/java/org/astraea/common/cost/CostFunction.java b/common/src/main/java/org/astraea/common/cost/CostFunction.java index 1ebac97bb8..06d2f1bd91 100644 --- a/common/src/main/java/org/astraea/common/cost/CostFunction.java +++ b/common/src/main/java/org/astraea/common/cost/CostFunction.java @@ -17,6 +17,7 @@ package org.astraea.common.cost; import java.util.Optional; +import org.astraea.common.Configuration; import org.astraea.common.metrics.collector.Fetcher; /** diff --git a/common/src/main/java/org/astraea/common/partitioner/Dispatcher.java b/common/src/main/java/org/astraea/common/partitioner/Dispatcher.java index b3b99c6751..6c60f9bf34 100644 --- a/common/src/main/java/org/astraea/common/partitioner/Dispatcher.java +++ b/common/src/main/java/org/astraea/common/partitioner/Dispatcher.java @@ -22,10 +22,10 @@ import org.apache.kafka.clients.producer.Partitioner; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.common.Cluster; +import org.astraea.common.Configuration; import org.astraea.common.Utils; import org.astraea.common.admin.ClusterInfo; import org.astraea.common.admin.ReplicaInfo; -import org.astraea.common.cost.Configuration; public interface Dispatcher extends Partitioner { /** diff --git a/common/src/main/java/org/astraea/common/partitioner/PartitionerUtils.java b/common/src/main/java/org/astraea/common/partitioner/PartitionerUtils.java index 235fa88ff8..2155eba9b3 100644 --- a/common/src/main/java/org/astraea/common/partitioner/PartitionerUtils.java +++ b/common/src/main/java/org/astraea/common/partitioner/PartitionerUtils.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Properties; import java.util.stream.Collectors; -import org.astraea.common.cost.Configuration; +import org.astraea.common.Configuration; /** do poisson for node's load situation */ public class PartitionerUtils { diff --git a/common/src/main/java/org/astraea/common/partitioner/StrictCostDispatcher.java b/common/src/main/java/org/astraea/common/partitioner/StrictCostDispatcher.java index 4dc2a0e49c..8edc8a9f49 100644 --- a/common/src/main/java/org/astraea/common/partitioner/StrictCostDispatcher.java +++ b/common/src/main/java/org/astraea/common/partitioner/StrictCostDispatcher.java @@ -25,13 +25,13 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.IntStream; +import org.astraea.common.Configuration; import org.astraea.common.Utils; import org.astraea.common.admin.ClusterInfo; import org.astraea.common.admin.NodeInfo; import org.astraea.common.admin.ReplicaInfo; import org.astraea.common.argument.DurationField; import org.astraea.common.cost.BrokerCost; -import org.astraea.common.cost.Configuration; import org.astraea.common.cost.HasBrokerCost; import org.astraea.common.cost.NodeLatencyCost; import org.astraea.common.metrics.collector.MetricCollector; diff --git a/common/src/main/java/org/astraea/common/partitioner/smooth/SmoothWeightRoundRobinDispatcher.java b/common/src/main/java/org/astraea/common/partitioner/smooth/SmoothWeightRoundRobinDispatcher.java index 3cb45af42f..69edfe5f28 100644 --- a/common/src/main/java/org/astraea/common/partitioner/smooth/SmoothWeightRoundRobinDispatcher.java +++ b/common/src/main/java/org/astraea/common/partitioner/smooth/SmoothWeightRoundRobinDispatcher.java @@ -31,13 +31,13 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import org.apache.kafka.common.Cluster; +import org.astraea.common.Configuration; import org.astraea.common.Lazy; import org.astraea.common.Utils; import org.astraea.common.admin.ClusterBean; import org.astraea.common.admin.ClusterInfo; import org.astraea.common.admin.NodeInfo; import org.astraea.common.admin.ReplicaInfo; -import org.astraea.common.cost.Configuration; import org.astraea.common.cost.NeutralIntegratedCost; import org.astraea.common.metrics.collector.MetricCollector; import org.astraea.common.partitioner.Dispatcher; diff --git a/common/src/test/java/org/astraea/common/UtilsTest.java b/common/src/test/java/org/astraea/common/UtilsTest.java index 36267e2933..a1ca19dde5 100644 --- a/common/src/test/java/org/astraea/common/UtilsTest.java +++ b/common/src/test/java/org/astraea/common/UtilsTest.java @@ -24,7 +24,6 @@ import java.util.concurrent.ExecutionException; import java.util.stream.IntStream; import java.util.stream.Stream; -import org.astraea.common.cost.Configuration; import org.astraea.common.cost.CostFunction; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; 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 index 76337b7b5a..6ea7d25674 100644 --- a/common/src/test/java/org/astraea/common/balancer/algorithms/GreedyBalancerTest.java +++ b/common/src/test/java/org/astraea/common/balancer/algorithms/GreedyBalancerTest.java @@ -20,10 +20,10 @@ import java.util.Map; import java.util.UUID; import java.util.stream.IntStream; +import org.astraea.common.Configuration; import org.astraea.common.Utils; import org.astraea.common.balancer.Balancer; import org.astraea.common.balancer.FakeClusterInfo; -import org.astraea.common.cost.Configuration; import org.astraea.common.cost.DecreasingCost; import org.astraea.common.metrics.BeanQuery; import org.astraea.common.metrics.MBeanClient; diff --git a/common/src/test/java/org/astraea/common/cost/DecreasingCost.java b/common/src/test/java/org/astraea/common/cost/DecreasingCost.java index 16f2857c01..1ee42bc5d2 100644 --- a/common/src/test/java/org/astraea/common/cost/DecreasingCost.java +++ b/common/src/test/java/org/astraea/common/cost/DecreasingCost.java @@ -16,6 +16,7 @@ */ package org.astraea.common.cost; +import org.astraea.common.Configuration; import org.astraea.common.admin.ClusterBean; import org.astraea.common.admin.ClusterInfo; import org.astraea.common.admin.Replica; diff --git a/common/src/test/java/org/astraea/common/partitioner/ConfigurationTest.java b/common/src/test/java/org/astraea/common/partitioner/ConfigurationTest.java index 64531c5141..e7eece7950 100644 --- a/common/src/test/java/org/astraea/common/partitioner/ConfigurationTest.java +++ b/common/src/test/java/org/astraea/common/partitioner/ConfigurationTest.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import org.astraea.common.cost.Configuration; +import org.astraea.common.Configuration; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/org/astraea/common/partitioner/DispatcherTest.java b/common/src/test/java/org/astraea/common/partitioner/DispatcherTest.java index 9a5483b55e..173620ac06 100644 --- a/common/src/test/java/org/astraea/common/partitioner/DispatcherTest.java +++ b/common/src/test/java/org/astraea/common/partitioner/DispatcherTest.java @@ -35,12 +35,12 @@ import org.apache.kafka.common.Cluster; import org.apache.kafka.common.metrics.stats.Value; import org.apache.kafka.common.serialization.ByteArraySerializer; +import org.astraea.common.Configuration; import org.astraea.common.Header; import org.astraea.common.Utils; import org.astraea.common.admin.Admin; import org.astraea.common.admin.ClusterInfo; import org.astraea.common.admin.ReplicaInfo; -import org.astraea.common.cost.Configuration; import org.astraea.common.producer.Metadata; import org.astraea.common.producer.Producer; import org.astraea.common.producer.Record; diff --git a/common/src/test/java/org/astraea/common/partitioner/PartitionerUtilsTest.java b/common/src/test/java/org/astraea/common/partitioner/PartitionerUtilsTest.java index 2a76947650..6ddb43cbda 100644 --- a/common/src/test/java/org/astraea/common/partitioner/PartitionerUtilsTest.java +++ b/common/src/test/java/org/astraea/common/partitioner/PartitionerUtilsTest.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import org.astraea.common.cost.Configuration; +import org.astraea.common.Configuration; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/org/astraea/common/partitioner/StrictCostDispatcherTest.java b/common/src/test/java/org/astraea/common/partitioner/StrictCostDispatcherTest.java index 63af8476b3..bcaffc27c6 100644 --- a/common/src/test/java/org/astraea/common/partitioner/StrictCostDispatcherTest.java +++ b/common/src/test/java/org/astraea/common/partitioner/StrictCostDispatcherTest.java @@ -23,6 +23,7 @@ import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.IntStream; +import org.astraea.common.Configuration; import org.astraea.common.Utils; import org.astraea.common.admin.ClusterBean; import org.astraea.common.admin.ClusterInfo; @@ -30,7 +31,6 @@ import org.astraea.common.admin.ReplicaInfo; import org.astraea.common.cost.BrokerCost; import org.astraea.common.cost.BrokerInputCost; -import org.astraea.common.cost.Configuration; import org.astraea.common.cost.HasBrokerCost; import org.astraea.common.cost.NodeThroughputCost; import org.astraea.common.cost.ReplicaLeaderCost; diff --git a/connector/src/main/java/org/astraea/connector/SourceConnector.java b/connector/src/main/java/org/astraea/connector/SourceConnector.java index 88605dac7a..ea4d900980 100644 --- a/connector/src/main/java/org/astraea/connector/SourceConnector.java +++ b/connector/src/main/java/org/astraea/connector/SourceConnector.java @@ -20,8 +20,8 @@ import java.util.Map; import java.util.stream.Collectors; import org.apache.kafka.common.config.ConfigDef; +import org.astraea.common.Configuration; import org.astraea.common.VersionUtils; -import org.astraea.common.cost.Configuration; public abstract class SourceConnector extends org.apache.kafka.connect.source.SourceConnector { diff --git a/connector/src/main/java/org/astraea/connector/SourceTask.java b/connector/src/main/java/org/astraea/connector/SourceTask.java index 2a0aa36386..998be30c88 100644 --- a/connector/src/main/java/org/astraea/connector/SourceTask.java +++ b/connector/src/main/java/org/astraea/connector/SourceTask.java @@ -22,8 +22,8 @@ import java.util.stream.Collectors; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.source.SourceRecord; +import org.astraea.common.Configuration; import org.astraea.common.VersionUtils; -import org.astraea.common.cost.Configuration; import org.astraea.common.producer.Metadata; import org.astraea.common.producer.Record; diff --git a/connector/src/test/java/org/astraea/connector/SourceConnectorTest.java b/connector/src/test/java/org/astraea/connector/SourceConnectorTest.java index a9114d5815..b2c5766fbe 100644 --- a/connector/src/test/java/org/astraea/connector/SourceConnectorTest.java +++ b/connector/src/test/java/org/astraea/connector/SourceConnectorTest.java @@ -19,7 +19,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.astraea.common.cost.Configuration; +import org.astraea.common.Configuration; import org.astraea.common.http.HttpExecutor; import org.astraea.common.json.TypeRef; import org.astraea.common.producer.Record;