Fix serviceConfig within scope of copy

Signed-off-by: NeatGuyCoding <[email protected]>

Author: NeatGuyCoding

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<String, ?> serviceConfig = new HashMap<>();
+		private final Map<String, Object> serviceConfig = new HashMap<>();
 
-		public Map<String, ?> getServiceConfig() {
+		public Map<String, Object> getServiceConfig() {
 			return this.serviceConfig;
 		}
 
@@ -349,6 +349,8 @@ public ChannelConfig copy() {
 			copy.defaultDeadline = this.defaultDeadline;
 			copy.health.copyValuesFrom(this.getHealth());
 			copy.ssl.copyValuesFrom(this.getSsl());
+			copy.serviceConfig.clear();
+			copy.serviceConfig.putAll(this.serviceConfig);
 			return copy;
 		}
 

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());
 		}
 
 	}