diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/filter/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/filter/package-info.java deleted file mode 100644 index f53d1e07dc9f3a..00000000000000 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/filter/package-info.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.pulsar.broker.loadbalance.extensible.filter; \ No newline at end of file diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/models/Split.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/models/Split.java deleted file mode 100644 index f980cd15c821d3..00000000000000 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/models/Split.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.pulsar.broker.loadbalance.extensible.models; - -import java.util.Map; -import java.util.Objects; -import java.util.Optional; - -/** - * Defines the information required for a bundle split. - */ -public record Split(String bundle, String sourceBroker, Map> splitBundleToDestBroker) { - - public Split { - Objects.requireNonNull(bundle); - } -} diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/models/Unload.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/models/Unload.java deleted file mode 100644 index 2d5ea3d4210822..00000000000000 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/models/Unload.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.pulsar.broker.loadbalance.extensible.models; - -import java.util.Objects; -import java.util.Optional; - -/** - * Defines the information required to unload or transfer a service unit(e.g. bundle). - */ -public record Unload(String sourceBroker, String serviceUnit, Optional destBroker) { - public Unload { - Objects.requireNonNull(sourceBroker); - Objects.requireNonNull(serviceUnit); - } - public Unload(String sourceBroker, String serviceUnit) { - this(sourceBroker, serviceUnit, Optional.empty()); - } -} \ No newline at end of file diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/BrokerRegistry.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/BrokerRegistry.java similarity index 96% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/BrokerRegistry.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/BrokerRegistry.java index f653534b8051cd..f6a3dc9e98e3c3 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/BrokerRegistry.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/BrokerRegistry.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible; +package org.apache.pulsar.broker.loadbalance.extensions; import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.function.BiConsumer; import org.apache.pulsar.broker.PulsarServerException; -import org.apache.pulsar.broker.loadbalance.extensible.data.BrokerLookupData; +import org.apache.pulsar.broker.loadbalance.extensions.data.BrokerLookupData; import org.apache.pulsar.metadata.api.NotificationType; /** diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/ExtensibleLoadManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManager.java similarity index 97% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/ExtensibleLoadManager.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManager.java index 5faf1c3a217d61..fb2c6ce52a3fc6 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/ExtensibleLoadManager.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManager.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible; +package org.apache.pulsar.broker.loadbalance.extensions; import java.util.Optional; import java.util.concurrent.CompletableFuture; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/LoadManagerContext.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/LoadManagerContext.java similarity index 85% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/LoadManagerContext.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/LoadManagerContext.java index 8c0e10582f696e..27878d64b85bc0 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/LoadManagerContext.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/LoadManagerContext.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible; +package org.apache.pulsar.broker.loadbalance.extensions; import org.apache.pulsar.broker.ServiceConfiguration; -import org.apache.pulsar.broker.loadbalance.extensible.data.BrokerLoadData; -import org.apache.pulsar.broker.loadbalance.extensible.data.TopBundlesLoadData; -import org.apache.pulsar.broker.loadbalance.extensible.store.LoadDataStore; +import org.apache.pulsar.broker.loadbalance.extensions.data.BrokerLoadData; +import org.apache.pulsar.broker.loadbalance.extensions.data.TopBundlesLoadData; +import org.apache.pulsar.broker.loadbalance.extensions.store.LoadDataStore; /** * The filter and load balance context, use for delivering context between filter, scheduler and strategy. diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/data/BrokerLoadData.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLoadData.java similarity index 99% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/data/BrokerLoadData.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLoadData.java index 0edcebd9783aa3..ee785ef8fba121 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/data/BrokerLoadData.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLoadData.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.data; +package org.apache.pulsar.broker.loadbalance.extensions.data; import lombok.Data; import org.apache.pulsar.broker.ServiceConfiguration; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/data/BrokerLookupData.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLookupData.java similarity index 97% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/data/BrokerLookupData.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLookupData.java index da34232ccbb01b..504ae13003e04c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/data/BrokerLookupData.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLookupData.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.data; +package org.apache.pulsar.broker.loadbalance.extensions.data; import java.util.Map; import java.util.Optional; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/data/TopBundlesLoadData.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/data/TopBundlesLoadData.java similarity index 96% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/data/TopBundlesLoadData.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/data/TopBundlesLoadData.java index 5b8e2446600646..9c34b40ff0416d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/data/TopBundlesLoadData.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/data/TopBundlesLoadData.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.data; +package org.apache.pulsar.broker.loadbalance.extensions.data; import java.util.List; import java.util.Objects; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/data/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/data/package-info.java similarity index 92% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/data/package-info.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/data/package-info.java index 82b2d2bcf0ba96..7110d96722525b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/data/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/data/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,4 +16,4 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.data; \ No newline at end of file +package org.apache.pulsar.broker.loadbalance.extensions.data; \ No newline at end of file diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/filter/BrokerFilter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/filter/BrokerFilter.java similarity index 91% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/filter/BrokerFilter.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/filter/BrokerFilter.java index dfc543e369ee35..88a68d7dc7161a 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/filter/BrokerFilter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/filter/BrokerFilter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.filter; +package org.apache.pulsar.broker.loadbalance.extensions.filter; import java.util.List; import org.apache.pulsar.broker.loadbalance.BrokerFilterException; -import org.apache.pulsar.broker.loadbalance.extensible.LoadManagerContext; +import org.apache.pulsar.broker.loadbalance.extensions.LoadManagerContext; /** * Filter out unqualified Brokers, which are not entered into LoadBalancer for decision-making. diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/store/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/filter/package-info.java similarity index 92% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/store/package-info.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/filter/package-info.java index eb3abbda8c1f18..53b0b55b6e23ec 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/store/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/filter/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,4 +16,4 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.store; \ No newline at end of file +package org.apache.pulsar.broker.loadbalance.extensions.filter; \ No newline at end of file diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/package-info.java similarity index 93% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/package-info.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/package-info.java index 5f1f2ad8a7b2ac..057f4552002af8 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,4 +16,4 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible; \ No newline at end of file +package org.apache.pulsar.broker.loadbalance.extensions; \ No newline at end of file diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/reporter/LoadDataReporter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/reporter/LoadDataReporter.java similarity index 94% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/reporter/LoadDataReporter.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/reporter/LoadDataReporter.java index 742fc340ff0adb..ed620c029856bc 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/reporter/LoadDataReporter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/reporter/LoadDataReporter.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.reporter; +package org.apache.pulsar.broker.loadbalance.extensions.reporter; import java.util.concurrent.CompletableFuture; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/reporter/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/reporter/package-info.java similarity index 92% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/reporter/package-info.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/reporter/package-info.java index 78f265ca1a940f..723d8a1bc9de47 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/reporter/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/reporter/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,4 +16,4 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.reporter; \ No newline at end of file +package org.apache.pulsar.broker.loadbalance.extensions.reporter; \ No newline at end of file diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/scheduler/LoadManagerScheduler.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/LoadManagerScheduler.java similarity index 94% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/scheduler/LoadManagerScheduler.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/LoadManagerScheduler.java index 36193d8b294f5d..1989a73c49ceb8 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/scheduler/LoadManagerScheduler.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/LoadManagerScheduler.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.scheduler; +package org.apache.pulsar.broker.loadbalance.extensions.scheduler; /** * The load manager scheduler. diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/scheduler/NamespaceBundleSplitStrategy.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/NamespaceBundleSplitStrategy.java similarity index 88% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/scheduler/NamespaceBundleSplitStrategy.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/NamespaceBundleSplitStrategy.java index ea0be8505cc5eb..07605121b309bb 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/scheduler/NamespaceBundleSplitStrategy.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/NamespaceBundleSplitStrategy.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.scheduler; +package org.apache.pulsar.broker.loadbalance.extensions.scheduler; import java.util.Set; import org.apache.pulsar.broker.PulsarService; -import org.apache.pulsar.broker.loadbalance.extensible.LoadManagerContext; -import org.apache.pulsar.broker.loadbalance.extensible.models.Split; +import org.apache.pulsar.broker.loadbalance.extensions.LoadManagerContext; +import org.apache.pulsar.broker.loadbalance.extensions.models.Split; /** * Determines which bundles should be split based on various thresholds. diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/scheduler/NamespaceUnloadStrategy.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/NamespaceUnloadStrategy.java similarity index 88% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/scheduler/NamespaceUnloadStrategy.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/NamespaceUnloadStrategy.java index 69a6a11902d328..0942dc9522ec7f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/scheduler/NamespaceUnloadStrategy.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/NamespaceUnloadStrategy.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.scheduler; +package org.apache.pulsar.broker.loadbalance.extensions.scheduler; import java.util.List; import java.util.Map; -import org.apache.pulsar.broker.loadbalance.extensible.LoadManagerContext; -import org.apache.pulsar.broker.loadbalance.extensible.models.Unload; +import org.apache.pulsar.broker.loadbalance.extensions.LoadManagerContext; +import org.apache.pulsar.broker.loadbalance.extensions.models.Unload; /** * The namespace unload strategy. diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/scheduler/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/package-info.java similarity index 92% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/scheduler/package-info.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/package-info.java index 79e455182a29f4..e79f430de5aa5b 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/scheduler/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,4 +16,4 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.scheduler; \ No newline at end of file +package org.apache.pulsar.broker.loadbalance.extensions.scheduler; \ No newline at end of file diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/store/LoadDataStore.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/store/LoadDataStore.java similarity index 96% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/store/LoadDataStore.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/store/LoadDataStore.java index 77ce2e4a20df86..8e7337076ca3bf 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/store/LoadDataStore.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/store/LoadDataStore.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.store; +package org.apache.pulsar.broker.loadbalance.extensions.store; import java.io.Closeable; import java.util.Map; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/store/LoadDataStoreException.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/store/LoadDataStoreException.java similarity index 95% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/store/LoadDataStoreException.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/store/LoadDataStoreException.java index cc3045d3b0e4c5..510c490f579d65 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/store/LoadDataStoreException.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/store/LoadDataStoreException.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.store; +package org.apache.pulsar.broker.loadbalance.extensions.store; import java.io.IOException; diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/models/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/store/package-info.java similarity index 92% rename from pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/models/package-info.java rename to pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/store/package-info.java index 505effce8cf174..33a84f26c7bd2c 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensible/models/package-info.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/store/package-info.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,4 +16,4 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.models; \ No newline at end of file +package org.apache.pulsar.broker.loadbalance.extensions.store; \ No newline at end of file diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensible/data/BrokerLoadDataTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLoadDataTest.java similarity index 96% rename from pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensible/data/BrokerLoadDataTest.java rename to pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLoadDataTest.java index 908c28004df457..b9eba837fd9643 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensible/data/BrokerLoadDataTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLoadDataTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.data; +package org.apache.pulsar.broker.loadbalance.extensions.data; import static org.testng.Assert.assertEquals; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensible/data/BrokerLookupDataTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLookupDataTest.java similarity index 97% rename from pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensible/data/BrokerLookupDataTest.java rename to pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLookupDataTest.java index 1763b898224382..e36ef1520cce8f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensible/data/BrokerLookupDataTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/data/BrokerLookupDataTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.data; +package org.apache.pulsar.broker.loadbalance.extensions.data; import org.apache.pulsar.broker.lookup.LookupResult; import org.apache.pulsar.policies.data.loadbalancer.AdvertisedListener; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensible/data/TopBundlesLoadDataTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/data/TopBundlesLoadDataTest.java similarity index 97% rename from pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensible/data/TopBundlesLoadDataTest.java rename to pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/data/TopBundlesLoadDataTest.java index 68e85b426d385e..edaaea2e350a13 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensible/data/TopBundlesLoadDataTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/data/TopBundlesLoadDataTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.broker.loadbalance.extensible.data; +package org.apache.pulsar.broker.loadbalance.extensions.data; import static org.testng.Assert.assertEquals;