Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 21:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polish RSocket packaging

Browse Source 
Fixes gh-7413
This commit is contained in:
Rob Winch
2019-09-06 16:07:33 -05:00
parent 9f0986a093
commit 1b699a49fb
34 changed files with 74 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rsocket/src/main/java/org/springframework/security/rsocket/PayloadExchange.java → rsocket/src/main/java/org/springframework/security/rsocket/api/PayloadExchange.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket;
package org.springframework.security.rsocket.api;
import io.rsocket.Payload;
import org.springframework.util.MimeType;
rsocket/src/main/java/org/springframework/security/rsocket/PayloadExchangeType.java → rsocket/src/main/java/org/springframework/security/rsocket/api/PayloadExchangeType.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket;
package org.springframework.security.rsocket.api;
/**
* The {@link PayloadExchange} type
rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptor.java → rsocket/src/main/java/org/springframework/security/rsocket/api/PayloadInterceptor.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket;
package org.springframework.security.rsocket.api;
import reactor.core.publisher.Mono;
rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptorChain.java → rsocket/src/main/java/org/springframework/security/rsocket/api/PayloadInterceptorChain.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket;
package org.springframework.security.rsocket.api;
import reactor.core.publisher.Mono;
rsocket/src/main/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptor.java
+3 -3
View File
@@ -23,9 +23,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.PayloadInterceptorChain;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.PayloadInterceptor;
import org.springframework.security.rsocket.api.PayloadInterceptorChain;
import org.springframework.security.rsocket.api.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadInterceptor;
import java.util.List;
rsocket/src/main/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptor.java
+3 -3
View File
@@ -20,9 +20,9 @@ import org.springframework.core.Ordered;
import org.springframework.security.authentication.ReactiveAuthenticationManager;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.PayloadInterceptor;
import org.springframework.security.rsocket.PayloadInterceptorChain;
import org.springframework.security.rsocket.api.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadInterceptor;
import org.springframework.security.rsocket.api.PayloadInterceptorChain;
import org.springframework.util.Assert;
import reactor.core.publisher.Mono;
rsocket/src/main/java/org/springframework/security/rsocket/authentication/BasicAuthenticationPayloadExchangeConverter.java
+1 -1
View File
@@ -21,7 +21,7 @@ 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.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadExchange;
import org.springframework.security.rsocket.metadata.BasicAuthenticationDecoder;
import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
import org.springframework.util.MimeType;
rsocket/src/main/java/org/springframework/security/rsocket/authentication/BearerPayloadExchangeConverter.java
+1 -1
View File
@@ -20,7 +20,7 @@ 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.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadExchange;
import org.springframework.security.rsocket.metadata.BearerTokenMetadata;
import reactor.core.publisher.Mono;
rsocket/src/main/java/org/springframework/security/rsocket/authentication/PayloadExchangeAuthenticationConverter.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.springframework.security.rsocket.authentication;
import org.springframework.security.core.Authentication;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadExchange;
import reactor.core.publisher.Mono;
/**
rsocket/src/main/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptor.java
+3 -3
View File
@@ -23,9 +23,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.PayloadInterceptorChain;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.PayloadInterceptor;
import org.springframework.security.rsocket.api.PayloadInterceptorChain;
import org.springframework.security.rsocket.api.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadInterceptor;
/**
* Provides authorization of the {@link PayloadExchange}.
rsocket/src/main/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManager.java
+1 -1
View File
@@ -22,7 +22,7 @@ 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.PayloadExchange;
import org.springframework.security.rsocket.api.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;
rsocket/src/main/java/org/springframework/security/rsocket/ContextPayloadInterceptorChain.java → rsocket/src/main/java/org/springframework/security/rsocket/core/ContextPayloadInterceptorChain.java
+4 -1
View File
@@ -14,8 +14,11 @@
* limitations under the License.
*/
package org.springframework.security.rsocket;
package org.springframework.security.rsocket.core;
import org.springframework.security.rsocket.api.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadInterceptor;
import org.springframework.security.rsocket.api.PayloadInterceptorChain;
import reactor.core.publisher.Mono;
import reactor.util.context.Context;
rsocket/src/main/java/org/springframework/security/rsocket/DefaultPayloadExchange.java → rsocket/src/main/java/org/springframework/security/rsocket/core/DefaultPayloadExchange.java
+3 -1
View File
@@ -14,9 +14,11 @@
* limitations under the License.
*/
package org.springframework.security.rsocket;
package org.springframework.security.rsocket.core;
import io.rsocket.Payload;
import org.springframework.security.rsocket.api.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadExchangeType;
import org.springframework.util.Assert;
import org.springframework.util.MimeType;
rsocket/src/main/java/org/springframework/security/rsocket/PayloadInterceptorRSocket.java → rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadInterceptorRSocket.java
+3 -1
View File
@@ -14,13 +14,15 @@
* limitations under the License.
*/
package org.springframework.security.rsocket;
package org.springframework.security.rsocket.core;
import io.rsocket.Payload;
import io.rsocket.RSocket;
import io.rsocket.ResponderRSocket;
import io.rsocket.util.RSocketProxy;
import org.reactivestreams.Publisher;
import org.springframework.security.rsocket.api.PayloadExchangeType;
import org.springframework.security.rsocket.api.PayloadInterceptor;
import org.springframework.util.MimeType;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
rsocket/src/main/java/org/springframework/security/rsocket/PayloadSocketAcceptor.java → rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadSocketAcceptor.java
+3 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket;
package org.springframework.security.rsocket.core;
import io.rsocket.ConnectionSetupPayload;
import io.rsocket.Payload;
@@ -22,6 +22,8 @@ import io.rsocket.RSocket;
import io.rsocket.SocketAcceptor;
import io.rsocket.metadata.WellKnownMimeType;
import org.springframework.lang.Nullable;
import org.springframework.security.rsocket.api.PayloadExchangeType;
import org.springframework.security.rsocket.api.PayloadInterceptor;
import org.springframework.util.Assert;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
rsocket/src/main/java/org/springframework/security/rsocket/PayloadSocketAcceptorInterceptor.java → rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadSocketAcceptorInterceptor.java
+2 -1
View File
@@ -14,12 +14,13 @@
* limitations under the License.
*/
package org.springframework.security.rsocket;
package org.springframework.security.rsocket.core;
import io.rsocket.SocketAcceptor;
import io.rsocket.metadata.WellKnownMimeType;
import io.rsocket.plugins.SocketAcceptorInterceptor;
import org.springframework.lang.Nullable;
import org.springframework.security.rsocket.api.PayloadInterceptor;
import org.springframework.util.Assert;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeAuthorizationContext.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.springframework.security.rsocket.util.matcher;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadExchange;
import java.util.Collections;
import java.util.Map;
rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatcher.java
+1 -1
View File
@@ -15,7 +15,7 @@
*/
package org.springframework.security.rsocket.util.matcher;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadExchange;
import reactor.core.publisher.Mono;
import java.util.Collections;
rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/PayloadExchangeMatchers.java
+2 -2
View File
@@ -16,8 +16,8 @@
package org.springframework.security.rsocket.util.matcher;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.PayloadExchangeType;
import org.springframework.security.rsocket.api.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadExchangeType;
import reactor.core.publisher.Mono;
/**
rsocket/src/main/java/org/springframework/security/rsocket/util/matcher/RoutePayloadExchangeMatcher.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.springframework.security.rsocket.util.matcher;
import org.springframework.messaging.rsocket.MetadataExtractor;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadExchange;
import org.springframework.util.Assert;
import org.springframework.util.RouteMatcher;
import reactor.core.publisher.Mono;
rsocket/src/test/java/org/springframework/security/rsocket/authentication/AnonymousPayloadInterceptorTests.java
+1 -1
View File
@@ -27,7 +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.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadExchange;
import java.util.List;
rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorChain.java
+2 -2
View File
@@ -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.PayloadInterceptorChain;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadInterceptorChain;
import org.springframework.security.rsocket.api.PayloadExchange;
/**
* @author Rob Winch
rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorTests.java
+4 -4
View File
@@ -37,7 +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.PayloadExchangeType;
import org.springframework.security.rsocket.api.PayloadExchangeType;
import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder;
import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
import org.springframework.util.MimeType;
@@ -45,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.DefaultPayloadExchange;
import org.springframework.security.rsocket.PayloadInterceptorChain;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.core.DefaultPayloadExchange;
import org.springframework.security.rsocket.api.PayloadInterceptorChain;
import org.springframework.security.rsocket.api.PayloadExchange;
import java.util.Map;
rsocket/src/test/java/org/springframework/security/rsocket/authorization/AuthorizationPayloadInterceptorTests.java
+2 -2
View File
@@ -29,8 +29,8 @@ import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import reactor.test.publisher.PublisherProbe;
import reactor.util.context.Context;
import org.springframework.security.rsocket.PayloadInterceptorChain;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadInterceptorChain;
import org.springframework.security.rsocket.api.PayloadExchange;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when;
rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTest.java
+1 -1
View File
@@ -22,7 +22,7 @@ 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.PayloadExchange;
import org.springframework.security.rsocket.api.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;
rsocket/src/test/java/org/springframework/security/rsocket/PayloadInterceptorRSocketTests.java → rsocket/src/test/java/org/springframework/security/rsocket/core/PayloadInterceptorRSocketTests.java
+7 -7
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket;
package org.springframework.security.rsocket.core;
import io.rsocket.Payload;
import io.rsocket.RSocket;
@@ -33,12 +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.security.rsocket.api.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadExchangeType;
import org.springframework.security.rsocket.api.PayloadInterceptor;
import org.springframework.security.rsocket.api.PayloadInterceptorChain;
import org.springframework.security.rsocket.core.DefaultPayloadExchange;
import org.springframework.security.rsocket.core.PayloadInterceptorRSocket;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
import reactor.core.publisher.Flux;
rsocket/src/test/java/org/springframework/security/rsocket/PayloadSocketAcceptorInterceptorTests.java → rsocket/src/test/java/org/springframework/security/rsocket/core/PayloadSocketAcceptorInterceptorTests.java
+5 -5
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket;
package org.springframework.security.rsocket.core;
import io.rsocket.ConnectionSetupPayload;
import io.rsocket.Payload;
@@ -28,10 +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 org.springframework.security.rsocket.api.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadInterceptor;
import org.springframework.security.rsocket.core.PayloadInterceptorRSocket;
import org.springframework.security.rsocket.core.PayloadSocketAcceptorInterceptor;
import reactor.core.publisher.Mono;
import java.util.Arrays;
rsocket/src/test/java/org/springframework/security/rsocket/PayloadSocketAcceptorTests.java → rsocket/src/test/java/org/springframework/security/rsocket/core/PayloadSocketAcceptorTests.java
+5 -5
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.security.rsocket;
package org.springframework.security.rsocket.core;
import io.rsocket.ConnectionSetupPayload;
import io.rsocket.Payload;
@@ -28,10 +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 org.springframework.security.rsocket.api.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadInterceptor;
import org.springframework.security.rsocket.core.PayloadInterceptorRSocket;
import org.springframework.security.rsocket.core.PayloadSocketAcceptor;
import reactor.core.publisher.Mono;
import java.util.Arrays;
rsocket/src/test/java/org/springframework/security/rsocket/util/matcher/RoutePayloadExchangeMatcherTests.java
+3 -3
View File
@@ -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.DefaultPayloadExchange;
import org.springframework.security.rsocket.PayloadExchange;
import org.springframework.security.rsocket.PayloadExchangeType;
import org.springframework.security.rsocket.core.DefaultPayloadExchange;
import org.springframework.security.rsocket.api.PayloadExchange;
import org.springframework.security.rsocket.api.PayloadExchangeType;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
import org.springframework.util.RouteMatcher;