From 9639962e27f38ff8b13e531a5bb4721eacd81a1d Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Thu, 5 Sep 2019 16:27:57 -0500 Subject: [PATCH] Fix RSocket Package Tangle Issue gh-7360 --- .../annotation/rsocket/RSocketSecurity.java | 24 +++++++++---------- .../config/annotation/rsocket/JwtITests.java | 2 +- ...RSocketMessageHandlerConnectionITests.java | 4 +--- .../rsocket/RSocketMessageHandlerITests.java | 4 +--- .../ContextPayloadInterceptorChain.java | 2 +- .../DefaultPayloadExchange.java | 2 +- .../{interceptor => }/PayloadExchange.java | 2 +- .../PayloadExchangeType.java | 2 +- .../{interceptor => }/PayloadInterceptor.java | 2 +- .../PayloadInterceptorChain.java | 2 +- .../PayloadInterceptorRSocket.java | 2 +- .../PayloadSocketAcceptor.java | 2 +- .../PayloadSocketAcceptorInterceptor.java | 2 +- .../AnonymousPayloadInterceptor.java | 8 +++---- .../AuthenticationPayloadInterceptor.java | 8 +++---- ...uthenticationPayloadExchangeConverter.java | 4 ++-- .../BearerPayloadExchangeConverter.java | 4 ++-- ...ayloadExchangeAuthenticationConverter.java | 4 ++-- .../AuthorizationPayloadInterceptor.java | 8 +++---- ...geMatcherReactiveAuthorizationManager.java | 10 ++++---- .../PayloadExchangeAuthorizationContext.java | 4 ++-- .../{ => matcher}/PayloadExchangeMatcher.java | 4 ++-- .../PayloadExchangeMatcherEntry.java | 2 +- .../PayloadExchangeMatchers.java | 6 ++--- .../RoutePayloadExchangeMatcher.java | 4 ++-- .../PayloadInterceptorRSocketTests.java | 8 ++++++- ...PayloadSocketAcceptorInterceptorTests.java | 8 +++++-- .../PayloadSocketAcceptorTests.java | 8 +++++-- .../AnonymousPayloadInterceptorTests.java | 5 ++-- ...AuthenticationPayloadInterceptorChain.java | 4 ++-- ...AuthenticationPayloadInterceptorTests.java | 9 ++++--- .../AuthorizationPayloadInterceptorTests.java | 7 +++--- ...tcherReactiveAuthorizationManagerTest.java | 12 +++++----- .../RoutePayloadExchangeMatcherTests.java | 10 ++++---- 34 files changed, 98 insertions(+), 91 deletions(-) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/ContextPayloadInterceptorChain.java (98%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/DefaultPayloadExchange.java (96%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/PayloadExchange.java (94%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/PayloadExchangeType.java (97%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/PayloadInterceptor.java (95%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/PayloadInterceptorChain.java (94%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/PayloadInterceptorRSocket.java (98%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/PayloadSocketAcceptor.java (98%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/PayloadSocketAcceptorInterceptor.java (97%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/authentication/AnonymousPayloadInterceptor.java (90%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/authentication/AuthenticationPayloadInterceptor.java (89%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/authentication/BasicAuthenticationPayloadExchangeConverter.java (94%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/authentication/BearerPayloadExchangeConverter.java (93%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/authentication/PayloadExchangeAuthenticationConverter.java (86%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/authorization/AuthorizationPayloadInterceptor.java (87%) rename rsocket/src/main/java/org/springframework/security/rsocket/{interceptor => }/authorization/PayloadExchangeMatcherReactiveAuthorizationManager.java (88%) rename rsocket/src/main/java/org/springframework/security/rsocket/util/{ => matcher}/PayloadExchangeAuthorizationContext.java (91%) rename rsocket/src/main/java/org/springframework/security/rsocket/util/{ => matcher}/PayloadExchangeMatcher.java (94%) rename rsocket/src/main/java/org/springframework/security/rsocket/util/{ => matcher}/PayloadExchangeMatcherEntry.java (94%) rename rsocket/src/main/java/org/springframework/security/rsocket/util/{ => matcher}/PayloadExchangeMatchers.java (88%) rename rsocket/src/main/java/org/springframework/security/rsocket/util/{ => matcher}/RoutePayloadExchangeMatcher.java (94%) rename rsocket/src/test/java/org/springframework/security/rsocket/{interceptor => }/PayloadInterceptorRSocketTests.java (97%) rename rsocket/src/test/java/org/springframework/security/rsocket/{interceptor => }/PayloadSocketAcceptorInterceptorTests.java (92%) rename rsocket/src/test/java/org/springframework/security/rsocket/{interceptor => }/PayloadSocketAcceptorTests.java (94%) rename rsocket/src/test/java/org/springframework/security/rsocket/{interceptor => }/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTest.java (89%) rename rsocket/src/test/java/org/springframework/security/rsocket/util/{ => matcher}/RoutePayloadExchangeMatcherTests.java (93%) diff --git a/config/src/main/java/org/springframework/security/config/annotation/rsocket/RSocketSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/rsocket/RSocketSecurity.java index 274dc4b539..a45e88df65 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/rsocket/RSocketSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/rsocket/RSocketSecurity.java @@ -28,18 +28,18 @@ import org.springframework.security.authorization.ReactiveAuthorizationManager; import org.springframework.security.config.Customizer; import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.security.oauth2.server.resource.authentication.JwtReactiveAuthenticationManager; -import org.springframework.security.rsocket.interceptor.PayloadInterceptor; -import org.springframework.security.rsocket.interceptor.PayloadSocketAcceptorInterceptor; -import org.springframework.security.rsocket.interceptor.authentication.AnonymousPayloadInterceptor; -import org.springframework.security.rsocket.interceptor.authentication.AuthenticationPayloadInterceptor; -import org.springframework.security.rsocket.interceptor.authentication.BearerPayloadExchangeConverter; -import org.springframework.security.rsocket.interceptor.authorization.AuthorizationPayloadInterceptor; -import org.springframework.security.rsocket.interceptor.authorization.PayloadExchangeMatcherReactiveAuthorizationManager; -import org.springframework.security.rsocket.util.PayloadExchangeAuthorizationContext; -import org.springframework.security.rsocket.util.PayloadExchangeMatcher; -import org.springframework.security.rsocket.util.PayloadExchangeMatcherEntry; -import org.springframework.security.rsocket.util.PayloadExchangeMatchers; -import org.springframework.security.rsocket.util.RoutePayloadExchangeMatcher; +import org.springframework.security.rsocket.PayloadInterceptor; +import org.springframework.security.rsocket.PayloadSocketAcceptorInterceptor; +import org.springframework.security.rsocket.authentication.AnonymousPayloadInterceptor; +import org.springframework.security.rsocket.authentication.AuthenticationPayloadInterceptor; +import org.springframework.security.rsocket.authentication.BearerPayloadExchangeConverter; +import org.springframework.security.rsocket.authorization.AuthorizationPayloadInterceptor; +import org.springframework.security.rsocket.authorization.PayloadExchangeMatcherReactiveAuthorizationManager; +import org.springframework.security.rsocket.util.matcher.PayloadExchangeAuthorizationContext; +import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcher; +import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcherEntry; +import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatchers; +import org.springframework.security.rsocket.util.matcher.RoutePayloadExchangeMatcher; import reactor.core.publisher.Mono; import java.util.ArrayList; diff --git a/config/src/test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java b/config/src/test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java index 09f7866728..c1d5648420 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java @@ -34,7 +34,7 @@ import org.springframework.security.config.Customizer; import org.springframework.security.oauth2.core.oidc.IdTokenClaimNames; import org.springframework.security.oauth2.jwt.Jwt; import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; -import org.springframework.security.rsocket.interceptor.PayloadSocketAcceptorInterceptor; +import org.springframework.security.rsocket.PayloadSocketAcceptorInterceptor; import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder; import org.springframework.security.rsocket.metadata.BearerTokenMetadata; import org.springframework.stereotype.Controller; diff --git a/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java b/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java index a47affc554..2b58d1b392 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java @@ -32,12 +32,10 @@ import org.springframework.messaging.rsocket.RSocketRequester; import org.springframework.messaging.rsocket.RSocketStrategies; import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler; import org.springframework.security.config.Customizer; -import org.springframework.security.config.annotation.rsocket.EnableRSocketSecurity; -import org.springframework.security.config.annotation.rsocket.RSocketSecurity; import org.springframework.security.core.userdetails.MapReactiveUserDetailsService; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.rsocket.interceptor.PayloadSocketAcceptorInterceptor; +import org.springframework.security.rsocket.PayloadSocketAcceptorInterceptor; import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder; import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata; import org.springframework.stereotype.Controller; diff --git a/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java b/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java index 133069ad84..38b0aca8bd 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java @@ -33,12 +33,10 @@ import org.springframework.messaging.rsocket.RSocketRequester; import org.springframework.messaging.rsocket.RSocketStrategies; import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler; import org.springframework.security.config.Customizer; -import org.springframework.security.config.annotation.rsocket.EnableRSocketSecurity; -import org.springframework.security.config.annotation.rsocket.RSocketSecurity; import org.springframework.security.core.userdetails.MapReactiveUserDetailsService; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.rsocket.interceptor.PayloadSocketAcceptorInterceptor; +import org.springframework.security.rsocket.PayloadSocketAcceptorInterceptor; import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder; import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata; import org.springframework.stereotype.Controller; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/ContextPayloadInterceptorChain.java b/rsocket/src/main/java/org/springframework/security/rsocket/ContextPayloadInterceptorChain.java similarity index 98% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/ContextPayloadInterceptorChain.java rename to rsocket/src/main/java/org/springframework/security/rsocket/ContextPayloadInterceptorChain.java index eb7d3f9494..005d4b1bd6 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/ContextPayloadInterceptorChain.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/ContextPayloadInterceptorChain.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor; +package org.springframework.security.rsocket; import reactor.core.publisher.Mono; import reactor.util.context.Context; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/DefaultPayloadExchange.java b/rsocket/src/main/java/org/springframework/security/rsocket/DefaultPayloadExchange.java similarity index 96% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/DefaultPayloadExchange.java rename to rsocket/src/main/java/org/springframework/security/rsocket/DefaultPayloadExchange.java index 9a289cd2e6..ab684a68b6 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/DefaultPayloadExchange.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/DefaultPayloadExchange.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor; +package org.springframework.security.rsocket; import io.rsocket.Payload; import org.springframework.util.Assert; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadExchange.java b/rsocket/src/main/java/org/springframework/security/rsocket/PayloadExchange.java similarity index 94% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadExchange.java rename to rsocket/src/main/java/org/springframework/security/rsocket/PayloadExchange.java index 7cf8ca4dca..fbb2adf542 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadExchange.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/PayloadExchange.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor; +package org.springframework.security.rsocket; import io.rsocket.Payload; import org.springframework.util.MimeType; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadExchangeType.java b/rsocket/src/main/java/org/springframework/security/rsocket/PayloadExchangeType.java similarity index 97% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadExchangeType.java rename to rsocket/src/main/java/org/springframework/security/rsocket/PayloadExchangeType.java index 455b0e96ef..cae02f9579 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadExchangeType.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/PayloadExchangeType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor; +package org.springframework.security.rsocket; /** * The {@link PayloadExchange} type diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadInterceptor.java b/rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptor.java similarity index 95% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadInterceptor.java rename to rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptor.java index 8984ef5417..d4f7e9d637 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadInterceptor.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor; +package org.springframework.security.rsocket; import reactor.core.publisher.Mono; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadInterceptorChain.java b/rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptorChain.java similarity index 94% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadInterceptorChain.java rename to rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptorChain.java index 97c6ef7487..d49dbeaf90 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadInterceptorChain.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptorChain.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor; +package org.springframework.security.rsocket; import reactor.core.publisher.Mono; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadInterceptorRSocket.java b/rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptorRSocket.java similarity index 98% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadInterceptorRSocket.java rename to rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptorRSocket.java index 8a32f0faef..8132d62da2 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadInterceptorRSocket.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptorRSocket.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor; +package org.springframework.security.rsocket; import io.rsocket.Payload; import io.rsocket.RSocket; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptor.java b/rsocket/src/main/java/org/springframework/security/rsocket/PayloadSocketAcceptor.java similarity index 98% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptor.java rename to rsocket/src/main/java/org/springframework/security/rsocket/PayloadSocketAcceptor.java index 333a268f98..6d4059dfb7 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptor.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/PayloadSocketAcceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor; +package org.springframework.security.rsocket; import io.rsocket.ConnectionSetupPayload; import io.rsocket.Payload; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptorInterceptor.java b/rsocket/src/main/java/org/springframework/security/rsocket/PayloadSocketAcceptorInterceptor.java similarity index 97% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptorInterceptor.java rename to rsocket/src/main/java/org/springframework/security/rsocket/PayloadSocketAcceptorInterceptor.java index 35fdb36e14..b735d61632 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptorInterceptor.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/PayloadSocketAcceptorInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor; +package org.springframework.security.rsocket; import io.rsocket.SocketAcceptor; import io.rsocket.metadata.WellKnownMimeType; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/AnonymousPayloadInterceptor.java b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptor.java similarity index 90% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/AnonymousPayloadInterceptor.java rename to rsocket/src/main/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptor.java index 97f2866d13..f5e6e56926 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/AnonymousPayloadInterceptor.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor.authentication; +package org.springframework.security.rsocket.authentication; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.core.GrantedAuthority; @@ -22,9 +22,9 @@ import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.context.ReactiveSecurityContextHolder; import org.springframework.util.Assert; import reactor.core.publisher.Mono; -import org.springframework.security.rsocket.interceptor.PayloadInterceptorChain; -import org.springframework.security.rsocket.interceptor.PayloadExchange; -import org.springframework.security.rsocket.interceptor.PayloadInterceptor; +import org.springframework.security.rsocket.PayloadInterceptorChain; +import org.springframework.security.rsocket.PayloadExchange; +import org.springframework.security.rsocket.PayloadInterceptor; import java.util.List; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/AuthenticationPayloadInterceptor.java b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptor.java similarity index 89% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/AuthenticationPayloadInterceptor.java rename to rsocket/src/main/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptor.java index 1a988c7e9c..a5b3c56408 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/AuthenticationPayloadInterceptor.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptor.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor.authentication; +package org.springframework.security.rsocket.authentication; import org.springframework.security.authentication.ReactiveAuthenticationManager; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.ReactiveSecurityContextHolder; -import org.springframework.security.rsocket.interceptor.PayloadExchange; -import org.springframework.security.rsocket.interceptor.PayloadInterceptor; -import org.springframework.security.rsocket.interceptor.PayloadInterceptorChain; +import org.springframework.security.rsocket.PayloadExchange; +import org.springframework.security.rsocket.PayloadInterceptor; +import org.springframework.security.rsocket.PayloadInterceptorChain; import org.springframework.util.Assert; import reactor.core.publisher.Mono; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/BasicAuthenticationPayloadExchangeConverter.java b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/BasicAuthenticationPayloadExchangeConverter.java similarity index 94% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/BasicAuthenticationPayloadExchangeConverter.java rename to rsocket/src/main/java/org/springframework/security/rsocket/authentication/BasicAuthenticationPayloadExchangeConverter.java index c4bce298aa..0471a4a689 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/BasicAuthenticationPayloadExchangeConverter.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/BasicAuthenticationPayloadExchangeConverter.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor.authentication; +package org.springframework.security.rsocket.authentication; import io.rsocket.metadata.WellKnownMimeType; import org.springframework.messaging.rsocket.DefaultMetadataExtractor; import org.springframework.messaging.rsocket.MetadataExtractor; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; -import org.springframework.security.rsocket.interceptor.PayloadExchange; +import org.springframework.security.rsocket.PayloadExchange; import org.springframework.security.rsocket.metadata.BasicAuthenticationDecoder; import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata; import org.springframework.util.MimeType; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/BearerPayloadExchangeConverter.java b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/BearerPayloadExchangeConverter.java similarity index 93% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/BearerPayloadExchangeConverter.java rename to rsocket/src/main/java/org/springframework/security/rsocket/authentication/BearerPayloadExchangeConverter.java index cc9db71dfc..b52a229c30 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/BearerPayloadExchangeConverter.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/BearerPayloadExchangeConverter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor.authentication; +package org.springframework.security.rsocket.authentication; import io.netty.buffer.ByteBuf; import io.rsocket.metadata.CompositeMetadata; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.server.resource.BearerTokenAuthenticationToken; -import org.springframework.security.rsocket.interceptor.PayloadExchange; +import org.springframework.security.rsocket.PayloadExchange; import org.springframework.security.rsocket.metadata.BearerTokenMetadata; import reactor.core.publisher.Mono; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/PayloadExchangeAuthenticationConverter.java b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/PayloadExchangeAuthenticationConverter.java similarity index 86% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/PayloadExchangeAuthenticationConverter.java rename to rsocket/src/main/java/org/springframework/security/rsocket/authentication/PayloadExchangeAuthenticationConverter.java index 2713aeb06a..dc34ef0262 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authentication/PayloadExchangeAuthenticationConverter.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/authentication/PayloadExchangeAuthenticationConverter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor.authentication; +package org.springframework.security.rsocket.authentication; import org.springframework.security.core.Authentication; -import org.springframework.security.rsocket.interceptor.PayloadExchange; +import org.springframework.security.rsocket.PayloadExchange; import reactor.core.publisher.Mono; /** diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authorization/AuthorizationPayloadInterceptor.java b/rsocket/src/main/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptor.java similarity index 87% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authorization/AuthorizationPayloadInterceptor.java rename to rsocket/src/main/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptor.java index 1fc8011594..12863f8003 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authorization/AuthorizationPayloadInterceptor.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor.authorization; +package org.springframework.security.rsocket.authorization; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.authorization.ReactiveAuthorizationManager; @@ -22,9 +22,9 @@ import org.springframework.security.core.context.ReactiveSecurityContextHolder; import org.springframework.security.core.context.SecurityContext; import org.springframework.util.Assert; import reactor.core.publisher.Mono; -import org.springframework.security.rsocket.interceptor.PayloadInterceptorChain; -import org.springframework.security.rsocket.interceptor.PayloadExchange; -import org.springframework.security.rsocket.interceptor.PayloadInterceptor; +import org.springframework.security.rsocket.PayloadInterceptorChain; +import org.springframework.security.rsocket.PayloadExchange; +import org.springframework.security.rsocket.PayloadInterceptor; /** * Provides authorization of the {@link PayloadExchange}. diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authorization/PayloadExchangeMatcherReactiveAuthorizationManager.java b/rsocket/src/main/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManager.java similarity index 88% rename from rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authorization/PayloadExchangeMatcherReactiveAuthorizationManager.java rename to rsocket/src/main/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManager.java index 7fb7096850..bcb3a573e6 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/interceptor/authorization/PayloadExchangeMatcherReactiveAuthorizationManager.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor.authorization; +package org.springframework.security.rsocket.authorization; import org.springframework.security.authorization.AuthorizationDecision; import org.springframework.security.authorization.ReactiveAuthorizationManager; @@ -22,10 +22,10 @@ import org.springframework.security.core.Authentication; import org.springframework.util.Assert; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import org.springframework.security.rsocket.interceptor.PayloadExchange; -import org.springframework.security.rsocket.util.PayloadExchangeAuthorizationContext; -import org.springframework.security.rsocket.util.PayloadExchangeMatcher; -import org.springframework.security.rsocket.util.PayloadExchangeMatcherEntry; +import org.springframework.security.rsocket.PayloadExchange; +import org.springframework.security.rsocket.util.matcher.PayloadExchangeAuthorizationContext; +import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcher; +import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcherEntry; import java.util.ArrayList; import java.util.List; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeAuthorizationContext.java b/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeAuthorizationContext.java similarity index 91% rename from rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeAuthorizationContext.java rename to rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeAuthorizationContext.java index ac01e07f73..2cb3719c88 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeAuthorizationContext.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeAuthorizationContext.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.security.rsocket.util; +package org.springframework.security.rsocket.util.matcher; -import org.springframework.security.rsocket.interceptor.PayloadExchange; +import org.springframework.security.rsocket.PayloadExchange; import java.util.Collections; import java.util.Map; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeMatcher.java b/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatcher.java similarity index 94% rename from rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeMatcher.java rename to rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatcher.java index d5a368a1f8..f7baaac650 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeMatcher.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatcher.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.security.rsocket.util; +package org.springframework.security.rsocket.util.matcher; -import org.springframework.security.rsocket.interceptor.PayloadExchange; +import org.springframework.security.rsocket.PayloadExchange; import reactor.core.publisher.Mono; import java.util.Collections; diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeMatcherEntry.java b/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatcherEntry.java similarity index 94% rename from rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeMatcherEntry.java rename to rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatcherEntry.java index 691033c417..6f7aa6ae28 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeMatcherEntry.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatcherEntry.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.util; +package org.springframework.security.rsocket.util.matcher; /** * @author Rob Winch diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeMatchers.java b/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatchers.java similarity index 88% rename from rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeMatchers.java rename to rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatchers.java index 9202949ac3..979eea096a 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/util/PayloadExchangeMatchers.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatchers.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.security.rsocket.util; +package org.springframework.security.rsocket.util.matcher; -import org.springframework.security.rsocket.interceptor.PayloadExchange; -import org.springframework.security.rsocket.interceptor.PayloadExchangeType; +import org.springframework.security.rsocket.PayloadExchange; +import org.springframework.security.rsocket.PayloadExchangeType; import reactor.core.publisher.Mono; /** diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/util/RoutePayloadExchangeMatcher.java b/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/RoutePayloadExchangeMatcher.java similarity index 94% rename from rsocket/src/main/java/org/springframework/security/rsocket/util/RoutePayloadExchangeMatcher.java rename to rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/RoutePayloadExchangeMatcher.java index 0b711d212b..ed0c2207ae 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/util/RoutePayloadExchangeMatcher.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/RoutePayloadExchangeMatcher.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.security.rsocket.util; +package org.springframework.security.rsocket.util.matcher; import org.springframework.messaging.rsocket.MetadataExtractor; -import org.springframework.security.rsocket.interceptor.PayloadExchange; +import org.springframework.security.rsocket.PayloadExchange; import org.springframework.util.Assert; import org.springframework.util.RouteMatcher; import reactor.core.publisher.Mono; diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/interceptor/PayloadInterceptorRSocketTests.java b/rsocket/src/test/java/org/springframework/security/rsocket/PayloadInterceptorRSocketTests.java similarity index 97% rename from rsocket/src/test/java/org/springframework/security/rsocket/interceptor/PayloadInterceptorRSocketTests.java rename to rsocket/src/test/java/org/springframework/security/rsocket/PayloadInterceptorRSocketTests.java index 6dc06fc168..45472009a7 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/interceptor/PayloadInterceptorRSocketTests.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/PayloadInterceptorRSocketTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor; +package org.springframework.security.rsocket; import io.rsocket.Payload; import io.rsocket.RSocket; @@ -33,6 +33,12 @@ import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.ReactiveSecurityContextHolder; import org.springframework.security.core.context.SecurityContext; +import org.springframework.security.rsocket.DefaultPayloadExchange; +import org.springframework.security.rsocket.PayloadExchange; +import org.springframework.security.rsocket.PayloadExchangeType; +import org.springframework.security.rsocket.PayloadInterceptor; +import org.springframework.security.rsocket.PayloadInterceptorChain; +import org.springframework.security.rsocket.PayloadInterceptorRSocket; import org.springframework.util.MimeType; import org.springframework.util.MimeTypeUtils; import reactor.core.publisher.Flux; diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptorInterceptorTests.java b/rsocket/src/test/java/org/springframework/security/rsocket/PayloadSocketAcceptorInterceptorTests.java similarity index 92% rename from rsocket/src/test/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptorInterceptorTests.java rename to rsocket/src/test/java/org/springframework/security/rsocket/PayloadSocketAcceptorInterceptorTests.java index 367a1b9b99..50c4bdc907 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptorInterceptorTests.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/PayloadSocketAcceptorInterceptorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor; +package org.springframework.security.rsocket; import io.rsocket.ConnectionSetupPayload; import io.rsocket.Payload; @@ -28,6 +28,10 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.http.MediaType; +import org.springframework.security.rsocket.PayloadExchange; +import org.springframework.security.rsocket.PayloadInterceptor; +import org.springframework.security.rsocket.PayloadInterceptorRSocket; +import org.springframework.security.rsocket.PayloadSocketAcceptorInterceptor; import reactor.core.publisher.Mono; import java.util.Arrays; @@ -118,4 +122,4 @@ public class PayloadSocketAcceptorInterceptorTests { verify(this.interceptor, times(2)).intercept(exchangeArg.capture(), any()); return exchangeArg.getValue(); } -} \ No newline at end of file +} diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptorTests.java b/rsocket/src/test/java/org/springframework/security/rsocket/PayloadSocketAcceptorTests.java similarity index 94% rename from rsocket/src/test/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptorTests.java rename to rsocket/src/test/java/org/springframework/security/rsocket/PayloadSocketAcceptorTests.java index af8154fcd6..48f95d93f4 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/interceptor/PayloadSocketAcceptorTests.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/PayloadSocketAcceptorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor; +package org.springframework.security.rsocket; import io.rsocket.ConnectionSetupPayload; import io.rsocket.Payload; @@ -28,6 +28,10 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.http.MediaType; +import org.springframework.security.rsocket.PayloadExchange; +import org.springframework.security.rsocket.PayloadInterceptor; +import org.springframework.security.rsocket.PayloadInterceptorRSocket; +import org.springframework.security.rsocket.PayloadSocketAcceptor; import reactor.core.publisher.Mono; import java.util.Arrays; @@ -157,4 +161,4 @@ public class PayloadSocketAcceptorTests { verify(this.interceptor, times(2)).intercept(exchangeArg.capture(), any()); return exchangeArg.getValue(); } -} \ No newline at end of file +} diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptorTests.java b/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptorTests.java index 86a00c93d0..f9a6123bda 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptorTests.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptorTests.java @@ -27,8 +27,7 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.context.ReactiveSecurityContextHolder; -import org.springframework.security.rsocket.interceptor.PayloadExchange; -import org.springframework.security.rsocket.interceptor.authentication.AnonymousPayloadInterceptor; +import org.springframework.security.rsocket.PayloadExchange; import java.util.List; @@ -105,4 +104,4 @@ public class AnonymousPayloadInterceptorTests { assertThat(authentication).isEqualTo(expected); } -} \ No newline at end of file +} diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorChain.java b/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorChain.java index 2f5480ab66..3979c35faa 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorChain.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorChain.java @@ -20,8 +20,8 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.ReactiveSecurityContextHolder; import org.springframework.security.core.context.SecurityContext; import reactor.core.publisher.Mono; -import org.springframework.security.rsocket.interceptor.PayloadInterceptorChain; -import org.springframework.security.rsocket.interceptor.PayloadExchange; +import org.springframework.security.rsocket.PayloadInterceptorChain; +import org.springframework.security.rsocket.PayloadExchange; /** * @author Rob Winch diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorTests.java b/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorTests.java index e1ed44301c..bec12b17dc 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorTests.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorTests.java @@ -37,8 +37,7 @@ import org.springframework.security.authentication.ReactiveAuthenticationManager import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; -import org.springframework.security.rsocket.interceptor.PayloadExchangeType; -import org.springframework.security.rsocket.interceptor.authentication.AuthenticationPayloadInterceptor; +import org.springframework.security.rsocket.PayloadExchangeType; import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder; import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata; import org.springframework.util.MimeType; @@ -46,9 +45,9 @@ import org.springframework.util.MimeTypeUtils; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; import reactor.test.publisher.PublisherProbe; -import org.springframework.security.rsocket.interceptor.DefaultPayloadExchange; -import org.springframework.security.rsocket.interceptor.PayloadInterceptorChain; -import org.springframework.security.rsocket.interceptor.PayloadExchange; +import org.springframework.security.rsocket.DefaultPayloadExchange; +import org.springframework.security.rsocket.PayloadInterceptorChain; +import org.springframework.security.rsocket.PayloadExchange; import java.util.Map; diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptorTests.java b/rsocket/src/test/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptorTests.java index c2c5098afa..75251083ee 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptorTests.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptorTests.java @@ -25,13 +25,12 @@ import org.springframework.security.authentication.AuthenticationCredentialsNotF import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.authorization.ReactiveAuthorizationManager; import org.springframework.security.core.context.ReactiveSecurityContextHolder; -import org.springframework.security.rsocket.interceptor.authorization.AuthorizationPayloadInterceptor; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; import reactor.test.publisher.PublisherProbe; import reactor.util.context.Context; -import org.springframework.security.rsocket.interceptor.PayloadInterceptorChain; -import org.springframework.security.rsocket.interceptor.PayloadExchange; +import org.springframework.security.rsocket.PayloadInterceptorChain; +import org.springframework.security.rsocket.PayloadExchange; import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; @@ -115,4 +114,4 @@ public class AuthorizationPayloadInterceptorTests { .then(() -> this.chainResult.assertWasSubscribed()) .verifyComplete(); } -} \ No newline at end of file +} diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/interceptor/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTest.java b/rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTest.java similarity index 89% rename from rsocket/src/test/java/org/springframework/security/rsocket/interceptor/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTest.java rename to rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTest.java index 5e214875ed..15fec2d043 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/interceptor/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTest.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.interceptor.authorization; +package org.springframework.security.rsocket.authorization; import org.junit.Test; import org.junit.runner.RunWith; @@ -22,11 +22,11 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.security.authorization.AuthorizationDecision; import org.springframework.security.authorization.ReactiveAuthorizationManager; -import org.springframework.security.rsocket.interceptor.PayloadExchange; -import org.springframework.security.rsocket.util.PayloadExchangeAuthorizationContext; -import org.springframework.security.rsocket.util.PayloadExchangeMatcher; -import org.springframework.security.rsocket.util.PayloadExchangeMatcherEntry; -import org.springframework.security.rsocket.util.PayloadExchangeMatchers; +import org.springframework.security.rsocket.PayloadExchange; +import org.springframework.security.rsocket.util.matcher.PayloadExchangeAuthorizationContext; +import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcher; +import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatcherEntry; +import org.springframework.security.rsocket.util.matcher.PayloadExchangeMatchers; import reactor.core.publisher.Mono; import static org.assertj.core.api.Assertions.assertThat; diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/util/RoutePayloadExchangeMatcherTests.java b/rsocket/src/test/java/org/springframework/security/rsocket/util/matcher/RoutePayloadExchangeMatcherTests.java similarity index 93% rename from rsocket/src/test/java/org/springframework/security/rsocket/util/RoutePayloadExchangeMatcherTests.java rename to rsocket/src/test/java/org/springframework/security/rsocket/util/matcher/RoutePayloadExchangeMatcherTests.java index 8c8c70ac1a..afd1a42416 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/util/RoutePayloadExchangeMatcherTests.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/util/matcher/RoutePayloadExchangeMatcherTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.rsocket.util; +package org.springframework.security.rsocket.util.matcher; import io.rsocket.Payload; import io.rsocket.metadata.WellKnownMimeType; @@ -25,9 +25,9 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.http.MediaType; import org.springframework.messaging.rsocket.MetadataExtractor; -import org.springframework.security.rsocket.interceptor.DefaultPayloadExchange; -import org.springframework.security.rsocket.interceptor.PayloadExchange; -import org.springframework.security.rsocket.interceptor.PayloadExchangeType; +import org.springframework.security.rsocket.DefaultPayloadExchange; +import org.springframework.security.rsocket.PayloadExchange; +import org.springframework.security.rsocket.PayloadExchangeType; import org.springframework.util.MimeType; import org.springframework.util.MimeTypeUtils; import org.springframework.util.RouteMatcher; @@ -113,4 +113,4 @@ public class RoutePayloadExchangeMatcherTests { assertThat(result.isMatch()).isTrue(); assertThat(result.getVariables()).containsAllEntriesOf(variables); } -} \ No newline at end of file +}