This is an automated email from the ASF dual-hosted git repository.

mikexue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git


The following commit(s) were added to refs/heads/master by this push:
     new cfd3a5353 simplify code
     new f073d77e6 Merge pull request #2758 from 
weihubeats/EventMeshGrpcProducer
cfd3a5353 is described below

commit cfd3a53533fa78c9055d660b6227fdcf631b81ad
Author: weihu <[email protected]>
AuthorDate: Sat Dec 31 16:53:14 2022 +0800

    simplify code
---
 .../grpc/pub/cloudevents/CloudEventsBatchPublishInstance.java    | 4 +---
 .../grpc/pub/cloudevents/CloudEventsPublishInstance.java         | 4 +---
 .../grpc/pub/cloudevents/CloudEventsRequestInstance.java         | 4 +---
 .../grpc/pub/eventmeshmessage/AsyncPublishBroadcast.java         | 4 +---
 .../grpc/pub/eventmeshmessage/AsyncPublishInstance.java          | 4 +---
 .../grpc/pub/eventmeshmessage/BatchPublishInstance.java          | 4 +---
 .../grpc/pub/eventmeshmessage/RequestReplyInstance.java          | 4 +---
 .../grpc/pub/eventmeshmessage/WorkflowAsyncPublishInstance.java  | 1 -
 .../eventmesh/client/grpc/producer/EventMeshGrpcProducer.java    | 9 +++------
 9 files changed, 10 insertions(+), 28 deletions(-)

diff --git 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsBatchPublishInstance.java
 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsBatchPublishInstance.java
