diff --git a/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/client/GrpcClientProperties.java b/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/client/GrpcClientProperties.java index 8976308c..f542df25 100644 --- a/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/client/GrpcClientProperties.java +++ b/spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/client/GrpcClientProperties.java @@ -153,9 +153,9 @@ public Health getHealth() { /** * Map representation of the service config to use for the channel */ - private final Map serviceConfig = new HashMap<>(); + private final Map serviceConfig = new HashMap<>(); - public Map getServiceConfig() { + public Map getServiceConfig() { return this.serviceConfig; } @@ -349,6 +349,7 @@ public ChannelConfig copy() { copy.defaultDeadline = this.defaultDeadline; copy.health.copyValuesFrom(this.getHealth()); copy.ssl.copyValuesFrom(this.getSsl()); + copy.serviceConfig.putAll(this.serviceConfig); return copy; } diff --git a/spring-grpc-spring-boot-autoconfigure/src/test/java/org/springframework/grpc/autoconfigure/client/GrpcClientPropertiesTests.java b/spring-grpc-spring-boot-autoconfigure/src/test/java/org/springframework/grpc/autoconfigure/client/GrpcClientPropertiesTests.java index 33b0284a..479c2789 100644 --- a/spring-grpc-spring-boot-autoconfigure/src/test/java/org/springframework/grpc/autoconfigure/client/GrpcClientPropertiesTests.java +++ b/spring-grpc-spring-boot-autoconfigure/src/test/java/org/springframework/grpc/autoconfigure/client/GrpcClientPropertiesTests.java @@ -289,6 +289,7 @@ void copyFromDefaultChannel() { var defaultChannel = properties.getDefaultChannel(); var newChannel = defaultChannel.copy(); assertThat(newChannel).usingRecursiveComparison().isEqualTo(defaultChannel); + assertThat(newChannel.getServiceConfig()).isEqualTo(defaultChannel.getServiceConfig()); } }