From 301ecd4cbb38c10f7730298be1ab1e3193c36cbf Mon Sep 17 00:00:00 2001 From: Martin Medek Date: Tue, 12 Jul 2022 12:26:23 +0200 Subject: [PATCH] DBZ-5165 checkstyle --- .../system/tools/databases/AbstractOcpDatabaseDeployer.java | 6 +++--- .../java/io/debezium/testing/system/fixtures/OcpClient.java | 4 ++-- .../testing/system/fixtures/databases/ocp/OcpDb2.java | 1 - .../testing/system/fixtures/databases/ocp/OcpMongo.java | 2 -- .../testing/system/fixtures/databases/ocp/OcpMySql.java | 2 -- .../system/fixtures/databases/ocp/OcpPostgreSql.java | 2 -- .../testing/system/fixtures/databases/ocp/OcpSqlServer.java | 2 -- 7 files changed, 5 insertions(+), 14 deletions(-) diff --git a/debezium-testing/debezium-testing-system/src/main/java/io/debezium/testing/system/tools/databases/AbstractOcpDatabaseDeployer.java b/debezium-testing/debezium-testing-system/src/main/java/io/debezium/testing/system/tools/databases/AbstractOcpDatabaseDeployer.java index 0e161767c..d9355bf91 100644 --- a/debezium-testing/debezium-testing-system/src/main/java/io/debezium/testing/system/tools/databases/AbstractOcpDatabaseDeployer.java +++ b/debezium-testing/debezium-testing-system/src/main/java/io/debezium/testing/system/tools/databases/AbstractOcpDatabaseDeployer.java @@ -5,6 +5,8 @@ */ package io.debezium.testing.system.tools.databases; +import static io.debezium.testing.system.tools.OpenShiftUtils.isRunningFromOcp; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -22,8 +24,6 @@ import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.openshift.client.OpenShiftClient; -import static io.debezium.testing.system.tools.OpenShiftUtils.isRunningFromOcp; - /** * @author Jakub Cechacek */ @@ -118,7 +118,7 @@ public B withLocalServices(String... yamlPath) { } public B withPublicServices(String... yamlPath) { - if(isRunningFromOcp()) { + if (isRunningFromOcp()) { return self(); } List services = Arrays.stream(yamlPath) diff --git a/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/OcpClient.java b/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/OcpClient.java index e2a5f9c83..df0aa0456 100644 --- a/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/OcpClient.java +++ b/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/OcpClient.java @@ -13,7 +13,6 @@ import org.slf4j.LoggerFactory; import io.debezium.testing.system.tools.ConfigProperties; -import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.openshift.client.DefaultOpenShiftClient; import io.fabric8.openshift.client.OpenShiftClient; @@ -40,7 +39,8 @@ public void setup() { .withPassword(ConfigProperties.OCP_PASSWORD.get()) .withRequestRetryBackoffLimit(ConfigProperties.OCP_REQUEST_RETRY_BACKOFF_LIMIT) .withTrustCerts(true); - } else { + } + else { LOGGER.info("OCP credentials not provided, using default config."); } client = new DefaultOpenShiftClient(configBuilder.build()); diff --git a/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpDb2.java b/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpDb2.java index 3913acb6b..adf4cc62d 100644 --- a/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpDb2.java +++ b/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpDb2.java @@ -6,7 +6,6 @@ package io.debezium.testing.system.fixtures.databases.ocp; import static io.debezium.testing.system.tools.ConfigProperties.OCP_PULL_SECRET_PATH; -import static io.debezium.testing.system.tools.OpenShiftUtils.isRunningFromOcp; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpMongo.java b/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpMongo.java index b2bd41246..406d34cfc 100644 --- a/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpMongo.java +++ b/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpMongo.java @@ -14,8 +14,6 @@ import fixture5.annotations.FixtureContext; -import static io.debezium.testing.system.tools.OpenShiftUtils.isRunningFromOcp; - @FixtureContext(requires = { OpenShiftClient.class }, provides = { MongoDatabaseController.class }) public class OcpMongo extends OcpDatabaseFixture { diff --git a/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpMySql.java b/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpMySql.java index 047330159..5dccbbe9c 100644 --- a/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpMySql.java +++ b/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpMySql.java @@ -14,8 +14,6 @@ import fixture5.annotations.FixtureContext; -import static io.debezium.testing.system.tools.OpenShiftUtils.isRunningFromOcp; - @FixtureContext(requires = { OpenShiftClient.class }, provides = { SqlDatabaseController.class }) public class OcpMySql extends OcpDatabaseFixture { diff --git a/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpPostgreSql.java b/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpPostgreSql.java index 03cdb85ed..89674e3fb 100644 --- a/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpPostgreSql.java +++ b/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpPostgreSql.java @@ -14,8 +14,6 @@ import fixture5.annotations.FixtureContext; -import static io.debezium.testing.system.tools.OpenShiftUtils.isRunningFromOcp; - @FixtureContext(requires = { OpenShiftClient.class }, provides = { SqlDatabaseController.class }) public class OcpPostgreSql extends OcpDatabaseFixture { diff --git a/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpSqlServer.java b/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpSqlServer.java index 0fef7f3cb..de5801ac5 100644 --- a/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpSqlServer.java +++ b/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/databases/ocp/OcpSqlServer.java @@ -14,8 +14,6 @@ import fixture5.annotations.FixtureContext; -import static io.debezium.testing.system.tools.OpenShiftUtils.isRunningFromOcp; - @FixtureContext(requires = { OpenShiftClient.class }, provides = { SqlDatabaseController.class }) public class OcpSqlServer extends OcpDatabaseFixture {