refactor: 替换过时API

Author: zhou-hao

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/token/ReactiveTokenAuthenticationSupplier.java

@@ -3,9 +3,6 @@
 import lombok.AllArgsConstructor;
 import org.hswebframework.web.authorization.Authentication;
 import org.hswebframework.web.authorization.ReactiveAuthenticationSupplier;
-import org.hswebframework.web.context.ContextKey;
-import org.hswebframework.web.context.ContextUtils;
-import org.hswebframework.web.logger.ReactiveLogger;
 import reactor.core.publisher.Mono;
 
 @AllArgsConstructor

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/token/UserTokenAuthenticationSupplier.java

@@ -1,8 +1,6 @@
 package org.hswebframework.web.authorization.token;
 
 import org.hswebframework.web.authorization.*;
-import org.hswebframework.web.context.ContextKey;
-import org.hswebframework.web.context.ContextUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 
@@ -65,13 +63,14 @@ protected Optional<Authentication> get(AuthenticationManager authenticationManag
     @Override
     public Optional<Authentication> get() {
 
-        return ContextUtils.currentContext()
-                .get(ContextKey.of(ParsedToken.class))
-                .map(t -> userTokenManager.getByToken(t.getToken()))
-                .map(tokenMono -> tokenMono
-                        .map(token -> get(thirdPartAuthenticationManager.get(token.getType()), token.getUserId()))
-                        .flatMap(Mono::justOrEmpty))
-                .flatMap(Mono::blockOptional);
+
+        return Optional
+            .ofNullable(UserTokenHolder.currentToken())
+            .map(t -> userTokenManager.getByToken(t.getToken()))
+            .map(tokenMono -> tokenMono
+                .map(token -> get(thirdPartAuthenticationManager.get(token.getType()), token.getUserId()))
+                .flatMap(Mono::justOrEmpty))
+            .flatMap(Mono::blockOptional);
 
     }
 }

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/token/UserTokenReactiveAuthenticationSupplier.java

@@ -3,10 +3,6 @@
 import org.hswebframework.web.authorization.Authentication;
 import org.hswebframework.web.authorization.ReactiveAuthenticationManager;
 import org.hswebframework.web.authorization.ReactiveAuthenticationSupplier;
-import org.hswebframework.web.authorization.exception.UnAuthorizedException;
-import org.hswebframework.web.context.ContextKey;
-import org.hswebframework.web.context.ContextUtils;
-import org.hswebframework.web.logger.ReactiveLogger;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 

hsweb-authorization/hsweb-authorization-api/src/test/java/org/hswebframework/web/authorization/AuthenticationTests.java

@@ -4,21 +4,15 @@
 import org.hswebframework.web.authorization.simple.builder.SimpleAuthenticationBuilder;
 import org.hswebframework.web.authorization.simple.builder.SimpleDataAccessConfigBuilderFactory;
 import org.hswebframework.web.authorization.token.*;
-import org.hswebframework.web.context.ContextKey;
 import org.hswebframework.web.logger.ReactiveLogger;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.support.StaticApplicationContext;
 import reactor.core.publisher.Mono;
-import reactor.core.publisher.SignalType;
 import reactor.test.StepVerifier;
 import reactor.util.context.Context;
 
