[kafka] branch trunk updated: HOTFIX: Fix compile error in TopicAdminTest (#8866)

[kk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kkarantasis pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 88fe466  HOTFIX: Fix compile error in TopicAdminTest (#8866)
88fe466 is described below

commit 88fe466f03ff61d684c5b7b1f20558181a8f2078
Author: Chia-Ping Tsai <ch...@gmail.com>
AuthorDate: Sat Jun 13 16:00:39 2020 +0800

    HOTFIX: Fix compile error in TopicAdminTest (#8866)
    
    Commit 9a4f00f78bf37041006ae8b6432d194f603ac6cc changed the constructor of DescribeConfigsResponse.
    
    The build failed with the following error:
    ```
    /home/chia7712/kafka/connect/runtime/src/test/java/org/apache/kafka/connect/util/TopicAdminTest.java:582: error: incompatible types: int cannot be converted to Struct
            return new DescribeConfigsResponse(1000, configs);
                                               ^
    Note: Some messages have been simplified; recompile with -Xdiags:verbose to get full output
    1 error
    ```
    
    Reviewers: Boyang Chan <bo...@confluent.io>, Tom Bentley <tb...@redhat.com>, Konstantine Karantasis <ko...@confluent.io>
---
 .../apache/kafka/connect/util/TopicAdminTest.java  | 33 ++++++++++++----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/util/TopicAdminTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/util/TopicAdminTest.java
index b655664..dd3062e 100644
--- a/connect/runtime/src/test/java/org/apache/kafka/connect/util/TopicAdminTest.java
+++ b/connect/runtime/src/test/java/org/apache/kafka/connect/util/TopicAdminTest.java
@@ -36,6 +36,7 @@ import org.apache.kafka.common.errors.TopicAuthorizationException;
 import org.apache.kafka.common.errors.UnsupportedVersionException;
 import org.apache.kafka.common.message.CreateTopicsResponseData;
 import org.apache.kafka.common.message.CreateTopicsResponseData.CreatableTopicResult;
+import org.apache.kafka.common.message.DescribeConfigsResponseData;
 import org.apache.kafka.common.message.MetadataResponseData;
 import org.apache.kafka.common.protocol.Errors;
 import org.apache.kafka.common.requests.ApiError;
@@ -46,13 +47,14 @@ import org.apache.kafka.common.utils.MockTime;
 import org.apache.kafka.connect.errors.ConnectException;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.apache.kafka.common.message.MetadataResponseData.MetadataResponseTopic;
 import static org.junit.Assert.assertEquals;
@@ -567,19 +569,20 @@ public class TopicAdminTest {
     }
 
     private DescribeConfigsResponse describeConfigsResponse(ApiError error, NewTopic... topics) {
-        if (error == null) error = new ApiError(Errors.NONE, "");
-        Map<ConfigResource, DescribeConfigsResponse.Config> configs = new HashMap<>();
-        for (NewTopic topic : topics) {
-            ConfigResource resource = new ConfigResource(ConfigResource.Type.TOPIC, topic.name());
-            DescribeConfigsResponse.ConfigSource source = DescribeConfigsResponse.ConfigSource.TOPIC_CONFIG;
-            Collection<DescribeConfigsResponse.ConfigEntry> entries = new ArrayList<>();
-            topic.configs().forEach((k, v) -> new DescribeConfigsResponse.ConfigEntry(
-                    k, v, source, false, false, Collections.emptySet()
-            ));
-            DescribeConfigsResponse.Config config = new DescribeConfigsResponse.Config(error, entries);
-            configs.put(resource, config);
-        }
-        return new DescribeConfigsResponse(1000, configs);
+        List<DescribeConfigsResponseData.DescribeConfigsResult> results = Stream.of(topics)
+                .map(topic -> new DescribeConfigsResponseData.DescribeConfigsResult()
+                        .setErrorCode(error.error().code())
+                        .setErrorMessage(error.message())
+                        .setResourceType(ConfigResource.Type.TOPIC.id())
+                        .setResourceName(topic.name())
+                        .setConfigs(topic.configs().entrySet()
+                                .stream()
+                                .map(e -> new DescribeConfigsResponseData.DescribeConfigsResourceResult()
+                                        .setName(e.getKey())
+                                        .setValue(e.getValue()))
+                                .collect(Collectors.toList())))
+                .collect(Collectors.toList());
+        return new DescribeConfigsResponse(new DescribeConfigsResponseData().setThrottleTimeMs(1000).setResults(results));
     }
 
 }