Added host & port brokers endpoint (backend) (provectus#1553)

* Added port to endpoint brokers - Issue:1521

* Added port to endpoint brokers - Issue:1521

* Fixed code style - Issue:1521

* Fixed checkStyle violations - Issue:1521

* Issue provectus#1521 added port to mapper

Co-authored-by: Roman Zabaluev <[email protected]>
Co-authored-by: Ilya Kuramshin <[email protected]>

Author: 3 people

kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java

@@ -93,7 +93,7 @@ private static <T extends ConsumerGroupDTO> T convertToConsumerGroup(
   }
 
   private static BrokerDTO mapCoordinator(Node node) {
-    return new BrokerDTO().host(node.host()).id(node.id());
+    return new BrokerDTO().host(node.host()).id(node.id()).port(node.port());
   }
 
   private static ConsumerGroupStateDTO mapConsumerGroupState(

kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java

@@ -78,6 +78,7 @@ public Flux<BrokerDTO> getBrokers(KafkaCluster cluster) {
               BrokerDTO broker = new BrokerDTO();
               broker.setId(node.id());
               broker.setHost(node.host());
+              broker.setPort(node.port());
               return broker;
             }).collect(Collectors.toList()))
         .flatMapMany(Flux::fromIterable);

kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/BrokerServiceTest.java

@@ -0,0 +1,59 @@
+package com.provectus.kafka.ui.service;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import com.provectus.kafka.ui.AbstractBaseTest;
+import com.provectus.kafka.ui.mapper.ClusterMapperImpl;
+import com.provectus.kafka.ui.mapper.DescribeLogDirsMapper;
+import com.provectus.kafka.ui.model.BrokerDTO;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import java.util.Properties;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.ContextConfiguration;
+import reactor.test.StepVerifier;
+
+@ContextConfiguration(initializers = {AbstractBaseTest.Initializer.class})
+class BrokerServiceTest extends AbstractBaseTest {
+  private final KafkaCluster kafkaCluster =
+      KafkaCluster.builder()
+          .name(LOCAL)
+          .bootstrapServers(kafka.getBootstrapServers())
+          .properties(new Properties())
+          .build();
+
+  private BrokerService brokerService;
+
+  @BeforeEach
+  void init() {
+    AdminClientServiceImpl adminClientService = new AdminClientServiceImpl();
+    adminClientService.setClientTimeout(5_000);
+    brokerService =
+        new BrokerService(new MetricsCache(), adminClientService, new DescribeLogDirsMapper(), new ClusterMapperImpl());
+  }
+
+  @Test
+  void getBrokersNominal() {
+    BrokerDTO brokerdto = new BrokerDTO();
+    brokerdto.setId(1);
+    brokerdto.setHost("localhost");
+    String port = kafka.getBootstrapServers().substring(kafka.getBootstrapServers().lastIndexOf(":") + 1);
+    brokerdto.setPort(Integer.parseInt(port));
+
+    StepVerifier.create(brokerService.getBrokers(kafkaCluster))
+        .expectNext(brokerdto)
+        .verifyComplete();
+  }
+
+  @Test
+  void getBrokersNull() {
+    assertThatThrownBy(() -> brokerService.getBrokers(null)).isInstanceOf(NullPointerException.class);
+  }
+
+  @Test
+  void getBrokersEmpty() {
+    assertThatThrownBy(() -> brokerService.getBrokers(KafkaCluster.builder().build())).isInstanceOf(
+        NullPointerException.class);
+  }
+
+}

kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml

@@ -1910,6 +1910,8 @@ components:
           type: integer
         host:
           type: string
+        port:
+          type: integer
       required:
         - id