This is an automated email from the ASF dual-hosted git repository. srdo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push: new 4764432 STORM-3453: eventhubs: fix all checkstyle warnings new 1bb13c6 Merge pull request #3071 from krichter722/checkstyle-eventhubs 4764432 is described below commit 4764432f1692a3a6f5e89a1bbf5e430481adb0f4 Author: Karl-Philipp Richter <krich...@posteo.de> AuthorDate: Thu Jul 4 21:16:21 2019 +0200 STORM-3453: eventhubs: fix all checkstyle warnings --- external/storm-eventhubs/pom.xml | 2 +- .../java/org/apache/storm/eventhubs/bolt/EventHubBolt.java | 1 - .../org/apache/storm/eventhubs/bolt/IEventDataFormat.java | 2 +- .../apache/storm/eventhubs/spout/BinaryEventDataScheme.java | 2 +- .../org/apache/storm/eventhubs/spout/EventDataScheme.java | 11 +++++------ .../java/org/apache/storm/eventhubs/spout/EventDataWrap.java | 3 +-- .../apache/storm/eventhubs/spout/EventHubReceiverImpl.java | 10 +++++----- .../java/org/apache/storm/eventhubs/spout/EventHubSpout.java | 8 +------- .../storm/eventhubs/spout/IEventHubReceiverFactory.java | 2 +- .../storm/eventhubs/spout/IPartitionManagerFactory.java | 2 +- .../apache/storm/eventhubs/spout/SimplePartitionManager.java | 2 +- .../apache/storm/eventhubs/spout/StringEventDataScheme.java | 9 ++++----- .../storm/eventhubs/trident/ITridentPartitionManager.java | 2 +- .../storm/eventhubs/trident/OpaqueTridentEventHubEmitter.java | 2 +- .../storm/eventhubs/trident/OpaqueTridentEventHubSpout.java | 2 +- .../java/org/apache/storm/eventhubs/trident/Partition.java | 2 +- .../trident/TransactionalTridentEventHubEmitter.java | 2 -- .../eventhubs/trident/TransactionalTridentEventHubSpout.java | 2 +- 18 files changed, 27 insertions(+), 39 deletions(-) diff --git a/external/storm-eventhubs/pom.xml b/external/storm-eventhubs/pom.xml index a6a1cef..8dec463 100755 --- a/external/storm-eventhubs/pom.xml +++ b/external/storm-eventhubs/pom.xml @@ -53,7 +53,7 @@ <artifactId>maven-checkstyle-plugin</artifactId> <!--Note - the version would be inherited--> <configuration> - <maxAllowedViolations>45</maxAllowedViolations> + <maxAllowedViolations>0</maxAllowedViolations> </configuration> </plugin> <plugin> diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/EventHubBolt.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/EventHubBolt.java index 85ffd03..4c1e068 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/EventHubBolt.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/EventHubBolt.java @@ -18,7 +18,6 @@ package org.apache.storm.eventhubs.bolt; - import com.microsoft.azure.eventhubs.EventData; import com.microsoft.azure.eventhubs.EventHubClient; import com.microsoft.azure.eventhubs.PartitionSender; diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/IEventDataFormat.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/IEventDataFormat.java index ec09460..08f8e63 100644 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/IEventDataFormat.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/IEventDataFormat.java @@ -22,7 +22,7 @@ import java.io.Serializable; import org.apache.storm.tuple.Tuple; /** - * Serialize a tuple to a byte array to be sent to EventHubs + * Serialize a tuple to a byte array to be sent to EventHubs. */ public interface IEventDataFormat extends Serializable { public byte[] serialize(Tuple tuple); diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/BinaryEventDataScheme.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/BinaryEventDataScheme.java index 4c8e0a2..40db61a 100644 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/BinaryEventDataScheme.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/BinaryEventDataScheme.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; /** * An Event Data Scheme which deserializes message payload into the raw bytes. * - * The resulting tuple would contain three items, the first being the message bytes, and the second a map of properties that include + * <p>The resulting tuple would contain three items, the first being the message bytes, and the second a map of properties that include * metadata, which can be used to determine who processes the message, and how it is processed.The third is the system properties which * exposes information like enqueue-time, offset and sequence number */ diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataScheme.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataScheme.java index 9bd0c22..40b8034 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataScheme.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataScheme.java @@ -30,10 +30,10 @@ import org.slf4j.LoggerFactory; * An Event Data Scheme which deserializes message payload into the Strings. No encoding is assumed. The receiver will need to handle * parsing of the string data in appropriate encoding. * - * The resulting tuple would contain two items: the the message string, and a map of properties that include metadata, which can be used to - * determine who processes the message, and how it is processed. + * <p>The resulting tuple would contain two items: the the message string, and a map of properties that include + * metadata, which can be used to determine who processes the message, and how it is processed. * - * For passing the raw bytes of a messsage to Bolts, refer to {@link BinaryEventDataScheme}. + * <p>For passing the raw bytes of a messsage to Bolts, refer to {@link BinaryEventDataScheme}. */ public class EventDataScheme implements IEventDataScheme { @@ -46,9 +46,8 @@ public class EventDataScheme implements IEventDataScheme { String messageData = ""; if (eventData.getBytes() != null) { messageData = new String(eventData.getBytes()); - } - /*Will only serialize AMQPValue type*/ - else if (eventData.getObject() != null) { + } else if (eventData.getObject() != null) { + /*Will only serialize AMQPValue type*/ try { if (!(eventData.getObject() instanceof List)) { messageData = eventData.getObject().toString(); diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataWrap.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataWrap.java index fc23c05..a331c69 100644 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataWrap.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventDataWrap.java @@ -43,7 +43,6 @@ public class EventDataWrap implements Comparable<EventDataWrap> { @Override public int compareTo(EventDataWrap ed) { - return messageId.getSequenceNumber(). - compareTo(ed.getMessageId().getSequenceNumber()); + return messageId.getSequenceNumber().compareTo(ed.getMessageId().getSequenceNumber()); } } diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubReceiverImpl.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubReceiverImpl.java index c5d6303..392adaf 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubReceiverImpl.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubReceiverImpl.java @@ -61,9 +61,10 @@ public class EventHubReceiverImpl implements IEventHubReceiver { @Override public void open(IEventFilter filter) throws EventHubException { - logger.info("creating eventhub receiver: partitionId=" + partitionId + - ", filter=" + filter.getOffset() != null ? - filter.getOffset() : Long.toString(filter.getTime().toEpochMilli())); + logger.info("creating eventhub receiver: partitionId=" + partitionId + + ", filter=" + filter.getOffset() != null + ? filter.getOffset() + : Long.toString(filter.getTime().toEpochMilli())); long start = System.currentTimeMillis(); try { ehClient = EventHubClient.createFromConnectionStringSync(connectionString); @@ -82,8 +83,7 @@ public class EventHubReceiverImpl implements IEventHubReceiver { filter.getTime(), 1); } else { - throw new RuntimeException("Eventhub receiver must have " + - "an offset or time to be created"); + throw new RuntimeException("Eventhub receiver must have an offset or time to be created"); } if (receiver != null) { receiver.setReceiveTimeout(Duration.ofMillis(receiverTimeoutInMillis)); diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java index f8e144e..ea12d09 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/EventHubSpout.java @@ -94,13 +94,7 @@ public class EventHubSpout extends BaseRichSpout { } /** - * This is a extracted method that is easy to test - * - * @param config - * @param totalTasks - * @param taskIndex - * @param collector - * @throws Exception + * This is a extracted method that is easy to test. */ public void preparePartitions(Map<String, Object> config, int totalTasks, int taskIndex, SpoutOutputCollector collector) throws Exception { diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IEventHubReceiverFactory.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IEventHubReceiverFactory.java index d25ebdd..ef4d9b8 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IEventHubReceiverFactory.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IEventHubReceiverFactory.java @@ -18,7 +18,7 @@ package org.apache.storm.eventhubs.spout; import java.io.Serializable; /** - * An abstract factory to generate EventHubReceiver + * An abstract factory to generate EventHubReceiver. */ public interface IEventHubReceiverFactory extends Serializable { IEventHubReceiver create(EventHubSpoutConfig config, String partitionId); diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IPartitionManagerFactory.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IPartitionManagerFactory.java index c3ce2ec..4a87b86 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IPartitionManagerFactory.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IPartitionManagerFactory.java @@ -18,7 +18,7 @@ package org.apache.storm.eventhubs.spout; import java.io.Serializable; /** - * An interface of factory method to create IPartitionManager + * An interface of factory method to create IPartitionManager. */ public interface IPartitionManagerFactory extends Serializable { IPartitionManager create(EventHubSpoutConfig spoutConfig, diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/SimplePartitionManager.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/SimplePartitionManager.java index 436aabe..3c98735 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/SimplePartitionManager.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/SimplePartitionManager.java @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * A simple partition manager that does not re-send failed messages + * A simple partition manager that does not re-send failed messages. */ public class SimplePartitionManager implements IPartitionManager { private static final Logger logger = LoggerFactory.getLogger(SimplePartitionManager.class); diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/StringEventDataScheme.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/StringEventDataScheme.java index 5b6a2b9..3bd1ba8 100644 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/StringEventDataScheme.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/StringEventDataScheme.java @@ -29,9 +29,9 @@ import org.slf4j.LoggerFactory; * An Event Data Scheme which deserializes message payload into the Strings. No encoding is assumed. The receiver will need to handle * parsing of the string data in appropriate encoding. * - * Note: Unlike other schemes provided, this scheme does not include any metadata. + * <p>Note: Unlike other schemes provided, this scheme does not include any metadata. * - * For metadata please refer to {@link BinaryEventDataScheme}, {@link EventDataScheme} + * <p>For metadata please refer to {@link BinaryEventDataScheme}, {@link EventDataScheme} */ public class StringEventDataScheme implements IEventDataScheme { @@ -44,9 +44,8 @@ public class StringEventDataScheme implements IEventDataScheme { String messageData = ""; if (eventData.getBytes() != null) { messageData = new String(eventData.getBytes()); - } - /*Will only serialize AMQPValue type*/ - else if (eventData.getObject() != null) { + } else if (eventData.getObject() != null) { + /*Will only serialize AMQPValue type*/ try { if (!(eventData.getObject() instanceof List)) { messageData = eventData.getObject().toString(); diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/ITridentPartitionManager.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/ITridentPartitionManager.java index 922e334..e1abdba 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/ITridentPartitionManager.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/ITridentPartitionManager.java @@ -27,7 +27,7 @@ public interface ITridentPartitionManager { void close(); /** - * receive a batch of messages from EvenHub up to "count" messages + * receive a batch of messages from EvenHub up to "count" messages. * * @param offset the starting offset * @param count max number of messages in this batch diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubEmitter.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubEmitter.java index 4020b21..2e88373 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubEmitter.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubEmitter.java @@ -27,7 +27,7 @@ import org.apache.storm.trident.spout.IOpaquePartitionedTridentSpout; import org.apache.storm.trident.topology.TransactionAttempt; /** - * A thin wrapper of TransactionalTridentEventHubEmitter for OpaqueTridentEventHubSpout + * A thin wrapper of TransactionalTridentEventHubEmitter for OpaqueTridentEventHubSpout. */ public class OpaqueTridentEventHubEmitter implements IOpaquePartitionedTridentSpout.Emitter<Partitions, Partition, Map> { private final TransactionalTridentEventHubEmitter transactionalEmitter; diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubSpout.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubSpout.java index f062201..d8fb338 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubSpout.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubSpout.java @@ -26,7 +26,7 @@ import org.apache.storm.trident.spout.IOpaquePartitionedTridentSpout; import org.apache.storm.tuple.Fields; /** - * Opaque Trident EventHubs Spout + * Opaque Trident EventHubs Spout. */ public class OpaqueTridentEventHubSpout implements IOpaquePartitionedTridentSpout<Partitions, Partition, Map> { private static final long serialVersionUID = 1L; diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/Partition.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/Partition.java index 44d9d23..c47e616 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/Partition.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/Partition.java @@ -23,7 +23,7 @@ import org.apache.storm.eventhubs.spout.EventHubSpoutConfig; import org.apache.storm.trident.spout.ISpoutPartition; /** - * Represents an EventHub partition + * Represents an EventHub partition. */ public class Partition implements ISpoutPartition, Serializable { private static final long serialVersionUID = 1L; diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubEmitter.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubEmitter.java index 8bd7bb1..2321617 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubEmitter.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubEmitter.java @@ -85,8 +85,6 @@ public class TransactionalTridentEventHubEmitter /** * Check if partition manager for a given partiton is created if not, create it. - * - * @param partition */ private ITridentPartitionManager getOrCreatePartitionManager(Partition partition) { ITridentPartitionManager pm; diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubSpout.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubSpout.java index a2eb73d..e9a22e7 100755 --- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubSpout.java +++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/TransactionalTridentEventHubSpout.java @@ -26,7 +26,7 @@ import org.apache.storm.trident.spout.IPartitionedTridentSpout; import org.apache.storm.tuple.Fields; /** - * Transactional Trident EventHub Spout + * Transactional Trident EventHub Spout. */ public class TransactionalTridentEventHubSpout implements IPartitionedTridentSpout<Partitions, Partition, Map<String, Object>> {