Skip to content

Commit 5345aec

Browse files
committed
Align RSocket sample with new Spring Boot configuration
1 parent bcaa8bc commit 5345aec

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

samples/boot/hellorsocket/src/integration-test/java/sample/HelloRSocketApplicationITests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package sample;
1717

18-
import org.junit.Test;
19-
import org.junit.runner.RunWith;
2018
import org.springframework.beans.factory.annotation.Autowired;
2119
import org.springframework.boot.rsocket.context.RSocketServerInitializedEvent;
2220
import org.springframework.boot.test.context.SpringBootTest;
@@ -27,6 +25,9 @@
2725
import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
2826
import org.springframework.test.context.TestPropertySource;
2927
import org.springframework.test.context.junit4.SpringRunner;
28+
29+
import org.junit.Test;
30+
import org.junit.runner.RunWith;
3031
import reactor.core.publisher.Mono;
3132

3233
import static org.assertj.core.api.Assertions.assertThat;
@@ -91,7 +92,7 @@ static class Config implements ApplicationListener<RSocketServerInitializedEvent
9192

9293
@Override
9394
public void onApplicationEvent(RSocketServerInitializedEvent event) {
94-
this.port = event.getrSocketServer().address().getPort();
95+
this.port = event.getServer().address().getPort();
9596
}
9697
}
9798
}

samples/boot/hellorsocket/src/main/java/sample/HelloRSocketSecurityConfig.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@
1616

1717
package sample;
1818

19-
import org.springframework.boot.rsocket.server.ServerRSocketFactoryCustomizer;
2019
import org.springframework.context.annotation.Bean;
2120
import org.springframework.context.annotation.Configuration;
2221
import org.springframework.security.config.annotation.rsocket.EnableRSocketSecurity;
2322
import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
2423
import org.springframework.security.core.userdetails.User;
2524
import org.springframework.security.core.userdetails.UserDetails;
26-
import org.springframework.security.rsocket.core.SecuritySocketAcceptorInterceptor;
2725

2826
/**
2927
* @author Rob Winch
@@ -43,9 +41,4 @@ MapReactiveUserDetailsService userDetailsService() {
4341
return new MapReactiveUserDetailsService(user);
4442
}
4543

46-
@Bean
47-
ServerRSocketFactoryCustomizer springSecurityRSocketSecurity(
48-
SecuritySocketAcceptorInterceptor interceptor) {
49-
return builder -> builder.addSocketAcceptorPlugin(interceptor);
50-
}
5144
}

0 commit comments

Comments
 (0)