From 43d3d9c415919c3ee68082fd926d0a90e2d9ffbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Zaj=C4=85czkowski?=
 <148013+szpak@users.noreply.github.com>
Date: Fri, 31 Mar 2023 17:38:41 +0200
Subject: [PATCH] Include also topic name is warnings and errors

Here the messages related to unexpected number of partitions.
Prior to that, it could be not trivial to be sure what topic is affected.

checkstyle fix
---
 .../provisioning/KafkaTopicProvisioner.java    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/src/main/java/org/springframework/cloud/stream/binder/kafka/provisioning/KafkaTopicProvisioner.java b/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/src/main/java/org/springframework/cloud/stream/binder/kafka/provisioning/KafkaTopicProvisioner.java
index e37b95eb7..94665173f 100644
--- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/src/main/java/org/springframework/cloud/stream/binder/kafka/provisioning/KafkaTopicProvisioner.java
+++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/src/main/java/org/springframework/cloud/stream/binder/kafka/provisioning/KafkaTopicProvisioner.java
@@ -424,19 +424,21 @@ public class KafkaTopicProvisioner implements
 					partitions.all().get(this.operationTimeout, TimeUnit.SECONDS);
 				}
 				else if (tolerateLowerPartitionsOnBroker) {
-					logger.warn("The number of expected partitions was: "
+					logger.warn("The number of expected partitions for topic "
+							+ topicName + " was: "
 							+ partitionCount + ", but " + partitionSize
 							+ (partitionSize > 1 ? " have " : " has ")
-							+ "been found instead." + "There will be "
+							+ "been found instead. " + "There will be "
 							+ (effectivePartitionCount - partitionSize)
 							+ " idle consumers");
 				}
 				else {
 					throw new ProvisioningException(
-							"The number of expected partitions was: " + partitionCount
+							"The number of expected partitions for topic " + topicName
+									+ " was: " + partitionCount
 									+ ", but " + partitionSize
 									+ (partitionSize > 1 ? " have " : " has ")
-									+ "been found instead."
+									+ "been found instead. "
 									+ "Consider either increasing the partition count of the topic or enabling "
 									+ "`autoAddPartitions`");
 				}
@@ -585,15 +587,17 @@ public class KafkaTopicProvisioner implements
 				int partitionSize = CollectionUtils.isEmpty(partitions) ? 0 : partitions.size();
 				if (partitionSize < partitionCount) {
 					if (tolerateLowerPartitionsOnBroker) {
-						logger.warn("The number of expected partitions was: "
+						logger.warn("The number of expected partitions for topic "
+								+ topicName + " was: "
 								+ partitionCount + ", but " + partitionSize
 								+ (partitionSize > 1 ? " have " : " has ")
-								+ "been found instead." + "There will be "
+								+ "been found instead. " + "There will be "
 								+ (partitionCount - partitionSize) + " idle consumers");
 					}
 					else {
 						throw new IllegalStateException(
-								"The number of expected partitions was: " + partitionCount
+								"The number of expected partitions for topic " + topicName
+									+ " was: " + partitionCount
 										+ ", but " + partitionSize
 										+ (partitionSize > 1 ? " have " : " has ")
 										+ "been found instead");