From 80858f62220fb8396e441d10f33c84a7b788f944 Mon Sep 17 00:00:00 2001 From: Siddheya Kulkarni <115717746+Asymtode712@users.noreply.github.com> Date: Mon, 30 Oct 2023 21:20:37 +0530 Subject: [PATCH 1/9] Update Errors.java --- .../main/java/org/apache/eventmesh/admin/enums/Errors.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/Errors.java b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/Errors.java index 3854993a46..7c2283a1c5 100644 --- a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/Errors.java +++ b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/Errors.java @@ -33,7 +33,7 @@ */ @Getter -public enum Errors { +public enum Status { SUCCESS(HttpStatus.OK, Types.SUCCESS, "Operation success."), @@ -58,7 +58,7 @@ public enum Errors { // error message private final String desc; - Errors(HttpStatus code, Types type, String desc) { + Status(HttpStatus code, Types type, String desc) { this.code = code; this.type = type; this.desc = desc; From a0bfef202e8f0f9d6df16c52aa4ff8db496ad8a9 Mon Sep 17 00:00:00 2001 From: Siddheya Kulkarni <115717746+Asymtode712@users.noreply.github.com> Date: Mon, 30 Oct 2023 21:54:48 +0530 Subject: [PATCH 2/9] Update Errors.java --- .../main/java/org/apache/eventmesh/admin/enums/Errors.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/Errors.java b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/Errors.java index 7c2283a1c5..ad999417e1 100644 --- a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/Errors.java +++ b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/Errors.java @@ -33,7 +33,7 @@ */ @Getter -public enum Status { +public enum Test { SUCCESS(HttpStatus.OK, Types.SUCCESS, "Operation success."), @@ -58,7 +58,7 @@ public enum Status { // error message private final String desc; - Status(HttpStatus code, Types type, String desc) { + Test(HttpStatus code, Types type, String desc) { this.code = code; this.type = type; this.desc = desc; From ff66f1a3cb559e53798ec577554d58915373dee6 Mon Sep 17 00:00:00 2001 From: Siddheya Kulkarni <115717746+Asymtode712@users.noreply.github.com> Date: Mon, 30 Oct 2023 22:47:50 +0530 Subject: [PATCH 3/9] Update Result.java --- .../main/java/org/apache/eventmesh/admin/dto/Result.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/dto/Result.java b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/dto/Result.java index 15b3dc2f42..19d5ee0021 100644 --- a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/dto/Result.java +++ b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/dto/Result.java @@ -17,9 +17,9 @@ package org.apache.eventmesh.admin.dto; -import static org.apache.eventmesh.admin.enums.Errors.SUCCESS; +import static org.apache.eventmesh.admin.enums.Status.SUCCESS; -import org.apache.eventmesh.admin.enums.Errors; +import org.apache.eventmesh.admin.enums.Status; import org.apache.eventmesh.admin.exception.BaseException; import org.springframework.http.HttpStatus; @@ -131,7 +131,7 @@ public Message(BaseException e) { * Only recommended for returning successful results, * the stack trace cannot be displayed when returning unsuccessful results. */ - public Message(Errors errors) { + public Message(Status errors) { this.name = errors.name(); this.type = errors.getType().name(); this.desc = errors.getDesc(); // no stack trace From af0bbfe51dfe573156210c2af4008c3917c3d645 Mon Sep 17 00:00:00 2001 From: Siddheya Kulkarni <115717746+Asymtode712@users.noreply.github.com> Date: Mon, 30 Oct 2023 23:00:14 +0530 Subject: [PATCH 4/9] Update and rename Errors.java to Status.java --- .../apache/eventmesh/admin/enums/{Errors.java => Status.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/{Errors.java => Status.java} (97%) diff --git a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/Errors.java b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/Status.java similarity index 97% rename from eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/Errors.java rename to eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/Status.java index ad999417e1..7c2283a1c5 100644 --- a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/Errors.java +++ b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/enums/Status.java @@ -33,7 +33,7 @@ */ @Getter -public enum Test { +public enum Status { SUCCESS(HttpStatus.OK, Types.SUCCESS, "Operation success."), @@ -58,7 +58,7 @@ public enum Test { // error message private final String desc; - Test(HttpStatus code, Types type, String desc) { + Status(HttpStatus code, Types type, String desc) { this.code = code; this.type = type; this.desc = desc; From fcd1b057b85092142707aa3f10dd2e0743c5db76 Mon Sep 17 00:00:00 2001 From: Siddheya Kulkarni <115717746+Asymtode712@users.noreply.github.com> Date: Mon, 30 Oct 2023 23:04:30 +0530 Subject: [PATCH 5/9] Update BaseException.java --- .../apache/eventmesh/admin/exception/BaseException.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/BaseException.java b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/BaseException.java index db2e3fd501..74ac6c867e 100644 --- a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/BaseException.java +++ b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/BaseException.java @@ -19,7 +19,7 @@ import static org.apache.eventmesh.admin.common.ConfigConst.COLON; -import org.apache.eventmesh.admin.enums.Errors; +import org.apache.eventmesh.admin.enums.Status; import org.apache.eventmesh.admin.utils.ExceptionUtils; import lombok.Getter; @@ -33,7 +33,7 @@ public class BaseException extends RuntimeException { private static final long serialVersionUID = 3509261993355721168L; - private Errors errors; + private Status errors; public BaseException(String message) { super(message); @@ -42,12 +42,12 @@ public BaseException(String message) { /** * Customized error reporting using enums and exceptions */ - public BaseException(Errors errors, Throwable cause) { + public BaseException(Status errors, Throwable cause) { super(ExceptionUtils.trimDesc(errors.getDesc()) + COLON + cause.getMessage(), cause); this.errors = errors; } - public BaseException(Errors errors) { + public BaseException(Status errors) { super(errors.getDesc()); this.errors = errors; } From 4a21a06a7a5f1f4986fd6e57cc961ae954895bcc Mon Sep 17 00:00:00 2001 From: Siddheya Kulkarni <115717746+Asymtode712@users.noreply.github.com> Date: Mon, 30 Oct 2023 23:05:41 +0530 Subject: [PATCH 6/9] Update EventMeshAdminException.java --- .../eventmesh/admin/exception/EventMeshAdminException.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/EventMeshAdminException.java b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/EventMeshAdminException.java index 3847f680cc..dcd9db652c 100644 --- a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/EventMeshAdminException.java +++ b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/EventMeshAdminException.java @@ -17,7 +17,7 @@ package org.apache.eventmesh.admin.exception; -import org.apache.eventmesh.admin.enums.Errors; +import org.apache.eventmesh.admin.enums.Status; /** * EventMeshAdmin Application side exception @@ -34,7 +34,7 @@ public EventMeshAdminException(String message) { /** * Customized error reporting using enums and exceptions */ - public EventMeshAdminException(Errors errors, Throwable cause) { + public EventMeshAdminException(Status errors, Throwable cause) { super(errors, cause); } } From 28a4e64d64f0f1c30e482d4df8a912bf8486ddf7 Mon Sep 17 00:00:00 2001 From: Siddheya Kulkarni <115717746+Asymtode712@users.noreply.github.com> Date: Mon, 30 Oct 2023 23:07:22 +0530 Subject: [PATCH 7/9] Update GlobalExceptionHandler.java --- .../eventmesh/admin/exception/GlobalExceptionHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/GlobalExceptionHandler.java b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/GlobalExceptionHandler.java index a54e17a58c..af115edf27 100644 --- a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/GlobalExceptionHandler.java +++ b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/GlobalExceptionHandler.java @@ -29,7 +29,7 @@ import lombok.extern.slf4j.Slf4j; /** - * This class, in conjunction with {@linkplain org.apache.eventmesh.admin.enums.Errors Errors} and {@link BaseException}, + * This class, in conjunction with {@linkplain org.apache.eventmesh.admin.enums.Status Status} and {@link BaseException}, * collectively implements customized error reporting. */ From 904ea0e4862ab8d904812baa5ad5ee4a651e9781 Mon Sep 17 00:00:00 2001 From: Siddheya Kulkarni <115717746+Asymtode712@users.noreply.github.com> Date: Mon, 30 Oct 2023 23:08:25 +0530 Subject: [PATCH 8/9] Update MetaException.java --- .../org/apache/eventmesh/admin/exception/MetaException.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/MetaException.java b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/MetaException.java index 9302102466..b81dfaf404 100644 --- a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/MetaException.java +++ b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/exception/MetaException.java @@ -17,7 +17,7 @@ package org.apache.eventmesh.admin.exception; -import org.apache.eventmesh.admin.enums.Errors; +import org.apache.eventmesh.admin.enums.Status; /** * Meta side exception with EventMeshAdmin Application @@ -34,11 +34,11 @@ public MetaException(String message) { /** * Customized error reporting using enums and exceptions */ - public MetaException(Errors errors, Throwable cause) { + public MetaException(Status errors, Throwable cause) { super(errors, cause); } - public MetaException(Errors errors) { + public MetaException(Status errors) { super(errors); } } From fdeb2332dd2aff1e9699129e61de1108d817238b Mon Sep 17 00:00:00 2001 From: Siddheya Kulkarni <115717746+Asymtode712@users.noreply.github.com> Date: Mon, 30 Oct 2023 23:10:20 +0530 Subject: [PATCH 9/9] Update NacosSubscriptionService.java --- .../admin/service/impl/NacosSubscriptionService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/service/impl/NacosSubscriptionService.java b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/service/impl/NacosSubscriptionService.java index 29241d31c3..a601075c14 100644 --- a/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/service/impl/NacosSubscriptionService.java +++ b/eventmesh-admin/src/main/java/org/apache/eventmesh/admin/service/impl/NacosSubscriptionService.java @@ -17,11 +17,11 @@ package org.apache.eventmesh.admin.service.impl; -import static org.apache.eventmesh.admin.enums.Errors.NACOS_EMPTY_RESP_ERR; -import static org.apache.eventmesh.admin.enums.Errors.NACOS_GET_CONFIGS_ERR; -import static org.apache.eventmesh.admin.enums.Errors.NACOS_LOGIN_EMPTY_RESP_ERR; -import static org.apache.eventmesh.admin.enums.Errors.NACOS_LOGIN_ERR; -import static org.apache.eventmesh.admin.enums.Errors.NACOS_SDK_CONFIG_ERR; +import static org.apache.eventmesh.admin.enums.Status.NACOS_EMPTY_RESP_ERR; +import static org.apache.eventmesh.admin.enums.Status.NACOS_GET_CONFIGS_ERR; +import static org.apache.eventmesh.admin.enums.Status.NACOS_LOGIN_EMPTY_RESP_ERR; +import static org.apache.eventmesh.admin.enums.Status.NACOS_LOGIN_ERR; +import static org.apache.eventmesh.admin.enums.Status.NACOS_SDK_CONFIG_ERR; import org.apache.eventmesh.admin.common.ConfigConst; import org.apache.eventmesh.admin.common.NacosConst;