KafkaTestUtils consumer properties API unification

Author: mipo256

spring-kafka-test/src/main/java/org/springframework/kafka/test/utils/KafkaTestUtils.java

@@ -81,13 +81,28 @@ private KafkaTestUtils() {
 	 * @param autoCommit the auto commit.
 	 * @param embeddedKafka a {@link EmbeddedKafkaBroker} instance.
 	 * @return the properties.
+	 * @deprecated please, use {@link #consumerProps(EmbeddedKafkaBroker, String, boolean)} instead
 	 */
+	@Deprecated(forRemoval = true, since = "4.0.0")
 	public static Map<String, Object> consumerProps(String group, String autoCommit,
 			EmbeddedKafkaBroker embeddedKafka) {
 
 		return consumerProps(embeddedKafka.getBrokersAsString(), group, autoCommit);
 	}
 
+	/**
+	 * Set up test properties for an {@code <Integer, String>} consumer.
+	 * @param group the group id.
+	 * @param autoCommit the auto commit.
+	 * @param embeddedKafka a {@link EmbeddedKafkaBroker} instance.
+	 * @return the properties.
+	 */
+	public static Map<String, Object> consumerProps(EmbeddedKafkaBroker embeddedKafka, String group,
+			boolean autoCommit) {
+
+		return consumerProps(embeddedKafka.getBrokersAsString(), group, autoCommit);
+	}
+
 	/**
 	 * Set up test properties for an {@code <Integer, String>} consumer.
 	 * @param brokers the bootstrapServers property.
@@ -114,8 +129,21 @@ public static Map<String, Object> producerProps(EmbeddedKafkaBroker embeddedKafk
 	 * @param group the group id.
 	 * @param autoCommit the auto commit.
 	 * @return the properties.
-	 */
+	 * @deprecated Please, use {@link #consumerProps(String, String, boolean)} instead.
+ 	 */
+	@Deprecated(forRemoval = true, since = "4.0.0")
 	public static Map<String, Object> consumerProps(String brokers, String group, String autoCommit) {
+		return consumerProps(brokers, group, Boolean.parseBoolean(autoCommit));
+	}
+
+	/**
+	 * Set up test properties for an {@code <Integer, String>} consumer.
+	 * @param brokers the bootstrapServers property.
+	 * @param group the group id.
+	 * @param autoCommit the auto commit.
+	 * @return the properties.
+	 */
+	public static Map<String, Object> consumerProps(String brokers, String group, boolean autoCommit) {
 		Map<String, Object> props = new HashMap<>();
 		props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, brokers);
 		props.put(ConsumerConfig.GROUP_ID_CONFIG, group);