This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
The following commit(s) were added to refs/heads/main by this push:
new 96aafa6 fix: change the default config of server.
96aafa6 is described below
commit 96aafa6919325a6b29d123727cbc78e9c6e6e4fe
Author: 2011shenlin <[email protected]>
AuthorDate: Sun Jun 25 11:02:45 2023 +0800
fix: change the default config of server.
---
README.md | 2 +-
.../rocketmq/eventbridge/adapter/rpc/impl/AppConfigAPIImpl.java | 4 ++--
.../adapter/storage/rocketmq/impl/RocketMQEventDataRepository.java | 7 +++----
.../java/org/apache/rocketmq/eventbridge/config/GlobalConfig.java | 2 --
.../rocketmq/eventbridge/tools/pattern/PatternEvaluatorTest.java | 2 +-
.../rocketmq/eventbridge/tools/transform/BaseTransformTest.java | 2 +-
docs/cn/RocketMQEventBridgeQuickStart.md | 2 +-
.../adapter/api/controller/ApiDestinationDTOControllerTest.java | 2 +-
8 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/README.md b/README.md
index 6dac851..8f46a3a 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ curl -X POST http://127.0.0.1:7001/putEvents \
-H "ce-id:1234-1234-1234" \
-H "ce-datacontenttype:application/json" \
-H "ce-time:2018-04-05T17:31:00Z" \
--H "ce-aliyuneventbusname:demo-bus" \
+-H "ce-eventbusname:demo-bus" \
-d 'A test recrod.'
```
diff --git
a/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/AppConfigAPIImpl.java
b/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/AppConfigAPIImpl.java
index c3d050f..dc802b0 100644
---
a/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/AppConfigAPIImpl.java
+++
b/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/AppConfigAPIImpl.java
@@ -29,10 +29,10 @@ public class AppConfigAPIImpl {
public AppConfigAPIImpl() {
GlobalConfig globalConfig = new GlobalConfig();
- globalConfig.setGetEventBusExtensionKey("aliyuneventbusname");
+ globalConfig.setGetEventBusExtensionKey("eventbusname");
Set<String> extensionKeys = Sets.newHashSet();
- extensionKeys.add("aliyuneventbusname");
+ extensionKeys.add("eventbusname");
globalConfig.setEventExtensionKeys(extensionKeys);
LocalConfig localConfig = new LocalConfig();
diff --git
a/adapter/storage/src/main/java/org/apache/rocketmq/eventbridge/adapter/storage/rocketmq/impl/RocketMQEventDataRepository.java
b/adapter/storage/src/main/java/org/apache/rocketmq/eventbridge/adapter/storage/rocketmq/impl/RocketMQEventDataRepository.java
index 1b95789..5b1d796 100644
---
a/adapter/storage/src/main/java/org/apache/rocketmq/eventbridge/adapter/storage/rocketmq/impl/RocketMQEventDataRepository.java
+++
b/adapter/storage/src/main/java/org/apache/rocketmq/eventbridge/adapter/storage/rocketmq/impl/RocketMQEventDataRepository.java
@@ -25,7 +25,6 @@ import org.apache.rocketmq.common.message.Message;
import
org.apache.rocketmq.eventbridge.adapter.persistence.data.mybatis.dataobject.EventTopicDO;
import
org.apache.rocketmq.eventbridge.adapter.persistence.data.mybatis.mapper.EventTopicMapper;
import
org.apache.rocketmq.eventbridge.adapter.storage.rocketmq.api.EventDataOnRocketMQConnectAPI;
-import org.apache.rocketmq.eventbridge.config.AppConfig;
import
org.apache.rocketmq.eventbridge.domain.common.exception.EventBridgeErrorCode;
import org.apache.rocketmq.eventbridge.domain.model.data.PutEventCallback;
import org.apache.rocketmq.eventbridge.domain.storage.EventDataRepository;
@@ -95,15 +94,15 @@ public class RocketMQEventDataRepository implements
EventDataRepository {
return getTopicNameWithOutCache(accountId, eventBusName);
}
- @Override public String getTopicNameWithOutCache(String accountId, String
eventBusName) {
+ @Override
+ public String getTopicNameWithOutCache(String accountId, String
eventBusName) {
String topicName = null;
EventTopicDO eventTopicDO = eventTopicMapper.getTopic(accountId,
eventBusName);
if (eventTopicDO != null) {
topicName = eventTopicDO.getName();
} else {
topicName =
eventDataOnRocketMQConnectAPI.buildTopicName(accountId, eventBusName);
- eventTopicMapper.createTopic(accountId, eventBusName, topicName,
AppConfig.getGlobalConfig()
- .getDefaultDataPersistentClusterName());
+ eventTopicMapper.createTopic(accountId, eventBusName, topicName,
clusterName);
}
return topicName;
}
diff --git
a/common/src/main/java/org/apache/rocketmq/eventbridge/config/GlobalConfig.java
b/common/src/main/java/org/apache/rocketmq/eventbridge/config/GlobalConfig.java
index fcdd5c6..e225abe 100644
---
a/common/src/main/java/org/apache/rocketmq/eventbridge/config/GlobalConfig.java
+++
b/common/src/main/java/org/apache/rocketmq/eventbridge/config/GlobalConfig.java
@@ -26,8 +26,6 @@ public class GlobalConfig {
private String getEventBusExtensionKey;
- private String defaultDataPersistentClusterName;
-
private int eventSizeUpLimit = (1 << 10) * 64;
}
diff --git
a/common/src/test/java/org/apache/rocketmq/eventbridge/tools/pattern/PatternEvaluatorTest.java
b/common/src/test/java/org/apache/rocketmq/eventbridge/tools/pattern/PatternEvaluatorTest.java
index 83532dd..2bd6599 100644
---
a/common/src/test/java/org/apache/rocketmq/eventbridge/tools/pattern/PatternEvaluatorTest.java
+++
b/common/src/test/java/org/apache/rocketmq/eventbridge/tools/pattern/PatternEvaluatorTest.java
@@ -48,7 +48,7 @@ public class PatternEvaluatorTest {
Map<String, String> specMap = new HashMap<>();
specMap.put("source", "acs.aliyuncvc");
assertThat(evaluator.evaluateSpecAttr(JsonUtil.convertToJsonElement(specMap))).isTrue();
- specMap.put("aliyuneventbusname", "demo-bus");
+ specMap.put("eventbusname", "demo-bus");
assertThat(evaluator.evaluateExtensionAttr(JsonUtil.convertToJsonElement(specMap))).isTrue();
assertThat(evaluator.evaluateData("{\"anyKey\":\"anyValue\"}")).isTrue();
}
diff --git
a/common/src/test/java/org/apache/rocketmq/eventbridge/tools/transform/BaseTransformTest.java
b/common/src/test/java/org/apache/rocketmq/eventbridge/tools/transform/BaseTransformTest.java
index 763f1a5..0442c05 100644
---
a/common/src/test/java/org/apache/rocketmq/eventbridge/tools/transform/BaseTransformTest.java
+++
b/common/src/test/java/org/apache/rocketmq/eventbridge/tools/transform/BaseTransformTest.java
@@ -23,7 +23,7 @@ public class BaseTransformTest {
+ " \"id\":\"51efe8e2-841f-4900-8ff5-3c6dfae1060e\",\n" + "
\"source\":\"acs.oss\",\n"
+ " \"type\":\"oss:ObjectCreated:PostObject\",\n" + "
\"dataschema\":\"http://taobao.com/test.json\",\n";
+ "
\"subject\":\"acs:oss:cn-hangzhou:1234567:xls-papk/game_apk/123.jpg\",\n"
- + " \"aliyuneventbusname\":\"demo-bus\",\n" + " \"data\":{\n" +
" \"null\":null,\n"
+ + " \"eventbusname\":\"demo-bus\",\n" + " \"data\":{\n" + "
\"null\":null,\n"
+ " \"text\":\"100\",\n" + " \"number\":100,\n" + "
\"boolean\":false,\n"
+ "\"cn\":\"中国\",\n" + " \"array\":[\n" + " {\n"
+ " \"level2-1\":\"level2-1\"\n" + " },\n" +
" {\n"
diff --git a/docs/cn/RocketMQEventBridgeQuickStart.md
b/docs/cn/RocketMQEventBridgeQuickStart.md
index 696420d..cfeb3fe 100644
--- a/docs/cn/RocketMQEventBridgeQuickStart.md
+++ b/docs/cn/RocketMQEventBridgeQuickStart.md
@@ -182,6 +182,6 @@ Content-Type:"application/cloudevents+json; charset=UTF-8"
"data" : {
"body":"demo"
},
- "aliyuneventbusname":"demo-bus"
+ "eventbusname":"demo-bus"
}
```
diff --git
a/test/demo/src/test/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ApiDestinationDTOControllerTest.java
b/test/demo/src/test/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ApiDestinationDTOControllerTest.java
index bdfc870..6a2aa02 100644
---
a/test/demo/src/test/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ApiDestinationDTOControllerTest.java
+++
b/test/demo/src/test/java/org/apache/rocketmq/eventbridge/adapter/api/controller/ApiDestinationDTOControllerTest.java
@@ -172,7 +172,7 @@ public class ApiDestinationDTOControllerTest {
result.setData(apiDestinationDTOList);
result.setTotal(9);
result.setNextToken("0");
- Mockito.when(apiDestinationService.listApiDestinations(any(), any(),
any(), anyInt()))
+ Mockito.when(apiDestinationService.listApiDestinations(any(), any(),
any(), any(), anyInt()))
.thenReturn(result);
ListApiDestinationsRequest listApiDestinationsRequest = new
ListApiDestinationsRequest();
listApiDestinationsRequest.setApiDestinationNamePrefix(UUID.randomUUID()
