Spring/spring-grpc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow default channel address to be carried through

Browse Source
This commit is contained in:
Dave Syer
2025-02-05 13:06:46 +00:00
parent f8354a61cb
commit cb58f10116
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/client/GrpcClientProperties.java
View File

@@ -83,7 +83,15 @@ public class GrpcClientProperties implements EnvironmentAware, VirtualTargets {
channel = this.defaultChannel.copy();
String address = name;
if (!name.contains(":/") && !name.startsWith("unix:")) {
address = "static://" + name;
if (name.contains(":")) {
address = "static://" + name;
}
else {
address = defaultChannel.getAddress();
if (!address.contains(":/")) {
address = "static://" + address;
}
}
}
channel.setAddress(address);
return channel;

13
spring-grpc-spring-boot-autoconfigure/src/test/java/org/springframework/grpc/autoconfigure/client/GrpcClientPropertiesTests.java
View File

@@ -27,7 +27,6 @@ import java.util.function.Function;
import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.context.properties.source.MapConfigurationPropertySource;
import org.springframework.grpc.autoconfigure.client.GrpcClientProperties.ChannelConfig;
@@ -213,8 +212,18 @@ class GrpcClientPropertiesTests {
defaultChannel.getSsl().setBundle("custom-bundle");
var properties = newProperties(defaultChannel, Map.of());
var newChannel = properties.getChannel("new-channel");
assertThat(newChannel).usingRecursiveComparison().isEqualTo(defaultChannel);
assertThat(properties).extracting("channels", InstanceOfAssertFactories.MAP).isEmpty();
}
@Test
void withUnknownNameReturnsNewChannelWithOwnAddress() {
var defaultChannel = new ChannelConfig();
defaultChannel.setAddress("static://my-server:9999");
var properties = newProperties(defaultChannel, Map.of());
var newChannel = properties.getChannel("other-server:8888");
assertThat(newChannel).usingRecursiveComparison().ignoringFields("address").isEqualTo(defaultChannel);
assertThat(newChannel).hasFieldOrPropertyWithValue("address", "static://new-channel");
assertThat(newChannel).hasFieldOrPropertyWithValue("address", "static://other-server:8888");
assertThat(properties).extracting("channels", InstanceOfAssertFactories.MAP).isEmpty();
}