upd page classes

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java

@@ -1,9 +1,9 @@
 package com.provectus.kafka.ui.models;
 
-import com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue;
-import com.provectus.kafka.ui.pages.topic.enums.CustomParameterType;
-import com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk;
-import com.provectus.kafka.ui.pages.topic.enums.TimeToRetain;
+import com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue;
+import com.provectus.kafka.ui.pages.topics.enums.CustomParameterType;
+import com.provectus.kafka.ui.pages.topics.enums.MaxSizeOnDisk;
+import com.provectus.kafka.ui.pages.topics.enums.TimeToRetain;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/broker/BrokersConfigTab.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.broker;
+package com.provectus.kafka.ui.pages.brokers;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/broker/BrokersDetails.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.broker;
+package com.provectus.kafka.ui.pages.brokers;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/broker/BrokersList.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.broker;
+package com.provectus.kafka.ui.pages.brokers;
 
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorCreateForm.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.connector;
+package com.provectus.kafka.ui.pages.connectors;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorDetails.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.connector;
+package com.provectus.kafka.ui.pages.connectors;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/KafkaConnectList.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.connector;
+package com.provectus.kafka.ui.pages.connectors;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersDetails.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersDetails.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.consumer;
+package com.provectus.kafka.ui.pages.consumers;
 
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.pages.BasePage;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersList.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.consumer;
+package com.provectus.kafka.ui.pages.consumers;
 
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaCreateForm.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.schema;
+package com.provectus.kafka.ui.pages.schemas;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaDetails.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.schema;
+package com.provectus.kafka.ui.pages.schemas;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaRegistryList.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.schema;
+package com.provectus.kafka.ui.pages.schemas;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.topic;
+package com.provectus.kafka.ui.pages.topics;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java

@@ -1,14 +1,14 @@
-package com.provectus.kafka.ui.pages.topic;
+package com.provectus.kafka.ui.pages.topics;
 
 import com.codeborne.selenide.ClickOptions;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
-import com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue;
-import com.provectus.kafka.ui.pages.topic.enums.CustomParameterType;
-import com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk;
-import com.provectus.kafka.ui.pages.topic.enums.TimeToRetain;
+import com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue;
+import com.provectus.kafka.ui.pages.topics.enums.CustomParameterType;
+import com.provectus.kafka.ui.pages.topics.enums.MaxSizeOnDisk;
+import com.provectus.kafka.ui.pages.topics.enums.TimeToRetain;
 import io.qameta.allure.Step;
 
 import static com.codeborne.selenide.Selenide.*;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.topic;
