Bump vertx.version from 4.5.15 to 5.0.1

.github/workflows/checkstyle.yml

@@ -35,6 +35,4 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
       - name: checkstyle
-        run: mvn -B -Pit install -DskipTests -Dspotbugs.skip=true checkstyle:check
-      - name: javadoc
-        run: mvn javadoc:javadoc -Prelease
+        run: mvn checkstyle:check -B -Pit

.github/workflows/maven.yml

@@ -49,6 +49,4 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Compilation and Installation
-      run: mvn clean install -Dcheckstyle.skip -Dspotbugs.skip=true -B -Pdocker -Pjacoco -Pit -Pcoverage
-    - name: publish coverage report
-      run: bash <(curl -s https://codecov.io/bash)
+      run: mvn clean verify -Dcheckstyle.skip=true -B -Pdocker -Pjacoco -Pit -Pcoverage

common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/RequestHeaderItemTest.java

@@ -78,7 +78,7 @@ public void initStrBuilder() {
 
   @Test
   public void serverFormattedElement() {
-    HeadersMultiMap headers = new HeadersMultiMap();
+    HeadersMultiMap headers = HeadersMultiMap.httpHeaders();
     String testValue = "testValue";
     headers.add(VAR_NAME, testValue);
     when(routingContext.request()).thenReturn(serverRequest);
@@ -129,7 +129,7 @@ public void clientFormattedElementIfHeaderIsNull() {
 
   @Test
   public void serverFormattedElementIfNotFound() {
-    HeadersMultiMap headers = new HeadersMultiMap();
+    HeadersMultiMap headers = HeadersMultiMap.httpHeaders();
     String testValue = "testValue";
     headers.add("anotherKey", testValue);
     when(routingContext.request()).thenReturn(serverRequest);

common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/element/impl/ResponseHeaderItemTest.java

@@ -64,7 +64,7 @@ public void initStrBuilder() {
 
   @Test
   public void serverFormattedElement() {
-    HeadersMultiMap headers = new HeadersMultiMap();
+    HeadersMultiMap headers = HeadersMultiMap.httpHeaders();
     String headerValue = "headerValue";
     headers.add(VAR_NAME, headerValue);
     when(routingContext.response()).thenReturn(serverResponse);
@@ -122,7 +122,7 @@ public void clientFormattedElementOnResponseIsNull() {
 
   @Test
   public void serverFormattedElementOnNotFound() {
-    HeadersMultiMap headers = new HeadersMultiMap();
+    HeadersMultiMap headers = HeadersMultiMap.httpHeaders();
     String headerValue = "headerValue";
     headers.add("anotherHeader", headerValue);
     when(routingContext.response()).thenReturn(serverResponse);

common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessor.java

@@ -116,7 +116,7 @@ public void before() {
     LegacyPropertyFactory.setEnvironment(environment);
     Mockito.when(environment.getProperty("servicecomb.rest.parameter.decodeAsObject", boolean.class, false))
         .thenReturn(false);
-    headers = new HeadersMultiMap();
+    headers = HeadersMultiMap.httpHeaders();
     value = "value";
   }
 

common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java

@@ -20,10 +20,6 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
-import jakarta.servlet.http.Part;
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.Response.Status;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
 import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
@@ -35,6 +31,10 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import jakarta.servlet.http.Part;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Response.Status;
+
 public class TestClassPathStaticResourceHandler {
   static ClassPathStaticResourceHandler handler = new ClassPathStaticResourceHandler();
 
@@ -49,7 +49,7 @@ public void normal() throws IOException {
     Part part = response.getResult();
 
     try (InputStream is = part.getInputStream()) {
-      Assertions.assertTrue(IOUtils.toString(is, StandardCharsets.UTF_8).endsWith("<html></html>\n"));
+      Assertions.assertTrue(IOUtils.toString(is, StandardCharsets.UTF_8).trim().endsWith("<html></html>"));
     }
     Assertions.assertEquals("text/html", part.getContentType());
     Assertions.assertEquals("text/html", response.getHeader(HttpHeaders.CONTENT_TYPE));
@@ -84,7 +84,7 @@ public void attack() {
   public void readContentFailed() throws IOException {
     handler = Mockito.spy(TestClassPathStaticResourceHandler.handler);
     Mockito.when(handler.findResource("web-root/index.html"))
-            .thenThrow(new RuntimeExceptionWithoutStackTrace("read content failed."));
+        .thenThrow(new RuntimeExceptionWithoutStackTrace("read content failed."));
 
     try (LogCollector logCollector = new LogCollector()) {
       Response response = handler.handle("index.html");

core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java

@@ -111,7 +111,7 @@ public void maxThreads() {
     Assertions.assertEquals(
         "servicecomb.executor.default.thread-per-group is deprecated, recommended to use servicecomb.executor.default.maxThreads-per-group.",
         collector.getEvents().get(collector.getEvents().size() - 2).getMessage().getFormattedMessage());
-    collector.teardown();
+    collector.tearDown();
 
     Mockito.when(environment.getProperty(KEY_MAX_THREADS, int.class, -1)).thenReturn(300);
     groupExecutor.initConfig();
@@ -127,7 +127,7 @@ public void adjustCoreThreads() {
     Assertions.assertEquals(
         "coreThreads is bigger than maxThreads, change from 25 to 10.",
         collector.getEvents().get(collector.getEvents().size() - 2).getMessage().getFormattedMessage());
-    collector.teardown();
+    collector.tearDown();
   }
 
   @Test

core/src/test/java/org/apache/servicecomb/core/transport/TestAbstractTransport.java

@@ -32,7 +32,7 @@
 import org.mockito.Mockito;
 import org.springframework.core.env.Environment;
 
-import io.vertx.core.file.impl.FileResolverImpl;
+import io.vertx.core.impl.SysProps;
 
 public class TestAbstractTransport {
   Environment environment = Mockito.mock(Environment.class);
@@ -56,7 +56,7 @@ public void setUp() {
     Mockito.when(environment.getProperty("servicecomb.my.publishPort", int.class, 0)).thenReturn(0);
     Mockito.when(environment.getProperty("servicecomb.transport.eventloop.size", int.class, -1))
         .thenReturn(-1);
-    Mockito.when(environment.getProperty(FileResolverImpl.DISABLE_CP_RESOLVING_PROP_NAME, boolean.class, true))
+    Mockito.when(environment.getProperty(SysProps.DISABLE_FILE_CP_RESOLVING.name, boolean.class, true))
         .thenReturn(true);
     LegacyPropertyFactory.setEnvironment(environment);
   }

demo/demo-consul/provider/src/main/java/org/apache/servicecomb/samples/WebsocketController.java

@@ -48,12 +48,10 @@ public void websocket(ServerWebSocket serverWebsocket) {
         e.printStackTrace();
       }
 
-      serverWebsocket.writeTextMessage("hello", r -> {
-      });
+      serverWebsocket.writeTextMessage("hello");
 
       for (int i = 0; i < 5; i++) {
-        serverWebsocket.writeTextMessage("hello " + i, r -> {
-        });
+        serverWebsocket.writeTextMessage("hello " + i);
         try {
           Thread.sleep(500);
         } catch (InterruptedException e) {

demo/demo-etcd/provider/src/main/java/org/apache/servicecomb/samples/WebsocketController.java

@@ -48,12 +48,10 @@ public void websocket(ServerWebSocket serverWebsocket) {
         e.printStackTrace();
       }
 
-      serverWebsocket.writeTextMessage("hello", r -> {
-      });
+      serverWebsocket.writeTextMessage("hello");
 
       for (int i = 0; i < 5; i++) {
-        serverWebsocket.writeTextMessage("hello " + i, r -> {
-        });
+        serverWebsocket.writeTextMessage("hello " + i);
         try {
           Thread.sleep(500);
         } catch (InterruptedException e) {

demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/CodeFirstPojoClient.java

@@ -94,7 +94,7 @@ private void testCodeFirstCompletableFuture(CodeFirstPojoIntf codeFirst) {
       return;
     }
 
-    Vertx vertx = VertxUtils.getOrCreateVertxByName("transport", null);
+    Vertx vertx = VertxUtils.getOrCreateVertxByName("transport", null, null);
     CountDownLatch latch = new CountDownLatch(1);
     // vertx.runOnContext in normal thread is not a good practice
     // here just a test, not care for this.

demo/demo-zookeeper/provider/src/main/java/org/apache/servicecomb/samples/WebsocketController.java

@@ -48,12 +48,10 @@ public void websocket(ServerWebSocket serverWebsocket) {
         e.printStackTrace();
       }
 
-      serverWebsocket.writeTextMessage("hello", r -> {
-      });
+      serverWebsocket.writeTextMessage("hello");
 
       for (int i = 0; i < 5; i++) {
-        serverWebsocket.writeTextMessage("hello " + i, r -> {
-        });
+        serverWebsocket.writeTextMessage("hello " + i);
         try {
           Thread.sleep(500);
         } catch (InterruptedException e) {

demo/pom.xml

@@ -52,7 +52,8 @@
     <module>demo-cse-v1</module>
     <module>demo-cse-v2</module>
     <module>demo-nacos</module>
-    <module>demo-etcd</module>
+    <!-- TODO: etcd for vert.x 5.x is not released, after release will support it-->
+    <!-- <module>demo-etcd</module> -->
     <module>demo-zookeeper</module>
     <module>demo-consul</module>
   </modules>

dependencies/default/pom.xml

@@ -85,7 +85,7 @@
     <slf4j.version>1.7.36</slf4j.version>
     <snakeyaml.version>2.4</snakeyaml.version>
     <swagger.version>2.2.35</swagger.version>
-    <vertx.version>4.5.15</vertx.version>
+    <vertx.version>5.0.1</vertx.version>
     <zipkin.version>3.5.1</zipkin.version>
     <zipkin-reporter.version>3.4.0</zipkin-reporter.version>
     <jetcd-core.version>0.8.5</jetcd-core.version>
@@ -279,27 +279,6 @@
         <version>${reactive-streams.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>io.vertx</groupId>
-        <artifactId>vertx-codegen</artifactId>
-        <version>${vertx.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.vertx</groupId>
-        <artifactId>vertx-core</artifactId>
-        <version>${vertx.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.vertx</groupId>
-        <artifactId>vertx-web</artifactId>
-        <version>${vertx.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.vertx</groupId>
-        <artifactId>vertx-rx-java3</artifactId>
-        <version>${vertx.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>io.zipkin.brave</groupId>
         <artifactId>brave-bom</artifactId>
@@ -459,19 +438,20 @@
         <scope>test</scope>
       </dependency>
 
-      <dependency>
-        <groupId>org.mock-server</groupId>
-        <artifactId>mockserver-netty</artifactId>
-        <version>${mock-server.version}</version>
-        <scope>test</scope>
-      </dependency>
-
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.vertx</groupId>
+        <artifactId>vertx-dependencies</artifactId>
+        <version>${vertx.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>

foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/event/TestEventManager.java

@@ -48,7 +48,7 @@ public void normalListener() {
 
     test(this);
     Assertions.assertTrue(collector.getEvents().isEmpty()); // ensure no warning logs
-    collector.teardown();
+    collector.tearDown();
   }
 
   @Test
@@ -72,7 +72,7 @@ void onInt(Integer obj) {
       Assertions.assertTrue(true);
     }
 
-    collector.teardown();
+    collector.tearDown();
   }
 
   @Test
@@ -98,7 +98,7 @@ public void onInt(Integer obj) {
 
     // ensure logs: "LOGGER.warn("Failed to create lambda for method: {}, fallback to reflect.", method, throwable);"
     Assertions.assertFalse(collector.getEvents().isEmpty());
-    collector.teardown();
+    collector.tearDown();
   }
 
   @Subscribe

foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestJvmUtils.java

@@ -56,7 +56,7 @@ public void findMainClass_invalid() {
 
     Assertions.assertNull(JvmUtils.findMainClass());
     Assertions.assertEquals("\"invalidCls\" is not a valid class.", logCollector.getEvents().get(0).getMessage());
-    logCollector.teardown();
+    logCollector.tearDown();
   }
 
   @Test