Skip to content

Commit 9639962

Browse files
committed
Fix RSocket Package Tangle
Issue gh-7360
1 parent 2a1f3f6 commit 9639962

File tree

34 files changed

+98
-91
lines changed

34 files changed

+98
-91
lines changed

config/src/main/java/org/springframework/security/config/annotation/rsocket/RSocketSecurity.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@
2828
import org.springframework.security.config.Customizer;
2929
import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
3030
import org.springframework.security.oauth2.server.resource.authentication.JwtReactiveAuthenticationManager;
31-
import org.springframework.security.rsocket.interceptor.PayloadInterceptor;
32-
import org.springframework.security.rsocket.interceptor.PayloadSocketAcceptorInterceptor;
33-
import org.springframework.security.rsocket.interceptor.authentication.AnonymousPayloadInterceptor;
34-
import org.springframework.security.rsocket.interceptor.authentication.AuthenticationPayloadInterceptor;
35-
import org.springframework.security.rsocket.interceptor.authentication.BearerPayloadExchangeConverter;
36-
import org.springframework.security.rsocket.interceptor.authorization.AuthorizationPayloadInterceptor;
37-
import org.springframework.security.rsocket.interceptor.authorization.PayloadExchangeMatcherReactiveAuthorizationManager;
38-
import org.springframework.security.rsocket.util.PayloadExchangeAuthorizationContext;
39-
import org.springframework.security.rsocket.util.PayloadExchangeMatcher;
40-
import org.springframework.security.rsocket.util.PayloadExchangeMatcherEntry;
41-
import org.springframework.security.rsocket.util.PayloadExchangeMatchers;
42-
import org.springframework.security.rsocket.util.RoutePayloadExchangeMatcher;
31+
import org.springframework.security.rsocket.PayloadInterceptor;
32+
import org.springframework.security.rsocket.PayloadSocketAcceptorInterceptor;
33+
import org.springframework.security.rsocket.authentication.AnonymousPayloadInterceptor;
34+
import org.springframework.security.rsocket.authentication.AuthenticationPayloadInterceptor;
35+
import org.springframework.security.rsocket.authentication.BearerPayloadExchangeConverter;
36+
import org.springframework.security.rsocket.authorization.AuthorizationPayloadInterceptor;
37+
import org.springframework.security.rsocket.authorization.PayloadExchangeMatcherReactiveAuthorizationManager;
38+
import org.springframework.security.rsocket.util.matcher.PayloadExchangeAuthorizationContext;
39+
import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcher;
40+
import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcherEntry;
41+
import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatchers;
42+
import org.springframework.security.rsocket.util.matcher.RoutePayloadExchangeMatcher;
4343
import reactor.core.publisher.Mono;
4444

4545
import java.util.ArrayList;

config/src/test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.springframework.security.oauth2.core.oidc.IdTokenClaimNames;
3535
import org.springframework.security.oauth2.jwt.Jwt;
3636
import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
37-
import org.springframework.security.rsocket.interceptor.PayloadSocketAcceptorInterceptor;
37+
import org.springframework.security.rsocket.PayloadSocketAcceptorInterceptor;
3838
import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder;
3939
import org.springframework.security.rsocket.metadata.BearerTokenMetadata;
4040
import org.springframework.stereotype.Controller;

config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@
3232
import org.springframework.messaging.rsocket.RSocketStrategies;
3333
import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler;
3434
import org.springframework.security.config.Customizer;
35-
import org.springframework.security.config.annotation.rsocket.EnableRSocketSecurity;
36-
import org.springframework.security.config.annotation.rsocket.RSocketSecurity;
3735
import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
3836
import org.springframework.security.core.userdetails.User;
3937
import org.springframework.security.core.userdetails.UserDetails;
40-
import org.springframework.security.rsocket.interceptor.PayloadSocketAcceptorInterceptor;
38+
import org.springframework.security.rsocket.PayloadSocketAcceptorInterceptor;
4139
import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder;
4240
import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
4341
import org.springframework.stereotype.Controller;

config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@
3333
import org.springframework.messaging.rsocket.RSocketStrategies;
3434
import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler;
3535
import org.springframework.security.config.Customizer;
36-
import org.springframework.security.config.annotation.rsocket.EnableRSocketSecurity;
37-
import org.springframework.security.config.annotation.rsocket.RSocketSecurity;
3836
import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
3937
import org.springframework.security.core.userdetails.User;
4038
import org.springframework.security.core.userdetails.UserDetails;
41-
import org.springframework.security.rsocket.interceptor.PayloadSocketAcceptorInterceptor;
39+
import org.springframework.security.rsocket.PayloadSocketAcceptorInterceptor;
4240
import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder;
4341
import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
4442
import org.springframework.stereotype.Controller;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.rsocket.interceptor;
17+
package org.springframework.security.rsocket;
1818

1919
import reactor.core.publisher.Mono;
2020
import reactor.util.context.Context;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.rsocket.interceptor;
17+
package org.springframework.security.rsocket;
1818

1919
import io.rsocket.Payload;
2020
import org.springframework.util.Assert;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.rsocket.interceptor;
17+
package org.springframework.security.rsocket;
1818

1919
import io.rsocket.Payload;
2020
import org.springframework.util.MimeType;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.rsocket.interceptor;
17+
package org.springframework.security.rsocket;
1818

1919
/**
2020
* The {@link PayloadExchange} type
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.rsocket.interceptor;
17+
package org.springframework.security.rsocket;
1818

1919
import reactor.core.publisher.Mono;
2020

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.rsocket.interceptor;
17+
package org.springframework.security.rsocket;
1818

1919
import reactor.core.publisher.Mono;
2020

0 commit comments

Comments
 (0)