Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Framework 5.3.0-SNAPSHOT

Browse Source 
This commit also switches to RSocket SNAPSHOTs and updates the
repository configuration to rely on "libs-snapshot", since the RSocket
SNAPSHOTs are mirrored there.

See gh-22640
This commit is contained in:
Brian Clozel 2020-07-29 14:39:37 +02:00
parent 7aa093e0ca
commit 6f2098ad71
6 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -21,7 +21,7 @@ allprojects {
maven { url "https://repo.spring.io/milestone" }
}
if (version.endsWith('-SNAPSHOT')) {
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/libs-snapshot" }
}
}

2
buildSrc/src/main/resources/effective-bom-settings.xml
View File

@ -9,7 +9,7 @@
<repositories>
<repository>
<id>spring-snapshot</id>
<url>https://repo.spring.io/snapshot</url>
<url>https://repo.spring.io/libs-snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketWebSocketNettyRouteProviderTests.java
View File

@ -87,7 +87,7 @@ class RSocketWebSocketNettyRouteProviderTests {
int port = server.getPort();
RSocketRequester.Builder builder = context.getBean(RSocketRequester.Builder.class);
return builder.dataMimeType(MediaType.APPLICATION_CBOR)
.connectWebSocket(URI.create("ws://localhost:" + port + "/rsocket")).block();
.websocket(URI.create("ws://localhost:" + port + "/rsocket"));
}
@Configuration(proxyBeanMethods = false)

4
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -1350,7 +1350,7 @@ bom {
]
}
}
library("RSocket", "1.0.1") {
library("RSocket", "1.1.0-SNAPSHOT") {
group("io.rsocket") {
imports = [
"rsocket-bom"
@ -1570,7 +1570,7 @@ bom {
]
}
}
library("Spring Framework", "5.3.0-M1") {
library("Spring Framework", "5.3.0-SNAPSHOT") {
group("org.springframework") {
imports = [
"spring-framework-bom"

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java
View File

@ -76,7 +76,7 @@ class NettyRSocketServerFactoryTests {
}
}
if (this.requester != null) {
this.requester.rsocket().dispose();
this.requester.rsocketClient().dispose();
}
}
@ -166,13 +166,13 @@ class NettyRSocketServerFactoryTests {
private RSocketRequester createRSocketTcpClient() {
Assertions.assertThat(this.server).isNotNull();
InetSocketAddress address = this.server.address();
return createRSocketRequesterBuilder().connectTcp(address.getHostString(), address.getPort()).block();
return createRSocketRequesterBuilder().tcp(address.getHostString(), address.getPort());
}
private RSocketRequester createRSocketWebSocketClient() {
Assertions.assertThat(this.server).isNotNull();
InetSocketAddress address = this.server.address();
return createRSocketRequesterBuilder().connect(WebsocketClientTransport.create(address)).block();
return createRSocketRequesterBuilder().transport(WebsocketClientTransport.create(address));
}
private RSocketRequester.Builder createRSocketRequesterBuilder() {

6
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-rsocket/src/test/java/smoketest/rsocket/SampleRSocketApplicationTests.java
View File

@ -16,8 +16,6 @@
package smoketest.rsocket;
import java.time.Duration;
import io.rsocket.metadata.WellKnownMimeType;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
@ -43,7 +41,7 @@ public class SampleRSocketApplicationTests {
@Test
void unauthenticatedAccessToRSocketEndpoint() {
RSocketRequester requester = this.builder.connectTcp("localhost", this.port).block(Duration.ofSeconds(5));
RSocketRequester requester = this.builder.tcp("localhost", this.port);
Mono<Project> result = requester.route("find.project.spring-boot").retrieveMono(Project.class);
StepVerifier.create(result).expectErrorMessage("Access Denied").verify();
}
@ -54,7 +52,7 @@ public class SampleRSocketApplicationTests {
.rsocketStrategies((builder) -> builder.encoder(new SimpleAuthenticationEncoder()))
.setupMetadata(new UsernamePasswordMetadata("user", "password"),
MimeTypeUtils.parseMimeType(WellKnownMimeType.MESSAGE_RSOCKET_AUTHENTICATION.getString()))
.connectTcp("localhost", this.port).block(Duration.ofSeconds(5));
.tcp("localhost", this.port);
Mono<Project> result = requester.route("find.project.spring-boot").retrieveMono(Project.class);
StepVerifier.create(result)
.assertNext((project) -> Assertions.assertThat(project.getName()).isEqualTo("spring-boot"))