optimize: ServiceFactory未添加注解时，提示正确的异常信息。

Author: wangliang181230

core-parent/core/src/main/java/icu/easyj/core/factory/ServiceFactory.java

@@ -142,7 +142,7 @@ public void addService(S service) {
 	}
 
 	public void addServiceInfo(ServiceInfo<S> serviceInfo) {
-		this.serviceMap.computeIfAbsent(serviceInfo.getCode(), ServiceGroup::new).add(serviceInfo);
+		this.serviceMap.computeIfAbsent(serviceInfo.getCode().toLowerCase(), ServiceGroup::new).add(serviceInfo);
 
 		if (serviceInfo.isDefault() && !DEFAULT_SERVICE_CODE.equals(serviceInfo.getCode())) {
 			this.serviceMap.computeIfAbsent(DEFAULT_SERVICE_CODE, ServiceGroup::new).add(serviceInfo);
@@ -157,15 +157,15 @@ public void addServiceList(List<S> serviceList) {
 		HashMap<String, List<ServiceInfo<S>>> map = new HashMap<>();
 		for (S service : serviceList) {
 			ServiceInfo<S> serviceInfo = ServiceInfo.of(service);
-			map.computeIfAbsent(serviceInfo.getCode(), k -> new ArrayList<>()).add(serviceInfo);
+			map.computeIfAbsent(serviceInfo.getCode().toLowerCase(), k -> new ArrayList<>()).add(serviceInfo);
 
 			if (serviceInfo.isDefault() && !DEFAULT_SERVICE_CODE.equals(serviceInfo.getCode())) {
 				map.computeIfAbsent(DEFAULT_SERVICE_CODE, k -> new ArrayList<>()).add(serviceInfo);
 			}
 		}
 
 		map.forEach((code, serviceInfoList) -> {
-			ServiceGroup<S> group = this.serviceMap.computeIfAbsent(code, ServiceGroup::new);
+			ServiceGroup<S> group = this.serviceMap.computeIfAbsent(code.toLowerCase(), ServiceGroup::new);
 			group.addAll(serviceInfoList);
 		});
 	}
@@ -177,15 +177,15 @@ public void addServiceInfoList(List<ServiceInfo<S>> serviceInfoList) {
 
 		HashMap<String, List<ServiceInfo<S>>> map = new HashMap<>();
 		for (ServiceInfo<S> serviceInfo : serviceInfoList) {
-			map.computeIfAbsent(serviceInfo.getCode(), k -> new ArrayList<>()).add(serviceInfo);
+			map.computeIfAbsent(serviceInfo.getCode().toLowerCase(), k -> new ArrayList<>()).add(serviceInfo);
 
 			if (serviceInfo.isDefault() && !DEFAULT_SERVICE_CODE.equals(serviceInfo.getCode())) {
 				map.computeIfAbsent(DEFAULT_SERVICE_CODE, k -> new ArrayList<>()).add(serviceInfo);
 			}
 		}
 
 		map.forEach((code, serviceInfoList0) -> {
-			ServiceGroup<S> group = this.serviceMap.computeIfAbsent(code, ServiceGroup::new);
+			ServiceGroup<S> group = this.serviceMap.computeIfAbsent(code.toLowerCase(), ServiceGroup::new);
 			group.addAll(serviceInfoList0);
 		});
 	}

core-parent/core/src/main/java/icu/easyj/core/factory/ServiceGroup.java

@@ -17,7 +17,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -52,7 +51,7 @@ public ServiceGroup(String code) {
 			throw new IllegalArgumentException("code 不能为空");
 		}
 
-		this.code = code.toLowerCase();
+		this.code = code;
 		this.sortedServiceList = new ArrayList<>();
 	}
 
@@ -133,7 +132,7 @@ private void checkServiceInfo(ServiceInfo<S> serviceInfo) {
 			return;
 		}
 
-		if (!Objects.equals(this.code, serviceInfo.getCode())) {
+		if (!this.code.equalsIgnoreCase(serviceInfo.getCode())) {
 			throw new IllegalArgumentException("serviceInfo 的 code 与 ServiceGroup 的 code 不一致");
 		}
 	}

core-parent/core/src/main/java/icu/easyj/core/factory/ServiceInfo.java

@@ -18,7 +18,9 @@
 import javax.annotation.Nonnull;
 
 import icu.easyj.core.util.StringUtils;
+import org.springframework.aop.support.AopUtils;
 import org.springframework.core.Ordered;
+import org.springframework.core.annotation.AnnotationConfigurationException;
 
 /**
  * 服务信息
@@ -36,7 +38,7 @@ public class ServiceInfo<S> {
 	private final int order;
 
 	private ServiceInfo(String code, boolean isDefault, int order, S service) {
-		this.code = code.toLowerCase(); // 转为小写
+		this.code = code; // 转为小写
 		this.isDefault = isDefault;
 		this.order = order;
 		this.service = service;
@@ -48,7 +50,13 @@ public static <S> ServiceInfo<S> of(S service) {
 			throw new IllegalArgumentException("service不能为空");
 		}
 
-		ServiceMark mark = service.getClass().getAnnotation(ServiceMark.class);
+		Class<?> serviceClass = AopUtils.getTargetClass(service);
+
+		ServiceMark mark = serviceClass.getAnnotation(ServiceMark.class);
+		if (mark == null) {
+			throw new AnnotationConfigurationException(serviceClass.getName() + " 未添加注解 @ServiceMark(code = \"xxx\")");
+		}
+
 		String code = mark.code();
 		if (StringUtils.isBlank(code)) {
 			throw new IllegalArgumentException("service的@ServiceMark.code或@ServiceMark.value不能为空");

core-parent/core/src/test/java/icu/easyj/core/factory/ServiceFactoryTest.java

@@ -4,8 +4,11 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
+import org.springframework.core.annotation.AnnotationConfigurationException;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class ServiceFactoryTest {
 
@@ -39,6 +42,9 @@ void test() {
 		assertEquals(b1, bList.get(0));
 		// B2
 		assertEquals(b2, bList.get(1));
+		// TestServiceImplNoAnnotation
+		assertNull(serviceFactory.get(TestServiceImplNoAnnotation.class.getSimpleName())); // null
+		assertThrows(AnnotationConfigurationException.class, () -> serviceFactory.addService(new TestServiceImplNoAnnotation())); // throw AnnotationConfigurationException
 	}
 
 }

core-parent/core/src/test/java/icu/easyj/core/factory/TestServiceImplNoAnnotation.java

@@ -0,0 +1,4 @@
+package icu.easyj.core.factory;
+
+class TestServiceImplNoAnnotation implements ITestService {
+}