This is an automated email from the ASF dual-hosted git repository. sanjeevrk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push: new 4def78d Move WorkerInfo to commons (#2899) 4def78d is described below commit 4def78d0ad5c0396955866c8b023d789c1b5d81d Author: Sanjeev Kulkarni <sanjee...@gmail.com> AuthorDate: Thu Nov 1 09:06:41 2018 -0700 Move WorkerInfo to commons (#2899) * Move WorkerInfo to commons * add back worker dep --- .../main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java | 3 --- .../src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java | 4 ---- .../src/main/java/org/apache/pulsar/client/admin/Worker.java | 2 +- .../java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java | 2 +- .../main/java/org/apache/pulsar/client/admin/internal/WorkerImpl.java | 2 +- .../src/main/java/org/apache/pulsar/admin/cli/CmdFunctionWorker.java | 2 +- .../src/main/java/org/apache/pulsar/common/functions}/WorkerInfo.java | 2 +- .../org/apache/pulsar/functions/worker/FunctionRuntimeManager.java | 1 + .../java/org/apache/pulsar/functions/worker/MembershipManager.java | 1 + .../java/org/apache/pulsar/functions/worker/rest/api/WorkerImpl.java | 1 + .../org/apache/pulsar/functions/worker/MembershipManagerTest.java | 3 +-- .../java/org/apache/pulsar/functions/worker/SchedulerManagerTest.java | 2 +- 12 files changed, 10 insertions(+), 15 deletions(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java index 01dd354..61ecac4 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java @@ -30,7 +30,6 @@ import javax.ws.rs.POST; import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -38,10 +37,8 @@ import javax.ws.rs.core.Response; import org.apache.pulsar.broker.admin.AdminResource; import org.apache.pulsar.client.api.Message; import org.apache.pulsar.common.io.ConnectorDefinition; -import org.apache.pulsar.functions.proto.Function.Assignment; import org.apache.pulsar.functions.proto.Function.FunctionMetaData; import org.apache.pulsar.functions.proto.InstanceCommunication.FunctionStatus; -import org.apache.pulsar.functions.worker.WorkerInfo; import org.apache.pulsar.functions.worker.WorkerService; import org.apache.pulsar.functions.worker.rest.api.FunctionsImpl; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java index 996d931..415a814 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java @@ -26,7 +26,6 @@ import java.net.InetAddress; import java.net.URL; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; @@ -46,16 +45,13 @@ import org.apache.pulsar.client.impl.auth.AuthenticationTls; import org.apache.pulsar.common.policies.data.ClusterData; import org.apache.pulsar.common.policies.data.TenantInfo; import org.apache.pulsar.functions.worker.WorkerConfig; -import org.apache.pulsar.functions.worker.WorkerInfo; import org.apache.pulsar.functions.worker.WorkerService; import org.apache.pulsar.functions.worker.rest.WorkerServer; import org.apache.pulsar.zookeeper.LocalBookkeeperEnsemble; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; import com.google.common.collect.Sets; diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Worker.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Worker.java index 709b713..37e1bac 100644 --- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Worker.java +++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Worker.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import org.apache.pulsar.functions.proto.InstanceCommunication.Metrics; -import org.apache.pulsar.functions.worker.WorkerInfo; +import org.apache.pulsar.common.functions.WorkerInfo; /** * Admin interface for worker stats management. diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java index a67deb0..20ea74b 100644 --- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java +++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java @@ -49,7 +49,7 @@ import org.apache.pulsar.common.policies.data.ErrorData; import org.apache.pulsar.functions.proto.InstanceCommunication.FunctionStatus; import org.apache.pulsar.functions.proto.InstanceCommunication.FunctionStatusList; import org.apache.pulsar.common.functions.FunctionConfig; -import org.apache.pulsar.functions.worker.WorkerInfo; +import org.apache.pulsar.common.functions.WorkerInfo; import org.glassfish.jersey.media.multipart.FormDataBodyPart; import org.glassfish.jersey.media.multipart.FormDataMultiPart; import org.glassfish.jersey.media.multipart.file.FileDataBodyPart; diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WorkerImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WorkerImpl.java index 4ca46cc..c2a9d13 100644 --- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WorkerImpl.java +++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WorkerImpl.java @@ -38,7 +38,7 @@ import org.apache.pulsar.client.api.Authentication; import org.apache.pulsar.functions.proto.InstanceCommunication.Metrics; import lombok.extern.slf4j.Slf4j; -import org.apache.pulsar.functions.worker.WorkerInfo; +import org.apache.pulsar.common.functions.WorkerInfo; @Slf4j public class WorkerImpl extends BaseResource implements Worker { diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctionWorker.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctionWorker.java index 9122375..80a7476 100644 --- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctionWorker.java +++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctionWorker.java @@ -30,7 +30,7 @@ import com.google.gson.JsonParser; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.apache.pulsar.functions.worker.WorkerInfo; +import org.apache.pulsar.common.functions.WorkerInfo; import java.util.Collection; import java.util.List; diff --git a/pulsar-functions/proto/src/main/java/org/apache/pulsar/functions/worker/WorkerInfo.java b/pulsar-common/src/main/java/org/apache/pulsar/common/functions/WorkerInfo.java similarity index 97% rename from pulsar-functions/proto/src/main/java/org/apache/pulsar/functions/worker/WorkerInfo.java rename to pulsar-common/src/main/java/org/apache/pulsar/common/functions/WorkerInfo.java index 6542ec6..b06503a 100644 --- a/pulsar-functions/proto/src/main/java/org/apache/pulsar/functions/worker/WorkerInfo.java +++ b/pulsar-common/src/main/java/org/apache/pulsar/common/functions/WorkerInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.pulsar.functions.worker; +package org.apache.pulsar.common.functions; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeManager.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeManager.java index 100c7c8..67a7aad 100644 --- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeManager.java +++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeManager.java @@ -43,6 +43,7 @@ import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.admin.PulsarAdminException; import org.apache.pulsar.client.api.MessageId; import org.apache.pulsar.client.api.Reader; +import org.apache.pulsar.common.functions.WorkerInfo; import org.apache.pulsar.common.policies.data.ErrorData; import org.apache.pulsar.functions.instance.AuthenticationConfig; import org.apache.pulsar.functions.proto.Function.Assignment; diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MembershipManager.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MembershipManager.java index e4969cf..d6e7b47 100644 --- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MembershipManager.java +++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MembershipManager.java @@ -42,6 +42,7 @@ import org.apache.pulsar.client.api.PulsarClient; import org.apache.pulsar.client.api.PulsarClientException; import org.apache.pulsar.client.api.SubscriptionType; import org.apache.pulsar.client.impl.ConsumerImpl; +import org.apache.pulsar.common.functions.WorkerInfo; import org.apache.pulsar.common.policies.data.ConsumerStats; import org.apache.pulsar.common.policies.data.TopicStats; import org.apache.pulsar.functions.proto.Function; diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/WorkerImpl.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/WorkerImpl.java index 87e9bc2..e5b67b7 100644 --- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/WorkerImpl.java +++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/WorkerImpl.java @@ -20,6 +20,7 @@ package org.apache.pulsar.functions.worker.rest.api; import com.google.gson.Gson; import lombok.extern.slf4j.Slf4j; +import org.apache.pulsar.common.functions.WorkerInfo; import org.apache.pulsar.common.policies.data.ErrorData; import org.apache.pulsar.functions.proto.Function; import org.apache.pulsar.functions.proto.InstanceCommunication; diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/MembershipManagerTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/MembershipManagerTest.java index a2fb620..678d338 100644 --- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/MembershipManagerTest.java +++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/MembershipManagerTest.java @@ -37,7 +37,6 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.distributedlog.api.namespace.Namespace; import org.apache.pulsar.client.admin.PulsarAdmin; -import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.ConsumerBuilder; import org.apache.pulsar.client.api.ConsumerEventListener; import org.apache.pulsar.client.api.PulsarClient; @@ -47,8 +46,8 @@ import org.apache.pulsar.client.api.ReaderBuilder; import org.apache.pulsar.client.api.SubscriptionType; import org.apache.pulsar.client.impl.ConsumerImpl; import org.apache.pulsar.client.impl.PulsarClientImpl; +import org.apache.pulsar.common.functions.WorkerInfo; import org.apache.pulsar.functions.proto.Function; -import org.apache.pulsar.functions.worker.scheduler.RoundRobinScheduler; import org.mockito.ArgumentMatcher; import org.mockito.Mockito; import org.testng.Assert; diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/SchedulerManagerTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/SchedulerManagerTest.java index 945a0cc..066ca81 100644 --- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/SchedulerManagerTest.java +++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/SchedulerManagerTest.java @@ -27,8 +27,8 @@ import org.apache.pulsar.client.api.MessageId; import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.api.ProducerBuilder; import org.apache.pulsar.client.api.PulsarClient; -import org.apache.pulsar.client.api.PulsarClientException; import org.apache.pulsar.client.api.TypedMessageBuilder; +import org.apache.pulsar.common.functions.WorkerInfo; import org.apache.pulsar.functions.proto.Function; import org.apache.pulsar.functions.proto.Function.Assignment; import org.apache.pulsar.functions.runtime.ThreadRuntimeFactory;