Merge pull request #1 from cn-src/dev-next

释放 1.3.0

build.gradle.kts

@@ -2,7 +2,7 @@ subprojects {
     val snapshotVersion = "next-SNAPSHOT"
     apply(plugin = "maven-publish")
     group = "cn.javaer.jany"
-    version = "1.2.0"
+    version = "1.3.0"
 
     repositories {
         mavenCentral()

buildSrc/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    implementation("io.spring.gradle:dependency-management-plugin:1.1.5")
+    implementation("io.spring.gradle:dependency-management-plugin:1.1.6")
 }
 
 repositories {

gradle.properties

@@ -1,37 +1,37 @@
 # suppress inspection "UnusedProperty" for whole file
 archunitVersion=1.3.0
-arthasSpringBootVersion=3.7.2
-classgraphVersion=4.8.174
-datasourceDecoratorVersion=1.9.1
-dbSchedulerVersion=14.0.1
-easyexcelVersion=4.0.1
+arthasSpringBootVersion=4.0.2
+classgraphVersion=4.8.177
+datasourceDecoratorVersion=1.9.2
+dbSchedulerVersion=14.1.0
+easyexcelVersion=4.0.3
 # ebean
-ebeanVersion=15.3.1
-guavaVersion=33.2.1-jre
+ebeanVersion=15.8.0
+guavaVersion=33.3.1-jre
 handlebarsVersion=4.3.1
-hutoolVersion=6.0.0-M13
+hutoolVersion=6.0.0-M17
 ip2regionVersion=2.7.0
-jetbrainsAnnotationsVersion=24.1.0
+jetbrainsAnnotationsVersion=26.0.1
 jsr305Version=3.0.2
 logviewerVersion=1.0.11
 magicApiVersion=2.1.1
-mapstructVersion=1.6.0.Beta2
-minioVersion=8.5.11
+mapstructVersion=1.6.2
+minioVersion=8.5.13
 p6spyVersion=3.9.1
-playtikaVersion=3.1.7
+playtikaVersion=3.1.9
 poiTlVersion=1.12.3-beta1
-redissonVersion=3.31.0
-retrofitSpringBootVersion=3.1.1
-saTokenVersion=1.38.0
-springBootAdminVersion=3.3.2
-springBootVersion=3.3.0
-springdocVersion=2.5.0
-xFileStorageVersion=2.1.0
-testcontainersVersion=1.19.8
-tianaiCaptchaVersion=1.4.1
+redissonVersion=3.37.0
+retrofitSpringBootVersion=3.1.3
+saTokenVersion=1.39.0
+springBootAdminVersion=3.3.4
+springBootVersion=3.3.5
+springdocVersion=2.6.0
+xFileStorageVersion=2.2.1
+testcontainersVersion=1.20.3
+tianaiCaptchaVersion=1.5.1
 tlogVersion=1.5.2
 transmittableThreadLocalVersion=2.14.5
-wxJavaVersion=4.6.2.B
+wxJavaVersion=4.6.5.B
 zonkyVersion=2.0.7
-zonkyPostgresVersion=16.2.0
+zonkyPostgresVersion=17.0.0
 zonkySpringVersion=2.5.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jany-core/src/main/java/cn/javaer/jany/JanyVersion.java

@@ -13,6 +13,6 @@ public interface JanyVersion {
      * @return 程序的版本。
      */
     static String getVersion() {
-        return "1.2.0";
+        return "1.3.0";
     }
 }

jany-core/src/test/java/cn/javaer/jany/util/AnnotationUtilsTest.java

@@ -32,7 +32,7 @@ void testFindMergedAnnotation1() {
         final Annotation ann = Demo.class.getAnnotation(Ann1.class);
 
         // Run the test
-        final MetaAnn result = AnnotationUtils.findMergedAnnotation(MetaAnn.class, ann).get();
+        final MetaAnn result = AnnotationUtils.findMergedAnnotation(MetaAnn.class, ann).getOrNull();
 
         // Verify the results
         Assertions.assertThat(result.name()).isEqualTo("name1");
@@ -44,7 +44,7 @@ void testFindMergedAnnotation2() {
         final Annotation annotations = Demo.class.getAnnotation(Ann1.class);
 
         // Run the test
-        final MetaAnn result = AnnotationUtils.findMergedAnnotation(MetaAnn.class, annotations).get();
+        final MetaAnn result = AnnotationUtils.findMergedAnnotation(MetaAnn.class, annotations).getOrNull();
 
         // Verify the results
         Assertions.assertThat(result.name()).isEqualTo("name1");
@@ -56,7 +56,7 @@ void testFindMergedAnnotation3() {
         final AnnotatedElement element = Demo.class;
 
         // Run the test
-        final MetaAnn result = AnnotationUtils.findMergedAnnotation(MetaAnn.class, element).get();
+        final MetaAnn result = AnnotationUtils.findMergedAnnotation(MetaAnn.class, element).getOrNull();
 
         // Verify the results
         Assertions.assertThat(result.name()).isEqualTo("name1");

jany-ebean/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("jany-library")
-    id("io.ebean") version "15.3.0"
+    id("io.ebean") version "15.8.0"
 }
 
 val ebeanVersion: String by project

jany-ebean/src/main/java/cn/javaer/jany/ebean/Qry.java

@@ -107,7 +107,7 @@ public static <T> Qry<T> of(Query<T> query) {
         return new Qry<>(query);
     }
 
-    public static <R, T, QR extends QueryBean<T, R>> Qry<T> of(QR rootBean) {
+    public static <T, R extends QueryBean<T, R>> Qry<T> of(R rootBean) {
         return new Qry<>(rootBean.query());
     }
 

jany-ebean/src/main/java/cn/javaer/jany/ebean/expression/Operator.java

@@ -20,6 +20,7 @@
 import cn.javaer.jany.util.CollUtils;
 import cn.javaer.jany.util.StrUtils;
 import io.ebean.ExpressionFactory;
+import org.dromara.hutool.core.text.StrUtil;
 import org.dromara.hutool.core.util.ObjUtil;
 
 /**
@@ -44,9 +45,9 @@ public enum Operator {
 
     ne(ExpressionFactory::ne),
     ieq((factory, property, value) ->
-        factory.ieq(property, ObjUtil.toString(value))),
+        factory.ieq(property, StrUtil.toStringOrNull(value))),
     ine((factory, property, value) ->
-        factory.ine(property, ObjUtil.toString(value))),
+        factory.ine(property, StrUtil.toStringOrNull(value))),
     inRange((factory, property, value) -> {
         Object[] values = (Object[]) value;
         return factory.inRange(property, values[0], values[1]);

jany-ebean/src/test/java/cn/javaer/jany/ebean/expression/WhereExpressionTest.java

@@ -30,7 +30,7 @@ class WhereExpressionTest {
     @Test
     void name() throws Exception {
         final Field name = Demo.class.getField("name");
-        final WhereExpression whereExpression = AnnotationUtils.findMergedAnnotation(WhereExpression.class, name).get();
+        final WhereExpression whereExpression = AnnotationUtils.findMergedAnnotation(WhereExpression.class, name).getOrNull();
         assertThat(whereExpression.property()).isEqualTo("name");
     }
 

jany-samples/build.gradle.kts

@@ -4,7 +4,7 @@ import java.util.*
 plugins {
     id("java-library")
     id("com.github.ben-manes.versions") version "0.51.0"
-    id("io.spring.dependency-management") version "1.1.5"
+    id("io.spring.dependency-management") version "1.1.6"
 }
 
 group = "cn.javaer.jany"

jany-samples/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jany-spring/src/main/java/cn/javaer/jany/spring/util/ResponseUtils.java

@@ -18,7 +18,7 @@
 
 import com.deepoove.poi.XWPFTemplate;
 import org.dromara.hutool.core.compress.ZipUtil;
-import org.dromara.hutool.poi.excel.ExcelWriter;
+import org.dromara.hutool.poi.excel.writer.ExcelWriter;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;

jany-spring/src/main/java/cn/javaer/jany/spring/web/WebContext.java

@@ -82,7 +82,7 @@ public static ClientInfo clientInfo() {
 
         String userAgentStr = request.getHeader("User-Agent");
         UserAgent userAgent = UserAgentUtil.parse(userAgentStr);
-        if (null != userAgentStr) {
+        if (null != userAgent) {
             clientInfo.setBrowser(userAgent.getBrowser().getName());
             clientInfo.setOs(userAgent.getOs().getName());
         }