From e65f23b7df2be87cc57a0b42ff47445c3baa755a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stig=20Rohde=20D=C3=B8ssing?= <stigdoessing@gmail.com>
Date: Thu, 18 May 2017 18:45:28 +0200
Subject: [PATCH] STORM-2515: Rename SSL methods in KafkaSpoutConfig, fix new
 violations from master

---
 external/storm-kafka-client/pom.xml                        | 2 +-
 .../apache/storm/kafka/spout/KafkaSpoutRetryService.java   | 6 ++++--
 .../storm/kafka/spout/trident/KafkaTridentSpoutOpaque.java | 3 ++-
 .../spout/trident/KafkaTridentSpoutTransactional.java      | 7 ++++---
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/external/storm-kafka-client/pom.xml b/external/storm-kafka-client/pom.xml
index f40ce031cfe..843868fbc51 100644
--- a/external/storm-kafka-client/pom.xml
+++ b/external/storm-kafka-client/pom.xml
@@ -152,7 +152,7 @@
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <!--Note - the version would be inherited-->
                 <configuration>
-                    <maxAllowedViolations>15</maxAllowedViolations>
+                    <maxAllowedViolations>9</maxAllowedViolations>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryService.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryService.java
index a1caf2ce870..1744ffd37a8 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryService.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryService.java
@@ -21,8 +21,8 @@
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Map;
-import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.common.TopicPartition;
 
 /**
  * Represents the logic that manages the retrial of failed tuples.
@@ -78,6 +78,7 @@ public interface KafkaSpoutRetryService extends Serializable {
     boolean isScheduled(KafkaSpoutMessageId msgId);
 
     /**
+     * Get the number of messages ready for retry.
      * @return The number of messages that are ready for retry
      */
     int readyMessageCount();
@@ -85,7 +86,8 @@ public interface KafkaSpoutRetryService extends Serializable {
     /**
      * Gets the {@link KafkaSpoutMessageId} for the given record.
      * @param record The record to fetch the id for
-     * @return The id the record was scheduled for retry with, or a new {@link KafkaSpoutMessageId} if the record was not scheduled for retry.
+     * @return The id the record was scheduled for retry with,
+     *     or a new {@link KafkaSpoutMessageId} if the record was not scheduled for retry.
      */
     KafkaSpoutMessageId getMessageId(ConsumerRecord<?, ?> record);
 }
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutOpaque.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutOpaque.java
index bdb34b7179e..4f49c7dfcd2 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutOpaque.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutOpaque.java
@@ -46,7 +46,8 @@ public KafkaTridentSpoutOpaque(KafkaTridentSpoutManager<K, V> kafkaManager) {
     }
 
     @Override
-    public Emitter<List<TopicPartition>, KafkaTridentSpoutTopicPartition, KafkaTridentSpoutBatchMetadata<K,V>> getEmitter(Map<String, Object> conf, TopologyContext context) {
+    public Emitter<List<TopicPartition>, KafkaTridentSpoutTopicPartition, KafkaTridentSpoutBatchMetadata<K,V>> getEmitter(
+            Map<String, Object> conf, TopologyContext context) {
         return new KafkaTridentSpoutEmitter<>(kafkaManager, context);
     }
 
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java
index ae1481c0ade..e41f95d3e0c 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java
@@ -25,14 +25,15 @@
 import org.apache.storm.tuple.Fields;
 
 // TODO
-public class KafkaTridentSpoutTransactional<Ps, P extends ISpoutPartition, T> implements IPartitionedTridentSpout<Ps, P, T> {
+public class KafkaTridentSpoutTransactional<PartitionsT, P extends ISpoutPartition, T> 
+        implements IPartitionedTridentSpout<PartitionsT, P, T> {
     @Override
-    public Coordinator<Ps> getCoordinator(Map<String, Object> conf, TopologyContext context) {
+    public Coordinator<PartitionsT> getCoordinator(Map<String, Object> conf, TopologyContext context) {
         return null;
     }
 
     @Override
-    public Emitter<Ps, P, T> getEmitter(Map<String, Object> conf, TopologyContext context) {
+    public Emitter<PartitionsT, P, T> getEmitter(Map<String, Object> conf, TopologyContext context) {
         return null;
     }