refactor record in TopicNamesHolder (#4193)

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

Author: moonyoungCHAE

spring-kafka/src/main/java/org/springframework/kafka/config/KafkaListenerEndpointRegistrar.java

@@ -274,14 +274,6 @@ public void registerEndpoint(KafkaListenerEndpoint endpoint) {
 
 	private record KafkaListenerEndpointDescriptor(KafkaListenerEndpoint endpoint,
 				@Nullable KafkaListenerContainerFactory<?> containerFactory) {
-
-		private KafkaListenerEndpointDescriptor(KafkaListenerEndpoint endpoint,
-				@Nullable KafkaListenerContainerFactory<?> containerFactory) {
-
-			this.endpoint = endpoint;
-			this.containerFactory = containerFactory;
-		}
-
 	}
 
 }

spring-kafka/src/main/java/org/springframework/kafka/retrytopic/EndpointCustomizer.java

@@ -46,24 +46,6 @@ public interface EndpointCustomizer<T extends MethodKafkaListenerEndpoint<?, ?>>
 	 */
 	Collection<TopicNamesHolder> customizeEndpointAndCollectTopics(T listenerEndpoint);
 
-	class TopicNamesHolder {
-
-		private final String mainTopic;
-
-		private final @Nullable String customizedTopic;
-
-		TopicNamesHolder(String mainTopic, @Nullable String customizedTopic) {
-			this.mainTopic = mainTopic;
-			this.customizedTopic = customizedTopic;
-		}
-
-		String getMainTopic() {
-			return this.mainTopic;
-		}
-
-		@Nullable
-		String getCustomizedTopic() {
-			return this.customizedTopic;
-		}
+	record TopicNamesHolder(String mainTopic, @Nullable String customizedTopic) {
 	}
 }

spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicConfigurer.java

@@ -384,8 +384,8 @@ private void processAndRegisterEndpoint(MethodKafkaListenerEndpoint<?, ?> mainEn
 				.customizeEndpointAndCollectTopics(endpoint)
 				.forEach(topicNamesHolder ->
 						this.destinationTopicProcessor
-								.registerDestinationTopic(topicNamesHolder.getMainTopic(),
-										topicNamesHolder.getCustomizedTopic(),
+								.registerDestinationTopic(topicNamesHolder.mainTopic(),
+										topicNamesHolder.customizedTopic(),
 										destinationTopicProperties, context));
 
 		registrar.registerEndpoint(endpoint, resolvedFactory);

spring-kafka/src/test/java/org/springframework/kafka/retrytopic/EndpointCustomizerFactoryTests.java

@@ -170,11 +170,11 @@ void shouldCustomizeEndpointForRetryTopicWithTopic(EndpointHandlerMethod beanMet
 		String topic1WithSuffix = topics[0] + suffix;
 		String topic2WithSuffix = topics[1] + suffix;
 		assertThat(holders).hasSize(2).element(0)
-				.matches(holder -> holder.getMainTopic().equals(topics[0])
-						&& holder.getCustomizedTopic().equals(topic1WithSuffix));
+				.matches(holder -> holder.mainTopic().equals(topics[0])
+						&& holder.customizedTopic().equals(topic1WithSuffix));
 		assertThat(holders).hasSize(2).element(1)
-				.matches(holder -> holder.getMainTopic().equals(topics[1])
-						&& holder.getCustomizedTopic().equals(topic2WithSuffix));
+				.matches(holder -> holder.mainTopic().equals(topics[1])
+						&& holder.customizedTopic().equals(topic2WithSuffix));
 
 		String testStringSuffix = testString + suffix;
 		assertThat(endpoint.getTopics()).contains(topic1WithSuffix, topic2WithSuffix);
@@ -191,11 +191,11 @@ void shouldCustomizeEndpointForRetryTopicWithTopic(EndpointHandlerMethod beanMet
 				(List<EndpointCustomizer.TopicNamesHolder>) endpointCustomizer.customizeEndpointAndCollectTopics(endpointTPO);
 
 		assertThat(holdersTPO).hasSize(2).element(0)
-				.matches(holder -> holder.getMainTopic().equals(topics[0])
-						&& holder.getCustomizedTopic().equals(topic1WithSuffix));
+				.matches(holder -> holder.mainTopic().equals(topics[0])
+						&& holder.customizedTopic().equals(topic1WithSuffix));
 		assertThat(holdersTPO).hasSize(2).element(1)
-				.matches(holder -> holder.getMainTopic().equals(topics[1])
-						&& holder.getCustomizedTopic().equals(topic2WithSuffix));
+				.matches(holder -> holder.mainTopic().equals(topics[1])
+						&& holder.customizedTopic().equals(topic2WithSuffix));
 
 		assertThat(endpointTPO.getTopics()).isEmpty();
 		TopicPartitionOffset[] topicPartitionsToAssign = endpointTPO.getTopicPartitionsToAssign();
@@ -226,8 +226,8 @@ private MethodKafkaListenerEndpoint<Object, Object> getEndpoint(boolean isMulti,
 	}
 
 	private Predicate<EndpointCustomizer.TopicNamesHolder> assertMainTopic(int index) {
-		return holder -> holder.getCustomizedTopic().equals(topics[index])
-				&& holder.getMainTopic().equals(topics[index]);
+		return holder -> holder.customizedTopic().equals(topics[index])
+				&& holder.mainTopic().equals(topics[index]);
 	}
 
 	private boolean equalsTopicPartitionOffset(TopicPartitionOffset tpo1, TopicPartitionOffset tpo2) {