This is an automated email from the ASF dual-hosted git repository. nnag pushed a commit to branch feature/restructuring in repository https://gitbox.apache.org/repos/asf/geode-kafka-connector.git
commit e58f29a1548f594efcbeef001cf6fddb68821c3f Author: Naburun Nag <n...@cs.wisc.edu> AuthorDate: Tue Feb 18 20:29:44 2020 -0800 Spotless and more apache renaming. --- .../java/org/apache/geode/kafka/GeodeContext.java | 6 ++--- .../apache/geode/kafka/sink/GeodeKafkaSink.java | 1 + .../geode/kafka/sink/GeodeKafkaSinkTask.java | 2 +- .../geode/kafka/sink/GeodeSinkConnectorConfig.java | 1 + .../geode/kafka/source/GeodeKafkaSource.java | 1 + .../geode/kafka/source/GeodeKafkaSourceTask.java | 2 +- .../kafka/source/GeodeSourceConnectorConfig.java | 1 + .../apache/geode/kafka/GeodeAsSinkDUnitTest.java | 2 +- .../apache/geode/kafka/GeodeAsSourceDUnitTest.java | 1 - .../kafka/security/SystemPropertyAuthInitTest.java | 28 ++++++++++++++++++++++ .../geode/kafka/sink/GeodeKafkaSinkTaskTest.java | 6 ++--- .../geode/kafka/sink/GeodeKafkaSinkTest.java | 3 ++- .../kafka/source/GeodeKafkaSourceTaskTest.java | 2 +- .../geode/kafka/source/GeodeKafkaSourceTest.java | 3 ++- .../source/GeodeSourceConnectorConfigTest.java | 3 ++- .../geode/kafka/utilities/GeodeKafkaTestUtils.java | 12 +++++----- .../kafka/utilities/WorkerAndHerderWrapper.java | 2 +- .../kafka/security/SystemPropertyAuthInitTest.java | 27 --------------------- 18 files changed, 55 insertions(+), 48 deletions(-) diff --git a/src/main/java/org/apache/geode/kafka/GeodeContext.java b/src/main/java/org/apache/geode/kafka/GeodeContext.java index 02cc85f..8833fd9 100644 --- a/src/main/java/org/apache/geode/kafka/GeodeContext.java +++ b/src/main/java/org/apache/geode/kafka/GeodeContext.java @@ -14,9 +14,9 @@ */ package org.apache.geode.kafka; -import static org.geode.kafka.GeodeConnectorConfig.SECURITY_CLIENT_AUTH_INIT; -import static org.geode.kafka.GeodeConnectorConfig.SECURITY_PASSWORD; -import static org.geode.kafka.GeodeConnectorConfig.SECURITY_USER; +import static org.apache.geode.kafka.GeodeConnectorConfig.SECURITY_CLIENT_AUTH_INIT; +import static org.apache.geode.kafka.GeodeConnectorConfig.SECURITY_PASSWORD; +import static org.apache.geode.kafka.GeodeConnectorConfig.SECURITY_USER; import java.util.List; diff --git a/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSink.java b/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSink.java index e4754f7..2bdd99a 100644 --- a/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSink.java +++ b/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSink.java @@ -22,6 +22,7 @@ import java.util.Map; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.sink.SinkConnector; + import org.apache.geode.kafka.GeodeConnectorConfig; public class GeodeKafkaSink extends SinkConnector { diff --git a/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTask.java b/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTask.java index 023284e..eaf0f66 100644 --- a/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTask.java +++ b/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTask.java @@ -22,13 +22,13 @@ import java.util.stream.Collectors; import org.apache.kafka.connect.sink.SinkRecord; import org.apache.kafka.connect.sink.SinkTask; -import org.apache.geode.kafka.GeodeContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionExistsException; import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.kafka.GeodeContext; /** diff --git a/src/main/java/org/apache/geode/kafka/sink/GeodeSinkConnectorConfig.java b/src/main/java/org/apache/geode/kafka/sink/GeodeSinkConnectorConfig.java index 47eb165..b12eb8f 100644 --- a/src/main/java/org/apache/geode/kafka/sink/GeodeSinkConnectorConfig.java +++ b/src/main/java/org/apache/geode/kafka/sink/GeodeSinkConnectorConfig.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Map; import org.apache.kafka.common.config.ConfigDef; + import org.apache.geode.kafka.GeodeConnectorConfig; public class GeodeSinkConnectorConfig extends GeodeConnectorConfig { diff --git a/src/main/java/org/apache/geode/kafka/source/GeodeKafkaSource.java b/src/main/java/org/apache/geode/kafka/source/GeodeKafkaSource.java index e8bfaf1..d2418fb 100644 --- a/src/main/java/org/apache/geode/kafka/source/GeodeKafkaSource.java +++ b/src/main/java/org/apache/geode/kafka/source/GeodeKafkaSource.java @@ -26,6 +26,7 @@ import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.source.SourceConnector; import org.apache.kafka.connect.util.ConnectorUtils; + import org.apache.geode.kafka.GeodeConnectorConfig; diff --git a/src/main/java/org/apache/geode/kafka/source/GeodeKafkaSourceTask.java b/src/main/java/org/apache/geode/kafka/source/GeodeKafkaSourceTask.java index 58de173..4e5b415 100644 --- a/src/main/java/org/apache/geode/kafka/source/GeodeKafkaSourceTask.java +++ b/src/main/java/org/apache/geode/kafka/source/GeodeKafkaSourceTask.java @@ -23,7 +23,6 @@ import java.util.stream.Collectors; import org.apache.kafka.connect.source.SourceRecord; import org.apache.kafka.connect.source.SourceTask; -import org.apache.geode.kafka.GeodeContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,6 +30,7 @@ import org.apache.geode.cache.query.CqAttributes; import org.apache.geode.cache.query.CqAttributesFactory; import org.apache.geode.cache.query.CqResults; import org.apache.geode.cache.query.Struct; +import org.apache.geode.kafka.GeodeContext; public class GeodeKafkaSourceTask extends SourceTask { diff --git a/src/main/java/org/apache/geode/kafka/source/GeodeSourceConnectorConfig.java b/src/main/java/org/apache/geode/kafka/source/GeodeSourceConnectorConfig.java index 339551a..ac70051 100644 --- a/src/main/java/org/apache/geode/kafka/source/GeodeSourceConnectorConfig.java +++ b/src/main/java/org/apache/geode/kafka/source/GeodeSourceConnectorConfig.java @@ -19,6 +19,7 @@ import java.util.List; import java.util.Map; import org.apache.kafka.common.config.ConfigDef; + import org.apache.geode.kafka.GeodeConnectorConfig; public class GeodeSourceConnectorConfig extends GeodeConnectorConfig { diff --git a/src/test/java/org/apache/geode/kafka/GeodeAsSinkDUnitTest.java b/src/test/java/org/apache/geode/kafka/GeodeAsSinkDUnitTest.java index 5cd3618..931de80 100644 --- a/src/test/java/org/apache/geode/kafka/GeodeAsSinkDUnitTest.java +++ b/src/test/java/org/apache/geode/kafka/GeodeAsSinkDUnitTest.java @@ -1,6 +1,5 @@ package org.apache.geode.kafka; -import static org.awaitility.Awaitility.await; import static org.apache.geode.kafka.utilities.GeodeKafkaTestUtils.createProducer; import static org.apache.geode.kafka.utilities.GeodeKafkaTestUtils.createTopic; import static org.apache.geode.kafka.utilities.GeodeKafkaTestUtils.deleteTopic; @@ -9,6 +8,7 @@ import static org.apache.geode.kafka.utilities.GeodeKafkaTestUtils.getZooKeeperP import static org.apache.geode.kafka.utilities.GeodeKafkaTestUtils.startKafka; import static org.apache.geode.kafka.utilities.GeodeKafkaTestUtils.startWorkerAndHerderCluster; import static org.apache.geode.kafka.utilities.GeodeKafkaTestUtils.startZooKeeper; +import static org.awaitility.Awaitility.await; import static org.junit.Assert.assertEquals; import java.util.Arrays; diff --git a/src/test/java/org/apache/geode/kafka/GeodeAsSourceDUnitTest.java b/src/test/java/org/apache/geode/kafka/GeodeAsSourceDUnitTest.java index 08aede2..8b41d3e 100644 --- a/src/test/java/org/apache/geode/kafka/GeodeAsSourceDUnitTest.java +++ b/src/test/java/org/apache/geode/kafka/GeodeAsSourceDUnitTest.java @@ -43,7 +43,6 @@ import org.junit.runners.Parameterized.Parameters; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.client.ClientRegionShortcut; -import org.apache.geode.kafka.utilities.GeodeKafkaTestUtils; import org.apache.geode.kafka.utilities.KafkaLocalCluster; import org.apache.geode.kafka.utilities.WorkerAndHerderCluster; import org.apache.geode.test.dunit.rules.ClientVM; diff --git a/src/test/java/org/apache/geode/kafka/security/SystemPropertyAuthInitTest.java b/src/test/java/org/apache/geode/kafka/security/SystemPropertyAuthInitTest.java new file mode 100644 index 0000000..5b2d43c --- /dev/null +++ b/src/test/java/org/apache/geode/kafka/security/SystemPropertyAuthInitTest.java @@ -0,0 +1,28 @@ +package org.apache.geode.kafka.security; + +import static org.apache.geode.kafka.GeodeConnectorConfig.SECURITY_PASSWORD; +import static org.apache.geode.kafka.GeodeConnectorConfig.SECURITY_USER; +import static org.junit.Assert.assertEquals; + +import java.util.Properties; + +import org.junit.Test; + +import org.apache.geode.security.AuthInitialize; + +public class SystemPropertyAuthInitTest { + + @Test + public void userNameAndPasswordAreObtainedFromSecurityProps() { + SystemPropertyAuthInit auth = new SystemPropertyAuthInit(); + String userName = "someUsername"; + String password = "somePassword"; + + Properties securityProps = new Properties(); + securityProps.put(SECURITY_USER, userName); + securityProps.put(SECURITY_PASSWORD, password); + Properties credentials = auth.getCredentials(securityProps, null, true); + assertEquals(credentials.get((AuthInitialize.SECURITY_USERNAME)), userName); + assertEquals(credentials.get((AuthInitialize.SECURITY_PASSWORD)), password); + } +} diff --git a/src/test/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTaskTest.java b/src/test/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTaskTest.java index dd325f2..b38a597 100644 --- a/src/test/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTaskTest.java +++ b/src/test/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTaskTest.java @@ -14,8 +14,8 @@ */ package org.apache.geode.kafka.sink; -import static org.geode.kafka.sink.GeodeSinkConnectorConfig.NULL_VALUES_MEAN_REMOVE; -import static org.geode.kafka.sink.GeodeSinkConnectorConfig.TOPIC_TO_REGION_BINDINGS; +import static org.apache.geode.kafka.sink.GeodeSinkConnectorConfig.NULL_VALUES_MEAN_REMOVE; +import static org.apache.geode.kafka.sink.GeodeSinkConnectorConfig.TOPIC_TO_REGION_BINDINGS; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; @@ -28,10 +28,10 @@ import java.util.HashMap; import java.util.List; import org.apache.kafka.connect.sink.SinkRecord; -import org.apache.geode.kafka.GeodeConnectorConfig; import org.junit.Test; import org.apache.geode.cache.Region; +import org.apache.geode.kafka.GeodeConnectorConfig; public class GeodeKafkaSinkTaskTest { diff --git a/src/test/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTest.java b/src/test/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTest.java index ea5cf1e..0ae65da 100644 --- a/src/test/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTest.java +++ b/src/test/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTest.java @@ -23,9 +23,10 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import org.apache.geode.kafka.GeodeConnectorConfig; import org.junit.Test; +import org.apache.geode.kafka.GeodeConnectorConfig; + public class GeodeKafkaSinkTest { @Test diff --git a/src/test/java/org/apache/geode/kafka/source/GeodeKafkaSourceTaskTest.java b/src/test/java/org/apache/geode/kafka/source/GeodeKafkaSourceTaskTest.java index 5125a91..bf427fd 100644 --- a/src/test/java/org/apache/geode/kafka/source/GeodeKafkaSourceTaskTest.java +++ b/src/test/java/org/apache/geode/kafka/source/GeodeKafkaSourceTaskTest.java @@ -35,7 +35,6 @@ import java.util.Map; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import org.apache.geode.kafka.GeodeContext; import org.junit.Test; import org.apache.geode.cache.client.ClientCache; @@ -44,6 +43,7 @@ import org.apache.geode.cache.query.CqEvent; import org.apache.geode.cache.query.CqResults; import org.apache.geode.cache.query.Struct; import org.apache.geode.cache.query.internal.ResultsBag; +import org.apache.geode.kafka.GeodeContext; public class GeodeKafkaSourceTaskTest { diff --git a/src/test/java/org/apache/geode/kafka/source/GeodeKafkaSourceTest.java b/src/test/java/org/apache/geode/kafka/source/GeodeKafkaSourceTest.java index 786fccf..38e9498 100644 --- a/src/test/java/org/apache/geode/kafka/source/GeodeKafkaSourceTest.java +++ b/src/test/java/org/apache/geode/kafka/source/GeodeKafkaSourceTest.java @@ -23,9 +23,10 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import org.apache.geode.kafka.GeodeConnectorConfig; import org.junit.Test; +import org.apache.geode.kafka.GeodeConnectorConfig; + public class GeodeKafkaSourceTest { @Test diff --git a/src/test/java/org/apache/geode/kafka/source/GeodeSourceConnectorConfigTest.java b/src/test/java/org/apache/geode/kafka/source/GeodeSourceConnectorConfigTest.java index 641a2ac..d543d23 100644 --- a/src/test/java/org/apache/geode/kafka/source/GeodeSourceConnectorConfigTest.java +++ b/src/test/java/org/apache/geode/kafka/source/GeodeSourceConnectorConfigTest.java @@ -20,9 +20,10 @@ import static org.junit.Assert.assertEquals; import java.util.HashMap; import java.util.Map; -import org.apache.geode.kafka.GeodeConnectorConfig; import org.junit.Test; +import org.apache.geode.kafka.GeodeConnectorConfig; + public class GeodeSourceConnectorConfigTest { @Test diff --git a/src/test/java/org/apache/geode/kafka/utilities/GeodeKafkaTestUtils.java b/src/test/java/org/apache/geode/kafka/utilities/GeodeKafkaTestUtils.java index c8e1bb0..f9c1e2b 100644 --- a/src/test/java/org/apache/geode/kafka/utilities/GeodeKafkaTestUtils.java +++ b/src/test/java/org/apache/geode/kafka/utilities/GeodeKafkaTestUtils.java @@ -130,12 +130,12 @@ public class GeodeKafkaTestUtils { } public static WorkerAndHerderCluster startWorkerAndHerderCluster(int maxTasks, - String sourceRegion, - String sinkRegion, - String sourceTopic, - String sinkTopic, - String offsetPath, - String locatorString) { + String sourceRegion, + String sinkRegion, + String sourceTopic, + String sinkTopic, + String offsetPath, + String locatorString) { WorkerAndHerderCluster workerAndHerderCluster = new WorkerAndHerderCluster(); try { workerAndHerderCluster.start(String.valueOf(maxTasks), sourceRegion, sinkRegion, sourceTopic, diff --git a/src/test/java/org/apache/geode/kafka/utilities/WorkerAndHerderWrapper.java b/src/test/java/org/apache/geode/kafka/utilities/WorkerAndHerderWrapper.java index 8003fc0..3fe6e66 100644 --- a/src/test/java/org/apache/geode/kafka/utilities/WorkerAndHerderWrapper.java +++ b/src/test/java/org/apache/geode/kafka/utilities/WorkerAndHerderWrapper.java @@ -34,8 +34,8 @@ import org.apache.kafka.connect.util.ConnectUtils; import org.apache.geode.kafka.GeodeConnectorConfig; import org.apache.geode.kafka.sink.GeodeKafkaSink; -import org.apache.geode.kafka.source.GeodeKafkaSource; import org.apache.geode.kafka.sink.GeodeSinkConnectorConfig; +import org.apache.geode.kafka.source.GeodeKafkaSource; public class WorkerAndHerderWrapper { diff --git a/src/test/java/org/geode/kafka/security/SystemPropertyAuthInitTest.java b/src/test/java/org/geode/kafka/security/SystemPropertyAuthInitTest.java deleted file mode 100644 index cdfd48c..0000000 --- a/src/test/java/org/geode/kafka/security/SystemPropertyAuthInitTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.geode.kafka.security; - -import org.apache.geode.security.AuthInitialize; -import org.junit.Test; - -import java.util.Properties; - -import static org.geode.kafka.GeodeConnectorConfig.SECURITY_PASSWORD; -import static org.geode.kafka.GeodeConnectorConfig.SECURITY_USER; -import static org.junit.Assert.assertEquals; - -public class SystemPropertyAuthInitTest { - - @Test - public void userNameAndPasswordAreObtainedFromSecurityProps() { - SystemPropertyAuthInit auth = new SystemPropertyAuthInit(); - String userName = "someUsername"; - String password = "somePassword"; - - Properties securityProps = new Properties(); - securityProps.put(SECURITY_USER, userName); - securityProps.put(SECURITY_PASSWORD, password); - Properties credentials = auth.getCredentials(securityProps, null, true); - assertEquals(credentials.get((AuthInitialize.SECURITY_USERNAME)), userName); - assertEquals(credentials.get((AuthInitialize.SECURITY_PASSWORD)), password); - } -}