This is an automated email from the ASF dual-hosted git repository.
xiatian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new e04156b37 [ISSUE #4808] Unify all `null == object` usage to standard
`object == null` (#4809)
e04156b37 is described below
commit e04156b3779658a81740a7b53c30e9824829d4cd
Author: Pil0tXia <[email protected]>
AuthorDate: Thu Apr 4 16:27:57 2024 +0800
[ISSUE #4808] Unify all `null == object` usage to standard `object == null`
(#4809)
---
.../main/java/org/apache/eventmesh/common/protocol/tcp/Header.java | 6 +++---
.../java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java | 2 +-
.../src/main/java/org/apache/eventmesh/common/utils/IPUtils.java | 2 +-
.../main/java/org/apache/eventmesh/common/utils/ThreadUtils.java | 2 +-
.../connector/dingtalk/sink/connector/DingDingSinkConnector.java | 2 +-
.../connector/jdbc/dialect/mysql/MysqlDatabaseDialect.java | 2 +-
.../eventmesh/connector/jdbc/source/SourceJdbcTaskManager.java | 2 +-
.../connector/jdbc/source/dialect/cdc/mysql/MysqlCdcEngine.java | 4 ++--
.../connector/jdbc/source/dialect/mysql/MysqlDataTypeConvertor.java | 2 +-
.../jdbc/source/dialect/snapshot/mysql/MysqlSnapshotEngine.java | 2 +-
.../jdbc/table/catalog/mysql/MysqlDefaultValueConvertorImpl.java | 2 +-
.../org/apache/eventmesh/connector/lark/sink/ImServiceHandler.java | 2 +-
.../connector/spring/sink/EventMeshListenerBeanPostProcessor.java | 2 +-
.../org/apache/eventmesh/tcp/demo/pub/cloudevents/SyncRequest.java | 4 ++--
.../org/apache/eventmesh/meta/etcd/service/EtcdMetaService.java | 2 +-
.../org/apache/eventmesh/meta/nacos/service/NacosMetaService.java | 2 +-
.../eventmesh/meta/zookeeper/service/ZookeeperMetaService.java | 4 ++--
.../eventmesh/openconnect/offsetmgmt/nacos/NacosConfigService.java | 4 ++--
.../resolver/grpc/GrpcEventMeshCloudEventProtocolResolver.java | 2 +-
.../resolver/grpc/GrpcEventMeshCloudEventProtocolResolver.java | 4 ++--
.../eventmesh/runtime/core/protocol/grpc/service/ServiceUtils.java | 4 ++--
.../main/java/org/apache/eventmesh/runtime/util/HttpTinyClient.java | 4 ++--
.../main/java/org/apache/eventmesh/runtime/util/RemotingHelper.java | 4 ++--
.../test/java/org/apache/eventmesh/runtime/client/common/Codec.java | 2 +-
.../eventmesh/client/grpc/producer/EventMeshMessageProducer.java | 2 +-
.../eventmesh/client/grpc/util/EventMeshCloudEventBuilder.java | 4 ++--
.../org/apache/eventmesh/auth/token/impl/auth/AuthTokenUtils.java | 4 ++--
.../eventmesh/storage/rocketmq/consumer/PushConsumerImpl.java | 2 +-
.../client/impl/consumer/ConsumeMessageConcurrentlyService.java | 4 ++--
29 files changed, 42 insertions(+), 42 deletions(-)
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Header.java
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Header.java
index 864cec212..86699845c 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Header.java
+++
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Header.java
@@ -49,7 +49,7 @@ public class Header {
}
public void putProperty(final String name, final Object value) {
- if (null == this.properties) {
+ if (this.properties == null) {
this.properties = new HashMap<>();
}
@@ -57,7 +57,7 @@ public class Header {
}
public Object getProperty(final String name) {
- if (null == this.properties) {
+ if (this.properties == null) {
return null;
}
return this.properties.get(name);
@@ -65,7 +65,7 @@ public class Header {
public String getStringProperty(final String name) {
Object property = getProperty(name);
- if (null == property) {
+ if (property == null) {
return null;
}
return property.toString();
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java
index c24ef94a8..a593a837e 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java
+++
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java
@@ -132,7 +132,7 @@ public class Codec {
try {
target = (ByteBuf) super.decode(ctx, in);
- if (null == target) {
+ if (target == null) {
return null;
}
byte[] flagBytes = parseFlag(target);
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/IPUtils.java
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/IPUtils.java
index f22389ffd..998735181 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/IPUtils.java
+++
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/IPUtils.java
@@ -161,7 +161,7 @@ public class IPUtils {
}
public static String parseChannelRemoteAddr(final Channel channel) {
- if (null == channel) {
+ if (channel == null) {
return "";
}
SocketAddress remote = channel.remoteAddress();
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/ThreadUtils.java
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/ThreadUtils.java
index 002530a54..72447509e 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/ThreadUtils.java
+++
b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/ThreadUtils.java
@@ -56,7 +56,7 @@ public class ThreadUtils {
}
public static void sleepWithThrowException(long timeout, TimeUnit
timeUnit) throws InterruptedException {
- if (null == timeUnit) {
+ if (timeUnit == null) {
return;
}
timeUnit.sleep(timeout);
diff --git
a/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnector.java
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnector.java
index ff41855e3..754461875 100644
---
a/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnector.java
+++
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnector.java
@@ -127,7 +127,7 @@ public class DingDingSinkConnector implements Sink {
orgGroupSendHeaders.xAcsDingtalkAccessToken = accessToken;
String templateTypeKey =
record.getExtension(ConnectRecordExtensionKeys.DINGTALK_TEMPLATE_TYPE);
- if (null == templateTypeKey || "null".equals(templateTypeKey))
{
+ if (templateTypeKey == null || "null".equals(templateTypeKey))
{
templateTypeKey =
DingDingMessageTemplateType.PLAIN_TEXT.getTemplateType();
}
DingDingMessageTemplateType templateType =
DingDingMessageTemplateType.of(templateTypeKey);
diff --git
a/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/dialect/mysql/MysqlDatabaseDialect.java
b/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/dialect/mysql/MysqlDatabaseDialect.java
index 014af3086..acd8730c2 100644
---
a/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/dialect/mysql/MysqlDatabaseDialect.java
+++
b/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/dialect/mysql/MysqlDatabaseDialect.java
@@ -162,7 +162,7 @@ public class MysqlDatabaseDialect extends
AbstractGeneralDatabaseDialect<MysqlJd
@Override
public boolean databaseExists(String databaseName) throws CatalogException
{
- if (null == databaseName || databaseName.trim().isEmpty()) {
+ if (databaseName == null || databaseName.trim().isEmpty()) {
return false;
}
List<String> databases = listDatabases();
diff --git
a/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/SourceJdbcTaskManager.java
b/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/SourceJdbcTaskManager.java
index 49e9c53a1..be38ffb75 100644
---
a/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/SourceJdbcTaskManager.java
+++
b/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/SourceJdbcTaskManager.java
@@ -64,7 +64,7 @@ public class SourceJdbcTaskManager extends
AbstractJdbcTaskManager<SourceEventMe
}
private void doHandleEvent(Event event) {
- if (null == event) {
+ if (event == null) {
return;
}
JdbcConnectData jdbcConnectData = event.getJdbcConnectData();
diff --git
a/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/dialect/cdc/mysql/MysqlCdcEngine.java
b/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/dialect/cdc/mysql/MysqlCdcEngine.java
index 147509e12..645e5c9ec 100644
---
a/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/dialect/cdc/mysql/MysqlCdcEngine.java
+++
b/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/dialect/cdc/mysql/MysqlCdcEngine.java
@@ -289,7 +289,7 @@ public class MysqlCdcEngine extends
AbstractCdcEngine<MysqlAntlr4DdlParser, Mysq
*/
private void eventMeshMysqlEventListener(Event event, MysqlJdbcContext
context) {
- if (null == event) {
+ if (event == null) {
return;
}
final EventHeader eventHeader = event.getHeader();
@@ -366,7 +366,7 @@ public class MysqlCdcEngine extends
AbstractCdcEngine<MysqlAntlr4DdlParser, Mysq
Event event = null;
try {
event = eventQueue.poll(5, TimeUnit.SECONDS);
- if (null == event) {
+ if (event == null) {
continue;
}
eventHandlers.getOrDefault(event.getHeader().getEventType(),
ignore -> ignoreEvent(context, ignore)).accept(event);
diff --git
a/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/dialect/mysql/MysqlDataTypeConvertor.java
b/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/dialect/mysql/MysqlDataTypeConvertor.java
index f187e71fb..322e4f5f1 100644
---
a/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/dialect/mysql/MysqlDataTypeConvertor.java
+++
b/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/dialect/mysql/MysqlDataTypeConvertor.java
@@ -116,7 +116,7 @@ public class MysqlDataTypeConvertor implements
DataTypeConvertor<MysqlType> {
/**
* @see <a
href="https://dev.mysql.com/doc/refman/8.0/en/bit-type.html";>Mysql doc</a>
*/
- if (null == dataTypeProperties) {
+ if (dataTypeProperties == null) {
return BytesEventMeshDataType.INSTANCE;
}
Integer precision = (Integer)
dataTypeProperties.get(MysqlDataTypeConvertor.PRECISION);
diff --git
a/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/dialect/snapshot/mysql/MysqlSnapshotEngine.java
b/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/dialect/snapshot/mysql/MysqlSnapshotEngine.java
index a70702901..e76ab49a3 100644
---
a/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/dialect/snapshot/mysql/MysqlSnapshotEngine.java
+++
b/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/dialect/snapshot/mysql/MysqlSnapshotEngine.java
@@ -311,7 +311,7 @@ public class MysqlSnapshotEngine extends
while (isRunning) {
try {
Event event = eventQueue.poll(5, TimeUnit.SECONDS);
- if (null == event) {
+ if (event == null) {
continue;
}
consumers.forEach(consumer -> consumer.accept(event));
diff --git
a/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/table/catalog/mysql/MysqlDefaultValueConvertorImpl.java
b/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/table/catalog/mysql/MysqlDefaultValueConvertorImpl.java
index 699f4fd4f..1832f17d7 100644
---
a/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/table/catalog/mysql/MysqlDefaultValueConvertorImpl.java
+++
b/eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/table/catalog/mysql/MysqlDefaultValueConvertorImpl.java
@@ -60,7 +60,7 @@ public class MysqlDefaultValueConvertorImpl implements
DefaultValueConvertor {
@Override
public Object parseDefaultValue(Column<?> column, String
defaultValueExpression) {
- if (null == defaultValueExpression) {
+ if (defaultValueExpression == null) {
return null;
}
defaultValueExpression = defaultValueExpression.trim();
diff --git
a/eventmesh-connectors/eventmesh-connector-lark/src/main/java/org/apache/eventmesh/connector/lark/sink/ImServiceHandler.java
b/eventmesh-connectors/eventmesh-connector-lark/src/main/java/org/apache/eventmesh/connector/lark/sink/ImServiceHandler.java
index e61940ce3..4797d58ef 100644
---
a/eventmesh-connectors/eventmesh-connector-lark/src/main/java/org/apache/eventmesh/connector/lark/sink/ImServiceHandler.java
+++
b/eventmesh-connectors/eventmesh-connector-lark/src/main/java/org/apache/eventmesh/connector/lark/sink/ImServiceHandler.java
@@ -230,7 +230,7 @@ public class ImServiceHandler {
.uuid(UUID.randomUUID().toString());
String templateTypeKey =
connectRecord.getExtension(ConnectRecordExtensionKeys.TEMPLATE_TYPE_4_LARK);
- if (null == templateTypeKey || "null".equals(templateTypeKey)) {
+ if (templateTypeKey == null || "null".equals(templateTypeKey)) {
templateTypeKey =
LarkMessageTemplateType.PLAIN_TEXT.getTemplateKey();
}
LarkMessageTemplateType templateType =
LarkMessageTemplateType.of(templateTypeKey);
diff --git
a/eventmesh-connectors/eventmesh-connector-spring/src/main/java/org/apache/eventmesh/connector/spring/sink/EventMeshListenerBeanPostProcessor.java
b/eventmesh-connectors/eventmesh-connector-spring/src/main/java/org/apache/eventmesh/connector/spring/sink/EventMeshListenerBeanPostProcessor.java
index b36e30841..f6c9605f6 100644
---
a/eventmesh-connectors/eventmesh-connector-spring/src/main/java/org/apache/eventmesh/connector/spring/sink/EventMeshListenerBeanPostProcessor.java
+++
b/eventmesh-connectors/eventmesh-connector-spring/src/main/java/org/apache/eventmesh/connector/spring/sink/EventMeshListenerBeanPostProcessor.java
@@ -97,7 +97,7 @@ public class EventMeshListenerBeanPostProcessor implements
ApplicationContextAwa
while (sinkConnector.isRunning()) {
try {
poll =
sinkConnector.getQueue().poll(annotation.requestTimeout(), TimeUnit.SECONDS);
- if (null == poll || null == poll.getData()) {
+ if (poll == null || poll.getData() == null) {
continue;
}
String messageBody = new String((byte[])
poll.getData());
diff --git
a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/cloudevents/SyncRequest.java
b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/cloudevents/SyncRequest.java
index 4be5e2569..1fe1371b3 100644
---
a/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/cloudevents/SyncRequest.java
+++
b/eventmesh-examples/src/main/java/org/apache/eventmesh/tcp/demo/pub/cloudevents/SyncRequest.java
@@ -65,7 +65,7 @@ public class SyncRequest {
final Package response = client.rr(event,
EventMeshCommon.DEFAULT_TIME_OUT_MILLS);
// check-NPE EventFormat
final EventFormat eventFormat =
EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE);
- if (null == eventFormat) {
+ if (eventFormat == null) {
log.error("eventFormat is null. end the process");
return;
}
@@ -75,7 +75,7 @@ public class SyncRequest {
// check-NPE CloudEventData
final CloudEventData cloudEventData = replyEvent.getData();
- if (null == cloudEventData) {
+ if (cloudEventData == null) {
log.error("replyEvent.data is null. end the process");
return;
}
diff --git
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/service/EtcdMetaService.java
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/service/EtcdMetaService.java
index bde4e0870..9d56db249 100644
---
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/service/EtcdMetaService.java
+++
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/service/EtcdMetaService.java
@@ -93,7 +93,7 @@ public class EtcdMetaService implements MetaService {
eventMeshRegisterInfoMap = new
ConcurrentHashMap<>(ConfigurationContextUtil.KEYS.size());
for (String key : ConfigurationContextUtil.KEYS) {
CommonConfiguration commonConfiguration =
ConfigurationContextUtil.get(key);
- if (null == commonConfiguration) {
+ if (commonConfiguration == null) {
continue;
}
if (StringUtils.isBlank(commonConfiguration.getMetaStorageAddr()))
{
diff --git
a/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/meta/nacos/service/NacosMetaService.java
b/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/meta/nacos/service/NacosMetaService.java
index ca612ae07..92abcf837 100644
---
a/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/meta/nacos/service/NacosMetaService.java
+++
b/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/meta/nacos/service/NacosMetaService.java
@@ -109,7 +109,7 @@ public class NacosMetaService implements MetaService {
eventMeshRegisterInfoMap = new
ConcurrentHashMap<>(ConfigurationContextUtil.KEYS.size());
for (String key : ConfigurationContextUtil.KEYS) {
CommonConfiguration commonConfiguration =
ConfigurationContextUtil.get(key);
- if (null == commonConfiguration) {
+ if (commonConfiguration == null) {
continue;
}
if (StringUtils.isBlank(commonConfiguration.getMetaStorageAddr()))
{
diff --git
a/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/service/ZookeeperMetaService.java
b/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/service/ZookeeperMetaService.java
index 844ab1804..359e7427f 100644
---
a/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/service/ZookeeperMetaService.java
+++
b/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/service/ZookeeperMetaService.java
@@ -86,7 +86,7 @@ public class ZookeeperMetaService implements MetaService {
eventMeshRegisterInfoMap = new
ConcurrentHashMap<>(ConfigurationContextUtil.KEYS.size());
for (String key : ConfigurationContextUtil.KEYS) {
CommonConfiguration commonConfiguration =
ConfigurationContextUtil.get(key);
- if (null == commonConfiguration) {
+ if (commonConfiguration == null) {
continue;
}
if (StringUtils.isBlank(commonConfiguration.getMetaStorageAddr()))
{
@@ -285,7 +285,7 @@ public class ZookeeperMetaService implements MetaService {
public boolean register(EventMeshRegisterInfo eventMeshRegisterInfo)
throws MetaException {
try {
String[] ipPort =
eventMeshRegisterInfo.getEndPoint().split(ZookeeperConstant.IP_PORT_SEPARATOR);
- if (null == ipPort || ipPort.length < 2) {
+ if (ipPort == null || ipPort.length < 2) {
return false;
}
String ip = ipPort[0];
diff --git
a/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-nacos/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/nacos/NacosConfigService.java
b/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-nacos/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/nacos/NacosConfigService.java
index 787adbc3f..8d4e9dade 100644
---
a/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-nacos/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/nacos/NacosConfigService.java
+++
b/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-nacos/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/nacos/NacosConfigService.java
@@ -69,7 +69,7 @@ public class NacosConfigService implements
OffsetManagementService {
// merge the updated connectorRecord & recordOffset to memory store
public void mergeOffset(ConnectorRecordPartition connectorRecordPartition,
RecordOffset recordOffset) {
- if (null == connectorRecordPartition ||
connectorRecordPartition.getPartition().isEmpty()) {
+ if (connectorRecordPartition == null ||
connectorRecordPartition.getPartition().isEmpty()) {
return;
}
if (positionStore.getKVMap().containsKey(connectorRecordPartition)) {
@@ -172,7 +172,7 @@ public class NacosConfigService implements
OffsetManagementService {
@Override
public void removePosition(List<ConnectorRecordPartition> partitions) {
- if (null == partitions) {
+ if (partitions == null) {
return;
}
for (ConnectorRecordPartition partition : partitions) {
diff --git
a/eventmesh-protocol-plugin/eventmesh-protocol-cloudevents/src/main/java/org/apache/eventmesh/protocol/cloudevents/resolver/grpc/GrpcEventMeshCloudEventProtocolResolver.java
b/eventmesh-protocol-plugin/eventmesh-protocol-cloudevents/src/main/java/org/apache/eventmesh/protocol/cloudevents/resolver/grpc/GrpcEventMeshCloudEventProtocolResolver.java
index a00d1852a..ad48ad59d 100644
---
a/eventmesh-protocol-plugin/eventmesh-protocol-cloudevents/src/main/java/org/apache/eventmesh/protocol/cloudevents/resolver/grpc/GrpcEventMeshCloudEventProtocolResolver.java
+++
b/eventmesh-protocol-plugin/eventmesh-protocol-cloudevents/src/main/java/org/apache/eventmesh/protocol/cloudevents/resolver/grpc/GrpcEventMeshCloudEventProtocolResolver.java
@@ -52,7 +52,7 @@ public class GrpcEventMeshCloudEventProtocolResolver {
}
public static EventMeshCloudEventWrapper
buildEventMeshCloudEvent(io.cloudevents.CloudEvent cloudEvent) {
- if (null == cloudEvent) {
+ if (cloudEvent == null) {
return new EventMeshCloudEventWrapper(null);
}
try {
diff --git
a/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/resolver/grpc/GrpcEventMeshCloudEventProtocolResolver.java
b/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/resolver/grpc/GrpcEventMeshCloudEventProtocolResolver.java
index d07760f91..19a1cbc43 100644
---
a/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/resolver/grpc/GrpcEventMeshCloudEventProtocolResolver.java
+++
b/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/resolver/grpc/GrpcEventMeshCloudEventProtocolResolver.java
@@ -39,7 +39,7 @@ public class GrpcEventMeshCloudEventProtocolResolver {
private static final EventFormat eventFormat =
EventFormatProvider.getInstance().resolveFormat(ProtobufFormat.PROTO_CONTENT_TYPE);
public static io.cloudevents.CloudEvent buildEvent(CloudEvent cloudEvent) {
- if (null == cloudEvent) {
+ if (cloudEvent == null) {
return null;
}
io.cloudevents.CloudEvent event =
eventFormat.deserialize(cloudEvent.toByteArray());
@@ -47,7 +47,7 @@ public class GrpcEventMeshCloudEventProtocolResolver {
}
public static EventMeshCloudEventWrapper
buildEventMeshCloudEvent(io.cloudevents.CloudEvent cloudEvent) {
- if (null == cloudEvent) {
+ if (cloudEvent == null) {
return new EventMeshCloudEventWrapper(null);
}
try {
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/ServiceUtils.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/ServiceUtils.java
index c59c7e357..592010300 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/ServiceUtils.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/grpc/service/ServiceUtils.java
@@ -66,7 +66,7 @@ public class ServiceUtils {
}
public static boolean validateCloudEventBatchAttributes(CloudEventBatch
cloudEventBatch) {
- if (null == cloudEventBatch || cloudEventBatch.getEventsCount() < 1) {
+ if (cloudEventBatch == null || cloudEventBatch.getEventsCount() < 1) {
return false;
}
List<CloudEvent> eventsList = cloudEventBatch.getEventsList();
@@ -99,7 +99,7 @@ public class ServiceUtils {
}
public static boolean validateCloudEventBatchData(CloudEventBatch
cloudEventBatch) {
- if (null == cloudEventBatch || cloudEventBatch.getEventsCount() < 1) {
+ if (cloudEventBatch == null || cloudEventBatch.getEventsCount() < 1) {
return false;
}
List<CloudEvent> eventsList = cloudEventBatch.getEventsList();
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/HttpTinyClient.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/HttpTinyClient.java
index f8dc942fa..38d3019de 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/HttpTinyClient.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/HttpTinyClient.java
@@ -35,7 +35,7 @@ public class HttpTinyClient {
public static HttpResult httpGet(String url, List<String> headers,
List<String> paramValues,
String encoding, long readTimeoutMs) throws IOException {
String encodedContent = encodingParams(paramValues, encoding);
- url += (null == encodedContent) ? "" : ("?" + encodedContent);
+ url += (encodedContent == null) ? "" : ("?" + encodedContent);
HttpURLConnection conn = null;
try {
@@ -65,7 +65,7 @@ public class HttpTinyClient {
private static String encodingParams(Collection<String> paramValues,
String encoding)
throws UnsupportedEncodingException {
StringBuilder sb = new StringBuilder();
- if (null == paramValues) {
+ if (paramValues == null) {
return null;
}
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/RemotingHelper.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/RemotingHelper.java
index 2e365c053..de2061731 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/RemotingHelper.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/RemotingHelper.java
@@ -48,7 +48,7 @@ public abstract class RemotingHelper {
}
public static String parseChannelRemoteAddr(final Channel channel) {
- if (null == channel) {
+ if (channel == null) {
return "";
}
@@ -67,7 +67,7 @@ public abstract class RemotingHelper {
}
public static String parseChannelLocalAddr(final Channel channel) {
- if (null == channel) {
+ if (channel == null) {
return "";
}
diff --git
a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/Codec.java
b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/Codec.java
index ee57b78bc..26670754d 100644
---
a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/Codec.java
+++
b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/Codec.java
@@ -94,7 +94,7 @@ public class Codec {
int bodyLength = 0;
try {
- if (null == in) {
+ if (in == null) {
return;
}
diff --git
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/producer/EventMeshMessageProducer.java
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/producer/EventMeshMessageProducer.java
index 229fb2971..95740a466 100644
---
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/producer/EventMeshMessageProducer.java
+++
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/producer/EventMeshMessageProducer.java
@@ -51,7 +51,7 @@ public class EventMeshMessageProducer implements
GrpcProducer<EventMeshMessage>
@Override
public Response publish(EventMeshMessage message) {
- if (null == message) {
+ if (message == null) {
return null;
}
diff --git
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshCloudEventBuilder.java
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshCloudEventBuilder.java
index f89715054..f7ab40c20 100644
---
a/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshCloudEventBuilder.java
+++
b/eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshCloudEventBuilder.java
@@ -236,7 +236,7 @@ public class EventMeshCloudEventBuilder {
@SuppressWarnings("unchecked")
public static <T> T buildMessageFromEventMeshCloudEvent(final CloudEvent
cloudEvent, final EventMeshProtocolType protocolType) {
- if (null == cloudEvent) {
+ if (cloudEvent == null) {
return null;
}
final String seq = EventMeshCloudEventUtils.getSeqNum(cloudEvent);
@@ -251,7 +251,7 @@ public class EventMeshCloudEventBuilder {
});
}
- if (null == protocolType) {
+ if (protocolType == null) {
return null;
}
diff --git
a/eventmesh-security-plugin/eventmesh-security-auth-token/src/main/java/org/apache/eventmesh/auth/token/impl/auth/AuthTokenUtils.java
b/eventmesh-security-plugin/eventmesh-security-auth-token/src/main/java/org/apache/eventmesh/auth/token/impl/auth/AuthTokenUtils.java
index ac55f88c9..41ceca549 100644
---
a/eventmesh-security-plugin/eventmesh-security-auth-token/src/main/java/org/apache/eventmesh/auth/token/impl/auth/AuthTokenUtils.java
+++
b/eventmesh-security-plugin/eventmesh-security-auth-token/src/main/java/org/apache/eventmesh/auth/token/impl/auth/AuthTokenUtils.java
@@ -55,7 +55,7 @@ public class AuthTokenUtils {
token = token.replace("Bearer ", "");
for (String key : ConfigurationContextUtil.KEYS) {
CommonConfiguration commonConfiguration =
ConfigurationContextUtil.get(key);
- if (null == commonConfiguration) {
+ if (commonConfiguration == null) {
continue;
}
if
(StringUtils.isBlank(commonConfiguration.getEventMeshSecurityPublickey())) {
@@ -98,7 +98,7 @@ public class AuthTokenUtils {
token = token.replace("Bearer ", "");
for (String key : ConfigurationContextUtil.KEYS) {
CommonConfiguration commonConfiguration =
ConfigurationContextUtil.get(key);
- if (null == commonConfiguration) {
+ if (commonConfiguration == null) {
continue;
}
if
(StringUtils.isBlank(commonConfiguration.getEventMeshSecurityPublickey())) {
diff --git
a/eventmesh-storage-plugin/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/consumer/PushConsumerImpl.java
b/eventmesh-storage-plugin/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/consumer/PushConsumerImpl.java
index d332a6c7b..4a7e0869c 100644
---
a/eventmesh-storage-plugin/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/consumer/PushConsumerImpl.java
+++
b/eventmesh-storage-plugin/eventmesh-storage-rocketmq/src/main/java/org/apache/eventmesh/storage/rocketmq/consumer/PushConsumerImpl.java
@@ -72,7 +72,7 @@ public class PushConsumerImpl {
}
this.rocketmqPushConsumer.setNamesrvAddr(accessPoints.replace(',',
';'));
String consumerGroup = clientConfig.getConsumerId();
- if (null == consumerGroup || consumerGroup.isEmpty()) {
+ if (consumerGroup == null || consumerGroup.isEmpty()) {
throw new StorageRuntimeException(
"Consumer Group is necessary for RocketMQ, please set it.");
}
diff --git
a/eventmesh-storage-plugin/eventmesh-storage-rocketmq/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
b/eventmesh-storage-plugin/eventmesh-storage-rocketmq/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
index f58a20cea..08b7b4aaf 100644
---
a/eventmesh-storage-plugin/eventmesh-storage-rocketmq/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
+++
b/eventmesh-storage-plugin/eventmesh-storage-rocketmq/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
@@ -441,7 +441,7 @@ public class ConsumeMessageConcurrentlyService implements
ConsumeMessageService
hasException = true;
}
long consumeRT = System.currentTimeMillis() - beginTimestamp;
- if (null == status) {
+ if (status == null) {
if (hasException) {
returnType = ConsumeReturnType.EXCEPTION;
} else {
@@ -457,7 +457,7 @@ public class ConsumeMessageConcurrentlyService implements
ConsumeMessageService
Objects.requireNonNull(consumeMessageContext).getProps().put(MixAll.CONSUME_CONTEXT_TYPE,
returnType.name());
}
- if (null == status) {
+ if (status == null) {
log.warn("consumeMessage return null, Group: {} Msgs: {} MQ:
{}",
ConsumeMessageConcurrentlyService.this.consumerGroup,
msgs,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
