From fb5c2c848be94d994fd091d47df3be088f8082bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 14 Feb 2025 14:28:39 +0800 Subject: [PATCH] =?UTF-8?q?optimize:=20@ServiceMark=20=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4value=E5=B1=9E=E6=80=A7=EF=BC=8Ccode?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=BF=85=E5=A1=AB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/icu/easyj/core/factory/ServiceInfo.java | 2 +- .../java/icu/easyj/core/factory/ServiceMark.java | 12 ++---------- .../icu/easyj/core/factory/TestServiceImplA.java | 2 +- .../icu/easyj/core/factory/TestServiceImplB1.java | 2 +- .../icu/easyj/core/factory/TestServiceImplB2.java | 2 +- 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/core-parent/core/src/main/java/icu/easyj/core/factory/ServiceInfo.java b/core-parent/core/src/main/java/icu/easyj/core/factory/ServiceInfo.java index b0d92ca8..c6bf5c52 100644 --- a/core-parent/core/src/main/java/icu/easyj/core/factory/ServiceInfo.java +++ b/core-parent/core/src/main/java/icu/easyj/core/factory/ServiceInfo.java @@ -49,7 +49,7 @@ public static ServiceInfo of(S service) { } ServiceMark mark = service.getClass().getAnnotation(ServiceMark.class); - String code = StringUtils.isNotBlank(mark.code()) ? mark.code() : mark.value(); + String code = mark.code(); if (StringUtils.isBlank(code)) { throw new IllegalArgumentException("service的@ServiceMark.code或@ServiceMark.value不能为空"); } diff --git a/core-parent/core/src/main/java/icu/easyj/core/factory/ServiceMark.java b/core-parent/core/src/main/java/icu/easyj/core/factory/ServiceMark.java index bdd1c839..1a42d91e 100644 --- a/core-parent/core/src/main/java/icu/easyj/core/factory/ServiceMark.java +++ b/core-parent/core/src/main/java/icu/easyj/core/factory/ServiceMark.java @@ -35,20 +35,12 @@ public @interface ServiceMark { /** - * 服务代码（同 code 属性，设置一个即可，两个都设置时，优先读取 code 属性） + * 服务代码 * 注：大小写不敏感 * * @return code 返回服务代码 */ - String value() default ""; - - /** - * 服务代码（同 value 属性，设置一个即可，两个都设置时，优先读取 code 属性） - * 注：大小写不敏感 - * - * @return code 返回服务代码 - */ - String code() default ""; + String code(); /** * 是否默认服务 diff --git a/core-parent/core/src/test/java/icu/easyj/core/factory/TestServiceImplA.java b/core-parent/core/src/test/java/icu/easyj/core/factory/TestServiceImplA.java index d2f51f75..7637d9c2 100644 --- a/core-parent/core/src/test/java/icu/easyj/core/factory/TestServiceImplA.java +++ b/core-parent/core/src/test/java/icu/easyj/core/factory/TestServiceImplA.java @@ -1,5 +1,5 @@ package icu.easyj.core.factory; -@ServiceMark(value = "A", isDefault = true) +@ServiceMark(code = "A", isDefault = true) class TestServiceImplA implements ITestService { } diff --git a/core-parent/core/src/test/java/icu/easyj/core/factory/TestServiceImplB1.java b/core-parent/core/src/test/java/icu/easyj/core/factory/TestServiceImplB1.java index 26d5c9f9..066f0326 100644 --- a/core-parent/core/src/test/java/icu/easyj/core/factory/TestServiceImplB1.java +++ b/core-parent/core/src/test/java/icu/easyj/core/factory/TestServiceImplB1.java @@ -1,5 +1,5 @@ package icu.easyj.core.factory; -@ServiceMark(value = "B", order = 1) +@ServiceMark(code = "B", order = 1) class TestServiceImplB1 implements ITestService { } diff --git a/core-parent/core/src/test/java/icu/easyj/core/factory/TestServiceImplB2.java b/core-parent/core/src/test/java/icu/easyj/core/factory/TestServiceImplB2.java index 298bbd86..76cbfe72 100644 --- a/core-parent/core/src/test/java/icu/easyj/core/factory/TestServiceImplB2.java +++ b/core-parent/core/src/test/java/icu/easyj/core/factory/TestServiceImplB2.java @@ -1,5 +1,5 @@ package icu.easyj.core.factory; -@ServiceMark(value = "B", order = 2) +@ServiceMark(code = "B", order = 2) class TestServiceImplB2 implements ITestService { }