Merge branch 'master' into pr/496

Author: ST-DDT

README-zh-CN.md

@@ -37,7 +37,7 @@ QQ交流群：294712648
 
 2.x.x.RELEASE 支持 Spring Boot 2.1.x/2.2.x 和 Spring Cloud Greenwich / Hoxton。
 
-最新版本： `2.10.1.RELEASE`
+最新版本： `2.11.0.RELEASE`
 
 ( `2.4.0.RELEASE` 用于 Spring Boot 2.0.x & Spring Cloud Finchy).
 
@@ -57,15 +57,15 @@ QQ交流群：294712648
 <dependency>
   <groupId>net.devh</groupId>
   <artifactId>grpc-spring-boot-starter</artifactId>
-  <version>2.10.1.RELEASE</version>
+  <version>2.11.0.RELEASE</version>
 </dependency>
 ````
 
 Gradle：
 
 ````gradle
 dependencies {
-  compile 'net.devh:grpc-spring-boot-starter:2.10.1.RELEASE'
+  compile 'net.devh:grpc-spring-boot-starter:2.11.0.RELEASE'
 }
 ````
 
@@ -77,15 +77,15 @@ dependencies {
 <dependency>
   <groupId>net.devh</groupId>
   <artifactId>grpc-server-spring-boot-starter</artifactId>
-  <version>2.10.1.RELEASE</version>
+  <version>2.11.0.RELEASE</version>
 </dependency>
 ````
 
 Gradle：
 
 ````gradle
 dependencies {
-  compile 'net.devh:grpc-server-spring-boot-starter:2.10.1.RELEASE'
+  compile 'net.devh:grpc-server-spring-boot-starter:2.11.0.RELEASE'
 }
 ````
 
@@ -117,15 +117,15 @@ public class GrpcServerService extends GreeterGrpc.GreeterImplBase {
 <dependency>
   <groupId>net.devh</groupId>
   <artifactId>grpc-client-spring-boot-starter</artifactId>
-  <version>2.10.1.RELEASE</version>
+  <version>2.11.0.RELEASE</version>
 </dependency>
 ````
 
 Gradle：
 
 ````gradle
 dependencies {
-  compile 'net.devh:grpc-client-spring-boot-starter:2.10.1.RELEASE'
+  compile 'net.devh:grpc-client-spring-boot-starter:2.11.0.RELEASE'
 }
 ````
 在 grpc 客户端的的 stub 字段上添加 `@GrpcClient(serverName)` 注解。

README.md

@@ -52,7 +52,7 @@ README: [English](README.md) | [中文](README-zh-CN.md)
 
 2.x.x.RELEASE supports Spring Boot 2.1.x/2.2.x & Spring Cloud Greenwich/Hoxton.
 
-The latest version: ``2.10.1.RELEASE``
+The latest version: ``2.11.0.RELEASE``
 
 (Use `2.4.0.RELEASE` for Spring Boot 2.0.x & Spring Cloud Finchley).
 
@@ -72,15 +72,15 @@ To add a dependency using Maven, use the following:
 <dependency>
   <groupId>net.devh</groupId>
   <artifactId>grpc-spring-boot-starter</artifactId>
-  <version>2.10.1.RELEASE</version>
+  <version>2.11.0.RELEASE</version>
 </dependency>
 ````
 
 To add a dependency using Gradle:
 
 ````gradle
 dependencies {
-  implementation 'net.devh:grpc-spring-boot-starter:2.10.1.RELEASE'
+  implementation 'net.devh:grpc-spring-boot-starter:2.11.0.RELEASE'
 }
 ````
 
@@ -92,15 +92,15 @@ To add a dependency using Maven, use the following:
 <dependency>
   <groupId>net.devh</groupId>
   <artifactId>grpc-server-spring-boot-starter</artifactId>
-  <version>2.10.1.RELEASE</version>
+  <version>2.11.0.RELEASE</version>
 </dependency>
 ````
 
 To add a dependency using Gradle:
 
 ````gradle
 dependencies {
-  implementation 'net.devh:grpc-server-spring-boot-starter:2.10.1.RELEASE'
+  implementation 'net.devh:grpc-server-spring-boot-starter:2.11.0.RELEASE'
 }
 ````
 
@@ -134,15 +134,15 @@ To add a dependency using Maven, use the following:
 <dependency>
   <groupId>net.devh</groupId>
   <artifactId>grpc-client-spring-boot-starter</artifactId>
-  <version>2.10.1.RELEASE</version>
+  <version>2.11.0.RELEASE</version>
 </dependency>
 ````
 
 To add a dependency using Gradle:
 
 ````gradle
 dependencies {
-  compile 'net.devh:grpc-client-spring-boot-starter:2.10.1.RELEASE'
+  compile 'net.devh:grpc-client-spring-boot-starter:2.11.0.RELEASE'
 }
 ````
 

build.gradle

@@ -9,22 +9,25 @@ buildscript {
         }
     }
     ext {
-        projectVersion = '2.11.0-SNAPSHOT'
+        projectVersion = '2.12.0-SNAPSHOT'
 
         // https://github.com/grpc/grpc-java/releases
-        grpcVersion = '1.35.0'
+        grpcVersion = '1.37.0'
+
+        // https://github.com/google/guava/releases
+        guavaVersion = '30.1.1-jre'
         // https://github.com/protocolbuffers/protobuf/releases
-        protobufVersion = '3.14.0'
+        protobufVersion = '3.15.8'
         protobufGradlePluginVersion = '0.8.12'
 
         // https://github.com/spring-projects/spring-boot/releases
-        springBootVersion = '2.3.8.RELEASE'
+        springBootVersion = '2.4.5'
         // https://github.com/spring-cloud/spring-cloud-release/releases
-        springCloudVersion = 'Hoxton.SR9'
+        springCloudVersion = '2020.0.2'
         // https://github.com/alibaba/spring-cloud-alibaba/releases
-        springCloudAlibabaNacosVersion = '2.2.3.RELEASE'
+        springCloudAlibabaNacosVersion = '2021.1'
         // https://github.com/spring-projects/spring-security-oauth/releases
-        springSecurityOAuthVersion = '2.5.0.RELEASE'
+        springSecurityOAuthVersion = '2.5.1.RELEASE'
 
         lombokPluginVersion = '4.0.0'
         versioningPluginVersion = '2.14.0'
@@ -38,10 +41,10 @@ plugins {
     id 'org.springframework.boot' version "${springBootVersion}" apply false
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'net.nemerosa.versioning' version '2.14.0'
-    id 'com.google.protobuf' version '0.8.14'
+    id 'com.google.protobuf' version '0.8.15'
     id 'io.franzbecker.gradle-lombok' version '4.0.0' apply false
     id 'com.github.ben-manes.versions' version '0.36.0' // gradle dependencyUpdates
-    id 'com.diffplug.spotless' version '5.9.0'
+    id 'com.diffplug.spotless' version '5.11.0'
 }
 
 // If you attempt to build without the `--scan` parameter in `gradle 6.0+` it will cause a build error that it can't find
@@ -57,7 +60,7 @@ if (hasProperty('buildScan')) {
 wrapper {
     // Update using:
     // ./gradlew wrapper --gradle-version=6.5 --distribution-type=bin
-    gradleVersion = '6.7.1'
+    gradleVersion = '7.0'
 }
 
 def buildTimeAndDate = OffsetDateTime.now()
@@ -95,11 +98,20 @@ allprojects {
         }
         format('misc') {
             target('**/*.gradle', '**/*.md', '**/*.yml')
+            targetExclude('**/build/**/*.*')
             trimTrailingWhitespace()
             endWithNewline()
         }
     }
 
+    normalization {
+        runtimeClasspath {
+            metaInf{
+                ignoreAttribute('Build-Time')
+            }
+        }
+    }
+
     // Copy LICENSE
     tasks.withType(Jar) {
         from(project.rootDir) {
@@ -155,7 +167,9 @@ allprojects { project ->
             imports {
                 mavenBom "org.springframework.boot:spring-boot-starter-parent:${springBootVersion}"
                 mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+                mavenBom "com.alibaba.cloud:spring-cloud-alibaba-dependencies:${springCloudAlibabaNacosVersion}"
                 mavenBom "com.google.protobuf:protobuf-bom:${protobufVersion}"
+                mavenBom "com.google.guava:guava-bom:${guavaVersion}"
                 mavenBom "io.grpc:grpc-bom:${grpcVersion}"
                 mavenBom "org.junit:junit-bom:5.7.0"
             }

docs/en/client/configuration.md

@@ -13,6 +13,7 @@ This section describes how you can configure your grpc-spring-boot-starter clien
   - [ClientInterceptor](#clientinterceptor)
   - [StubFactory](#stubfactory)
   - [StubTransformer](#stubtransformer)
+- [Custom NameResolverProvider](#custom-nameresolverprovider)
 
 ## Additional Topics <!-- omit in toc -->
 
@@ -80,7 +81,8 @@ There are a number of supported schemes, that you can use to determine the targe
   You can define custom
   [`NameResolverProvider`s](https://javadoc.io/page/io.grpc/grpc-all/latest/io/grpc/NameResolverProvider.html) those
   will be picked up, by either via Java's `ServiceLoader` or from spring's application context and registered in
-  the `NameResolverRegistry`.
+  the `NameResolverRegistry`. \
+  See also [Custom NameResolverProvider](#custom-nameresolverprovider)
 
 If you don't define an address it will be guessed:
 
@@ -243,6 +245,23 @@ You can also use `StubTransformer`s to add custom `ClientInterceptor`s to your s
 
 > **Note**: The `StubTransformer`s are applied after the  `@GrpcClient#interceptors(Names)` have been added.
 
+## Custom NameResolverProvider
+
+Sometimes you might have some custom logic that decides which server you wish to connect to, you can achieve this
+using a custom `NameResolverProvider`.
+
+> **Note:** This can only be used to decide this on an application level and not on a per request level.
+
+This library provides some `NameResolverProvider`s itself so you can use them as a
+[reference](https://github.com/yidongnan/grpc-spring-boot-starter/tree/master/grpc-client-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/client/nameresolver).
+
+You can register your `NameResolverProvider` by adding it to `META-INF/services/io.grpc.NameResolverProvider` for Java's
+`ServiceLoader` or adding it your spring context. If you wish to use some spring beans inside your `NameResolver`, then
+you have to define it via spring context (unless you wish to use `static`).
+
+> **Note:** `NameResolverProvider`s are registered gloablly, so might run into issues if you boot up two or more
+> applications simulataneosly in the same JVM (e.g. during tests).
+
 ## Additional Topics <!-- omit in toc -->
 
 - [Getting Started](getting-started.md)

docs/en/trouble-shooting.md

@@ -9,6 +9,7 @@ are also affected. If there is no such topic, feel free to open a new one as des
 
 ## Table of Contents
 
+- [NoClassDefFoundError, ClassNotFoundException, NoSuchMethodError, AbstractMethodError](#noclassdeffounderror-classnotfoundexception-nosuchmethoderror-abstractmethoderror)
 - [Transport failed](#transport-failed)
 - [Network closed for unknown reason](#network-closed-for-unknown-reason)
 - [Could not find TLS ALPN provider](#could-not-find-tls-alpn-provider)
@@ -18,6 +19,52 @@ are also affected. If there is no such topic, feel free to open a new one as des
 - [Client fails to resolve domain name](#client-fails-to-resolve-domain-name)
 - [Creating issues / asking questions](#creating-issues)
 
+## NoClassDefFoundError, ClassNotFoundException, NoSuchMethodError, AbstractMethodError
+
+### Example
+
+````txt
+Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'client' defined in file [~/.../MyGrpcClient.class]: Initialization of bean failed; nested exception is java.lang.NoClassDefFoundError: io/grpc/TlsChannelCredentials$Feature
+    at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:602)
+    [...]
+Caused by: java.lang.NoClassDefFoundError: io/grpc/TlsChannelCredentials$Feature
+    at io.grpc.netty.ProtocolNegotiators.<clinit>(ProtocolNegotiators.java:92)
+````
+
+### The Problem
+
+The server/client does not start because some class or method is missing. \
+This is usually the case if the grpc-libraries use slightly different versions.
+
+### The solution
+
+Make sure to use exactly the same version for all `grpc-java` versions.
+
+Add the following entry to your `dependencyManagement` section of your project:
+
+````xml
+<dependency>
+    <groupId>io.grpc</groupId>
+    <artifactId>grpc-bom</artifactId>
+    <version>${grpcVersion}</version>
+    <type>pom</type>
+    <scope>import</scope>
+</dependency>
+````
+
+You can use a similar approach for gradle:
+
+````groovy
+dependencyManagement {
+    imports {
+        mavenBom "io.grpc:grpc-bom:${grpcVersion}"
+````
+
+> **Note:** grpc-spring-boot-starter isn't strictly bound to a specific version of grpc-java, so you can also use this
+> to change the version of grpc-java you are using in your project.
+
+See also [Could not find TLS ALPN provider](#could-not-find-tls-alpn-provider)
+
 ## Transport failed
 
 ### Server-side

docs/en/versions.md

@@ -47,8 +47,8 @@ Current version.
 
 | Version | spring-boot | gRPC | Date |
 |:-------:|:-----------:|:----:| ---: |
-| 2.12.0* | 2.4.x | 1.34.1 | TBA |
-| 2.11.0* | 2.3.8 | 1.35.0 | Feb, 2021 |
+| 2.12.0* | 2.4.5 | 1.37.0 | Apr, 2021 |
+| 2.11.0 | 2.3.8 | 1.35.0 | Feb, 2021 |
 | 2.10.1 | 2.3.3 | 1.31.1 | Aug, 2020 |
 | 2.10.0 | 2.3.3 | 1.31.1 | Aug, 2020 |
 | 2.9.0  | 2.3.1 | 1.30.0 | Jun, 2020 |

docs/zh-CN/examples.md

@@ -23,6 +23,14 @@
 - [客户端](https://github.com/yidongnan/grpc-spring-boot-starter/tree/master/examples/cloud-grpc-client)
 - [说明](https://github.com/yidongnan/grpc-spring-boot-starter/tree/master/examples#cloud-mode)
 
+## Cloud-Nacos 示例
+
+使用 nacos 服务发现的 Cloud 环境。
+
+- [服务端](https://github.com/yidongnan/grpc-spring-boot-starter/tree/master/examples/cloud-grpc-server-nacos)
+- [客户端](https://github.com/yidongnan/grpc-spring-boot-starter/tree/master/examples/cloud-grpc-client-nacos)
+- [说明](https://github.com/yidongnan/grpc-spring-boot-starter/tree/master/examples#cloud-mode)
+
 ## 基础认证示例
 
 演示了 grpc 跟 spring security 的设置。 为了简单起见，此设置使用 Basic 身份验证，但也可以为其使用其他身份验证机制。

docs/zh-CN/versions.md

@@ -38,7 +38,8 @@
 
 |   版本    | spring-boot |  gRPC  |       日期  |
 |:---------:|:-----------:|:------:| ----------:|
-|   2.11.0* |    2.3.3    | 1.31.1 |     待定    |
+|   2.12.0* |    2.4.x    | 1.34.1 |    待定     |
+|   2.11.0 |    2.3.3    | 1.31.1 |  2021年02月 |
 |   2.10.1  |    2.3.3    | 1.31.1 |  2020年08月 |
 |   2.10.0  |    2.3.3    | 1.31.1 |  2020年08月 |
 |   2.9.0   |    2.3.0    | 1.30.0 |  2020年06月 |

examples/cloud-eureka-server/src/main/resources/bootstrap.yml renamed to examples/cloud-eureka-server/src/main/resources/application.yml

@@ -17,10 +17,11 @@ eureka:
     registerWithEureka: false
     fetchRegistry: false
     serviceUrl:
-            defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://localhost:8761/eureka/
   server:
     enable-self-preservation: false
 
-endpoints:
- shutdown:
-  enabled: true
+management:
+  endpoint:
+    shutdown:
+      enabled: true

examples/cloud-grpc-client-nacos/build.gradle

@@ -0,0 +1,10 @@
+plugins {
+    id 'org.springframework.boot'
+}
+
+dependencies {
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery'
+    implementation project(':grpc-client-spring-boot-starter') // replace to implementation("net.devh:grpc-client-spring-boot-starter:${springBootGrpcVersion}")
+    implementation project(':examples:grpc-lib')
+}