upgrade spring data to 3.2 (#280)

* Compatible with version 3.0

* Closes #276 Multi-tenant support

* upgrade spring data to 3.2

.editorconfig

@@ -115,7 +115,7 @@ ij_java_for_statement_wrap = off
 ij_java_generate_final_locals = false
 ij_java_generate_final_parameters = false
 ij_java_if_brace_force = never
-ij_java_imports_layout = java.**, |, javax.**, |, *, |, io.easybest.**, |, $*
+ij_java_imports_layout = java.**, |, jakarta.**, |, *, |, io.easybest.**, |, $*
 ij_java_indent_case_from_switch = true
 ij_java_insert_inner_class_imports = false
 ij_java_insert_override_annotation = true

.github/workflows/github-actions-cd.yml

@@ -13,10 +13,10 @@ jobs:
         name: 'Deploy to Maven Central'
         steps:
             -   uses: actions/checkout@v3
-            -   name: 'Set up JDK 8'
+            -   name: 'Set up JDK 17'
                 uses: actions/setup-java@v3
                 with:
-                    java-version: '8'
+                    java-version: '17'
                     distribution: 'adopt'
             -   name: Gradle Cache
                 uses: actions/cache@v3

.github/workflows/github-actions-ci.yml

@@ -5,7 +5,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                java: [ 8, 11, 17 ]
+                java: [ 17 ]
         name: 'Build on Java ${{ matrix.java }}'
         steps:
             -   uses: actions/checkout@v3

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id "org.jetbrains.kotlin.jvm" apply false
-	id "io.spring.nohttp" version "0.0.10"
+	id "io.spring.nohttp" version "0.0.11"
 }
 
 
@@ -47,12 +47,12 @@ configure(javaProjects) { project ->
 	apply plugin: "io.easybest.gradle.plugin.deployed"
 	apply plugin: "io.easybest.gradle.plugin.optional-dependencies"
 
-	sourceCompatibility = 1.8
-	targetCompatibility = 1.8
+	sourceCompatibility = 17
+	targetCompatibility = 17
 
 	java {
 		toolchain {
-			languageVersion = JavaLanguageVersion.of(8)
+			languageVersion = JavaLanguageVersion.of(17)
 		}
 	}
 }

buildSrc/build.gradle

@@ -10,8 +10,8 @@ repositories {
 	maven { url "https://repo.spring.io/release" }
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17
 
 dependencies {
 	implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.28")

buildSrc/src/main/java/io/easybest/mybatis/build/JavaConventions.java

@@ -24,7 +24,6 @@
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
-import io.easybest.mybatis.build.toolchain.ToolchainPlugin;
 import io.spring.javaformat.gradle.FormatTask;
 import io.spring.javaformat.gradle.SpringJavaFormatPlugin;
 import org.gradle.api.JavaVersion;
@@ -39,12 +38,14 @@
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.api.tasks.javadoc.Javadoc;
 
+import io.easybest.mybatis.build.toolchain.ToolchainPlugin;
+
 /**
  * @author Jarvis Song
  */
 class JavaConventions {
 
-	private static final String SOURCE_AND_TARGET_COMPATIBILITY = "1.8";
+	private static final String SOURCE_AND_TARGET_COMPATIBILITY = "17";
 
 	void apply(Project project) {
 		project.getPlugins().withType(JavaBasePlugin.class, java -> {
@@ -114,7 +115,7 @@ private void configureJavaCompileConventions(Project project) {
 	}
 
 	private boolean buildingWithJava8(Project project) {
-		return !project.hasProperty("toolchainVersion") && JavaVersion.current() == JavaVersion.VERSION_1_8;
+		return !project.hasProperty("toolchainVersion") && JavaVersion.current() == JavaVersion.VERSION_17;
 	}
 
 	private void configureSpringJavaFormat(Project project) {

core/build.gradle

@@ -2,7 +2,7 @@ description "${projectName} core"
 
 dependencies {
 
-	api("javax.persistence:javax.persistence-api:2.2")
+	api("jakarta.persistence:jakarta.persistence-api:3.1.0")
 	compileOnly("org.springframework.data:spring-data-commons:${springDataVersion}")
 	compileOnly('com.google.code.findbugs:annotations:3.0.1')
 

core/src/main/java/io/easybest/mybatis/annotation/DatabaseDefault.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

core/src/main/java/io/easybest/mybatis/annotation/GetterOptional.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

core/src/main/java/io/easybest/mybatis/annotation/JdbcType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

core/src/main/java/io/easybest/mybatis/annotation/LogicDelete.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

core/src/main/java/io/easybest/mybatis/annotation/Tenant.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2019-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.easybest.mybatis.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Tags need to support multi-tenancy.
+ *
+ * @author Jarvis Song
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface Tenant {
+
+	/**
+	 * Column name of the multi-tenant ID.
+	 * @return column name
+	 */
+	String value() default "tenant_id";
+
+}

core/src/main/java/io/easybest/mybatis/annotation/TypeHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

core/src/main/java/io/easybest/mybatis/domain/AbstractAuditable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,10 @@
 import java.time.LocalDateTime;
 import java.util.Optional;
 
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 import org.springframework.data.domain.Auditable;
 import org.springframework.lang.NonNull;

core/src/main/java/io/easybest/mybatis/domain/AbstractPersistable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@
 
 import java.io.Serializable;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Transient;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Transient;
 
 import org.springframework.data.domain.Persistable;
 import org.springframework.data.util.ProxyUtils;

core/src/main/java/io/easybest/mybatis/domain/Audit.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,18 +19,17 @@
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Temporal;
+import jakarta.persistence.Column;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.lang.Nullable;
 
-import static javax.persistence.TemporalType.TIMESTAMP;
-
 /**
  * Base audit.
  *
@@ -61,15 +60,15 @@ public abstract class Audit<AUDITOR, ID extends Serializable> extends Id<ID> {
 	 * 创建时间.
 	 */
 	@CreatedDate
-	@Temporal(TIMESTAMP)
+	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name = "created_date")
 	private @Nullable LocalDateTime createdDate;
 
 	/**
 	 * 最后修改时间.
 	 */
 	@LastModifiedDate
-	@Temporal(TIMESTAMP)
+	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name = "last_modified_date")
 	private @Nullable LocalDateTime lastModifiedDate;
 

core/src/main/java/io/easybest/mybatis/domain/Id.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.MappedSuperclass;
 
 /**
  * .
@@ -32,7 +32,7 @@
 public abstract class Id<T extends Serializable> implements Identifiable<T> {
 
 	@GeneratedValue(strategy = GenerationType.AUTO)
-	@javax.persistence.Id
+	@jakarta.persistence.Id
 	protected T id;
 
 	public Id() {

core/src/main/java/io/easybest/mybatis/domain/Identifiable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

core/src/main/java/io/easybest/mybatis/domain/LongId.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package io.easybest.mybatis.domain;
 
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.MappedSuperclass;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

gradle.properties

@@ -1,4 +1,4 @@
-version=2.1.0-SNAPSHOT
+version=3.2.0-SNAPSHOT
 projectName=spring-data-mybatis
 groupId=io.easybest
 
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1g -Dfile.encoding=UTF-8
 kotlinVersion=1.6.21
 kotlin.stdlib.default.dependency=false
 
-springDataVersion=2.7.5
-springVersion=5.3.23
-springBootVersion=2.7.5
-lombokVersion=1.18.24
+springDataVersion=3.2.1
+springVersion=6.1.2
+springBootVersion=3.2.1
+lombokVersion=1.18.30

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac