refact to using junit5 and jdk17

alibaba · Apr 21, 2024 · 8ec1631 · 8ec1631
1 parent c9de978
commit 8ec1631
Show file tree

Hide file tree

Showing 43 changed files with 143 additions and 191 deletions.
diff --git a/cola-components/cola-component-catchlog-starter/pom.xml b/cola-components/cola-component-catchlog-starter/pom.xml
@@ -77,11 +77,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- 日志包 -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
 
         <!-- cola组件依赖 -->
         <dependency>

diff --git a/...component-catchlog-starter/src/test/java/com/alibaba/cola/catchlog/test/CatchLogTest.java b/...component-catchlog-starter/src/test/java/com/alibaba/cola/catchlog/test/CatchLogTest.java
@@ -2,17 +2,13 @@
 
 import com.alibaba.cola.catchlog.CatchLogAspect;
 import com.alibaba.cola.catchlog.CatchLogAutoConfiguration;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.annotation.Resource;
 
 /**
  *
  */
-@RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = {CatchLogAutoConfiguration.class, Demo.class, CatchLogAspect.class, Application.class})
 public class CatchLogTest {
 

diff --git a/...ponents/cola-component-domain-starter/src/test/java/com/alibaba/cola/domain/Customer.java b/...ponents/cola-component-domain-starter/src/test/java/com/alibaba/cola/domain/Customer.java
@@ -1,8 +1,8 @@
 package com.alibaba.cola.domain;
 
 import com.alibaba.cola.domain.Entity;
+import jakarta.annotation.Resource;
 
-import javax.annotation.Resource;
 
 /**
  * Customer

diff --git a/cola-components/cola-component-extension-starter/README.md b/cola-components/cola-component-extension-starter/README.md
@@ -5,5 +5,5 @@
 https://blog.csdn.net/significantfrank/article/details/100074716
 
 ## 使用介绍
-参看测试代码`com.alibaba.cola.extension.test.ExtensionTest`
+参看测试代码`com.alibaba.cola.extension.ExtensionTest`
 
diff --git a/.../cola-component-extension-starter/src/main/java/com/alibaba/cola/extension/Extension.java b/.../cola-component-extension-starter/src/main/java/com/alibaba/cola/extension/Extension.java
@@ -18,7 +18,6 @@
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
-@Repeatable(Extensions.class)
 @Component
 public @interface Extension {
     String bizId()  default BizScenario.DEFAULT_BIZ_ID;

diff --git a/...mponent-extension-starter/src/main/java/com/alibaba/cola/extension/ExtensionExecutor.java b/...mponent-extension-starter/src/main/java/com/alibaba/cola/extension/ExtensionExecutor.java
@@ -8,11 +8,11 @@
 package com.alibaba.cola.extension;
 
 import com.alibaba.cola.extension.register.AbstractComponentExecutor;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 
 /**
  * ExtensionExecutor

diff --git a/...cola-component-extension-starter/src/main/java/com/alibaba/cola/extension/Extensions.java b/...cola-component-extension-starter/src/main/java/com/alibaba/cola/extension/Extensions.java
@@ -24,6 +24,4 @@
 
     String[] scenario() default BizScenario.DEFAULT_SCENARIO;
 
-    Extension[] value() default {};
-
 }
diff --git a/...tension-starter/src/main/java/com/alibaba/cola/extension/register/ExtensionBootstrap.java b/...tension-starter/src/main/java/com/alibaba/cola/extension/register/ExtensionBootstrap.java
@@ -3,13 +3,14 @@
 import com.alibaba.cola.extension.Extension;
 import com.alibaba.cola.extension.ExtensionPointI;
 import com.alibaba.cola.extension.Extensions;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+
 import java.util.Map;
 
 /**

diff --git a/...xtension-starter/src/main/java/com/alibaba/cola/extension/register/ExtensionRegister.java b/...xtension-starter/src/main/java/com/alibaba/cola/extension/register/ExtensionRegister.java
@@ -8,15 +8,14 @@
 package com.alibaba.cola.extension.register;
 
 import com.alibaba.cola.extension.*;
+import jakarta.annotation.Resource;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 
-import javax.annotation.Resource;
-
 /**
  * ExtensionRegister
  *
@@ -66,20 +65,8 @@ public void doRegistrationExtensions(ExtensionPointI extensionObject){
         }
 
         Extensions extensionsAnnotation = AnnotationUtils.findAnnotation(extensionClz, Extensions.class);
-        Extension[] extensions = extensionsAnnotation.value();
-        if (!ObjectUtils.isEmpty(extensions)){
-            for (Extension extensionAnn : extensions) {
-                BizScenario bizScenario = BizScenario.valueOf(extensionAnn.bizId(), extensionAnn.useCase(), extensionAnn.scenario());
-                ExtensionCoordinate extensionCoordinate = new ExtensionCoordinate(calculateExtensionPoint(extensionClz), bizScenario.getUniqueIdentity());
-                ExtensionPointI preVal = extensionRepository.getExtensionRepo().put(extensionCoordinate, extensionObject);
-                if (preVal != null) {
-                    String errMessage = "Duplicate registration is not allowed for :" + extensionCoordinate;
-                    throw new ExtensionException(EXTENSION_DEFINE_DUPLICATE, errMessage);
-                }
-            }
-        }
 
-        //
+        //Support multiple extensions registration
         String[] bizIds = extensionsAnnotation.bizId();
         String[] useCases = extensionsAnnotation.useCase();
         String[] scenarios = extensionsAnnotation.scenario();

diff --git a/...baba/cola/extension/test/Application.java → ...m/alibaba/cola/extension/Application.java b/...baba/cola/extension/test/Application.java → ...m/alibaba/cola/extension/Application.java
@@ -1,7 +1,8 @@
-package com.alibaba.cola.extension.test;
+package com.alibaba.cola.extension;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 
 /**
  * Application
@@ -10,6 +11,7 @@
  * @date 2020-11-10 3:58 PM
  */
 @SpringBootApplication
+@ComponentScan(basePackages = "com.alibaba.cola")
 public class Application {
 
     public static void main(String[] args) {

diff --git a/...ba/cola/extension/test/ExtensionTest.java → ...alibaba/cola/extension/ExtensionTest.java b/...ba/cola/extension/test/ExtensionTest.java → ...alibaba/cola/extension/ExtensionTest.java
@@ -1,27 +1,25 @@
-package com.alibaba.cola.extension.test;
+package com.alibaba.cola.extension;
 
 import com.alibaba.cola.dto.Response;
-import com.alibaba.cola.extension.BizScenario;
-import com.alibaba.cola.extension.test.customer.client.AddCustomerCmd;
-import com.alibaba.cola.extension.test.customer.client.Constants;
-import com.alibaba.cola.extension.test.customer.client.CustomerDTO;
-import com.alibaba.cola.extension.test.customer.client.CustomerServiceI;
-import com.alibaba.cola.extension.test.customer.domain.CustomerType;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import com.alibaba.cola.extension.customer.client.AddCustomerCmd;
+import com.alibaba.cola.extension.customer.client.Constants;
+import com.alibaba.cola.extension.customer.client.CustomerDTO;
+import com.alibaba.cola.extension.customer.client.CustomerServiceI;
+import com.alibaba.cola.extension.customer.domain.CustomerType;
+import jakarta.annotation.Resource;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import javax.annotation.Resource;
+
 
 /**
  * ExtensionTest
  *
  * @author Frank Zhang
  * @date 2020-11-14 2:55 PM
  */
-@RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = Application.class)
 public class ExtensionTest {
     @Resource
@@ -43,7 +41,7 @@ public void testBiz1UseCase1Scenario1AddCustomerSuccess(){
         Response response = customerService.addCustomer(addCustomerCmd);
 
         //3. Expect Success
-        Assert.assertTrue(response.isSuccess());
+        Assertions.assertTrue(response.isSuccess());
     }
 
     @Test
@@ -62,7 +60,7 @@ public void testBiz1UseCase1AddCustomerSuccess(){
         Response response = customerService.addCustomer(addCustomerCmd);
 
         //3. Expect Success
-        Assert.assertTrue(response.isSuccess());
+        Assertions.assertTrue(response.isSuccess());
     }
 
     @Test
@@ -81,6 +79,6 @@ public void testBiz1AddCustomerSuccess(){
         Response response = customerService.addCustomer(addCustomerCmd);
 
         //3. Expect Success
-        Assert.assertTrue(response.isSuccess());
+        Assertions.assertTrue(response.isSuccess());
     }
 }
diff --git a/.../extension/test/MultiCoordinateTests.java → .../cola/extension/MultiCoordinateTests.java b/.../extension/test/MultiCoordinateTests.java → .../cola/extension/MultiCoordinateTests.java
@@ -1,23 +1,19 @@
-package com.alibaba.cola.extension.test;
+package com.alibaba.cola.extension;
 
-import com.alibaba.cola.extension.BizScenario;
-import com.alibaba.cola.extension.ExtensionExecutor;
-import com.alibaba.cola.extension.test.customer.app.extensionpoint.StatusNameConvertorExtPt;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import com.alibaba.cola.extension.customer.app.extensionpoint.StatusNameConvertorExtPt;
+
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import javax.annotation.Resource;
 
 /**
  * 多坐标测试
  *
  * @author wangguoqiang wrote on 2022/10/10 14:54
  * @version 1.0
  */
-@RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = Application.class)
 public class MultiCoordinateTests {
 
@@ -45,23 +41,13 @@ public void testMultiCoordinate() {
         String name7 = extensionExecutor.execute(StatusNameConvertorExtPt.class, bizScenario7, pt -> pt.statusNameConvertor(7));
         String name8 = extensionExecutor.execute(StatusNameConvertorExtPt.class, bizScenario8, pt -> pt.statusNameConvertor(8));
 
-        Assert.assertEquals("one",name1);
-        Assert.assertEquals("two",name2);
-        Assert.assertEquals("three",name3);
-        Assert.assertEquals("four",name4);
-        Assert.assertEquals("five",name5);
-        Assert.assertEquals("six",name6);
-        Assert.assertEquals("seven",name7);
-        Assert.assertEquals("eight",name8);
-    }
-
-    @Test
-    public void testMultiCoordinateWithAnnotation() {
-        BizScenario bizScenario1 = BizScenario.valueOf("Sony", "user", "scenario3");
-        BizScenario bizScenario2 = BizScenario.valueOf("Siemens", "order", "scenario1");
-        String name1 = extensionExecutor.execute(StatusNameConvertorExtPt.class, bizScenario1, pt -> pt.statusNameConvertor(1));
-        String name2 = extensionExecutor.execute(StatusNameConvertorExtPt.class, bizScenario2, pt -> pt.statusNameConvertor(2));
-        Assert.assertEquals("one",name1);
-        Assert.assertEquals("two",name2);
+        Assertions.assertEquals("one",name1);
+        Assertions.assertEquals("two",name2);
+        Assertions.assertEquals("three",name3);
+        Assertions.assertEquals("four",name4);
+        Assertions.assertEquals("five",name5);
+        Assertions.assertEquals("six",name6);
+        Assertions.assertEquals("seven",name7);
+        Assertions.assertEquals("eight",name8);
     }
 }
diff --git a/.../test/customer/app/AddCustomerCmdExe.java → ...nsion/customer/app/AddCustomerCmdExe.java b/.../test/customer/app/AddCustomerCmdExe.java → ...nsion/customer/app/AddCustomerCmdExe.java
@@ -1,18 +1,17 @@
-package com.alibaba.cola.extension.test.customer.app;
+package com.alibaba.cola.extension.customer.app;
 
 import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.extension.ExtensionExecutor;
-import com.alibaba.cola.extension.test.customer.app.extensionpoint.CustomerConvertorExtPt;
-import com.alibaba.cola.extension.test.customer.infrastructure.DomainEventPublisher;
-import com.alibaba.cola.extension.test.customer.client.AddCustomerCmd;
-import com.alibaba.cola.extension.test.customer.domain.CustomerEntity;
-import com.alibaba.cola.extension.test.customer.app.extensionpoint.AddCustomerValidatorExtPt;
+import com.alibaba.cola.extension.customer.app.extensionpoint.AddCustomerValidatorExtPt;
+import com.alibaba.cola.extension.customer.app.extensionpoint.CustomerConvertorExtPt;
+import com.alibaba.cola.extension.customer.client.AddCustomerCmd;
+import com.alibaba.cola.extension.customer.domain.CustomerEntity;
+import com.alibaba.cola.extension.customer.infrastructure.DomainEventPublisher;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
-
 /**
  * AddCustomerCmdExe
  *

diff --git a/...omer/app/CustomerCreatedEventHandler.java → ...omer/app/CustomerCreatedEventHandler.java b/...omer/app/CustomerCreatedEventHandler.java → ...omer/app/CustomerCreatedEventHandler.java
@@ -1,7 +1,7 @@
-package com.alibaba.cola.extension.test.customer.app;
+package com.alibaba.cola.extension.customer.app;
 
 import com.alibaba.cola.dto.Response;
-import com.alibaba.cola.extension.test.customer.client.CustomerCreatedEvent;
+import com.alibaba.cola.extension.customer.client.CustomerCreatedEvent;
 
 /**
  * CustomerCreatedEventHandler

diff --git a/...est/customer/app/CustomerServiceImpl.java → ...ion/customer/app/CustomerServiceImpl.java b/...est/customer/app/CustomerServiceImpl.java → ...ion/customer/app/CustomerServiceImpl.java
@@ -1,15 +1,14 @@
-package com.alibaba.cola.extension.test.customer.app;
+package com.alibaba.cola.extension.customer.app;
 
 import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.dto.SingleResponse;
-import com.alibaba.cola.extension.test.customer.client.AddCustomerCmd;
-import com.alibaba.cola.extension.test.customer.client.CustomerDTO;
-import com.alibaba.cola.extension.test.customer.client.CustomerServiceI;
-import com.alibaba.cola.extension.test.customer.client.GetOneCustomerQry;
+import com.alibaba.cola.extension.customer.client.AddCustomerCmd;
+import com.alibaba.cola.extension.customer.client.CustomerDTO;
+import com.alibaba.cola.extension.customer.client.CustomerServiceI;
+import com.alibaba.cola.extension.customer.client.GetOneCustomerQry;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-
 /**
  * CustomerServiceImpl
  *

diff --git a/...st/customer/app/GetOneCustomerQryExe.java → ...on/customer/app/GetOneCustomerQryExe.java b/...st/customer/app/GetOneCustomerQryExe.java → ...on/customer/app/GetOneCustomerQryExe.java
@@ -1,7 +1,7 @@
-package com.alibaba.cola.extension.test.customer.app;
+package com.alibaba.cola.extension.customer.app;
 
 import com.alibaba.cola.dto.SingleResponse;
-import com.alibaba.cola.extension.test.customer.client.GetOneCustomerQry;
+import com.alibaba.cola.extension.customer.client.GetOneCustomerQry;
 import org.springframework.stereotype.Component;
 
 /**

diff --git a/...stomerBiz1UseCase1Scenario1Validator.java → ...stomerBiz1UseCase1Scenario1Validator.java b/...stomerBiz1UseCase1Scenario1Validator.java → ...stomerBiz1UseCase1Scenario1Validator.java
@@ -1,9 +1,9 @@
-package com.alibaba.cola.extension.test.customer.app.extension;
+package com.alibaba.cola.extension.customer.app.extension;
 
 import com.alibaba.cola.extension.Extension;
-import com.alibaba.cola.extension.test.customer.client.AddCustomerCmd;
-import com.alibaba.cola.extension.test.customer.client.Constants;
-import com.alibaba.cola.extension.test.customer.app.extensionpoint.AddCustomerValidatorExtPt;
+import com.alibaba.cola.extension.customer.client.AddCustomerCmd;
+import com.alibaba.cola.extension.customer.client.Constants;
+import com.alibaba.cola.extension.customer.app.extensionpoint.AddCustomerValidatorExtPt;
 
 /**
  * AddCustomerBiz1UseCase1Scenario1Validator

diff --git a/...ion/AddCustomerBiz1UseCase1Validator.java → ...ion/AddCustomerBiz1UseCase1Validator.java b/...ion/AddCustomerBiz1UseCase1Validator.java → ...ion/AddCustomerBiz1UseCase1Validator.java
@@ -1,9 +1,9 @@
-package com.alibaba.cola.extension.test.customer.app.extension;
+package com.alibaba.cola.extension.customer.app.extension;
 
 import com.alibaba.cola.extension.Extension;
-import com.alibaba.cola.extension.test.customer.client.AddCustomerCmd;
-import com.alibaba.cola.extension.test.customer.client.Constants;
-import com.alibaba.cola.extension.test.customer.app.extensionpoint.AddCustomerValidatorExtPt;
+import com.alibaba.cola.extension.customer.client.AddCustomerCmd;
+import com.alibaba.cola.extension.customer.client.Constants;
+import com.alibaba.cola.extension.customer.app.extensionpoint.AddCustomerValidatorExtPt;
 
 /**
  * AddCustomerBiz1UseCase1Validator

diff --git a/...extension/AddCustomerBizOneValidator.java → ...extension/AddCustomerBizOneValidator.java b/...extension/AddCustomerBizOneValidator.java → ...extension/AddCustomerBizOneValidator.java
@@ -1,11 +1,11 @@
-package com.alibaba.cola.extension.test.customer.app.extension;
+package com.alibaba.cola.extension.customer.app.extension;
 
 import com.alibaba.cola.exception.BizException;
 import com.alibaba.cola.extension.Extension;
-import com.alibaba.cola.extension.test.customer.client.AddCustomerCmd;
-import com.alibaba.cola.extension.test.customer.client.Constants;
-import com.alibaba.cola.extension.test.customer.domain.CustomerType;
-import com.alibaba.cola.extension.test.customer.app.extensionpoint.AddCustomerValidatorExtPt;
+import com.alibaba.cola.extension.customer.client.AddCustomerCmd;
+import com.alibaba.cola.extension.customer.client.Constants;
+import com.alibaba.cola.extension.customer.domain.CustomerType;
+import com.alibaba.cola.extension.customer.app.extensionpoint.AddCustomerValidatorExtPt;
 
 /**
  * AddCustomerBizOneValidator