You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by xi...@apache.org on 2022/05/24 06:22:15 UTC
[incubator-eventmesh] branch master updated: Format the code in `eventmesh-sdk-java` and `eventmesh-common` (#874)
This is an automated email from the ASF dual-hosted git repository.
xiaoyang 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 96aa29d1 Format the code in `eventmesh-sdk-java` and `eventmesh-common` (#874)
96aa29d1 is described below
commit 96aa29d1426875ef97eec44a4e4396c4f044a730
Author: mroccyen <qi...@126.com>
AuthorDate: Tue May 24 14:22:10 2022 +0800
Format the code in `eventmesh-sdk-java` and `eventmesh-common` (#874)
---
.../main/java/org/apache/eventmesh/common/ThreadPoolFactory.java | 4 ++--
.../org/apache/eventmesh/common/config/ConfigurationWrapper.java | 6 +++---
.../common/protocol/grpc/common/BatchMessageWrapper.java | 2 +-
.../common/protocol/grpc/common/SimpleMessageWrapper.java | 2 +-
.../eventmesh/common/protocol/http/body/BaseRequestBody.java | 3 +--
.../apache/eventmesh/client/grpc/consumer/SubStreamHandler.java | 9 +++++----
.../eventmesh/client/grpc/producer/EventMeshGrpcProducer.java | 2 ++
.../apache/eventmesh/client/grpc/util/EventMeshClientUtil.java | 7 ++++---
.../org/apache/eventmesh/client/http/AbstractHttpClient.java | 1 +
.../org/apache/eventmesh/client/tcp/common/RequestContext.java | 2 +-
.../client/tcp/impl/openmessage/OpenMessageTCPClient.java | 6 +++---
.../client/tcp/impl/openmessage/OpenMessageTCPPubClient.java | 6 +++---
.../client/tcp/impl/openmessage/OpenMessageTCPSubClient.java | 6 +++---
13 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/ThreadPoolFactory.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/ThreadPoolFactory.java
index 3e3831c3..8b6e4379 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/ThreadPoolFactory.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/ThreadPoolFactory.java
@@ -36,7 +36,7 @@ public class ThreadPoolFactory {
public static ThreadPoolExecutor createThreadPoolExecutor(int core, int max, final String threadName,
final boolean isDaemon) {
- return createThreadPoolExecutor(core, max, new LinkedBlockingQueue<Runnable>(1000), threadName, isDaemon);
+ return createThreadPoolExecutor(core, max, new LinkedBlockingQueue<>(1000), threadName, isDaemon);
}
public static ThreadPoolExecutor createThreadPoolExecutor(int core, int max, BlockingQueue<Runnable> blockingQueue,
@@ -47,7 +47,7 @@ public class ThreadPoolFactory {
}
public static ThreadPoolExecutor createThreadPoolExecutor(int core, int max, ThreadFactory threadFactory) {
- return createThreadPoolExecutor(core, max, new LinkedBlockingQueue<Runnable>(1000), threadFactory);
+ return createThreadPoolExecutor(core, max, new LinkedBlockingQueue<>(1000), threadFactory);
}
public static ThreadPoolExecutor createThreadPoolExecutor(int core, int max, BlockingQueue<Runnable> blockingQueue,
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/ConfigurationWrapper.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/ConfigurationWrapper.java
index 0f193a48..e1b2cadd 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/ConfigurationWrapper.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/config/ConfigurationWrapper.java
@@ -39,13 +39,13 @@ public class ConfigurationWrapper {
private static final long TIME_INTERVAL = 30 * 1000L;
- private String file;
+ private final String file;
private Properties properties = new Properties();
- private boolean reload;
+ private final boolean reload;
- private ScheduledExecutorService configLoader = ThreadPoolFactory.createSingleScheduledExecutor("eventMesh-configLoader-");
+ private final ScheduledExecutorService configLoader = ThreadPoolFactory.createSingleScheduledExecutor("eventMesh-configLoader-");
public ConfigurationWrapper(String file, boolean reload) {
this.file = file;
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/common/BatchMessageWrapper.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/common/BatchMessageWrapper.java
index 011bcb4c..4be71812 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/common/BatchMessageWrapper.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/common/BatchMessageWrapper.java
@@ -22,7 +22,7 @@ import org.apache.eventmesh.common.protocol.grpc.protos.BatchMessage;
public class BatchMessageWrapper implements ProtocolTransportObject {
- private BatchMessage batchMessage;
+ private final BatchMessage batchMessage;
public BatchMessageWrapper(BatchMessage batchMessage) {
this.batchMessage = batchMessage;
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/common/SimpleMessageWrapper.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/common/SimpleMessageWrapper.java
index d16ac5d8..245f55bb 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/common/SimpleMessageWrapper.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/grpc/common/SimpleMessageWrapper.java
@@ -22,7 +22,7 @@ import org.apache.eventmesh.common.protocol.grpc.protos.SimpleMessage;
public class SimpleMessageWrapper implements ProtocolTransportObject {
- private SimpleMessage simpleMessage;
+ private final SimpleMessage simpleMessage;
public SimpleMessageWrapper(SimpleMessage simpleMessage) {
this.simpleMessage = simpleMessage;
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/BaseRequestBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/BaseRequestBody.java
index 09a3f741..a8d77c8e 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/BaseRequestBody.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/BaseRequestBody.java
@@ -23,8 +23,7 @@ import java.util.Map;
public class BaseRequestBody extends Body {
public static BaseRequestBody buildBody(Map<String, Object> bodyParam) {
- BaseRequestBody baseRequestBody = new BaseRequestBody();
- return baseRequestBody;
+ return new BaseRequestBody();
}
@Override
diff --git a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/consumer/SubStreamHandler.java b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/consumer/SubStreamHandler.java
index e765cf52..ed3654cc 100644
--- a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/consumer/SubStreamHandler.java
+++ b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/consumer/SubStreamHandler.java
@@ -36,15 +36,15 @@ public class SubStreamHandler<T> extends Thread {
private static final Logger logger = LoggerFactory.getLogger(SubStreamHandler.class);
- private CountDownLatch latch = new CountDownLatch(1);
+ private final CountDownLatch latch = new CountDownLatch(1);
- private ConsumerServiceStub consumerAsyncClient;
+ private final ConsumerServiceStub consumerAsyncClient;
- private EventMeshGrpcClientConfig clientConfig;
+ private final EventMeshGrpcClientConfig clientConfig;
private StreamObserver<Subscription> sender;
- private ReceiveMsgHook<T> listener;
+ private final ReceiveMsgHook<T> listener;
public SubStreamHandler(ConsumerServiceStub consumerAsyncClient, EventMeshGrpcClientConfig clientConfig,
ReceiveMsgHook<T> listener) {
@@ -122,6 +122,7 @@ public class SubStreamHandler<T> extends Thread {
.setReply(reply).build();
}
+ @Override
public void run() {
try {
latch.await();
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 030bb383..5abb4948 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
@@ -77,6 +77,7 @@ public class EventMeshGrpcProducer implements AutoCloseable {
}
}
+ @SuppressWarnings("unchecked")
public <T> Response publish(List<T> messageList) {
logger.info("BatchPublish message " + messageList.toString());
@@ -125,6 +126,7 @@ public class EventMeshGrpcProducer implements AutoCloseable {
}
}
+ @Override
public void close() {
channel.shutdown();
}
diff --git a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshClientUtil.java b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshClientUtil.java
index 8a788855..ee92eca4 100644
--- a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshClientUtil.java
+++ b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshClientUtil.java
@@ -53,7 +53,7 @@ public class EventMeshClientUtil {
private static final Logger logger = LoggerFactory.getLogger(EventMeshClientUtil.class);
public static RequestHeader buildHeader(EventMeshGrpcClientConfig clientConfig, String protocolType) {
- RequestHeader header = RequestHeader.newBuilder()
+ return RequestHeader.newBuilder()
.setEnv(clientConfig.getEnv())
.setIdc(clientConfig.getIdc())
.setIp(IPUtils.getLocalAddress())
@@ -67,9 +67,9 @@ public class EventMeshClientUtil {
// default CloudEvents version is V1
.setProtocolVersion(SpecVersion.V1.toString())
.build();
- return header;
}
+ @SuppressWarnings("unchecked")
public static <T> T buildMessage(SimpleMessage message, String protocolType) {
String seq = message.getSeqNum();
String uniqueId = message.getUniqueId();
@@ -93,7 +93,7 @@ public class EventMeshClientUtil {
.withExtension(ProtocolKey.SEQ_NUM, message.getSeqNum())
.withExtension(ProtocolKey.UNIQUE_ID, message.getUniqueId());
- message.getPropertiesMap().forEach((k, v) -> cloudEventBuilder.withExtension(k, v));
+ message.getPropertiesMap().forEach(cloudEventBuilder::withExtension);
return (T) cloudEventBuilder.build();
} catch (Throwable t) {
@@ -171,6 +171,7 @@ public class EventMeshClientUtil {
}
}
+ @SuppressWarnings("unchecked")
public static <T> BatchMessage buildBatchMessages(List<T> messageList, EventMeshGrpcClientConfig clientConfig,
String protocolType) {
if (EventMeshCommon.CLOUD_EVENTS_PROTOCOL_NAME.equals(protocolType)) {
diff --git a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/AbstractHttpClient.java b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/AbstractHttpClient.java
index 463968cb..58ebb0b3 100644
--- a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/AbstractHttpClient.java
+++ b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/AbstractHttpClient.java
@@ -57,6 +57,7 @@ public abstract class AbstractHttpClient implements AutoCloseable {
this.httpClient = setHttpClient();
}
+ @Override
public void close() throws EventMeshException {
try (final CloseableHttpClient ignore = this.httpClient) {
// ignore
diff --git a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/RequestContext.java b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/RequestContext.java
index 3f3fe0c8..30217549 100644
--- a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/RequestContext.java
+++ b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/RequestContext.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
public class RequestContext {
- private static Logger logger = LoggerFactory.getLogger(RequestContext.class);
+ private static final Logger logger = LoggerFactory.getLogger(RequestContext.class);
private Object key;
private Package request;
diff --git a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/openmessage/OpenMessageTCPClient.java b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/openmessage/OpenMessageTCPClient.java
index e7ec849c..353ce8f6 100644
--- a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/openmessage/OpenMessageTCPClient.java
+++ b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/openmessage/OpenMessageTCPClient.java
@@ -38,9 +38,9 @@ public class OpenMessageTCPClient implements EventMeshTCPClient<Message> {
private final EventMeshTCPPubClient<Message> eventMeshTCPPubClient;
private final EventMeshTCPSubClient<Message> eventMeshTCPSubClient;
- public OpenMessageTCPClient(EventMeshTCPClientConfig eventMeshTCPClientConfig) {
- eventMeshTCPPubClient = new OpenMessageTCPPubClient(eventMeshTCPClientConfig);
- eventMeshTCPSubClient = new OpenMessageTCPSubClient(eventMeshTCPClientConfig);
+ public OpenMessageTCPClient(EventMeshTCPClientConfig eventMeshTcpClientConfig) {
+ eventMeshTCPPubClient = new OpenMessageTCPPubClient(eventMeshTcpClientConfig);
+ eventMeshTCPSubClient = new OpenMessageTCPSubClient(eventMeshTcpClientConfig);
}
@Override
diff --git a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/openmessage/OpenMessageTCPPubClient.java b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/openmessage/OpenMessageTCPPubClient.java
index e24b2b5b..f7482b52 100644
--- a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/openmessage/OpenMessageTCPPubClient.java
+++ b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/openmessage/OpenMessageTCPPubClient.java
@@ -31,10 +31,10 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
class OpenMessageTCPPubClient implements EventMeshTCPPubClient<Message> {
- private final EventMeshTCPClientConfig eventMeshTCPClientConfig;
+ private final EventMeshTCPClientConfig eventMeshTcpClientConfig;
- public OpenMessageTCPPubClient(final EventMeshTCPClientConfig eventMeshTCPClientConfig) {
- this.eventMeshTCPClientConfig = eventMeshTCPClientConfig;
+ public OpenMessageTCPPubClient(final EventMeshTCPClientConfig eventMeshTcpClientConfig) {
+ this.eventMeshTcpClientConfig = eventMeshTcpClientConfig;
}
@Override
diff --git a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/openmessage/OpenMessageTCPSubClient.java b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/openmessage/OpenMessageTCPSubClient.java
index b601d497..cf0322a0 100644
--- a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/openmessage/OpenMessageTCPSubClient.java
+++ b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/openmessage/OpenMessageTCPSubClient.java
@@ -31,10 +31,10 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
class OpenMessageTCPSubClient implements EventMeshTCPSubClient<Message> {
- private final EventMeshTCPClientConfig eventMeshTCPClientConfig;
+ private final EventMeshTCPClientConfig eventMeshTcpClientConfig;
- public OpenMessageTCPSubClient(EventMeshTCPClientConfig eventMeshTCPClientConfig) {
- this.eventMeshTCPClientConfig = eventMeshTCPClientConfig;
+ public OpenMessageTCPSubClient(EventMeshTCPClientConfig eventMeshTcpClientConfig) {
+ this.eventMeshTcpClientConfig = eventMeshTcpClientConfig;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org