Make isEnabled anemic (move logic to determineEnabled)

Signed-off-by: onobc <chris.bono@gmail.com>

Author: onobc

module/spring-boot-grpc-client/src/main/java/org/springframework/boot/grpc/client/autoconfigure/GrpcClientProperties.java

@@ -418,15 +418,18 @@ public static class Ssl {
 			 */
 			private @Nullable String bundle;
 
-			// TODO bono
-			public boolean isEnabled() {
-				return (this.enabled != null) ? this.enabled : this.bundle != null;
+			public @Nullable Boolean isEnabled() {
+				return this.enabled;
 			}
 
-			public void setEnabled(boolean enabled) {
+			public void setEnabled(@Nullable Boolean enabled) {
 				this.enabled = enabled;
 			}
 
+			public boolean determineEnabled() {
+				return (this.enabled != null) ? this.enabled : this.bundle != null;
+			}
+
 			public @Nullable String getBundle() {
 				return this.bundle;
 			}

module/spring-boot-grpc-client/src/main/java/org/springframework/boot/grpc/client/autoconfigure/NamedChannelCredentialsProvider.java

@@ -50,10 +50,11 @@ public NamedChannelCredentialsProvider(SslBundles bundles, GrpcClientProperties
 	@Override
 	public ChannelCredentials getChannelCredentials(String path) {
 		ChannelConfig channel = this.properties.getChannel(path);
-		if (!channel.getSsl().isEnabled() && channel.getNegotiationType() == NegotiationType.PLAINTEXT) {
+		boolean sslEnabled = channel.getSsl().determineEnabled();
+		if (!sslEnabled && channel.getNegotiationType() == NegotiationType.PLAINTEXT) {
 			return InsecureChannelCredentials.create();
 		}
-		if (channel.getSsl().isEnabled()) {
+		if (sslEnabled) {
 			String bundleName = channel.getSsl().getBundle();
 			Assert.notNull(bundleName, "Bundle name must not be null when SSL is enabled");
 			SslBundle bundle = this.bundles.getBundle(bundleName);

module/spring-boot-grpc-client/src/test/java/org/springframework/boot/grpc/client/autoconfigure/GrpcClientPropertiesTests.java

@@ -92,7 +92,8 @@ private void withDefaultValues(String channelName,
 			assertThat(channel.getMaxInboundMetadataSize()).isEqualTo(DataSize.ofBytes(8192));
 			assertThat(channel.getUserAgent()).isNull();
 			assertThat(channel.isSecure()).isTrue();
-			assertThat(channel.getSsl().isEnabled()).isFalse();
+			assertThat(channel.getSsl().isEnabled()).isNull();
+			assertThat(channel.getSsl().determineEnabled()).isFalse();
 			assertThat(channel.getSsl().getBundle()).isNull();
 		}
 
@@ -144,6 +145,7 @@ private void withSpecifiedValues(String channelName,
 			assertThat(channel.getUserAgent()).isEqualTo("me");
 			assertThat(channel.isSecure()).isFalse();
 			assertThat(channel.getSsl().isEnabled()).isTrue();
+			assertThat(channel.getSsl().determineEnabled()).isTrue();
 			assertThat(channel.getSsl().getBundle()).isEqualTo("my-bundle");
 		}
 
@@ -182,6 +184,16 @@ void withServiceConfig() {
 			assertThat(channel.getServiceConfig().get("something")).isInstanceOf(Map.class);
 		}
 
+		@Test
+		void whenBundleNameSetThenDetermineEnabledReturnsTrue() {
+			Map<String, String> map = new HashMap<>();
+			map.put("spring.grpc.client.default-channel.ssl.bundle", "my-bundle");
+			GrpcClientProperties properties = bindProperties(map);
+			var channel = properties.getDefaultChannel();
+			assertThat(channel.getSsl().isEnabled()).isNull();
+			assertThat(channel.getSsl().determineEnabled()).isTrue();
+		}
+
 	}
 
 	@Nested