Upgrade Kafka Clients to 3.1.0

Fix deprecations.

build.gradle

@@ -64,7 +64,7 @@ ext {
 	jaywayJsonPathVersion = '2.6.0'
 	junit4Version = '4.13.2'
 	junitJupiterVersion = '5.8.2'
-	kafkaVersion = '3.0.0'
+	kafkaVersion = '3.1.0'
 	log4jVersion = '2.17.1'
 	micrometerVersion = '2.0.0-M1'
 	mockitoVersion = '4.0.0'

spring-kafka/src/main/java/org/springframework/kafka/core/KafkaAdmin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 the original author or authors.
+ * Copyright 2017-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -209,7 +209,7 @@ public Map<String, TopicDescription> describeTopics(String... topicNames) {
 			Map<String, TopicDescription> results = new HashMap<>();
 			DescribeTopicsResult topics = admin.describeTopics(Arrays.asList(topicNames));
 			try {
-				results.putAll(topics.all().get(this.operationTimeout, TimeUnit.SECONDS));
+				results.putAll(topics.allTopicNames().get(this.operationTimeout, TimeUnit.SECONDS));
 				return results;
 			}
 			catch (InterruptedException ie) {
@@ -251,7 +251,7 @@ private Map<String, NewPartitions> checkPartitions(Map<String, NewTopic> topicNa
 			DescribeTopicsResult topicInfo, List<NewTopic> topicsToAdd) {
 
 		Map<String, NewPartitions> topicsToModify = new HashMap<>();
-		topicInfo.values().forEach((n, f) -> {
+		topicInfo.topicNameValues().forEach((n, f) -> {
 			NewTopic topic = topicNameToTopic.get(n);
 			try {
 				TopicDescription topicDescription = f.get(this.operationTimeout, TimeUnit.SECONDS);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 the original author or authors.
+ * Copyright 2016-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -449,7 +449,7 @@ protected void checkTopics() {
 								.toArray(String[]::new);
 					}
 					DescribeTopicsResult result = client.describeTopics(Arrays.asList(topics));
-					missing = result.values()
+					missing = result.topicNameValues()
 							.entrySet()
 							.stream()
 							.filter(entry -> {

spring-kafka/src/test/java/org/springframework/kafka/core/KafkaAdminTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 the original author or authors.
+ * Copyright 2017-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -131,7 +131,7 @@ public void testDefaultPartsAndReplicas() throws Exception {
 			await().until(() -> {
 				DescribeTopicsResult topics = adminClient.describeTopics(Arrays.asList("optBoth", "optPart", "optRepl"));
 				try {
-					results.putAll(topics.all().get(10, TimeUnit.SECONDS));
+					results.putAll(topics.allTopicNames().get(10, TimeUnit.SECONDS));
 					return true;
 				}
 				catch (InterruptedException ie) {