+package com.provectus.kafka.ui.pages.topics;
 
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicSettingsTab.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicSettingsTab.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.topic;
+package com.provectus.kafka.ui.pages.topics;
 
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.topic;
+package com.provectus.kafka.ui.pages.topics;
 
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CleanupPolicyValue.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CleanupPolicyValue.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.topic.enums;
+package com.provectus.kafka.ui.pages.topics.enums;
 
 public enum CleanupPolicyValue {
 

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CustomParameterType.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CustomParameterType.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.topic.enums;
+package com.provectus.kafka.ui.pages.topics.enums;
 
 public enum CustomParameterType {
 

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/MaxSizeOnDisk.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/MaxSizeOnDisk.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.topic.enums;
+package com.provectus.kafka.ui.pages.topics.enums;
 
 public enum MaxSizeOnDisk {
 

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/TimeToRetain.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/TimeToRetain.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.topic.enums;
+package com.provectus.kafka.ui.pages.topics.enums;
 
 public enum TimeToRetain {
 

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java

@@ -2,20 +2,20 @@ package com.provectus.kafka.ui;
 
 import com.provectus.kafka.ui.pages.NaviSideBar;
 import com.provectus.kafka.ui.pages.TopPanel;
-import com.provectus.kafka.ui.pages.broker.BrokersConfigTab;
-import com.provectus.kafka.ui.pages.broker.BrokersDetails;
-import com.provectus.kafka.ui.pages.broker.BrokersList;
-import com.provectus.kafka.ui.pages.connector.ConnectorCreateForm;
-import com.provectus.kafka.ui.pages.connector.ConnectorDetails;
-import com.provectus.kafka.ui.pages.connector.KafkaConnectList;
-import com.provectus.kafka.ui.pages.consumer.ConsumersDetails;
-import com.provectus.kafka.ui.pages.consumer.ConsumersList;
+import com.provectus.kafka.ui.pages.brokers.BrokersConfigTab;
+import com.provectus.kafka.ui.pages.brokers.BrokersDetails;
+import com.provectus.kafka.ui.pages.brokers.BrokersList;
+import com.provectus.kafka.ui.pages.connectors.ConnectorCreateForm;
+import com.provectus.kafka.ui.pages.connectors.ConnectorDetails;
+import com.provectus.kafka.ui.pages.connectors.KafkaConnectList;
+import com.provectus.kafka.ui.pages.consumers.ConsumersDetails;
+import com.provectus.kafka.ui.pages.consumers.ConsumersList;
 import com.provectus.kafka.ui.pages.ksqlDb.KsqlDbList;
 import com.provectus.kafka.ui.pages.ksqlDb.KsqlQueryForm;
-import com.provectus.kafka.ui.pages.schema.SchemaCreateForm;
-import com.provectus.kafka.ui.pages.schema.SchemaDetails;
-import com.provectus.kafka.ui.pages.schema.SchemaRegistryList;
-import com.provectus.kafka.ui.pages.topic.*;
+import com.provectus.kafka.ui.pages.schemas.SchemaCreateForm;
+import com.provectus.kafka.ui.pages.schemas.SchemaDetails;
+import com.provectus.kafka.ui.pages.schemas.SchemaRegistryList;
+import com.provectus.kafka.ui.pages.topics.*;
 import com.provectus.kafka.ui.services.ApiService;
 
 public abstract class Facade {

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java

@@ -11,7 +11,7 @@ import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.BROKERS;
-import static com.provectus.kafka.ui.pages.broker.BrokersDetails.DetailsTab.CONFIGS;
+import static com.provectus.kafka.ui.pages.brokers.BrokersDetails.DetailsTab.CONFIGS;
 
 public class BrokersTest extends BaseTest {
 

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java

@@ -2,7 +2,7 @@ package com.provectus.kafka.ui.smokeSuite.topics;
 
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.pages.topic.TopicDetails;
+import com.provectus.kafka.ui.pages.topics.TopicDetails;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
@@ -20,12 +20,11 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
-import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.MESSAGES;
-import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.OVERVIEW;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.MESSAGES;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.OVERVIEW;
 import static com.provectus.kafka.ui.utilities.TimeUtils.waitUntilNewMinuteStarted;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java

@@ -3,7 +3,7 @@ package com.provectus.kafka.ui.smokeSuite.topics;
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.pages.topic.TopicDetails;
+import com.provectus.kafka.ui.pages.topics.TopicDetails;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
@@ -20,14 +20,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
-import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.MESSAGES;
-import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.SETTINGS;
-import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.COMPACT;
-import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.DELETE;
-import static com.provectus.kafka.ui.pages.topic.enums.CustomParameterType.COMPRESSION_TYPE;
-import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.*;
-import static com.provectus.kafka.ui.pages.topic.enums.TimeToRetain.BTN_2_DAYS;
-import static com.provectus.kafka.ui.pages.topic.enums.TimeToRetain.BTN_7_DAYS;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.MESSAGES;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.SETTINGS;
+import static com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue.COMPACT;
+import static com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue.DELETE;
+import static com.provectus.kafka.ui.pages.topics.enums.CustomParameterType.COMPRESSION_TYPE;
+import static com.provectus.kafka.ui.pages.topics.enums.MaxSizeOnDisk.*;
+import static com.provectus.kafka.ui.pages.topics.enums.TimeToRetain.BTN_2_DAYS;
+import static com.provectus.kafka.ui.pages.topics.enums.TimeToRetain.BTN_7_DAYS;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.apache.commons.lang3.RandomUtils.nextInt;