Skip to content

Commit fbf88d3

Browse files
authored
Bump vertx.version from 4.5.15 to 5.0.1 (#4900)
1 parent ac2f1f6 commit fbf88d3

File tree

70 files changed

+365
-2135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+365
-2135
lines changed

.github/workflows/checkstyle.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,4 @@ jobs:
3535
java-version: '17'
3636
distribution: 'temurin'
3737
- name: checkstyle
38-
run: mvn -B -Pit install -DskipTests -Dspotbugs.skip=true checkstyle:check
39-
- name: javadoc
40-
run: mvn javadoc:javadoc -Prelease
38+
run: mvn checkstyle:check -B -Pit

.github/workflows/maven.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,4 @@ jobs:
4949
restore-keys: |
5050
${{ runner.os }}-maven-
5151
- name: Compilation and Installation
52-
run: mvn clean install -Dcheckstyle.skip -Dspotbugs.skip=true -B -Pdocker -Pjacoco -Pit -Pcoverage
53-
- name: publish coverage report
54-
run: bash <(curl -s https://codecov.io/bash)
52+
run: mvn clean verify -Dcheckstyle.skip=true -B -Pdocker -Pjacoco -Pit -Pcoverage

.github/workflows/spotbugs.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void initStrBuilder() {
7878

7979
@Test
8080
public void serverFormattedElement() {
81-
HeadersMultiMap headers = new HeadersMultiMap();
81+
HeadersMultiMap headers = HeadersMultiMap.httpHeaders();
8282
String testValue = "testValue";
8383
headers.add(VAR_NAME, testValue);
8484
when(routingContext.request()).thenReturn(serverRequest);
@@ -129,7 +129,7 @@ public void clientFormattedElementIfHeaderIsNull() {
129129

130130
@Test
131131
public void serverFormattedElementIfNotFound() {
132-
HeadersMultiMap headers = new HeadersMultiMap();
132+
HeadersMultiMap headers = HeadersMultiMap.httpHeaders();
133133
String testValue = "testValue";
134134
headers.add("anotherKey", testValue);
135135
when(routingContext.request()).thenReturn(serverRequest);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void initStrBuilder() {
6464

6565
@Test
6666
public void serverFormattedElement() {
67-
HeadersMultiMap headers = new HeadersMultiMap();
67+
HeadersMultiMap headers = HeadersMultiMap.httpHeaders();
6868
String headerValue = "headerValue";
6969
headers.add(VAR_NAME, headerValue);
7070
when(routingContext.response()).thenReturn(serverResponse);
@@ -122,7 +122,7 @@ public void clientFormattedElementOnResponseIsNull() {
122122

123123
@Test
124124
public void serverFormattedElementOnNotFound() {
125-
HeadersMultiMap headers = new HeadersMultiMap();
125+
HeadersMultiMap headers = HeadersMultiMap.httpHeaders();
126126
String headerValue = "headerValue";
127127
headers.add("anotherHeader", headerValue);
128128
when(routingContext.response()).thenReturn(serverResponse);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void before() {
116116
LegacyPropertyFactory.setEnvironment(environment);
117117
Mockito.when(environment.getProperty("servicecomb.rest.parameter.decodeAsObject", boolean.class, false))
118118
.thenReturn(false);
119-
headers = new HeadersMultiMap();
119+
headers = HeadersMultiMap.httpHeaders();
120120
value = "value";
121121
}
122122

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
import java.io.InputStream;
2121
import java.nio.charset.StandardCharsets;
2222

23-
import jakarta.servlet.http.Part;
24-
import jakarta.ws.rs.core.HttpHeaders;
25-
import jakarta.ws.rs.core.Response.Status;
26-
2723
import org.apache.commons.io.IOUtils;
2824
import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
2925
import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
@@ -35,6 +31,10 @@
3531
import org.junit.jupiter.api.Test;
3632
import org.mockito.Mockito;
3733

34+
import jakarta.servlet.http.Part;
35+
import jakarta.ws.rs.core.HttpHeaders;
36+
import jakarta.ws.rs.core.Response.Status;
37+
3838
public class TestClassPathStaticResourceHandler {
3939
static ClassPathStaticResourceHandler handler = new ClassPathStaticResourceHandler();
4040

@@ -49,7 +49,7 @@ public void normal() throws IOException {
4949
Part part = response.getResult();
5050

5151
try (InputStream is = part.getInputStream()) {
52-
Assertions.assertTrue(IOUtils.toString(is, StandardCharsets.UTF_8).endsWith("<html></html>\n"));
52+
Assertions.assertTrue(IOUtils.toString(is, StandardCharsets.UTF_8).trim().endsWith("<html></html>"));
5353
}
5454
Assertions.assertEquals("text/html", part.getContentType());
5555
Assertions.assertEquals("text/html", response.getHeader(HttpHeaders.CONTENT_TYPE));
@@ -84,7 +84,7 @@ public void attack() {
8484
public void readContentFailed() throws IOException {
8585
handler = Mockito.spy(TestClassPathStaticResourceHandler.handler);
8686
Mockito.when(handler.findResource("web-root/index.html"))
87-
.thenThrow(new RuntimeExceptionWithoutStackTrace("read content failed."));
87+
.thenThrow(new RuntimeExceptionWithoutStackTrace("read content failed."));
8888

8989
try (LogCollector logCollector = new LogCollector()) {
9090
Response response = handler.handle("index.html");

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void maxThreads() {
111111
Assertions.assertEquals(
112112
"servicecomb.executor.default.thread-per-group is deprecated, recommended to use servicecomb.executor.default.maxThreads-per-group.",
113113
collector.getEvents().get(collector.getEvents().size() - 2).getMessage().getFormattedMessage());
114-
collector.teardown();
114+
collector.tearDown();
115115

116116
Mockito.when(environment.getProperty(KEY_MAX_THREADS, int.class, -1)).thenReturn(300);
117117
groupExecutor.initConfig();
@@ -127,7 +127,7 @@ public void adjustCoreThreads() {
127127
Assertions.assertEquals(
128128
"coreThreads is bigger than maxThreads, change from 25 to 10.",
129129
collector.getEvents().get(collector.getEvents().size() - 2).getMessage().getFormattedMessage());
130-
collector.teardown();
130+
collector.tearDown();
131131
}
132132

133133
@Test

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.mockito.Mockito;
3333
import org.springframework.core.env.Environment;
3434

35-
import io.vertx.core.file.impl.FileResolverImpl;
35+
import io.vertx.core.impl.SysProps;
3636

3737
public class TestAbstractTransport {
3838
Environment environment = Mockito.mock(Environment.class);
@@ -56,7 +56,7 @@ public void setUp() {
5656
Mockito.when(environment.getProperty("servicecomb.my.publishPort", int.class, 0)).thenReturn(0);
5757
Mockito.when(environment.getProperty("servicecomb.transport.eventloop.size", int.class, -1))
5858
.thenReturn(-1);
59-
Mockito.when(environment.getProperty(FileResolverImpl.DISABLE_CP_RESOLVING_PROP_NAME, boolean.class, true))
59+
Mockito.when(environment.getProperty(SysProps.DISABLE_FILE_CP_RESOLVING.name, boolean.class, true))
6060
.thenReturn(true);
6161
LegacyPropertyFactory.setEnvironment(environment);
6262
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,10 @@ public void websocket(ServerWebSocket serverWebsocket) {
4848
e.printStackTrace();
4949
}
5050

51-
serverWebsocket.writeTextMessage("hello", r -> {
52-
});
51+
serverWebsocket.writeTextMessage("hello");
5352

5453
for (int i = 0; i < 5; i++) {
55-
serverWebsocket.writeTextMessage("hello " + i, r -> {
56-
});
54+
serverWebsocket.writeTextMessage("hello " + i);
5755
try {
5856
Thread.sleep(500);
5957
} catch (InterruptedException e) {

0 commit comments

Comments
 (0)