feat: 4.2.0 适配r2dbc 1.x

Author: zhou-hao

hsweb-easy-orm-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hsweb-easy-orm</artifactId>
         <groupId>org.hswebframework</groupId>
-        <version>4.1.3-SNAPSHOT</version>
+        <version>4.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

hsweb-easy-orm-rdb/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hsweb-easy-orm</artifactId>
         <groupId>org.hswebframework</groupId>
-        <version>4.1.3-SNAPSHOT</version>
+        <version>4.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -91,25 +91,28 @@
         <dependency>
             <groupId>io.r2dbc</groupId>
             <artifactId>r2dbc-h2</artifactId>
+            <version>1.0.0.RELEASE</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>io.asyncer</groupId>
             <artifactId>r2dbc-mysql</artifactId>
-            <version>0.9.7</version>
+            <version>1.3.0</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>r2dbc-postgresql</artifactId>
+            <version>1.0.7.RELEASE</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>io.r2dbc</groupId>
             <artifactId>r2dbc-mssql</artifactId>
+            <version>1.0.2.RELEASE</version>
             <optional>true</optional>
         </dependency>
 
@@ -123,6 +126,7 @@
         <dependency>
             <groupId>io.r2dbc</groupId>
             <artifactId>r2dbc-spi</artifactId>
+            <version>1.0.0.RELEASE</version>
             <optional>true</optional>
         </dependency>
 

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/reactive/r2dbc/R2dbcReactiveSqlExecutor.java

@@ -128,7 +128,7 @@ public Mono<Integer> update(Publisher<SqlRequest> request) {
             return this
                     .doExecute(Operation.execute, _logger, toFlux(request), Result::getRowsUpdated)
                     .doOnNext(count -> _logger.debug("==>    Updated: {}", count))
-                    .reduce(0, Math::addExact);
+                    .reduce(0, (l,r)-> l + r.intValue());
         });
     }
 

pom.xml

@@ -6,7 +6,7 @@
     <groupId>org.hswebframework</groupId>
     <artifactId>hsweb-easy-orm</artifactId>
     <packaging>pom</packaging>
-    <version>4.1.3-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
     <modules>
         <module>hsweb-easy-orm-core</module>
         <module>hsweb-easy-orm-rdb</module>
@@ -271,13 +271,13 @@
                 <version>3.14.0</version>
             </dependency>
 
-            <dependency>
-                <groupId>io.r2dbc</groupId>
-                <artifactId>r2dbc-bom</artifactId>
-                <version>${r2dbc.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>io.r2dbc</groupId>-->
+<!--                <artifactId>r2dbc-bom</artifactId>-->
+<!--                <version>${r2dbc.version}</version>-->
+<!--                <type>pom</type>-->
+<!--                <scope>import</scope>-->
+<!--            </dependency>-->
 
             <dependency>
                 <groupId>org.projectlombok</groupId>