index e0a74c001..d0d582f52 100644
--- 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsBatchPublishInstance.java
+++ 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsBatchPublishInstance.java
@@ -56,9 +56,7 @@ public class CloudEventsBatchPublishInstance {
                 .sys("1234").build();
 
         try (EventMeshGrpcProducer eventMeshGrpcProducer = new 
EventMeshGrpcProducer(eventMeshClientConfig)) {
-
-            eventMeshGrpcProducer.init();
-
+            
             Map<String, String> content = new HashMap<>();
             content.put("content", "testRequestReplyMessage");
 
diff --git 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsPublishInstance.java
 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsPublishInstance.java
index 4d40b168a..1847bfcf0 100644
--- 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsPublishInstance.java
+++ 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsPublishInstance.java
@@ -57,9 +57,7 @@ public class CloudEventsPublishInstance {
                 .sys("1234").build();
 
         try (EventMeshGrpcProducer eventMeshGrpcProducer = new 
EventMeshGrpcProducer(eventMeshClientConfig)) {
-
-            eventMeshGrpcProducer.init();
-
+            
             Map<String, String> content = new HashMap<>();
             content.put("content", "testAsyncMessage");
 
diff --git 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsRequestInstance.java
 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsRequestInstance.java
index 033c08981..648e89f02 100644
--- 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsRequestInstance.java
+++ 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/cloudevents/CloudEventsRequestInstance.java
@@ -57,9 +57,7 @@ public class CloudEventsRequestInstance {
                 .sys("1234").build();
 
         try (EventMeshGrpcProducer eventMeshGrpcProducer = new 
EventMeshGrpcProducer(eventMeshClientConfig)) {
-
-            eventMeshGrpcProducer.init();
-
+            
             Map<String, String> content = new HashMap<>();
             content.put("content", "testRequestReplyMessage");
 
diff --git 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/AsyncPublishBroadcast.java
 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/AsyncPublishBroadcast.java
index 299089138..33b48b6a0 100644
--- 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/AsyncPublishBroadcast.java
+++ 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/AsyncPublishBroadcast.java
@@ -52,9 +52,7 @@ public class AsyncPublishBroadcast {
                 .sys("1234").build();
 
         try (EventMeshGrpcProducer eventMeshGrpcProducer = new 
EventMeshGrpcProducer(eventMeshClientConfig)) {
-
-            eventMeshGrpcProducer.init();
-
+            
             Map<String, String> content = new HashMap<>();
             content.put("content", "testAsyncMessage");
 
diff --git 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/AsyncPublishInstance.java
 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/AsyncPublishInstance.java
index a2769a7f6..0850eec0a 100644
--- 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/AsyncPublishInstance.java
+++ 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/AsyncPublishInstance.java
@@ -52,9 +52,7 @@ public class AsyncPublishInstance {
                 .sys("1234").build();
 
         try (EventMeshGrpcProducer eventMeshGrpcProducer = new 
EventMeshGrpcProducer(eventMeshClientConfig)) {
-
-            eventMeshGrpcProducer.init();
-
+            
             Map<String, String> content = new HashMap<>();
             content.put("content", "testAsyncMessage");
 
diff --git 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/BatchPublishInstance.java
 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/BatchPublishInstance.java
index 0c0eaebe3..e4d49ac1e 100644
--- 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/BatchPublishInstance.java
+++ 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/BatchPublishInstance.java
@@ -51,9 +51,7 @@ public class BatchPublishInstance {
                 .sys("1234").build();
 
         try (EventMeshGrpcProducer eventMeshGrpcProducer = new 
EventMeshGrpcProducer(eventMeshClientConfig)) {
-
-            eventMeshGrpcProducer.init();
-
+            
             Map<String, String> content = new HashMap<>();
             content.put("content", "testRequestReplyMessage");
 
diff --git 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/RequestReplyInstance.java
 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/RequestReplyInstance.java
index edc72033b..b798d3c3e 100644
--- 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/RequestReplyInstance.java
+++ 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/RequestReplyInstance.java
@@ -53,9 +53,7 @@ public class RequestReplyInstance {
                 .sys("1234").build();
 
         try (EventMeshGrpcProducer eventMeshGrpcProducer = new 
EventMeshGrpcProducer(eventMeshClientConfig)) {
-
-            eventMeshGrpcProducer.init();
-
+            
             Map<String, String> content = new HashMap<>();
             content.put("content", "testRequestReplyMessage");
 
diff --git 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/WorkflowAsyncPublishInstance.java
 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/WorkflowAsyncPublishInstance.java
index eec9c1ec1..ce266181f 100644
--- 
a/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/WorkflowAsyncPublishInstance.java
+++ 
b/eventmesh-examples/src/main/java/org/apache/eventmesh/grpc/pub/eventmeshmessage/WorkflowAsyncPublishInstance.java
@@ -60,7 +60,6 @@ public class WorkflowAsyncPublishInstance {
                 .sys("DEFAULT").build();
 
         try (EventMeshGrpcProducer eventMeshGrpcProducer = new 
EventMeshGrpcProducer(eventMeshClientConfig)) {
-            eventMeshGrpcProducer.init();
 
             NacosSelector nacosSelector = new NacosSelector();
             nacosSelector.init();
diff --git 
a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/producer/EventMeshGrpcProducer.java
 
b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/producer/EventMeshGrpcProducer.java
index 804d3341b..1a24257de 100644
--- 
a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/producer/EventMeshGrpcProducer.java
+++ 
b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/producer/EventMeshGrpcProducer.java
@@ -45,7 +45,7 @@ public class EventMeshGrpcProducer implements AutoCloseable {
 
     private final EventMeshGrpcClientConfig clientConfig;
 
-    private ManagedChannel channel;
+    private final ManagedChannel channel;
 
     PublisherServiceBlockingStub publisherClient;
 
@@ -53,11 +53,8 @@ public class EventMeshGrpcProducer implements AutoCloseable {
 
     public EventMeshGrpcProducer(EventMeshGrpcClientConfig clientConfig) {
         this.clientConfig = clientConfig;
-    }
-
-    public void init() {
         channel = 
ManagedChannelBuilder.forAddress(clientConfig.getServerAddr(), 
clientConfig.getServerPort())
-                .usePlaintext().build();
+            .usePlaintext().build();
         publisherClient = PublisherServiceGrpc.newBlockingStub(channel);
 
         cloudEventProducer = new CloudEventProducer(clientConfig, 
publisherClient);
@@ -81,7 +78,7 @@ public class EventMeshGrpcProducer implements AutoCloseable {
     public <T> Response publish(List<T> messageList) {
         logger.info("BatchPublish message " + messageList.toString());
 
-        if (messageList.size() == 0) {
+        if (messageList.isEmpty()) {
             return null;
         }
         if (messageList.get(0) instanceof CloudEvent) {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to