-import java.util.Collections;
-import java.util.Set;
-
-import static org.hswebframework.web.context.ContextUtils.*;
 import static org.junit.Assert.*;
 
 public class AuthenticationTests {

hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/web/ReactiveUserTokenController.java

@@ -8,13 +8,10 @@
 import org.hswebframework.web.authorization.annotation.QueryAction;
 import org.hswebframework.web.authorization.annotation.Resource;
 import org.hswebframework.web.authorization.annotation.SaveAction;
-import org.hswebframework.web.authorization.exception.UnAuthorizedException;
 import org.hswebframework.web.authorization.token.ParsedToken;
 import org.hswebframework.web.authorization.token.TokenState;
 import org.hswebframework.web.authorization.token.UserToken;
 import org.hswebframework.web.authorization.token.UserTokenManager;
-import org.hswebframework.web.context.ContextKey;
-import org.hswebframework.web.context.ContextUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;

hsweb-core/src/main/java/org/hswebframework/web/context/ContextKey.java

@@ -5,6 +5,7 @@
 
 @AllArgsConstructor
 @Getter
+@Deprecated
 public final class ContextKey<T> {
 
     private final String key;

hsweb-core/src/main/java/org/hswebframework/web/context/ContextUtils.java

@@ -9,6 +9,7 @@
 /**
  * @since 4.0.0
  */
+@Deprecated
 public class ContextUtils {
 
     private static final ThreadLocal<Context> contextThreadLocal = ThreadLocal.withInitial(MapContext::new);

hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultReactiveSwitcher.java

@@ -1,11 +1,10 @@
 package org.hswebframework.web.datasource.switcher;
 
 import lombok.extern.slf4j.Slf4j;
-import org.hswebframework.web.context.ContextKey;
-import org.hswebframework.web.context.ContextUtils;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.util.context.Context;
 
 import java.util.Collection;
 import java.util.Deque;
@@ -16,44 +15,52 @@
 @Slf4j
 public class DefaultReactiveSwitcher implements ReactiveSwitcher {
 
-    private String name;
+    private final String name;
 
-    private String defaultId;
+    private final String defaultId;
 
-    private String type;
+    private final String type;
 
-    public DefaultReactiveSwitcher(String name,String type) {
+    public DefaultReactiveSwitcher(String name, String type) {
         this.name = "ReactiveSwitcher.".concat(name);
         this.defaultId = name.concat(".").concat("_default");
-        this.type=type;
+        this.type = type;
     }
 
     @Deprecated
     private <R> Mono<R> doInContext(Function<Deque<String>, Mono<R>> function) {
-        return ContextUtils.reactiveContext()
-                .map(ctx -> ctx.getOrDefault(ContextKey.<Deque<String>>of(this.name), LinkedList::new))
-                .flatMap(function);
+
+        return Mono
+            .deferContextual(ctx -> function.apply(ctx
+                                                       .<Deque<String>>getOrEmpty(this.name)
+                                                       .orElseGet(LinkedList::new)));
     }
 
     @SuppressWarnings("all")
-    private <R extends Publisher<?>> R  doInContext(R publisher, Consumer<Deque<String>> consumer) {
+    private <R extends Publisher<?>> R doInContext(R publisher, Consumer<Deque<String>> consumer) {
         if (publisher instanceof Mono) {
-            return (R)((Mono<?>) publisher)
-                    .contextWrite(ContextUtils.acceptContext(ctx -> {
-                        consumer.accept(ctx.getOrDefault(ContextKey.<Deque<String>>of(this.name), LinkedList::new));
-                    }));
+            return (R) Mono
+                .deferContextual(ctx -> {
+                    Deque<String> deque = ctx.<Deque<String>>getOrEmpty(this.name).orElseGet(LinkedList::new);
+                    consumer.accept(deque);
+                    return ((Mono<R>) publisher)
+                        .contextWrite(Context.of(name, deque));
+                });
         } else if (publisher instanceof Flux) {
-            return (R)((Flux<?>) publisher)
-                    .contextWrite(ContextUtils.acceptContext(ctx -> {
-                        consumer.accept(ctx.getOrDefault(ContextKey.<Deque<String>>of(this.name), LinkedList::new));
-                    }));
+            return (R) Flux
+                .deferContextual(ctx -> {
+                    Deque<String> deque = ctx.<Deque<String>>getOrEmpty(this.name).orElseGet(LinkedList::new);
+                    consumer.accept(deque);
+                    return ((Flux<R>) publisher)
+                        .contextWrite(Context.of(name, deque));
+                });
         }
         return publisher;
     }
 
     @Override
-    public <P extends Publisher<?>> P  useLast(P publisher) {
-        return doInContext(publisher,queue -> {
+    public <P extends Publisher<?>> P useLast(P publisher) {
+        return doInContext(publisher, queue -> {
             // 没有上一次了
             if (queue.isEmpty()) {
                 return;
@@ -66,16 +73,16 @@ public <P extends Publisher<?>> P  useLast(P publisher) {
 
     @Override
     public <P extends Publisher<?>> P use(P publisher, String id) {
-        return doInContext(publisher,queue-> queue.addLast(id));
+        return doInContext(publisher, queue -> queue.addLast(id));
     }
 
     @Override
-    public <P extends Publisher<?>> P  useDefault(P publisher) {
-        return  use(publisher,defaultId);
+    public <P extends Publisher<?>> P useDefault(P publisher) {
+        return use(publisher, defaultId);
     }
 
     @Override
-    public <P extends Publisher<?>> P  reset(P publisher) {
+    public <P extends Publisher<?>> P reset(P publisher) {
         return doInContext(publisher, Collection::clear);
     }
 

hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/switcher/DefaultSwitcher.java

@@ -1,8 +1,7 @@
 package org.hswebframework.web.datasource.switcher;
 
 import lombok.extern.slf4j.Slf4j;
-import org.hswebframework.web.context.ContextKey;
-import org.hswebframework.web.context.ContextUtils;
+import org.hswebframework.web.context.ContextHolder;
 
 
 import java.util.Deque;
@@ -26,8 +25,10 @@ public DefaultSwitcher(String name, String type) {
 
     protected Deque<String> getUsedHistoryQueue() {
         // 从ThreadLocal中获取一个使用记录
-        return ContextUtils.currentContext()
-                .<Deque<String>>getOrDefault(ContextKey.of(name), LinkedList::new);
+        return ContextHolder
+            .current()
+            .<Deque<String>>getOrEmpty(name)
+            .orElseGet(LinkedList::new);
     }
 
     @Override

pom.xml

@@ -235,7 +235,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>