Merge branch 'main' into pb-http-mapping

.github/workflows/build.yml

@@ -3,11 +3,13 @@ on:
   push:
     branches:
       - main
-      - 2.x
+      - 3.1.x
+      - 2.7.x
   pull_request:
     branches:
       - main
-      - 2.x
+      - 3.1.x
+      - 2.7.x
 jobs:
   build:
     runs-on: ubuntu-latest

README.md

@@ -78,11 +78,11 @@ Mainly maintain the following versions:
   is [main](https://github.com/DanielLiu1123/grpc-starter/).
 
   3.x version is kept in sync with Spring Boot 3,
-  if you are using Spring Boot 3.1.5, then `grpc-boot-starter` 3.1.5 should be used.
+  if you are using Spring Boot 3.1.6, then `grpc-boot-starter` 3.1.6 should be used.
 
   | Spring Boot | grpc-boot-starter |
   |-------------|-------------------|
-  | 3.x         | 3.1.5             |
+  | 3.x         | 3.1.6             |
 
 - 2.x
 
@@ -91,7 +91,7 @@ Mainly maintain the following versions:
 
   | Spring Boot | grpc-boot-starter |
   |-------------|-------------------|
-  | 2.x         | 2.1.5             |
+  | 2.x         | 2.1.6             |
 
 ## License
 

build.gradle

@@ -25,12 +25,8 @@ allprojects {
     repositories {
         mavenLocal()
         mavenCentral()
-        maven {
-            url "https://repo.spring.io/snapshot"
-        }
-        maven {
-            url "https://repo.spring.io/milestone"
-        }
+        maven { url "https://repo.spring.io/snapshot" }
+        maven { url "https://repo.spring.io/milestone" }
     }
     compileJava {
         options.encoding = 'UTF-8'

docs/en-us/guide/quickstart.md

@@ -5,7 +5,7 @@
 #### **Gradle**
 
 ```groovy
-implementation platform('com.freemanan:grpc-starter-dependencies:3.1.5')
+implementation platform('com.freemanan:grpc-starter-dependencies:3.1.6')
 implementation 'com.freemanan:grpc-boot-starter'
 ```
 
@@ -17,7 +17,7 @@ implementation 'com.freemanan:grpc-boot-starter'
     <dependency>
       <groupId>com.freemanan</groupId>
       <artifactId>grpc-starter-dependencies</artifactId>
-      <version>3.1.5</version>
+      <version>3.1.6</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>

docs/en-us/guide/version.md

@@ -6,11 +6,11 @@ Mainly maintain the following versions:
   is [main](https://github.com/DanielLiu1123/grpc-starter/).
 
   3.x version is kept in sync with Spring Boot 3,
-  if you are using Spring Boot 3.1.5, then `grpc-boot-starter` 3.1.5 should be used.
+  if you are using Spring Boot 3.1.6, then `grpc-boot-starter` 3.1.6 should be used.
 
   | Spring Boot | grpc-boot-starter |
   |-------------|-------------------|
-  | 3.x         | 3.1.5             |
+  | 3.x         | 3.1.6             |
 
 - 2.x
 
@@ -19,4 +19,4 @@ Mainly maintain the following versions:
 
   | Spring Boot | grpc-boot-starter |
   |-------------|-------------------|
-  | 2.x         | 2.1.5             |
+  | 2.x         | 2.1.6             |

docs/zh-cn/coverpage.md

@@ -1,6 +1,6 @@
 ![logo](assets/images/logo.png)
 
-# gRPC Starter <small>3.1.5</small>
+# gRPC Starter <small>3.1.6</small>
 
 > Spring Boot Starters for gRPC ecosystem
 

docs/zh-cn/guide/quickstart.md

@@ -5,7 +5,7 @@
 #### ** Gradle **
 
 ```groovy
-implementation platform('com.freemanan:grpc-starter-dependencies:3.1.5')
+implementation platform('com.freemanan:grpc-starter-dependencies:3.1.6')
 implementation 'com.freemanan:grpc-boot-starter'
 ```
 
@@ -18,7 +18,7 @@ implementation 'com.freemanan:grpc-boot-starter'
     <dependency>
       <groupId>com.freemanan</groupId>
       <artifactId>grpc-starter-dependencies</artifactId>
-      <version>3.1.5</version>
+      <version>3.1.6</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>

docs/zh-cn/guide/version.md

@@ -3,16 +3,16 @@
 - 3.x
 
     基于 Spring Boot 3，baseline 为 JDK 17，对应分支为 [main](https://github.com/DanielLiu1123/grpc-starter/)，如果 Spring Boot 版本为 3.x，必须使用 3.x 版本。
-    如果使用 Spring Boot 的版本为 3.1.5，则应使用 `grpc-boot-starter` 3.1.5 版本。
+    如果使用 Spring Boot 的版本为 3.1.6，则应使用 `grpc-boot-starter` 3.1.6 版本。
 
     | Spring Boot | grpc-boot-starter |
     |-------------|-------------------|
-    | 3.x         | 3.1.5             |
+    | 3.x         | 3.1.6             |
 
 - 2.x
 
     基于 Spring Boot 2，baseline 为 JDK 8，对应分支为 [2.x](https://github.com/DanielLiu1123/grpc-starter/tree/2.x)，如果 Spring Boot 版本为 2.x，必须使用 2.x 版本。
 
     | Spring Boot | grpc-boot-starter |
     |-------------|-------------------|
-    | 2.x         | 2.1.5             |
+    | 2.x         | 2.1.6             |

examples/tracing/build.gradle

@@ -9,7 +9,7 @@ dependencies {
 
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("io.micrometer:micrometer-tracing-bridge-brave")
-    implementation("com.freemanan:httpexchange-spring-boot-starter:3.1.5")
+    implementation("com.freemanan:httpexchange-spring-boot-starter:3.1.6")
 
     testImplementation(project(":grpc-starters:grpc-starter-test"))
 }

gradle.properties

@@ -1,24 +1,24 @@
-group=com.freemanan
+group=io.github.danielliu1123
 artifact=grpc-starter
-version=3.1.6-SNAPSHOT
+version=3.2.0-SNAPSHOT
 
 # Spring related
-springBootVersion=3.1.5
-springCloudVersion=2022.0.4
-springDependencyManagementVersion=1.1.3
+springBootVersion=3.2.0
+springCloudVersion=2023.0.0-RC1
+springDependencyManagementVersion=1.1.4
 
 # gRPC related
 protobufGradlePluginVersion=0.9.4
 # required JDK 11
 bufGradlePluginVersion=0.8.6
-grpcVersion=1.59.0
-protobufVersion=3.24.4
+grpcVersion=1.59.1
+protobufVersion=3.25.1
 pgvVersion=1.0.2
-protovalidateVersion=0.1.6
+protovalidateVersion=0.1.8
 
 # Code quality
-spotlessVersion=6.22.0
-spotbugsVersion=6.0.0-rc.2
+spotlessVersion=6.23.2
+spotbugsVersion=6.0.0-rc.3
 
 # Others
 javaxValidationApiVersion=1.3.2

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -145,15 +145,15 @@ 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
+        # shellcheck disable=SC2039,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
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # 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"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

grpc-boot-autoconfigure/grpc-client-boot-autoconfigure/src/main/java/com/freemanan/starter/grpc/client/GrpcClientCreator.java

@@ -53,7 +53,7 @@ public <T> T create() {
                 .getBeanDefinition();
         abd.setLazyInit(true);
 
-        String channelBeanName = UUID.randomUUID().toString();
+        String channelBeanName = "grpc-channel-" + UUID.randomUUID();
         BeanDefinitionHolder holder = new BeanDefinitionHolder(abd, channelBeanName);
         BeanDefinitionRegistry registry = (BeanDefinitionRegistry) beanFactory;
         if (SPRING_CLOUD_CONTEXT_PRESENT

grpc-extensions/grpc-json-transcoder/src/main/java/com/freemanan/starter/grpc/extensions/jsontranscoder/webflux/WebFluxProtobufHandlerAdaptor.java

@@ -129,7 +129,7 @@ private Mono<HandlerResult> handleException(
             ArrayList<Throwable> exceptions = new ArrayList<>();
             try {
                 if (log.isDebugEnabled()) {
-                    log.debug("{} Using @ExceptionHandler {}", exchange.getLogPrefix(), invocable);
+                    log.debug("{} using @ExceptionHandler {}", exchange.getLogPrefix(), invocable);
                 }
                 if (bindingContext != null) {
                     bindingContext.getModel().asMap().clear();

grpc-extensions/grpc-json-transcoder/src/test/java/com/freemanan/starter/grpc/extensions/jsontranscoder/Deps.java

@@ -5,7 +5,7 @@
  */
 public class Deps {
 
-    public static final String SPRING_BOOT_VERSION = "3.1.5";
+    public static final String SPRING_BOOT_VERSION = "3.2.0";
 
     public static final String WEB_MVC_STARTER =
             "org.springframework.boot:spring-boot-starter-web:" + SPRING_BOOT_VERSION;

grpc-extensions/grpc-metrics/src/test/java/com/freemanan/starter/grpc/extensions/metrics/Deps.java

@@ -7,5 +7,5 @@ public final class Deps {
 
     private Deps() {}
 
-    public static final String SPRING_BOOT_VERSION = "3.1.5";
+    public static final String SPRING_BOOT_VERSION = "3.2.0";
 }

grpc-extensions/grpc-metrics/src/test/java/com/freemanan/starter/grpc/extensions/metrics/GrpcMetricsAutoConfigurationTest.java

@@ -41,9 +41,10 @@ void testMetricsBeans_whenAllConditionsMatched() {
                 .doesNotThrowAnyException();
         assertThatCode(() -> ctx.getBean(AnnotationAwareAspectJAutoProxyCreator.class))
                 .doesNotThrowAnyException();
-        assertThatCode(() -> ctx.getBean(CountedAspect.class)).isInstanceOf(NoSuchBeanDefinitionException.class);
-        assertThatCode(() -> ctx.getBean(TimedAspect.class)).isInstanceOf(NoSuchBeanDefinitionException.class);
-        assertThatCode(() -> ctx.getBean(ObservedAspect.class)).isInstanceOf(NoSuchBeanDefinitionException.class);
+        // MetricsAspectsAutoConfiguration add CountedAspect, TimedAspect and ObservedAspect beans from 3.2.0
+        assertThatCode(() -> ctx.getBean(CountedAspect.class)).doesNotThrowAnyException();
+        assertThatCode(() -> ctx.getBean(TimedAspect.class)).doesNotThrowAnyException();
+        assertThatCode(() -> ctx.getBean(ObservedAspect.class)).doesNotThrowAnyException();
 
         ctx.close();
     }

grpc-extensions/grpc-test/src/main/resources/application-grpc-starter-test-example.yml

@@ -0,0 +1,4 @@
+grpc:
+  test:
+    server:
+      port-type: in_process

settings.gradle

@@ -1,3 +1,11 @@
+pluginManagement {
+    repositories {
+        maven { url 'https://repo.spring.io/milestone' }
+        maven { url 'https://repo.spring.io/snapshot' }
+        gradlePluginPortal()
+    }
+}
+
 rootProject.name = 'grpc-starter'
 
 // core autoconfigure