This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 98f6ffb68cc7a339ce6c6fd19d5be4c0f77f1d3c Author: Andrea Tarocchi <andrea.taroc...@gmail.com> AuthorDate: Sat Mar 6 15:46:21 2021 +0100 chore: fix checkstyle. --- .../camel/kafkaconnector/CamelSourceRecord.java | 22 +++++++++++++++++++--- .../camel/kafkaconnector/CamelSourceTask.java | 20 +++++++++++--------- .../camel/kafkaconnector/CamelSourceTaskTest.java | 2 -- .../CamelTypeConverterTransformTest.java | 1 - .../hdfs/sink/CamelSinkHDFSITCase.java | 13 ++++++------- .../source/CamelSourceNettyHTTPITCase.java | 14 +++++--------- 6 files changed, 41 insertions(+), 31 deletions(-) diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceRecord.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceRecord.java index 87934ef..5d03b89 100644 --- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceRecord.java +++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceRecord.java @@ -1,13 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.camel.kafkaconnector; +import java.util.Map; + import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.header.Header; import org.apache.kafka.connect.source.SourceRecord; -import java.util.Map; - public class CamelSourceRecord extends SourceRecord { - private Integer claimCheck = null; + private Integer claimCheck; public CamelSourceRecord(Map<String, ?> sourcePartition, Map<String, ?> sourceOffset, String topic, Integer partition, Schema valueSchema, Object value) { super(sourcePartition, sourceOffset, topic, partition, valueSchema, value); diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java index 03d0c1a..51b055d 100644 --- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java +++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java @@ -16,6 +16,15 @@ */ package org.apache.camel.kafkaconnector; +import java.io.IOException; +import java.math.BigDecimal; +import java.time.Instant; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Map; + import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.ExtendedExchange; @@ -38,14 +47,7 @@ import org.jctools.queues.SpscArrayQueue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.math.BigDecimal; -import java.time.Instant; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Map; + public class CamelSourceTask extends SourceTask { public static final String HEADER_CAMEL_PREFIX = "CamelHeader."; @@ -128,7 +130,7 @@ public class CamelSourceTask extends SourceTask { freeSlots = new SpscArrayQueue<>(maxNotCommittedRecords); freeSlots.fill(new MessagePassingQueue.Supplier<Integer>() { - int i = 0; + int i; @Override public Integer get() { return i++; diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java index 51b4db3..5c99ad0 100644 --- a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java +++ b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.kafkaconnector; -import java.awt.print.PrinterJob; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; @@ -28,7 +27,6 @@ import java.util.concurrent.Executors; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.apache.camel.Exchange; import org.apache.camel.LoggingLevel; import org.apache.camel.ProducerTemplate; import org.apache.camel.kafkaconnector.utils.StringJoinerAggregator; diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/CamelTypeConverterTransformTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/CamelTypeConverterTransformTest.java index c6cecbf..6da72c2 100644 --- a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/CamelTypeConverterTransformTest.java +++ b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/CamelTypeConverterTransformTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.kafkaconnector.transforms; -import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.Collections; import java.util.HashMap; diff --git a/tests/itests-hdfs/src/test/java/org/apache/camel/kafkaconnector/hdfs/sink/CamelSinkHDFSITCase.java b/tests/itests-hdfs/src/test/java/org/apache/camel/kafkaconnector/hdfs/sink/CamelSinkHDFSITCase.java index 55cf21f..a111fdc 100644 --- a/tests/itests-hdfs/src/test/java/org/apache/camel/kafkaconnector/hdfs/sink/CamelSinkHDFSITCase.java +++ b/tests/itests-hdfs/src/test/java/org/apache/camel/kafkaconnector/hdfs/sink/CamelSinkHDFSITCase.java @@ -14,9 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.kafkaconnector.hdfs.sink; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory; import org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport; import org.apache.camel.kafkaconnector.common.test.StringMessageProducer; @@ -36,11 +40,6 @@ import org.junit.runners.model.InitializationError; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -85,7 +84,7 @@ public class CamelSinkHDFSITCase extends CamelSinkTestSupport { boolean hdfsServiceCorrectlyStarted = TestUtils.waitFor(() -> hdfsEasy.createFile(new Path(currentBasePath, "initTest"), "test") && hdfsEasy.delete(new Path(currentBasePath, "initTest"))); - if(hdfsServiceCorrectlyStarted) { + if (hdfsServiceCorrectlyStarted) { if (!hdfsEasy.delete(currentBasePath)) { // This is OK: directory may not exist on the path LOG.debug("The directory at {} was not removed", currentBasePath.getName()); diff --git a/tests/itests-netty-http/src/test/java/org/apache/camel/kafkaconnector/nettyhttp/source/CamelSourceNettyHTTPITCase.java b/tests/itests-netty-http/src/test/java/org/apache/camel/kafkaconnector/nettyhttp/source/CamelSourceNettyHTTPITCase.java index 48bcb59..0174eb1 100644 --- a/tests/itests-netty-http/src/test/java/org/apache/camel/kafkaconnector/nettyhttp/source/CamelSourceNettyHTTPITCase.java +++ b/tests/itests-netty-http/src/test/java/org/apache/camel/kafkaconnector/nettyhttp/source/CamelSourceNettyHTTPITCase.java @@ -16,6 +16,9 @@ */ package org.apache.camel.kafkaconnector.nettyhttp.source; +import java.io.IOException; +import java.net.InetAddress; + import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory; import org.apache.camel.kafkaconnector.common.test.CamelSourceTestSupport; import org.apache.camel.kafkaconnector.common.test.TestMessageConsumer; @@ -25,7 +28,6 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; @@ -33,9 +35,6 @@ import org.junit.jupiter.api.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.net.InetAddress; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; @@ -59,9 +58,6 @@ public class CamelSourceNettyHTTPITCase extends CamelSourceTestSupport { topicName = getTopicForTest(this); } - @AfterEach - public void tearDown() {} - @Test @Timeout(90) public void testBasicSendReceive() throws Exception { @@ -81,7 +77,7 @@ public class CamelSourceNettyHTTPITCase extends CamelSourceTestSupport { protected void produceTestData() { int retriesLeft = 10; boolean success = false; - while(retriesLeft > 0 && !success) { + while (retriesLeft > 0 && !success) { try (final CloseableHttpClient httpclient = HttpClients.createDefault()) { byte[] ipAddr = new byte[]{127, 0, 0, 1}; @@ -99,7 +95,7 @@ public class CamelSourceNettyHTTPITCase extends CamelSourceTestSupport { success = true; LOG.info("Request success at {} attempt.", retriesLeft); } catch (IOException e) { - if(retriesLeft == 1) { + if (retriesLeft == 1) { e.printStackTrace(); fail("There should be no exceptions in sending the http test message."); } else {