✨ Introducing new features. up mica-auto 3.0.0 spring-boot 3.0.0

Aeizzz · Aeizzz · commit 4a402ccc092a · 2022-12-06T18:00:49.000+08:00
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: idempotent-spring-boot-starter
+name: oss-spring-boot-starter
 
 on:
   push:
@@ -13,15 +13,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          java-version: '11'
-          distribution: 'adopt'
+    - uses: actions/checkout@v2
+    - name: Set up JDK 17
+      uses: actions/setup-java@v2
+      with:
+        java-version: '17'
+        distribution: 'adopt'
 
-      - name: mvn clean install
-        run: mvn clean install -Dmaven.test.skip=true
+    - name: mvn clean install
+      run: mvn clean install
 
-      - name: mvn spring-javaformat:validate
-        run: mvn spring-javaformat:validate
+    - name: mvn spring-javaformat:validate
+      run: mvn spring-javaformat:validate
diff --git a/.github/workflows/oss-release-deploy.yml b/.github/workflows/oss-release-deploy.yml
@@ -6,30 +6,22 @@ on:
       - '*'
 
 jobs:
-  oss-deploy:
+  oss-release-deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
           cache: maven
 
-#      - name: Build with Maven
-#        run: mvn -B package --file pom.xml
-
-#      - name: Publish to GitHub Packages Apache Maven
-#        run: mvn deploy
-#        env:
-#          GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password
-
       - name: Setup Maven Central
         uses: actions/setup-java@v3
         with: # overwrite settings.xml
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
           server-id: sonatype
           server-username: OSSRH_USERNAME
@@ -38,7 +30,7 @@ jobs:
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
 
       - name: Publish to Maven Central
-        run: mvn clean deploy -Dmaven.test.skip=true -P 'release'
+        run:  mvn clean deploy -P release -Dmaven.test.skip=true
         env:
           MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
diff --git a/.github/workflows/oss-snapshot-deploy.yml b/.github/workflows/oss-snapshot-deploy.yml
@@ -0,0 +1,41 @@
+name: publish maven package
+on:
+  workflow_dispatch:
+  push:
+    branches: [ master ]
+
+jobs:
+  oss-snapshot-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+          cache: maven
+
+      - name: Setup Maven Central
+        uses: actions/setup-java@v3
+        with: # overwrite settings.xml
+          java-version: '17'
+          distribution: 'adopt'
+          server-id: sonatype
+          server-username: OSSRH_USERNAME
+          server-password: OSSRH_PASSWORD
+          gpg-private-key: ${{ secrets.MAVEN_GPG_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+      - name: Set Release version env variable
+        run: |
+          echo "RELEASE_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
+
+      - name: Publish to Maven Central
+        if: contains('${{ env.RELEASE_VERSION }}', 'SNAPSHOT')
+        run: mvn clean deploy -P snapshot -Dmaven.test.skip=true
+        env:
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
diff --git a/README.md b/README.md
@@ -25,14 +25,18 @@
 ![](https://i.loli.net/2020/09/27/dbMiYhwTBurZK4y.png)
 
 ## 如何使用
+| 版本 | 支持 |
+|-------|--|
+| 3.0.0 | 适配 SpringBoot3.x |
+| 1.0.1 | 适配 SpringBoot2.x |
 
 - 1. 引入依赖
 
 ```xml
 <dependency>
     <groupId>com.pig4cloud.plugin</groupId>
     <artifactId>multilevel-cache-spring-boot-starter</artifactId>
-    <version>1.0.1</version>
+    <version>${lastVersion}</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.5</version>
+        <version>3.0.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.pig4cloud.plugin</groupId>
     <artifactId>multilevel-cache-spring-boot-starter</artifactId>
-    <version>1.0.1</version>
+    <version>3.0.0-SNAPSHOT</version>
     <name>multilevel-cache-spring-boot-starter</name>
     <description>support L1 caffeine and L2 redis cache</description>
     <url>https://pig4cloud.com</url>
@@ -36,8 +36,8 @@
     </scm>
 
     <properties>
-        <java.version>1.8</java.version>
-        <mica.version>2.3.1</mica.version>
+        <java.version>17</java.version>
+        <mica.version>3.0.0</mica.version>
         <spring.checkstyle.plugin>0.0.29</spring.checkstyle.plugin>
     </properties>
 
@@ -122,7 +122,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.9.1</version>
+                        <version>3.3.2</version>
                         <configuration>
                             <show>private</show>
                             <nohelp>true</nohelp>
@@ -165,7 +165,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.8</version>
+                        <version>1.6.13</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>sonatype</serverId>
diff --git a/src/main/java/com/pig4cloud/plugin/cache/MultilevelCacheAutoConfiguration.java b/src/main/java/com/pig4cloud/plugin/cache/MultilevelCacheAutoConfiguration.java
@@ -7,6 +7,7 @@
 import com.pig4cloud.plugin.cache.support.ServerIdGenerator;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -28,6 +29,7 @@
  * @version 1.0.0
  */
 @Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @AutoConfigureAfter(RedisAutoConfiguration.class)
 @EnableConfigurationProperties(CacheConfigProperties.class)
 public class MultilevelCacheAutoConfiguration {
diff --git a/src/main/java/com/pig4cloud/plugin/cache/support/RedisCaffeineCache.java b/src/main/java/com/pig4cloud/plugin/cache/support/RedisCaffeineCache.java
@@ -301,8 +301,8 @@ protected Object getCaffeineValue(Object key) {
 
 	@Override
 	@SuppressWarnings("unchecked")
-	public @NonNull Map<Object, Object> getAll(@NonNull Iterable<?> keys,
-			@NonNull Function<Iterable<?>, @NonNull Map<Object, Object>> mappingFunction) {
+	public @NonNull Map<Object, Object> getAll(Iterable<?> keys,
+			Function<? super Set<?>, ? extends Map<?, ?>> mappingFunction) {
 		GetAllContext context = new GetAllContext((Iterable<Object>) keys);
 		context.saveRedisAbsentKeys = true;
 		doGetAll(context);
@@ -315,7 +315,7 @@ protected Object getCaffeineValue(Object key) {
 			return result;
 		}
 		// 从 mappingFunction 中获取值
-		Map<Object, Object> mappingKeyValues = mappingFunction.apply(context.redisAbsentKeys);
+		Map<?, ?> mappingKeyValues = mappingFunction.apply(context.redisAbsentKeys);
 		putAll(mappingKeyValues);
 		Map<Object, Object> result = new HashMap<>(cachedKeyValues.size() + mappingKeyValues.size(), 1);
 		cachedKeyValues.forEach((k, v) -> result.put(k, fromStoreValue(v)));
@@ -343,7 +343,7 @@ protected void doGetAll(GetAllContext context) {
 			boolean saveCacheAbsentKeys = context.saveRedisAbsentKeys;
 			if (saveCacheAbsentKeys) {
 				// mappingFunction 的参数
-				context.redisAbsentKeys = new ArrayList<>(redisAbsentCount);
+				context.redisAbsentKeys = new HashSet<>(redisAbsentCount);
 			}
 			int index = 0;
 			for (Object key : caffeineAbsentKeys) {
@@ -376,7 +376,7 @@ public GetAllContext(Iterable<Object> allKeys) {
 		/**
 		 * redis中未查询到的key
 		 */
-		protected List<Object> redisAbsentKeys;
+		protected Set<Object> redisAbsentKeys;
 
 		/**
 		 * redis中未查询到的key数量
