Add Newlines When Logging Container Config

- add missing properties

Author: garyrussell

spring-kafka/src/main/java/org/springframework/kafka/listener/ConsumerProperties.java

@@ -439,24 +439,26 @@ public String toString() {
 
 	protected final String renderProperties() {
 		return renderTopics()
-				+ ", pollTimeout=" + this.pollTimeout
-				+ (this.groupId != null ? ", groupId=" + this.groupId : "")
-				+ (StringUtils.hasText(this.clientId) ? ", clientId=" + this.clientId : "")
+				+ "\n pollTimeout=" + this.pollTimeout
+				+ (this.groupId != null ? "\n groupId=" + this.groupId : "")
+				+ (StringUtils.hasText(this.clientId) ? "\n clientId=" + this.clientId : "")
 				+ (this.consumerRebalanceListener != null
-						? ", consumerRebalanceListener=" + this.consumerRebalanceListener
+						? "\n consumerRebalanceListener=" + this.consumerRebalanceListener
 						: "")
-				+ (this.commitCallback != null ? ", commitCallback=" + this.commitCallback : "")
-				+ ", syncCommits=" + this.syncCommits
-				+ (this.syncCommitTimeout != null ? ", syncCommitTimeout=" + this.syncCommitTimeout : "")
-				+ (this.kafkaConsumerProperties.size() > 0 ? ", properties=" + this.kafkaConsumerProperties : ""
-				+ ", authorizationExceptionRetryInterval=" + this.authorizationExceptionRetryInterval);
+				+ (this.commitCallback != null ? "\n commitCallback=" + this.commitCallback : "")
+				+ "\n syncCommits=" + this.syncCommits
+				+ (this.syncCommitTimeout != null ? "\n syncCommitTimeout=" + this.syncCommitTimeout : "")
+				+ (this.kafkaConsumerProperties.size() > 0 ? "\n properties=" + this.kafkaConsumerProperties : "")
+				+ "\n authorizationExceptionRetryInterval=" + this.authorizationExceptionRetryInterval
+				+ "\n commitRetries=" + this.commitRetries
+				+ "\n fixTxOffsets" + this.fixTxOffsets;
 	}
 
 	private String renderTopics() {
-		return (this.topics != null ? "topics=" + Arrays.toString(this.topics) : "")
-				+ (this.topicPattern != null ? ", topicPattern=" + this.topicPattern : "")
+		return (this.topics != null ? "\n topics=" + Arrays.toString(this.topics) : "")
+				+ (this.topicPattern != null ? "\n topicPattern=" + this.topicPattern : "")
 				+ (this.topicPartitions != null
-						? ", topicPartitions=" + Arrays.toString(this.topicPartitions)
+						? "\n topicPartitions=" + Arrays.toString(this.topicPartitions)
 						: "");
 	}
 

spring-kafka/src/main/java/org/springframework/kafka/listener/ContainerProperties.java

@@ -874,29 +874,33 @@ private void adviseListenerIfNeeded() {
 	public String toString() {
 		return "ContainerProperties ["
 				+ renderProperties()
-				+ ", ackMode=" + this.ackMode
-				+ ", ackCount=" + this.ackCount
-				+ ", ackTime=" + this.ackTime
-				+ ", messageListener=" + this.messageListener
+				+ "\n ackMode=" + this.ackMode
+				+ "\n ackCount=" + this.ackCount
+				+ "\n ackTime=" + this.ackTime
+				+ "\n messageListener=" + this.messageListener
 				+ (this.consumerTaskExecutor != null
-						? ", consumerTaskExecutor=" + this.consumerTaskExecutor
+						? "\n consumerTaskExecutor=" + this.consumerTaskExecutor
 						: "")
-				+ ", shutdownTimeout=" + this.shutdownTimeout
-				+ ", idleEventInterval="
+				+ "\n shutdownTimeout=" + this.shutdownTimeout
+				+ "\n idleEventInterval="
 				+ (this.idleEventInterval == null ? "not enabled" : this.idleEventInterval)
-				+ ", idlePartitionEventInterval="
+				+ "\n idlePartitionEventInterval="
 				+ (this.idlePartitionEventInterval == null ? "not enabled" : this.idlePartitionEventInterval)
 				+ (this.transactionManager != null
-						? ", transactionManager=" + this.transactionManager
+						? "\n transactionManager=" + this.transactionManager
 						: "")
-				+ ", monitorInterval=" + this.monitorInterval
-				+ (this.scheduler != null ? ", scheduler=" + this.scheduler : "")
-				+ ", noPollThreshold=" + this.noPollThreshold
-				+ ", subBatchPerPartition=" + this.subBatchPerPartition
-				+ ", assignmentCommitOption=" + this.assignmentCommitOption
-				+ ", deliveryAttemptHeader=" + this.deliveryAttemptHeader
-				+ ", eosMode=" + this.eosMode
-				+ "]";
+				+ "\n monitorInterval=" + this.monitorInterval
+				+ (this.scheduler != null ? "\n scheduler=" + this.scheduler : "")
+				+ "\n noPollThreshold=" + this.noPollThreshold
+				+ "\n subBatchPerPartition=" + this.subBatchPerPartition
+				+ "\n assignmentCommitOption=" + this.assignmentCommitOption
+				+ "\n deliveryAttemptHeader=" + this.deliveryAttemptHeader
+				+ "\n eosMode=" + this.eosMode
+				+ "\n transactionDefinition=" + this.transactionDefinition
+				+ "\n stopContainerWhenFenced=" + this.stopContainerWhenFenced
+				+ "\n stopImmediate=" + this.stopImmediate
+				+ "\n asyncAcks=" + this.asyncAcks
+				+ "\n]";
 	}
 
 }

spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java

@@ -771,7 +771,7 @@ else if (listener instanceof MessageListener) {
 			this.monitorTask = this.taskScheduler.scheduleAtFixedRate(this::checkConsumer, // NOSONAR
 					Duration.ofSeconds(this.containerProperties.getMonitorInterval()));
 			if (this.containerProperties.isLogContainerConfig()) {
-				this.logger.info(this.toString());
+				this.logger.info(toString());
 			}
 			Map<String, Object> props = KafkaMessageListenerContainer.this.consumerFactory.getConfigurationProperties();
 			this.checkNullKeyForExceptions = checkDeserializer(findDeserializerClass(props, consumerProperties, false));
@@ -2922,14 +2922,15 @@ public void seekToTimestamp(Collection<TopicPartition> topicParts, long timestam
 		@Override
 		public String toString() {
 			return "KafkaMessageListenerContainer.ListenerConsumer ["
-					+ "containerProperties=" + this.containerProperties
-					+ ", listenerType=" + this.listenerType
-					+ ", isConsumerAwareListener=" + this.isConsumerAwareListener
-					+ ", isBatchListener=" + this.isBatchListener
-					+ ", autoCommit=" + this.autoCommit
-					+ ", consumerGroupId=" + this.consumerGroupId
-					+ ", clientIdSuffix=" + KafkaMessageListenerContainer.this.clientIdSuffix
-					+ "]";
+					+ "\ncontainerProperties=" + this.containerProperties
+					+ "\nother properties ["
+					+ "\n listenerType=" + this.listenerType
+					+ "\n isConsumerAwareListener=" + this.isConsumerAwareListener
+					+ "\n isBatchListener=" + this.isBatchListener
+					+ "\n autoCommit=" + this.autoCommit
+					+ "\n consumerGroupId=" + this.consumerGroupId
+					+ "\n clientIdSuffix=" + KafkaMessageListenerContainer.this.clientIdSuffix
+					+ "\n]";
 		}
 
 		private void closeProducers(@Nullable Collection<TopicPartition> partitions) {