Restore build... methods that don't need an SSL bundle

Restore `buildConsumerProperties()` and `buildProducerProperties()`
methods in `KafkaProperties` to make it more convenient to use them
without an SSL bundle.

Fixes gh-43300

Author: philwebb

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

@@ -183,10 +183,7 @@ private Map<String, Object> buildCommonProperties(SslBundles sslBundles) {
 	 * default {@code kafkaConsumerFactory} bean.
 	 * @return the consumer properties initialized with the customizations defined on this
 	 * instance
-	 * @deprecated since 3.2.0 for removal in 3.4.0 in favor of
-	 * {@link #buildConsumerProperties(SslBundles)}}
 	 */
-	@Deprecated(since = "3.2.0", forRemoval = true)
 	public Map<String, Object> buildConsumerProperties() {
 		return buildConsumerProperties(null);
 	}
@@ -213,10 +210,7 @@ public Map<String, Object> buildConsumerProperties(SslBundles sslBundles) {
 	 * default {@code kafkaProducerFactory} bean.
 	 * @return the producer properties initialized with the customizations defined on this
 	 * instance
-	 * @deprecated since 3.2.0 for removal in 3.4.0 in favor of
-	 * {@link #buildProducerProperties(SslBundles)}}
 	 */
-	@Deprecated(since = "3.2.0", forRemoval = true)
 	public Map<String, Object> buildProducerProperties() {
 		return buildProducerProperties(null);
 	}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java

@@ -80,7 +80,7 @@ void sslPemConfiguration() {
 		properties.getSsl().setKeyStoreKey("-----BEGINkey");
 		properties.getSsl().setTrustStoreCertificates("-----BEGINtrust");
 		properties.getSsl().setKeyStoreCertificateChain("-----BEGINchain");
-		Map<String, Object> consumerProperties = properties.buildConsumerProperties(null);
+		Map<String, Object> consumerProperties = properties.buildConsumerProperties();
 		assertThat(consumerProperties).containsEntry(SslConfigs.SSL_KEYSTORE_KEY_CONFIG, "-----BEGINkey");
 		assertThat(consumerProperties).containsEntry(SslConfigs.SSL_TRUSTSTORE_CERTIFICATES_CONFIG, "-----BEGINtrust");
 		assertThat(consumerProperties).containsEntry(SslConfigs.SSL_KEYSTORE_CERTIFICATE_CHAIN_CONFIG,
@@ -103,7 +103,7 @@ void sslPropertiesWhenKeyStoreLocationAndKeySetShouldThrowException() {
 		properties.getSsl().setKeyStoreKey("-----BEGIN");
 		properties.getSsl().setKeyStoreLocation(new ClassPathResource("ksLoc"));
 		assertThatExceptionOfType(MutuallyExclusiveConfigurationPropertiesException.class)
-			.isThrownBy(() -> properties.buildConsumerProperties(null));
+			.isThrownBy(() -> properties.buildConsumerProperties());
 	}
 
 	@Test
@@ -112,7 +112,7 @@ void sslPropertiesWhenTrustStoreLocationAndCertificatesSetShouldThrowException()
 		properties.getSsl().setTrustStoreLocation(new ClassPathResource("tsLoc"));
 		properties.getSsl().setTrustStoreCertificates("-----BEGIN");
 		assertThatExceptionOfType(MutuallyExclusiveConfigurationPropertiesException.class)
-			.isThrownBy(() -> properties.buildConsumerProperties(null));
+			.isThrownBy(() -> properties.buildConsumerProperties());
 	}
 
 	@Test