From 58a9961a31d20b328480d9dd06aed17cd70f9cb5 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 6 Jun 2023 00:03:50 +0900 Subject: [PATCH] Name methods consistently in KafkaConnectionDetails See gh-35733 --- .../kafka/KafkaAutoConfiguration.java | 2 +- .../kafka/KafkaConnectionDetails.java | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java index 7f12d98ee1..9d73f58cd5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java @@ -204,7 +204,7 @@ public class KafkaAutoConfiguration { private void applyKafkaConnectionDetailsForAdmin(Map properties, KafkaConnectionDetails connectionDetails) { - properties.put(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, connectionDetails.getAdminBootstrapNodes()); + properties.put(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, connectionDetails.getAdminBootstrapServers()); if (!(connectionDetails instanceof PropertiesKafkaConnectionDetails)) { properties.put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, "PLAINTEXT"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaConnectionDetails.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaConnectionDetails.java index cbcb535467..5490e9852e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaConnectionDetails.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaConnectionDetails.java @@ -31,38 +31,38 @@ import org.springframework.boot.autoconfigure.service.connection.ConnectionDetai public interface KafkaConnectionDetails extends ConnectionDetails { /** - * Returns the list of bootstrap nodes. - * @return the list of bootstrap nodes + * Returns the list of bootstrap servers. + * @return the list of bootstrap servers */ List getBootstrapServers(); /** - * Returns the list of bootstrap nodes used for consumers. - * @return the list of bootstrap nodes used for consumers + * Returns the list of bootstrap servers used for consumers. + * @return the list of bootstrap servers used for consumers */ default List getConsumerBootstrapServers() { return getBootstrapServers(); } /** - * Returns the list of bootstrap nodes used for producers. - * @return the list of bootstrap nodes used for producers + * Returns the list of bootstrap servers used for producers. + * @return the list of bootstrap servers used for producers */ default List getProducerBootstrapServers() { return getBootstrapServers(); } /** - * Returns the list of bootstrap nodes used for the admin. - * @return the list of bootstrap nodes used for the admin + * Returns the list of bootstrap servers used for the admin. + * @return the list of bootstrap servers used for the admin */ - default List getAdminBootstrapNodes() { + default List getAdminBootstrapServers() { return getBootstrapServers(); } /** - * Returns the list of bootstrap nodes used for Kafka Streams. - * @return the list of bootstrap nodes used for Kafka Streams + * Returns the list of bootstrap servers used for Kafka Streams. + * @return the list of bootstrap servers used for Kafka Streams */ default List getStreamsBootstrapServers() { return getBootstrapServers();