refactor: 优化

Author: zhou-hao

hsweb-easy-orm-rdb/pom.xml

@@ -41,7 +41,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.14.2</version>
+            <version>2.19.2</version>
             <optional>true</optional>
         </dependency>
 
@@ -98,6 +98,12 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.29</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -140,7 +146,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.0.0-jre</version>
+            <version>33.4.8-jre</version>
         </dependency>
 
     </dependencies>

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/utils/SqlUtils.java

@@ -8,8 +8,8 @@
 import org.hswebframework.ezorm.rdb.operator.builder.fragments.SqlFragments;
 import org.hswebframework.utils.time.DateFormatter;
 import org.slf4j.Logger;
+import reactor.util.annotation.NonNull;
 
-import javax.annotation.Nonnull;
 import java.util.Arrays;
 import java.util.Date;
 
@@ -147,7 +147,7 @@ public static String toNativeSql(String sql, Object... parameters) {
         return sqlParameterToString(sql, len, stringParameter);
     }
 
-    private static @Nonnull String sqlParameterToString(String sql, int len, String[] stringParameter) {
+    private static @NonNull String sqlParameterToString(String sql, int len, String[] stringParameter) {
         StringBuilder builder = new StringBuilder(sql.length() + len + 16);
 
         int parameterIndex = 0;