From cbea02bbfd9bd9805dc52b23ac5ce688489f02ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20Kokosi=C5=84ski?= Date: Sat, 3 Jul 2021 15:40:54 +0200 Subject: [PATCH] Minor cleanup in connectors - inline field - remove obvious comments - limit access to field - remove explicit default constructor --- .../plugin/kinesis/KinesisConnectorFactory.java | 11 +---------- .../TestKinesisTableDescriptionSupplier.java | 6 +----- .../kinesis/TestingKinesisConnectorFactory.java | 2 +- .../io/trino/plugin/kinesis/util/TestUtils.java | 2 +- .../io/trino/plugin/redis/RedisColumnHandle.java | 14 -------------- .../io/trino/plugin/redis/RedisDecoderModule.java | 3 --- 6 files changed, 4 insertions(+), 34 deletions(-) diff --git a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnectorFactory.java b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnectorFactory.java index 6b88966e0061..3bfdca0b37b0 100644 --- a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnectorFactory.java +++ b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnectorFactory.java @@ -32,17 +32,9 @@ import static com.google.common.base.Throwables.throwIfUnchecked; import static java.util.Objects.requireNonNull; -/** - * This factory class creates the KinesisConnector during server start and binds all the dependency - * by calling create() method. - */ public class KinesisConnectorFactory implements ConnectorFactory { - public KinesisConnectorFactory() - { - } - @Override public String getName() { @@ -78,8 +70,7 @@ public Connector create(String catalogName, Map config, Connecto .setRequiredConfigurationProperties(config) .initialize(); - KinesisConnector connector = injector.getInstance(KinesisConnector.class); - return connector; + return injector.getInstance(KinesisConnector.class); } catch (Exception e) { throwIfUnchecked(e); diff --git a/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestKinesisTableDescriptionSupplier.java b/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestKinesisTableDescriptionSupplier.java index 1c53854b2a76..9b2101561578 100644 --- a/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestKinesisTableDescriptionSupplier.java +++ b/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestKinesisTableDescriptionSupplier.java @@ -33,12 +33,8 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -/** - * Unit test for the TableDescriptionSupplier and related classes - */ public class TestKinesisTableDescriptionSupplier { - private KinesisPlugin kinesisPlugin; private KinesisConnector connector; @BeforeClass @@ -57,7 +53,7 @@ public void start() mockClient.createStream("sampleTable", 2); KinesisConnectorFactory kinesisConnectorFactory = new TestingKinesisConnectorFactory(kinesisTestClientManager); - kinesisPlugin = new KinesisPlugin(kinesisConnectorFactory); + KinesisPlugin kinesisPlugin = new KinesisPlugin(kinesisConnectorFactory); connector = TestUtils.createConnector(kinesisPlugin, properties, true); } diff --git a/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestingKinesisConnectorFactory.java b/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestingKinesisConnectorFactory.java index d80735f33c23..827680c26942 100644 --- a/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestingKinesisConnectorFactory.java +++ b/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/TestingKinesisConnectorFactory.java @@ -33,7 +33,7 @@ public class TestingKinesisConnectorFactory extends KinesisConnectorFactory { - KinesisClientProvider kinesisClientProvider; + private KinesisClientProvider kinesisClientProvider; public TestingKinesisConnectorFactory(KinesisClientProvider kinesisClientProvider) { diff --git a/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/util/TestUtils.java b/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/util/TestUtils.java index 4ddc746e806b..9786f76cdfd4 100644 --- a/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/util/TestUtils.java +++ b/plugin/trino-kinesis/src/test/java/io/trino/plugin/kinesis/util/TestUtils.java @@ -30,7 +30,7 @@ public final class TestUtils { - public static final String NONE_KEY = "NONE"; + private static final String NONE_KEY = "NONE"; private TestUtils() {} diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisColumnHandle.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisColumnHandle.java index 205e90e6b919..c092fcd1a878 100644 --- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisColumnHandle.java +++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisColumnHandle.java @@ -24,22 +24,11 @@ import static com.google.common.base.MoreObjects.toStringHelper; import static java.util.Objects.requireNonNull; -/** - * Redis specific connector column handle. - */ public final class RedisColumnHandle implements DecoderColumnHandle, Comparable { private final int ordinalPosition; - - /** - * Column Name - */ private final String name; - - /** - * Column type - */ private final Type type; /** @@ -62,9 +51,6 @@ public final class RedisColumnHandle */ private final boolean keyDecoder; - /** - * True if the column should be hidden. - */ private final boolean hidden; /** diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisDecoderModule.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisDecoderModule.java index 530f821f5691..d275ab3c6bcb 100644 --- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisDecoderModule.java +++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisDecoderModule.java @@ -34,9 +34,6 @@ import static com.google.inject.Scopes.SINGLETON; -/** - * Redis decoder specific module. Installs the registry and all known decoder submodules. - */ public class RedisDecoderModule implements Module {