Skip to content

Commit 229201c

Browse files
Pil0tXiaPil0tXia
authored
[ISSUE #4838] Deprecate unused eventMesh.connector.plugin.type etc. properties (#4839)
* Remove all references of `eventMesh.connector.plugin.type` * Deprecate `eventMesh.connector.plugin.type` and sort properties * Remove misconfigured & not-used `registerIntervalInMills`, `fetchRegistryAddrIntervalInMills` * Remove 'defibus' related un-used usages * Supplement #4809 for `null != object`
1 parent fe2bd7c commit 229201c

File tree

33 files changed

+41
-111
lines changed

33 files changed

+41
-111
lines changed

Diff for: ‎eventmesh-common/src/main/java/org/apache/eventmesh/common/EventMeshThreadFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ public EventMeshThreadFactory(final String threadNamePrefix) {
6767
public Thread newThread(@Nonnull final Runnable runnable) {
6868

6969
StringBuilder threadName = new StringBuilder(threadNamePrefix);
70-
if (null != threadIndex) {
70+
if (threadIndex != null) {
7171
threadName.append("-").append(threadIndex.incrementAndGet());
7272
}
7373
Thread thread = new Thread(runnable, threadName.toString());
7474
thread.setDaemon(daemon);
75-
if (null != priority) {
75+
if (priority != null) {
7676
thread.setPriority(priority);
7777
}
7878

Diff for: ‎eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java

+1-10
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,6 @@ public class CommonConfiguration {
6767
@ConfigField(field = "metaStorage.plugin.password")
6868
private String eventMeshMetaStoragePluginPassword = "";
6969

70-
@ConfigField(field = "metaStorage.plugin.metaStorageIntervalInMills")
71-
private Integer eventMeshMetaStorageIntervalInMills = 10 * 1000;
72-
73-
@ConfigField(field = "metaStorage.plugin.fetchMetaStorageAddrIntervalInMills")
74-
private Integer eventMeshFetchMetaStorageAddrInterval = 10 * 1000;
75-
7670
@ConfigField(field = "metaStorage.plugin.enabled")
7771
private boolean eventMeshServerMetaStorageEnable = false;
7872

@@ -85,11 +79,8 @@ public class CommonConfiguration {
8579
@ConfigField(field = "security.plugin.type", notEmpty = true)
8680
private String eventMeshSecurityPluginType = "security";
8781

88-
@ConfigField(field = "connector.plugin.type", notEmpty = true)
89-
private String eventMeshConnectorPluginType = "rocketmq";
90-
9182
@ConfigField(field = "storage.plugin.type", notEmpty = true)
92-
private String eventMeshStoragePluginType = "rocketmq";
83+
private String eventMeshStoragePluginType = "standalone";
9384

9485
@ConfigField(field = "security.validation.type.token", notEmpty = true)
9586
private boolean eventMeshSecurityValidateTypeToken = false;

Diff for: ‎eventmesh-common/src/test/java/org/apache/eventmesh/common/config/CommonConfigurationTest.java

-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public void testGetCommonConfiguration() {
4545
Assertions.assertEquals("cluster-succeed!!!", config.getEventMeshCluster());
4646
Assertions.assertEquals("name-succeed!!!", config.getEventMeshName());
4747
Assertions.assertEquals("816", config.getSysID());
48-
// Assertions.assertEquals("connector-succeed!!!", config.getEventMeshConnectorPluginType());
4948
Assertions.assertEquals("storage-succeed!!!", config.getEventMeshStoragePluginType());
5049
Assertions.assertEquals("storage-succeed!!!", config.getEventMeshStoragePluginType());
5150
Assertions.assertEquals("security-succeed!!!", config.getEventMeshSecurityPluginType());
@@ -55,9 +54,6 @@ public void testGetCommonConfiguration() {
5554
Assertions.assertEquals("username-succeed!!!", config.getEventMeshMetaStoragePluginUsername());
5655
Assertions.assertEquals("password-succeed!!!", config.getEventMeshMetaStoragePluginPassword());
5756

58-
Assertions.assertEquals(Integer.valueOf(816), config.getEventMeshMetaStorageIntervalInMills());
59-
Assertions.assertEquals(Integer.valueOf(1816), config.getEventMeshFetchMetaStorageAddrInterval());
60-
6157
List<String> list = new ArrayList<>();
6258
list.add("metrics-succeed1!!!");
6359
list.add("metrics-succeed2!!!");

Diff for: ‎eventmesh-common/src/test/java/org/apache/eventmesh/common/utils/SystemUtilsTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ public class SystemUtilsTest {
2424

2525
@Test
2626
public void isLinuxPlatform() {
27-
if (null != SystemUtils.OS_NAME && SystemUtils.OS_NAME.toLowerCase().contains("linux")) {
27+
if (SystemUtils.OS_NAME != null && SystemUtils.OS_NAME.toLowerCase().contains("linux")) {
2828
Assertions.assertTrue(SystemUtils.isLinuxPlatform());
2929
Assertions.assertFalse(SystemUtils.isWindowsPlatform());
3030
}
3131
}
3232

3333
@Test
3434
public void isWindowsPlatform() {
35-
if (null != SystemUtils.OS_NAME && SystemUtils.OS_NAME.toLowerCase().contains("windows")) {
35+
if (SystemUtils.OS_NAME != null && SystemUtils.OS_NAME.toLowerCase().contains("windows")) {
3636
Assertions.assertFalse(SystemUtils.isLinuxPlatform());
3737
Assertions.assertTrue(SystemUtils.isWindowsPlatform());
3838
}

Diff for: ‎eventmesh-common/src/test/resources/configuration.properties

-3
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,10 @@ eventMesh.sysid=816
2020
eventMesh.server.cluster=cluster-succeed!!!
2121
eventMesh.server.name=name-succeed!!!
2222
eventMesh.server.hostIp=hostIp-succeed!!!
23-
eventMesh.connector.plugin.type=connector-succeed!!!
2423
eventMesh.storage.plugin.type=storage-succeed!!!
2524
eventMesh.security.plugin.type=security-succeed!!!
2625
eventMesh.metaStorage.plugin.type=metaStorage-succeed!!!
2726
eventMesh.trace.plugin=trace-succeed!!!
28-
eventMesh.metaStorage.plugin.metaStorageIntervalInMills=816
29-
eventMesh.metaStorage.plugin.fetchMetaStorageAddrIntervalInMills=1816
3027
eventMesh.metrics.plugin=metrics-succeed1!!!,metrics-succeed2!!!,metrics-succeed3!!!
3128
eventMesh.metaStorage.plugin.server-addr=server-addr-succeed1!!!
3229

Diff for: ‎eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/dialect/AbstractGeneralDatabaseDialect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ protected void registerType(Type type) {
146146
@Override
147147
public String getTypeName(Dialect hibernateDialect, Column<?> column) {
148148
Type type = this.getType(column);
149-
if (null != type) {
149+
if (type != null) {
150150
return type.getTypeName(column);
151151
}
152152
Long length = Optional.ofNullable(column.getColumnLength()).orElse(0L);

Diff for: ‎eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/dialect/antlr4/mysql/listener/CreateTableParserListener.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public void enterTableOptionCharset(TableOptionCharsetContext ctx) {
166166
@Override
167167
public void enterTableOptionAutoIncrement(TableOptionAutoIncrementContext ctx) {
168168
DecimalLiteralContext decimalLiteralContext = ctx.decimalLiteral();
169-
if (null != decimalLiteralContext) {
169+
if (decimalLiteralContext != null) {
170170
String autoIncrementNumber = Antlr4Utils.getText(decimalLiteralContext);
171171
this.tableEditor.withOption(MysqlTableOptions.AUTO_INCREMENT, autoIncrementNumber);
172172
}

Diff for: ‎eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/source/dialect/cdc/mysql/MysqlCdcEngine.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ private void enableGtidHandle() {
392392
EventMeshGtidSet purgedServerEventMeshGtidSet = new EventMeshGtidSet(purgedServerGtid);
393393

394394
EventMeshGtidSet filteredEventMeshGtidSet = filterGtidSet(context, executedEventMeshGtidSet, purgedServerEventMeshGtidSet);
395-
if (null != filteredEventMeshGtidSet) {
395+
if (filteredEventMeshGtidSet != null) {
396396
client.setGtidSet(filteredEventMeshGtidSet.toString());
397397
this.context.completedGtidSet(filteredEventMeshGtidSet.toString());
398398
localGtidSet = new com.github.shyiko.mysql.binlog.GtidSet(filteredEventMeshGtidSet.toString());
@@ -645,7 +645,7 @@ private void handleCdcDmlData(MysqlJdbcContext context, MysqlSourceMateData sour
645645
schema.addKeys(tableSchema.getPrimaryKey().getColumnNames());
646646
Pair<Serializable[], BitSet> beforePair = Optional.ofNullable(pair.getLeft()).orElse(new Pair<>());
647647
Serializable[] beforeRows = beforePair.getLeft();
648-
if (null != beforeRows && beforeRows.length != 0) {
648+
if (beforeRows != null && beforeRows.length != 0) {
649649
BitSet includedColumns = beforePair.getRight();
650650
Map<String, Object> beforeValues = new HashMap<>(beforeRows.length);
651651
for (int index = 0; index < columnsSize; ++index) {
@@ -663,7 +663,7 @@ private void handleCdcDmlData(MysqlJdbcContext context, MysqlSourceMateData sour
663663

664664
Pair<Serializable[], BitSet> afterPair = Optional.ofNullable(pair.getRight()).orElse(new Pair<>());
665665
Serializable[] afterRows = afterPair.getLeft();
666-
if (null != afterRows && afterRows.length != 0) {
666+
if (afterRows != null && afterRows.length != 0) {
667667
BitSet includedColumns = afterPair.getRight();
668668
Map<String, Object> afterValues = new HashMap<>(afterRows.length);
669669
for (int index = 0; index < columnsSize; ++index) {

Diff for: ‎eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/table/catalog/Table.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public Table(TableId tableId, PrimaryKey primaryKey, List<UniqueKey> uniqueKeys,
4848
this.primaryKey = primaryKey;
4949
this.uniqueKeys = uniqueKeys;
5050
this.comment = comment;
51-
if (null != options) {
51+
if (options != null) {
5252
this.options.putAll(options);
5353
}
5454
}

Diff for: ‎eventmesh-connectors/eventmesh-connector-lark/src/main/java/org/apache/eventmesh/connector/lark/sink/ImServiceHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -313,12 +313,12 @@ private String createInteractiveContent(ConnectRecord connectRecord, String titl
313313

314314
private boolean needAtAll(ConnectRecord connectRecord) {
315315
String atAll = connectRecord.getExtension(ConnectRecordExtensionKeys.AT_ALL_4_LARK);
316-
return null != atAll && !"null".equals(atAll) && Boolean.parseBoolean(atAll);
316+
return atAll != null && !"null".equals(atAll) && Boolean.parseBoolean(atAll);
317317
}
318318

319319
private String needAtUser(ConnectRecord connectRecord) {
320320
String atUsers = connectRecord.getExtension(ConnectRecordExtensionKeys.AT_USERS_4_LARK);
321-
return null != atUsers && !"null".equals(atUsers) ? atUsers : "";
321+
return atUsers != null && !"null".equals(atUsers) ? atUsers : "";
322322
}
323323

324324
/**

Diff for: ‎eventmesh-connectors/eventmesh-connector-rabbitmq/src/main/java/org/apache/eventmesh/connector/rabbitmq/client/RabbitmqClient.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void unbinding(Channel channel, String exchangeName, String routingKey, S
120120
* @param connection connection
121121
*/
122122
public void closeConnection(Connection connection) {
123-
if (null != connection) {
123+
if (connection != null) {
124124
try {
125125
connection.close();
126126
} catch (Exception ex) {
@@ -135,7 +135,7 @@ public void closeConnection(Connection connection) {
135135
* @param channel channel
136136
*/
137137
public void closeChannel(Channel channel) {
138-
if (null != channel) {
138+
if (channel != null) {
139139
try {
140140
channel.close();
141141
} catch (Exception ex) {

Diff for: ‎eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/meta/consul/service/ConsulMetaService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void init() throws MetaException {
7272
if (initStatus.compareAndSet(false, true)) {
7373
for (String key : ConfigurationContextUtil.KEYS) {
7474
CommonConfiguration commonConfiguration = ConfigurationContextUtil.get(key);
75-
if (null != commonConfiguration) {
75+
if (commonConfiguration != null) {
7676
String metaStorageAddr = commonConfiguration.getMetaStorageAddr();
7777
if (StringUtils.isBlank(metaStorageAddr)) {
7878
throw new MetaException("namesrvAddr cannot be null");

Diff for: ‎eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/service/ZookeeperMetaService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public void shutdown() throws MetaException {
175175
if (!startStatus.compareAndSet(true, false)) {
176176
return;
177177
}
178-
if (null != zkClient) {
178+
if (zkClient != null) {
179179
zkClient.close();
180180
}
181181
log.info("ZookeeperRegistryService closed");

Diff for: ‎eventmesh-operator/config/samples/eventmesh_v1_runtime.yaml

+3-11
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ data:
3535
eventMesh.server.cluster=COMMON
3636
eventMesh.server.name=EVENTMESH-runtime
3737
eventMesh.sysid=0000
38+
eventMesh.server.tcp.port=10000
3839
eventMesh.server.http.port=10105
3940
eventMesh.server.grpc.port=10205
41+
# HTTP Admin Server
42+
eventMesh.server.admin.http.port=10106
4043
########################## eventMesh tcp configuration ############################
4144
eventMesh.server.tcp.enabled=true
42-
eventMesh.server.tcp.port=10000
4345
eventMesh.server.tcp.readerIdleSeconds=120
4446
eventMesh.server.tcp.writerIdleSeconds=120
4547
eventMesh.server.tcp.allIdleSeconds=120
@@ -69,13 +71,6 @@ data:
6971
eventMesh.server.retry.async.pushRetryDelayInMills=500
7072
eventMesh.server.retry.sync.pushRetryDelayInMills=500
7173
eventMesh.server.retry.pushRetryQueueSize=10000
72-
#admin
73-
eventMesh.server.admin.http.port=10106
74-
#metaStorage
75-
eventMesh.server.metaStorage.metaStorageIntervalInMills=10000
76-
eventMesh.server.metaStorage.fetchMetaStorageAddrIntervalInMills=20000
77-
#auto-ack
78-
#eventMesh.server.defibus.client.comsumeTimeoutInMin=5
7974
8075
#sleep interval between closing client of different group in server graceful shutdown
8176
eventMesh.server.gracefulShutdown.sleepIntervalInMills=1000
@@ -85,9 +80,6 @@ data:
8580
eventMesh.server.blacklist.ipv4=0.0.0.0/8,127.0.0.0/8,169.254.0.0/16,255.255.255.255/32
8681
eventMesh.server.blacklist.ipv6=::/128,::1/128,ff00::/8
8782
88-
#connector plugin
89-
eventMesh.connector.plugin.type=standalone
90-
9183
#storage plugin
9284
eventMesh.storage.plugin.type=standalone
9385

Diff for: ‎eventmesh-protocol-plugin/eventmesh-protocol-http/src/main/java/org/apache/eventmesh/protocol/http/HttpProtocolAdaptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public ProtocolTransportObject fromCloudEvent(CloudEvent cloudEvent) throws Prot
9797
}
9898
httpEventWrapper.setSysHeaderMap(sysHeaderMap);
9999
// ce data
100-
if (null != cloudEvent.getData()) {
100+
if (cloudEvent.getData() != null) {
101101
Map<String, Object> dataContentMap = JsonUtils.parseTypeReferenceObject(
102102
new String(Objects.requireNonNull(cloudEvent.getData()).toBytes(), Constants.DEFAULT_CHARSET),
103103
new TypeReference<Map<String, Object>>() {

Diff for: ‎eventmesh-runtime/conf/eventmesh.properties

+8-14
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ eventMesh.server.provide.protocols=HTTP,TCP,GRPC
2121
eventMesh.server.cluster=COMMON
2222
eventMesh.server.name=EVENTMESH-runtime
2323
eventMesh.sysid=0000
24+
eventMesh.server.tcp.port=10000
2425
eventMesh.server.http.port=10105
2526
eventMesh.server.grpc.port=10205
27+
# HTTP Admin Server
28+
eventMesh.server.admin.http.port=10106
29+
2630
########################## EventMesh TCP Configuration ##########################
2731
eventMesh.server.tcp.enabled=true
28-
eventMesh.server.tcp.port=10000
2932
eventMesh.server.tcp.readerIdleSeconds=120
3033
eventMesh.server.tcp.writerIdleSeconds=120
3134
eventMesh.server.tcp.allIdleSeconds=120
@@ -57,14 +60,6 @@ eventMesh.server.retry.sync.pushRetryDelayInMills=500
5760
eventMesh.server.retry.pushRetryQueueSize=10000
5861
eventMesh.server.retry.plugin.type=default
5962

60-
# runtime admin
61-
eventMesh.server.admin.http.port=10106
62-
# metaStorage
63-
eventMesh.server.metaStorage.metaStorageIntervalInMills=10000
64-
eventMesh.server.metaStorage.fetchMetaStorageAddrIntervalInMills=20000
65-
# auto-ack
66-
#eventMesh.server.defibus.client.comsumeTimeoutInMin=5
67-
6863
# sleep interval between closing client of different group in server graceful shutdown
6964
eventMesh.server.gracefulShutdown.sleepIntervalInMills=1000
7065
eventMesh.server.rebalanceRedirect.sleepIntervalInMills=200
@@ -73,9 +68,7 @@ eventMesh.server.rebalanceRedirect.sleepIntervalInMills=200
7368
eventMesh.server.blacklist.ipv4=0.0.0.0/8,127.0.0.0/8,169.254.0.0/16,255.255.255.255/32
7469
eventMesh.server.blacklist.ipv6=::/128,::1/128,ff00::/8
7570

76-
# connector plugin
77-
eventMesh.connector.plugin.type=standalone
78-
71+
########################## EventMesh Plugin Configuration ##########################
7972
# storage plugin
8073
eventMesh.storage.plugin.type=standalone
8174

@@ -91,6 +84,7 @@ eventMesh.metaStorage.plugin.type=nacos
9184
eventMesh.metaStorage.plugin.server-addr=127.0.0.1:8848
9285
eventMesh.metaStorage.plugin.username=nacos
9386
eventMesh.metaStorage.plugin.password=nacos
87+
9488
# metaStorage plugin: nacos
9589
#eventMesh.metaStorage.nacos.endpoint=
9690
#eventMesh.metaStorage.nacos.accessKey=
@@ -137,9 +131,9 @@ eventMesh.trace.plugin=zipkin
137131
eventMesh.webHook.admin.start=true
138132
# Webhook event configuration storage mode. Currently, only file and nacos are supported
139133
eventMesh.webHook.operationMode=file
140-
# The file storage path of the file storage mode. If #{eventmeshhome} is written, it is in the eventmesh root directory
134+
# The file storage path of the file storage mode. If #{eventMeshHome} is written, it is in the EventMesh root directory
141135
eventMesh.webHook.fileMode.filePath= #{eventMeshHome}/webhook
142-
# Nacos storage mode, and the configuration naming rule is eventmesh webHook. nacosMode. {nacos native configuration key} please see the specific configuration [nacos github api](https://github.com/alibaba/nacos/blob/develop/api/src/main/java/com/alibaba/nacos/api/SystemPropertyKeyConst.java)
136+
# Nacos storage mode, and the configuration naming rule is EventMesh webHook. nacosMode. {nacos native configuration key} please see the specific configuration [nacos github api](https://github.com/alibaba/nacos/blob/develop/api/src/main/java/com/alibaba/nacos/api/SystemPropertyKeyConst.java)
143137
## Address of Nacos
144138
eventMesh.webHook.nacosMode.serverAddr=127.0.0.1:8848
145139
# Webhook CloudEvent sending mode. This property is the same as the eventMesh.storage.plugin.type configuration.

Diff for: ‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -451,11 +451,11 @@ public void channelReadComplete(final ChannelHandlerContext ctx) throws Exceptio
451451

452452
@Override
453453
public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) {
454-
if (null != cause) {
454+
if (cause != null) {
455455
log.error("", cause);
456456
}
457457

458-
if (null != ctx) {
458+
if (ctx != null) {
459459
ctx.close();
460460
}
461461
}

Diff for: ‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
2828
import org.apache.eventmesh.runtime.acl.Acl;
2929
import org.apache.eventmesh.runtime.common.ServiceState;
30-
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
3130
import org.apache.eventmesh.runtime.core.protocol.http.producer.ProducerTopicManager;
3231
import org.apache.eventmesh.runtime.meta.MetaStorage;
3332
import org.apache.eventmesh.runtime.storage.StorageResource;
@@ -139,13 +138,10 @@ public void init() throws Exception {
139138
adminBootstrap.init();
140139
}
141140

142-
final String eventStore = System.getProperty(EventMeshConstants.EVENT_STORE_PROPERTIES, System.getenv(EventMeshConstants.EVENT_STORE_ENV));
143-
144-
log.info("eventStore : {}", eventStore);
145141
producerTopicManager = new ProducerTopicManager(this);
146142
producerTopicManager.init();
147-
serviceState = ServiceState.INITED;
148143

144+
serviceState = ServiceState.INITED;
149145
log.info(SERVER_STATE_MSG, serviceState);
150146
}
151147

Diff for: ‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/constants/EventMeshConstants.java

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121

2222
public class EventMeshConstants {
2323

24-
public static final String EVENT_STORE_PROPERTIES = "eventstore";
25-
26-
public static final String EVENT_STORE_ENV = "EVENT_STORE";
27-
2824
public static final String PROTOCOL_HTTP = "http";
2925

3026
public static final String PROTOCOL_TCP = "tcp";

Diff for: ‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQProducerWrapper.java

-1
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,4 @@ public boolean reply(final CloudEvent cloudEvent, final SendCallback sendCallbac
9191
public Producer getMeshMQProducer() {
9292
return meshMQProducer;
9393
}
94-
9594
}

Diff for: ‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQWrapper.java

-18
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,11 @@
1717

1818
package org.apache.eventmesh.runtime.core.plugin;
1919

20-
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
21-
22-
import org.apache.commons.lang3.StringUtils;
23-
2420
import java.util.concurrent.atomic.AtomicBoolean;
2521

2622
public abstract class MQWrapper {
2723

28-
public static final String EVENT_STORE_DEFIBUS = "defibus";
29-
30-
public static String CURRENT_EVENT_STORE = EVENT_STORE_DEFIBUS;
31-
32-
public static final String EVENT_STORE_CONF = System.getProperty(EventMeshConstants.EVENT_STORE_PROPERTIES,
33-
System.getenv(EventMeshConstants.EVENT_STORE_ENV));
34-
35-
static {
36-
if (StringUtils.isNotBlank(EVENT_STORE_CONF)) {
37-
CURRENT_EVENT_STORE = EVENT_STORE_CONF;
38-
}
39-
}
40-
4124
public AtomicBoolean started = new AtomicBoolean(Boolean.FALSE);
4225

4326
public AtomicBoolean inited = new AtomicBoolean(Boolean.FALSE);
44-
4527
}

Diff for: ‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/producer/EventMeshProducer.java

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public synchronized void init(CommonConfiguration configuration,
6565
keyValue.put(EventMeshConstants.INSTANCE_NAME, EventMeshUtil.buildMeshClientID(
6666
producerGroupConfig.getGroupName(), configuration.getEventMeshCluster()));
6767

68-
// TODO for defibus
6968
keyValue.put(EventMeshConstants.EVENT_MESH_IDC, configuration.getEventMeshIDC());
7069
mqProducerWrapper = new MQProducerWrapper(
7170
configuration.getEventMeshStoragePluginType());

0 commit comments

Comments
 (0)