This is an automated email from the ASF dual-hosted git repository.

mikexue 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 cc43deef5 [ISSUE #4227] Use switch...case... instead of if...else... 
for HookConfigOperationManager (#4228)
cc43deef5 is described below

commit cc43deef549d8b4869b8c544474200594aa2691d
Author: Pil0tXia <[email protected]>
AuthorDate: Tue Jul 18 09:26:29 2023 +0800

    [ISSUE #4227] Use switch...case... instead of if...else... for 
HookConfigOperationManager (#4228)
    
    * Optimize: Use switch...case... and remove redundantly throwed exception.
    
    * fix checkstyle
---
 .../storage/HookConfigOperationManager.java        | 44 +++++++++++++---------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git 
a/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/storage/HookConfigOperationManager.java
 
b/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/storage/HookConfigOperationManager.java
index bb1641596..2190f3174 100644
--- 
a/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/storage/HookConfigOperationManager.java
+++ 
b/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/storage/HookConfigOperationManager.java
@@ -29,7 +29,6 @@ import 
org.apache.eventmesh.webhook.api.WebHookConfigOperation;
 import org.apache.eventmesh.webhook.api.utils.ClassUtils;
 import org.apache.eventmesh.webhook.receive.config.ReceiveConfiguration;
 
-import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -60,15 +59,19 @@ public class HookConfigOperationManager implements 
WebHookConfigOperation {
      *
      * @param receiveConfiguration receiveConfiguration
      */
-    public HookConfigOperationManager(final ReceiveConfiguration 
receiveConfiguration)
-        throws FileNotFoundException, NacosException {
+    public HookConfigOperationManager(final ReceiveConfiguration 
receiveConfiguration) throws NacosException {
 
         this.operationMode = receiveConfiguration.getOperationMode();
 
-        if (OPERATION_MODE_FILE.equals(operationMode)) {
-            new WebhookFileListener(receiveConfiguration.getFilePath(), 
cacheWebHookConfig);
-        } else if (OPERATION_MODE_NACOS.equals(operationMode)) {
-            nacosModeInit(receiveConfiguration.getOperationProperties());
+        switch (operationMode) {
+            case OPERATION_MODE_FILE:
+                new WebhookFileListener(receiveConfiguration.getFilePath(), 
cacheWebHookConfig);
+                break;
+            case OPERATION_MODE_NACOS:
+                nacosModeInit(receiveConfiguration.getOperationProperties());
+                break;
+            default:
+                break;
         }
     }
 
@@ -78,17 +81,22 @@ public class HookConfigOperationManager implements 
WebHookConfigOperation {
 
     @Override
     public WebHookConfig queryWebHookConfigById(final WebHookConfig 
webHookConfig) {
-        if (OPERATION_MODE_FILE.equals(operationMode)) {
-            return 
cacheWebHookConfig.get(ClassUtils.convertResourcePathToClassName(webHookConfig.getCallbackPath()));
-        } else if (OPERATION_MODE_NACOS.equals(operationMode)) {
-            try {
-                final String content = 
nacosConfigService.getConfig(webHookConfig.getManufacturerEventName()
-                        + DATA_ID_EXTENSION,
-                    GROUP_PREFIX + webHookConfig.getManufacturerName(), 
TIMEOUT_MS);
-                return JsonUtils.parseObject(content, WebHookConfig.class);
-            } catch (NacosException e) {
-                log.error("queryWebHookConfigById failed", e);
-            }
+        switch (operationMode) {
+            case OPERATION_MODE_FILE:
+                return 
cacheWebHookConfig.get(ClassUtils.convertResourcePathToClassName(webHookConfig.getCallbackPath()));
+            case OPERATION_MODE_NACOS:
+                try {
+                    final String content = nacosConfigService.getConfig(
+                        webHookConfig.getManufacturerEventName() + 
DATA_ID_EXTENSION,
+                        GROUP_PREFIX + webHookConfig.getManufacturerName(),
+                        TIMEOUT_MS);
+                    return JsonUtils.parseObject(content, WebHookConfig.class);
+                } catch (NacosException e) {
+                    log.error("queryWebHookConfigById failed", e);
+                }
+                break;
+            default:
+                break;
         }
         return null;
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to