From 6769cef03078540954b06aa4f53b40020531571c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=91=A8?= <zh.sqy@qq.com>
Date: Tue, 24 Oct 2023 14:05:33 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=8D=87=E7=BA=A7=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC,=E6=9B=BF=E6=8D=A2=E8=BF=87?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84API.=20(#14)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* build: 升级guava到32.1.2-jre

* build: 升级依赖

* refactor: 升级依赖版本,替换过时的API.
---
 pom.xml                                            |  2 +-
 .../org/jetlinks/reactor/ql/DefaultReactorQL.java  | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7456765..0e89454 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
         <project.build.locales>zh_CN</project.build.locales>
         <java.version>1.8</java.version>
         <project.build.jdk>${java.version}</project.build.jdk>
-        <reactor.version>2020.0.36</reactor.version>
+        <reactor.version>2020.0.31</reactor.version>
     </properties>
 
     <profiles>
diff --git a/src/main/java/org/jetlinks/reactor/ql/DefaultReactorQL.java b/src/main/java/org/jetlinks/reactor/ql/DefaultReactorQL.java
index c6f0867..b691b85 100644
--- a/src/main/java/org/jetlinks/reactor/ql/DefaultReactorQL.java
+++ b/src/main/java/org/jetlinks/reactor/ql/DefaultReactorQL.java
@@ -103,7 +103,7 @@ protected void prepare() {
                                                      )
                                              )
                                 ))
-                         .subscriberContext(context -> context.put(ReactorQLContext.class, ctx));
+                         .contextWrite(context -> context.put(ReactorQLContext.class, ctx));
         } else {
             builder = ctx ->
                     limit.apply(ctx,
@@ -117,7 +117,7 @@ protected void prepare() {
                                                      )
                                              )
                                 )
-                    ).subscriberContext(context -> context.put(ReactorQLContext.class, ctx));
+                    ).contextWrite(context -> context.put(ReactorQLContext.class, ctx));
         }
     }
 
@@ -308,7 +308,7 @@ else if (groupByExpression instanceof BinaryExpression) {
                                              //过滤分组结果
                                              .filterWhen(ctx -> filter.apply(ctx, ctx.getRecord()))
                                              //分组命名放到上下文里
-                                             .subscriberContext(Context.of(GROUP_NAME_CONTEXT_KEY, group.getT2())),
+                                             .contextWrite(Context.of(GROUP_NAME_CONTEXT_KEY, group.getT2())),
                                      Integer.MAX_VALUE
                             );
                 }
@@ -316,7 +316,7 @@ else if (groupByExpression instanceof BinaryExpression) {
                         .apply(flux)
                         .flatMap(group -> columnMapper
                                          .apply(group.getT1())
-                                         .subscriberContext(Context.of(GROUP_NAME_CONTEXT_KEY, group.getT2())),
+                                         .contextWrite(Context.of(GROUP_NAME_CONTEXT_KEY, group.getT2())),
                                  Integer.MAX_VALUE
                         );
             }
@@ -449,8 +449,7 @@ public void visit(AllTableColumns columns) {
                             .doOnNext(cursor::set)
                             .as(oneMapper)
                             .flatMap(val -> Mono
-                                    .subscriberContext()
-                                    .flatMap(ctx -> {
+                                    .deferContextual(ctx -> {
                                         ReactorQLRecord newCtx = cursor.get();
                                         if (newCtx == null) {
                                             newCtx = ReactorQLRecord
@@ -516,8 +515,7 @@ public void visit(AllTableColumns columns) {
                                 });
                             })
                             .flatMap(map -> Mono
-                                    .subscriberContext()
-                                    .flatMap(ctx -> {
+                                    .deferContextual(ctx -> {
                                         ReactorQLRecord newCtx = lastRecordRef.get();
                                         //上游没有数据则创建一个新数据
                                         if (newCtx == null) {