You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by ch...@apache.org on 2022/08/25 08:49:04 UTC
[incubator-eventmesh] branch master updated: [Issue #1076] Extraction of constants
This is an automated email from the ASF dual-hosted git repository.
chenguangsheng 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 e1624684 [Issue #1076] Extraction of constants
new cb03b4c0 Merge pull request #1089 from Karen-W-2002/NacosWebHookConfigOperations_Constants
e1624684 is described below
commit e1624684e0e56b53f6ce6812988db78011eb77cf
Author: Karen-W-2002 <ka...@gmail.com>
AuthorDate: Thu Aug 4 22:43:02 2022 +0800
[Issue #1076] Extraction of constants
---
.../eventmesh/webhook/admin/NacosWebHookConfigOperation.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java b/eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java
index 14972dc0..421b6515 100644
--- a/eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java
+++ b/eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java
@@ -50,6 +50,7 @@ import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.util.internal.Stri
public class NacosWebHookConfigOperation implements WebHookConfigOperation {
private static final Logger logger = LoggerFactory.getLogger(NacosWebHookConfigOperation.class);
+ private static final String CONSTANTS_WEBHOOK = "webhook";
private final ConfigService configService;
@@ -57,9 +58,9 @@ public class NacosWebHookConfigOperation implements WebHookConfigOperation {
public NacosWebHookConfigOperation(Properties properties) throws NacosException {
configService = ConfigFactory.createConfigService(properties);
- String manufacturers = configService.getConfig(MANUFACTURERS_DATA_ID, "webhook", TIMEOUT_MS);
+ String manufacturers = configService.getConfig(MANUFACTURERS_DATA_ID, CONSTANTS_WEBHOOK, TIMEOUT_MS);
if (manufacturers == null) {
- configService.publishConfig(MANUFACTURERS_DATA_ID, "webhook", JsonUtils.serialize(new ManufacturerObject()), ConfigType.JSON.getType());
+ configService.publishConfig(MANUFACTURERS_DATA_ID, CONSTANTS_WEBHOOK, JsonUtils.serialize(new ManufacturerObject()), ConfigType.JSON.getType());
}
}
@@ -89,7 +90,7 @@ public class NacosWebHookConfigOperation implements WebHookConfigOperation {
ManufacturerObject manufacturerObject = getManufacturersInfo();
manufacturerObject.addManufacturer(manufacturerName);
manufacturerObject.getManufacturerEvents(manufacturerName).add(getWebHookConfigDataId(webHookConfig));
- configService.publishConfig(MANUFACTURERS_DATA_ID, "webhook",
+ configService.publishConfig(MANUFACTURERS_DATA_ID, CONSTANTS_WEBHOOK,
JsonUtils.serialize(manufacturerObject), ConfigType.JSON.getType());
} catch (NacosException e) {
logger.error("update manufacturersInfo error", e);
@@ -133,7 +134,7 @@ public class NacosWebHookConfigOperation implements WebHookConfigOperation {
try {
ManufacturerObject manufacturerObject = getManufacturersInfo();
manufacturerObject.getManufacturerEvents(manufacturerName).remove(getWebHookConfigDataId(webHookConfig));
- configService.publishConfig(MANUFACTURERS_DATA_ID, "webhook",
+ configService.publishConfig(MANUFACTURERS_DATA_ID, CONSTANTS_WEBHOOK,
JsonUtils.serialize(manufacturerObject), ConfigType.JSON.getType());
} catch (NacosException e) {
logger.error("update manufacturersInfo error", e);
@@ -197,7 +198,7 @@ public class NacosWebHookConfigOperation implements WebHookConfigOperation {
}
private ManufacturerObject getManufacturersInfo() throws NacosException {
- String manufacturersContent = configService.getConfig(MANUFACTURERS_DATA_ID, "webhook", TIMEOUT_MS);
+ String manufacturersContent = configService.getConfig(MANUFACTURERS_DATA_ID, CONSTANTS_WEBHOOK, TIMEOUT_MS);
return StringUtil.isNullOrEmpty(manufacturersContent)
? new ManufacturerObject() : JsonUtils.deserialize(manufacturersContent, ManufacturerObject.class);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org