Addressing PR review

Signed-off-by: Soby Chacko <[email protected]>

Author: sobychacko

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

@@ -31,13 +31,11 @@
 import org.springframework.expression.BeanResolver;
 import org.springframework.kafka.listener.KafkaListenerErrorHandler;
 import org.springframework.kafka.listener.MessageListenerContainer;
-import org.springframework.kafka.listener.ShareKafkaMessageListenerContainer;
 import org.springframework.kafka.listener.adapter.BatchMessagingMessageListenerAdapter;
 import org.springframework.kafka.listener.adapter.BatchToRecordAdapter;
 import org.springframework.kafka.listener.adapter.HandlerAdapter;
 import org.springframework.kafka.listener.adapter.MessagingMessageListenerAdapter;
 import org.springframework.kafka.listener.adapter.RecordMessagingMessageListenerAdapter;
-import org.springframework.kafka.listener.adapter.ShareRecordMessagingMessageListenerAdapter;
 import org.springframework.kafka.support.JavaUtils;
 import org.springframework.kafka.support.converter.BatchMessageConverter;
 import org.springframework.kafka.support.converter.MessageConverter;
@@ -179,12 +177,7 @@ protected MessagingMessageListenerAdapter<K, V> createMessageListener(MessageLis
 				"Could not create message listener - MessageHandlerMethodFactory not set");
 
 		final MessagingMessageListenerAdapter<K, V> messageListener;
-		if (container instanceof ShareKafkaMessageListenerContainer<?, ?>) {
-			messageListener = createShareMessageListenerInstance(messageConverter);
-		}
-		else {
-			messageListener = createMessageListenerInstance(messageConverter);
-		}
+		messageListener = createMessageListenerInstance(messageConverter);
 		messageListener.setHandlerMethod(configureListenerAdapter(messageListener));
 		JavaUtils.INSTANCE
 			.acceptIfNotNull(getReplyTopic(), replyTopic -> {
@@ -210,31 +203,6 @@ protected HandlerAdapter configureListenerAdapter(MessagingMessageListenerAdapte
 		return new HandlerAdapter(invocableHandlerMethod);
 	}
 
-	/**
-	 * Create an empty {@link MessagingMessageListenerAdapter} instance.
-	 * @param messageConverter the converter (may be null).
-	 * @return the {@link MessagingMessageListenerAdapter} instance.
-	 */
-	protected MessagingMessageListenerAdapter<K, V> createShareMessageListenerInstance(
-			@Nullable MessageConverter messageConverter) {
-
-		MessagingMessageListenerAdapter<K, V> listener;
-		ShareRecordMessagingMessageListenerAdapter<K, V> messageListener = new ShareRecordMessagingMessageListenerAdapter<>(
-				this.bean, this.method, this.errorHandler);
-		if (messageConverter instanceof RecordMessageConverter recordMessageConverter) {
-			messageListener.setMessageConverter(recordMessageConverter);
-		}
-		listener = messageListener;
-		if (this.messagingConverter != null) {
-			listener.setMessagingConverter(this.messagingConverter);
-		}
-		BeanResolver resolver = getBeanResolver();
-		if (resolver != null) {
-			listener.setBeanResolver(resolver);
-		}
-		return listener;
-	}
-
 	protected MessagingMessageListenerAdapter<K, V> createMessageListenerInstance(
 			@Nullable MessageConverter messageConverter) {