Remove SslBundles from KafkaProperties

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

Author: Torres-09

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java

@@ -170,7 +170,7 @@ public KafkaJaasLoginModuleInitializer kafkaJaasInitializer() throws IOException
 	@Bean
 	@ConditionalOnMissingBean
 	KafkaAdmin kafkaAdmin(KafkaConnectionDetails connectionDetails) {
-		Map<String, Object> properties = this.properties.buildAdminProperties(null);
+		Map<String, Object> properties = this.properties.buildAdminProperties();
 		applyKafkaConnectionDetailsForAdmin(properties, connectionDetails);
 		KafkaAdmin kafkaAdmin = new KafkaAdmin(properties);
 		KafkaProperties.Admin admin = this.properties.getAdmin();

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java

@@ -38,7 +38,6 @@
 import org.springframework.boot.context.properties.PropertyMapper;
 import org.springframework.boot.context.properties.source.MutuallyExclusiveConfigurationPropertiesException;
 import org.springframework.boot.convert.DurationUnit;
-import org.springframework.boot.ssl.SslBundles;
 import org.springframework.core.io.Resource;
 import org.springframework.kafka.listener.ContainerProperties.AckMode;
 import org.springframework.kafka.security.jaas.KafkaJaasLoginModuleInitializer;
@@ -162,15 +161,15 @@ public Retry getRetry() {
 		return this.retry;
 	}
 
-	private Map<String, Object> buildCommonProperties(SslBundles sslBundles) {
+	private Map<String, Object> buildCommonProperties() {
 		Map<String, Object> properties = new HashMap<>();
 		if (this.bootstrapServers != null) {
 			properties.put(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, this.bootstrapServers);
 		}
 		if (this.clientId != null) {
 			properties.put(CommonClientConfigs.CLIENT_ID_CONFIG, this.clientId);
 		}
-		properties.putAll(this.ssl.buildProperties(sslBundles));
+		properties.putAll(this.ssl.buildProperties());
 		properties.putAll(this.security.buildProperties());
 		if (!CollectionUtils.isEmpty(this.properties)) {
 			properties.putAll(this.properties);
@@ -187,8 +186,8 @@ private Map<String, Object> buildCommonProperties(SslBundles sslBundles) {
 	 * instance
 	 */
 	public Map<String, Object> buildConsumerProperties() {
-		Map<String, Object> properties = buildCommonProperties(null);
-		properties.putAll(this.consumer.buildProperties(null));
+		Map<String, Object> properties = buildCommonProperties();
+		properties.putAll(this.consumer.buildProperties());
 		return properties;
 	}
 
@@ -201,21 +200,8 @@ public Map<String, Object> buildConsumerProperties() {
 	 * instance
 	 */
 	public Map<String, Object> buildProducerProperties() {
-		return buildProducerProperties(null);
-	}
-
-	/**
-	 * Create an initial map of producer properties from the state of this instance.
-	 * <p>
-	 * This allows you to add additional properties, if necessary, and override the
-	 * default {@code kafkaProducerFactory} bean.
-	 * @param sslBundles bundles providing SSL trust material
-	 * @return the producer properties initialized with the customizations defined on this
-	 * instance
-	 */
-	public Map<String, Object> buildProducerProperties(SslBundles sslBundles) {
-		Map<String, Object> properties = buildCommonProperties(sslBundles);
-		properties.putAll(this.producer.buildProperties(sslBundles));
+		Map<String, Object> properties = buildCommonProperties();
+		properties.putAll(this.producer.buildProperties());
 		return properties;
 	}
 
@@ -224,27 +210,25 @@ public Map<String, Object> buildProducerProperties(SslBundles sslBundles) {
 	 * <p>
 	 * This allows you to add additional properties, if necessary, and override the
 	 * default {@code kafkaAdmin} bean.
-	 * @param sslBundles bundles providing SSL trust material
 	 * @return the admin properties initialized with the customizations defined on this
 	 * instance
 	 */
-	public Map<String, Object> buildAdminProperties(SslBundles sslBundles) {
-		Map<String, Object> properties = buildCommonProperties(sslBundles);
-		properties.putAll(this.admin.buildProperties(sslBundles));
+	public Map<String, Object> buildAdminProperties() {
+		Map<String, Object> properties = buildCommonProperties();
+		properties.putAll(this.admin.buildProperties());
 		return properties;
 	}
 
 	/**
 	 * Create an initial map of streams properties from the state of this instance.
 	 * <p>
 	 * This allows you to add additional properties, if necessary.
-	 * @param sslBundles bundles providing SSL trust material
 	 * @return the streams properties initialized with the customizations defined on this
 	 * instance
 	 */
-	public Map<String, Object> buildStreamsProperties(SslBundles sslBundles) {
-		Map<String, Object> properties = buildCommonProperties(sslBundles);
-		properties.putAll(this.streams.buildProperties(sslBundles));
+	public Map<String, Object> buildStreamsProperties() {
+		Map<String, Object> properties = buildCommonProperties();
+		properties.putAll(this.streams.buildProperties());
 		return properties;
 	}
 
@@ -460,7 +444,7 @@ public Map<String, String> getProperties() {
 			return this.properties;
 		}
 
-		public Map<String, Object> buildProperties(SslBundles sslBundles) {
+		public Map<String, Object> buildProperties() {
 			Properties properties = new Properties();
 			PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 			map.from(this::getAutoCommitInterval)
@@ -488,7 +472,7 @@ public Map<String, Object> buildProperties(SslBundles sslBundles) {
 			map.from(this::getMaxPollInterval)
 				.asInt(Duration::toMillis)
 				.to(properties.in(ConsumerConfig.MAX_POLL_INTERVAL_MS_CONFIG));
-			return properties.with(this.ssl, this.security, this.properties, sslBundles);
+			return properties.with(this.ssl, this.security, this.properties);
 		}
 
 	}
@@ -650,7 +634,7 @@ public Map<String, String> getProperties() {
 			return this.properties;
 		}
 
-		public Map<String, Object> buildProperties(SslBundles sslBundles) {
+		public Map<String, Object> buildProperties() {
 			Properties properties = new Properties();
 			PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 			map.from(this::getAcks).to(properties.in(ProducerConfig.ACKS_CONFIG));
@@ -664,7 +648,7 @@ public Map<String, Object> buildProperties(SslBundles sslBundles) {
 			map.from(this::getKeySerializer).to(properties.in(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG));
 			map.from(this::getRetries).to(properties.in(ProducerConfig.RETRIES_CONFIG));
 			map.from(this::getValueSerializer).to(properties.in(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG));
-			return properties.with(this.ssl, this.security, this.properties, sslBundles);
+			return properties.with(this.ssl, this.security, this.properties);
 		}
 
 	}
@@ -771,11 +755,11 @@ public Map<String, String> getProperties() {
 			return this.properties;
 		}
 
-		public Map<String, Object> buildProperties(SslBundles sslBundles) {
+		public Map<String, Object> buildProperties() {
 			Properties properties = new Properties();
 			PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 			map.from(this::getClientId).to(properties.in(ProducerConfig.CLIENT_ID_CONFIG));
-			return properties.with(this.ssl, this.security, this.properties, sslBundles);
+			return properties.with(this.ssl, this.security, this.properties);
 		}
 
 	}
@@ -905,7 +889,7 @@ public Map<String, String> getProperties() {
 			return this.properties;
 		}
 
-		public Map<String, Object> buildProperties(SslBundles sslBundles) {
+		public Map<String, Object> buildProperties() {
 			Properties properties = new Properties();
 			PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 			map.from(this::getApplicationId).to(properties.in("application.id"));
@@ -916,7 +900,7 @@ public Map<String, Object> buildProperties(SslBundles sslBundles) {
 			map.from(this::getClientId).to(properties.in(CommonClientConfigs.CLIENT_ID_CONFIG));
 			map.from(this::getReplicationFactor).to(properties.in("replication.factor"));
 			map.from(this::getStateDir).to(properties.in("state.dir"));
-			return properties.with(this.ssl, this.security, this.properties, sslBundles);
+			return properties.with(this.ssl, this.security, this.properties);
 		}
 
 	}
@@ -1410,12 +1394,7 @@ public void setProtocol(String protocol) {
 			this.protocol = protocol;
 		}
 
-		@Deprecated(since = "3.2.0", forRemoval = true)
 		public Map<String, Object> buildProperties() {
-			return buildProperties(null);
-		}
-
-		public Map<String, Object> buildProperties(SslBundles sslBundles) {
 			validate();
 			String bundleName = getBundle();
 			Properties properties = new Properties();
@@ -1781,8 +1760,8 @@ <V> java.util.function.Consumer<V> in(String key) {
 			return (value) -> put(key, value);
 		}
 
-		Properties with(Ssl ssl, Security security, Map<String, String> properties, SslBundles sslBundles) {
-			putAll(ssl.buildProperties(sslBundles));
+		Properties with(Ssl ssl, Security security, Map<String, String> properties) {
+			putAll(ssl.buildProperties());
 			putAll(security.buildProperties());
 			putAll(properties);
 			return this;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaStreamsAnnotationDrivenConfiguration.java

@@ -62,7 +62,7 @@ class KafkaStreamsAnnotationDrivenConfiguration {
 	@Bean(KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME)
 	KafkaStreamsConfiguration defaultKafkaStreamsConfig(Environment environment,
 			KafkaConnectionDetails connectionDetails) {
-		Map<String, Object> properties = this.properties.buildStreamsProperties(null);
+		Map<String, Object> properties = this.properties.buildStreamsProperties();
 		applyKafkaConnectionDetailsForStreams(properties, connectionDetails);
 		if (this.properties.getStreams().getApplicationId() == null) {
 			String applicationName = environment.getProperty("spring.application.name");