diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java index aca317eb94..e0e3af37d8 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.provectus.kafka.ui.exception.UnprocessableEntityException; import com.provectus.kafka.ui.model.KsqlCommandResponse; -import com.provectus.kafka.ui.strategy.ksqlStatement.KsqlStatementStrategy; +import com.provectus.kafka.ui.strategy.ksql.statement.KsqlStatementStrategy; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.log4j.Log4j2; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java index ef174a1de7..0a02de3b9a 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java @@ -2,7 +2,6 @@ package com.provectus.kafka.ui.controller; import com.provectus.kafka.ui.api.KsqlApi; import com.provectus.kafka.ui.model.KsqlCommand; - import com.provectus.kafka.ui.model.KsqlCommandResponse; import com.provectus.kafka.ui.service.KsqlService; import lombok.RequiredArgsConstructor; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KsqlService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KsqlService.java index 93eab520c0..39c0e7f3d6 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KsqlService.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KsqlService.java @@ -7,13 +7,12 @@ import com.provectus.kafka.ui.exception.UnprocessableEntityException; import com.provectus.kafka.ui.model.KafkaCluster; import com.provectus.kafka.ui.model.KsqlCommand; import com.provectus.kafka.ui.model.KsqlCommandResponse; -import com.provectus.kafka.ui.strategy.ksqlStatement.KsqlStatementStrategy; +import com.provectus.kafka.ui.strategy.ksql.statement.KsqlStatementStrategy; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import reactor.core.publisher.Mono; -import java.util.List; - @Service @RequiredArgsConstructor public class KsqlService { diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/CreateStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/CreateStrategy.java similarity index 92% rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/CreateStrategy.java rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/CreateStrategy.java index 9349fe92df..9ce7d5db6d 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/CreateStrategy.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/CreateStrategy.java @@ -1,4 +1,4 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; import com.fasterxml.jackson.databind.JsonNode; import com.provectus.kafka.ui.model.KsqlCommandResponse; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/DescribeStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/DescribeStrategy.java similarity index 92% rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/DescribeStrategy.java rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/DescribeStrategy.java index d03a33f4ce..b36bb06f44 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/DescribeStrategy.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/DescribeStrategy.java @@ -1,4 +1,4 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; import com.fasterxml.jackson.databind.JsonNode; import com.provectus.kafka.ui.model.KsqlCommandResponse; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/DropStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/DropStrategy.java similarity index 92% rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/DropStrategy.java rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/DropStrategy.java index e9821fa873..c1d11347a8 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/DropStrategy.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/DropStrategy.java @@ -1,4 +1,4 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; import com.fasterxml.jackson.databind.JsonNode; import com.provectus.kafka.ui.model.KsqlCommandResponse; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/ExplainStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ExplainStrategy.java similarity index 92% rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/ExplainStrategy.java rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ExplainStrategy.java index d58ea6f3be..54524398dd 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/ExplainStrategy.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ExplainStrategy.java @@ -1,4 +1,4 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; import com.fasterxml.jackson.databind.JsonNode; import com.provectus.kafka.ui.model.KsqlCommandResponse; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/KsqlStatementStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/KsqlStatementStrategy.java similarity index 96% rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/KsqlStatementStrategy.java rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/KsqlStatementStrategy.java index e9ca6c5788..c32d104425 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/KsqlStatementStrategy.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/KsqlStatementStrategy.java @@ -1,12 +1,15 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; import com.fasterxml.jackson.databind.JsonNode; import com.provectus.kafka.ui.exception.UnprocessableEntityException; import com.provectus.kafka.ui.model.KsqlCommand; import com.provectus.kafka.ui.model.KsqlCommandResponse; import com.provectus.kafka.ui.model.Table; - -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Spliterator; +import java.util.Spliterators; import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/ListStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ListStrategy.java similarity index 95% rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/ListStrategy.java rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ListStrategy.java index c89d92bcae..c443f181bd 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/ListStrategy.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ListStrategy.java @@ -1,11 +1,10 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; import com.fasterxml.jackson.databind.JsonNode; import com.provectus.kafka.ui.model.KsqlCommandResponse; -import org.springframework.stereotype.Component; - import java.util.List; import java.util.Optional; +import org.springframework.stereotype.Component; @Component public class ListStrategy extends KsqlStatementStrategy { diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/SelectStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/SelectStrategy.java similarity index 91% rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/SelectStrategy.java rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/SelectStrategy.java index c90cdc847b..0ce1462f33 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/SelectStrategy.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/SelectStrategy.java @@ -1,4 +1,4 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; import com.fasterxml.jackson.databind.JsonNode; import com.provectus.kafka.ui.model.KsqlCommandResponse; diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/ShowStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ShowStrategy.java similarity index 95% rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/ShowStrategy.java rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ShowStrategy.java index 7ee683a857..cfffaa3e98 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/ShowStrategy.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ShowStrategy.java @@ -1,18 +1,17 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; import com.fasterxml.jackson.databind.JsonNode; import com.provectus.kafka.ui.model.KsqlCommandResponse; -import org.springframework.stereotype.Component; - import java.util.List; import java.util.Optional; +import org.springframework.stereotype.Component; @Component public class ShowStrategy extends KsqlStatementStrategy { private final String requestPath = "/ksql"; - private String responseValueKey = ""; private final List statements = List.of("functions", "topics", "streams", "tables", "queries", "properties"); + private String responseValueKey = ""; @Override public KsqlCommandResponse serializeResponse(JsonNode response) { diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/TerminateStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/TerminateStrategy.java similarity index 92% rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/TerminateStrategy.java rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/TerminateStrategy.java index b342e2fd38..90e285e006 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksqlStatement/TerminateStrategy.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/TerminateStrategy.java @@ -1,4 +1,4 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; import com.fasterxml.jackson.databind.JsonNode; import com.provectus.kafka.ui.model.KsqlCommandResponse; diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KsqlServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KsqlServiceTest.java index 81c07d95a0..270a819e70 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KsqlServiceTest.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KsqlServiceTest.java @@ -1,5 +1,11 @@ package com.provectus.kafka.ui.service; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import com.provectus.kafka.ui.client.KsqlClient; import com.provectus.kafka.ui.exception.ClusterNotFoundException; import com.provectus.kafka.ui.exception.KsqlDbNotFoundException; @@ -7,8 +13,10 @@ import com.provectus.kafka.ui.exception.UnprocessableEntityException; import com.provectus.kafka.ui.model.KafkaCluster; import com.provectus.kafka.ui.model.KsqlCommand; import com.provectus.kafka.ui.model.KsqlCommandResponse; -import com.provectus.kafka.ui.strategy.ksqlStatement.KsqlStatementStrategy; -import com.provectus.kafka.ui.strategy.ksqlStatement.ShowStrategy; +import com.provectus.kafka.ui.strategy.ksql.statement.KsqlStatementStrategy; +import com.provectus.kafka.ui.strategy.ksql.statement.ShowStrategy; +import java.util.List; +import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -18,13 +26,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import java.util.List; -import java.util.Optional; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; - @ExtendWith(MockitoExtension.class) class KsqlServiceTest { private KsqlService ksqlService; diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/CreateStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/CreateStrategyTest.java similarity index 91% rename from kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/CreateStrategyTest.java rename to kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/CreateStrategyTest.java index 41b67bc0a6..b2d2ee07e2 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/CreateStrategyTest.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/CreateStrategyTest.java @@ -1,4 +1,9 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -10,13 +15,10 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; - @ExtendWith(MockitoExtension.class) class CreateStrategyTest { + private final ObjectMapper mapper = new ObjectMapper(); private KsqlStatementStrategy ksqlStatementStrategy; - private ObjectMapper mapper = new ObjectMapper(); @BeforeEach public void setUp() { diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/DescribeStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/DescribeStrategyTest.java similarity index 89% rename from kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/DescribeStrategyTest.java rename to kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/DescribeStrategyTest.java index 4a57999a06..14bd3bbe15 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/DescribeStrategyTest.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/DescribeStrategyTest.java @@ -1,25 +1,26 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.provectus.kafka.ui.exception.UnprocessableEntityException; import com.provectus.kafka.ui.model.KsqlCommandResponse; import com.provectus.kafka.ui.model.Table; +import java.util.List; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; - @ExtendWith(MockitoExtension.class) class DescribeStrategyTest { + private final ObjectMapper mapper = new ObjectMapper(); private KsqlStatementStrategy ksqlStatementStrategy; - private ObjectMapper mapper = new ObjectMapper(); @BeforeEach public void setUp() { diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/DropStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/DropStrategyTest.java similarity index 89% rename from kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/DropStrategyTest.java rename to kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/DropStrategyTest.java index 70742d4500..097b247be7 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/DropStrategyTest.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/DropStrategyTest.java @@ -1,4 +1,9 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -10,13 +15,10 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; - @ExtendWith(MockitoExtension.class) class DropStrategyTest { + private final ObjectMapper mapper = new ObjectMapper(); private KsqlStatementStrategy ksqlStatementStrategy; - private ObjectMapper mapper = new ObjectMapper(); @BeforeEach public void setUp() { diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/ExplainStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ExplainStrategyTest.java similarity index 89% rename from kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/ExplainStrategyTest.java rename to kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ExplainStrategyTest.java index bf4131331e..e3bcfd58fc 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/ExplainStrategyTest.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ExplainStrategyTest.java @@ -1,25 +1,26 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.provectus.kafka.ui.exception.UnprocessableEntityException; import com.provectus.kafka.ui.model.KsqlCommandResponse; import com.provectus.kafka.ui.model.Table; +import java.util.List; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; - @ExtendWith(MockitoExtension.class) class ExplainStrategyTest { + private final ObjectMapper mapper = new ObjectMapper(); private KsqlStatementStrategy ksqlStatementStrategy; - private ObjectMapper mapper = new ObjectMapper(); @BeforeEach public void setUp() { diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/ListStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ListStrategyTest.java similarity index 93% rename from kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/ListStrategyTest.java rename to kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ListStrategyTest.java index 7a6997b448..b8381b0d23 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/ListStrategyTest.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ListStrategyTest.java @@ -1,25 +1,26 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.provectus.kafka.ui.exception.UnprocessableEntityException; import com.provectus.kafka.ui.model.KsqlCommandResponse; import com.provectus.kafka.ui.model.Table; +import java.util.List; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; - @ExtendWith(MockitoExtension.class) class ListStrategyTest { + private final ObjectMapper mapper = new ObjectMapper(); private KsqlStatementStrategy ksqlStatementStrategy; - private ObjectMapper mapper = new ObjectMapper(); @BeforeEach public void setUp() { diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/SelectStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/SelectStrategyTest.java similarity index 89% rename from kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/SelectStrategyTest.java rename to kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/SelectStrategyTest.java index fa88acb981..bc748ac8d9 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/SelectStrategyTest.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/SelectStrategyTest.java @@ -1,25 +1,26 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.provectus.kafka.ui.exception.UnprocessableEntityException; import com.provectus.kafka.ui.model.KsqlCommandResponse; import com.provectus.kafka.ui.model.Table; +import java.util.List; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; - @ExtendWith(MockitoExtension.class) class SelectStrategyTest { private KsqlStatementStrategy ksqlStatementStrategy; - private ObjectMapper mapper = new ObjectMapper(); + private final ObjectMapper mapper = new ObjectMapper(); @BeforeEach public void setUp() { diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/ShowStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ShowStrategyTest.java similarity index 94% rename from kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/ShowStrategyTest.java rename to kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ShowStrategyTest.java index 9610336e43..69cb4cdfad 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/ShowStrategyTest.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ShowStrategyTest.java @@ -1,27 +1,26 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.provectus.kafka.ui.exception.UnprocessableEntityException; -import com.provectus.kafka.ui.model.KsqlCommand; import com.provectus.kafka.ui.model.KsqlCommandResponse; -import com.provectus.kafka.ui.model.KsqlResponseTable; import com.provectus.kafka.ui.model.Table; +import java.util.List; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; - @ExtendWith(MockitoExtension.class) class ShowStrategyTest { private KsqlStatementStrategy ksqlStatementStrategy; - private ObjectMapper mapper = new ObjectMapper(); + private final ObjectMapper mapper = new ObjectMapper(); @BeforeEach public void setUp() { diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/TerminateStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/TerminateStrategyTest.java similarity index 88% rename from kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/TerminateStrategyTest.java rename to kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/TerminateStrategyTest.java index d58a911f2d..18e918b56b 100644 --- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksqlStatement/TerminateStrategyTest.java +++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/TerminateStrategyTest.java @@ -1,4 +1,9 @@ -package com.provectus.kafka.ui.strategy.ksqlStatement; +package com.provectus.kafka.ui.strategy.ksql.statement; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -10,13 +15,10 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; - @ExtendWith(MockitoExtension.class) class TerminateStrategyTest { + private final ObjectMapper mapper = new ObjectMapper(); private KsqlStatementStrategy ksqlStatementStrategy; - private ObjectMapper mapper = new ObjectMapper(); @BeforeEach public void setUp() {