Merge branch 'master' into pr/496

Author: ST-DDT

grpc-client-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/client/config/GrpcChannelProperties.java

@@ -403,11 +403,10 @@ public Duration getImmediateConnectTimeout() {
     }
 
     /**
-     * If set to a positive duration instructs a client to connect to GRPC-endpoint when GRPC stub is created. If it's
-     * set to a positive timeout application startup will be slower due to connection process will be executed
-     * synchronously with maximum to connection timeout. If connection fails stub will fail to create with an exception
-     * which in turn causes context startup to If connection fails stub will fail to create with an exception which in
-     * turn causes context fail. Defaults to false.
+     * If set to a positive duration instructs the client to connect to the gRPC endpoint when the GRPC stub is created.
+     * As a result the application startup will be slightly slower due to connection process being executed
+     * synchronously up to the maximum to connection timeout. If the connection fails, the stub will fail to create with
+     * an exception which in turn causes the application context startup to fail. Defaults to {@code 0}.
      *
      * @param immediateConnectTimeout Connection timeout at application startup.
      */

grpc-client-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -81,6 +81,13 @@
 			"description": "Whether keepAlive will be performed when there are no outstanding RPC on a connection.",
 			"defaultValue": false
 		},
+		{
+			"name": "grpc.client.GLOBAL.shutdown-grace-period",
+			"type": "java.time.Duration",
+			"sourceType": "net.devh.boot.grpc.client.config.GrpcChannelProperties",
+			"description": "The time to wait for the channel to gracefully shutdown (completing all requests).\nIf set to a negative value, the channel waits forever.\nIf set to 0 the channel will force shutdown immediately.\nDefaults to 30s.",
+			"defaultValue": "30s"
+		},
 		{
 			"name": "grpc.client.GLOBAL.max-inbound-message-size",
 			"type": "org.springframework.util.unit.DataSize",
@@ -94,6 +101,13 @@
 			"description": "The negotiation type to use on the connection.",
 			"defaultValue": "TLS"
 		},
+		{
+			"name": "grpc.client.GLOBAL.immediate-connect-timeout",
+			"type": "java.time.Duration",
+			"sourceType": "net.devh.boot.grpc.client.config.GrpcChannelProperties",
+			"description": "Connection timeout at application startup. If set to a positive duration instructs a client to connect to GRPC-endpoint when GRPC stub is created.",
+			"defaultValue": 0
+		},
 		{
 			"name": "grpc.client.GLOBAL.security.authority-override",
 			"type": "java.lang.String",
@@ -108,7 +122,7 @@
 		},
 		{
 			"name": "grpc.client.GLOBAL.security.ciphers",
-			"type": "java.lang.String",
+			"type": "java.util.List<java.lang.String>",
 			"sourceType": "net.devh.boot.grpc.client.config.GrpcChannelProperties$Security",
 			"description": "The cipher suite accepted for secure connections (in the order of preference). If not specified (null), then the default suites will be used."
 		},