Merge pull request #1093 from o-shevchenko/maxInboundMetadataSize_global

Fix setting maxInboundMetadataSize from GLOBAL
grpc-ecosystem · Apr 19, 2024 · cbbef18 · cbbef18
2 parents fd47ce0 + d125ecc
commit cbbef18
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/...ng-boot-starter/src/main/java/net/devh/boot/grpc/client/config/GrpcChannelProperties.java b/...ng-boot-starter/src/main/java/net/devh/boot/grpc/client/config/GrpcChannelProperties.java
@@ -501,6 +501,9 @@ public void copyDefaultsFrom(final GrpcChannelProperties config) {
         if (this.maxInboundMessageSize == null) {
             this.maxInboundMessageSize = config.maxInboundMessageSize;
         }
+        if (this.maxInboundMetadataSize == null) {
+            this.maxInboundMetadataSize = config.maxInboundMetadataSize;
+        }
         if (this.negotiationType == null) {
             this.negotiationType = config.negotiationType;
         }

diff --git a/...arter/src/test/java/net/devh/boot/grpc/client/config/GrpcChannelPropertiesGlobalTest.java b/...arter/src/test/java/net/devh/boot/grpc/client/config/GrpcChannelPropertiesGlobalTest.java
@@ -26,6 +26,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.util.unit.DataSize;
 
 /**
  * Tests whether the global property fallback works.
@@ -34,6 +35,8 @@
 @SpringBootTest(properties = {
         "grpc.client.GLOBAL.keepAliveTime=23m",
         "grpc.client.GLOBAL.keepAliveTimeout=31s",
+        "grpc.client.GLOBAL.maxInboundMessageSize=5MB",
+        "grpc.client.GLOBAL.maxInboundMetadataSize=3MB",
         "grpc.client.test.keepAliveTime=42m"})
 class GrpcChannelPropertiesGlobalTest {
 
@@ -52,4 +55,11 @@ void test() {
         assertEquals(Duration.ofSeconds(31), this.grpcChannelsProperties.getChannel("test").getKeepAliveTimeout());
     }
 
+    @Test
+    void testCopyDefaults() {
+        assertEquals(DataSize.ofMegabytes(5),
+                this.grpcChannelsProperties.getChannel("test").getMaxInboundMessageSize());
+        assertEquals(DataSize.ofMegabytes(3),
+                this.grpcChannelsProperties.getChannel("test").getMaxInboundMetadataSize());
+    }
 }