From 4f27a39b68c1be44c6a1b9aa7a3d756d6ce26c62 Mon Sep 17 00:00:00 2001
From: iliax <ikuramshin@provectus.com>
Date: Mon, 24 Jul 2023 21:22:20 +0400
Subject: [PATCH] minor fixes

---
 .../kafka/ui/controller/GraphsController.java        | 12 +++++++-----
 .../kafka/ui/service/metrics/sink/MetricsSink.java   |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/GraphsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/GraphsController.java
index 8a0bf24635..b07a452190 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/GraphsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/GraphsController.java
@@ -64,12 +64,14 @@ public class GraphsController extends AbstractController implements GraphsApi {
   @Override
   public Mono<ResponseEntity<GraphDescriptionsDTO>> getGraphsList(String clusterName,
                                                                   ServerWebExchange exchange) {
+    var context = AccessContext.builder()
+        .cluster(clusterName)
+        .operationName("getGraphsList")
+        .build();
+
     var graphs = graphsService.getGraphs(getCluster(clusterName));
-    return Mono.just(
-        ResponseEntity.ok(
-            new GraphDescriptionsDTO().graphs(graphs.map(this::map).toList())
-        )
-    );
+    return accessControlService.validateAccess(context).then(
+        Mono.just(ResponseEntity.ok(new GraphDescriptionsDTO().graphs(graphs.map(this::map).toList()))));
   }
 
   private GraphDescriptionDTO map(GraphDescription graph) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/sink/MetricsSink.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/sink/MetricsSink.java
index 50bbfb245c..162ba138cc 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/sink/MetricsSink.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/sink/MetricsSink.java
@@ -42,7 +42,7 @@ public interface MetricsSink {
     return compoundSink(sinks);
   }
 
-  static MetricsSink compoundSink(List<MetricsSink> sinks) {
+  private static MetricsSink compoundSink(List<MetricsSink> sinks) {
     return metricsStream -> {
       var materialized = metricsStream.toList();
       return Flux.fromIterable(sinks)