storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kabh...@apache.org
Subject [1/3] storm git commit: STORM-2515: Rename SSL methods in KafkaSpoutConfig, fix new violations from master
Date Tue, 06 Jun 2017 23:10:07 GMT
Repository: storm
Updated Branches:
  refs/heads/master 7f3344747 -> f47875195


STORM-2515: Rename SSL methods in KafkaSpoutConfig, fix new violations from master


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e65f23b7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e65f23b7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e65f23b7

Branch: refs/heads/master
Commit: e65f23b7df2be87cc57a0b42ff47445c3baa755a
Parents: 5befe27
Author: Stig Rohde Døssing <stigdoessing@gmail.com>
Authored: Thu May 18 18:45:28 2017 +0200
Committer: Stig Rohde Døssing <stigdoessing@gmail.com>
Committed: Tue Jun 6 17:50:30 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/storm/blob/e65f23b7/external/storm-kafka-client/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/pom.xml b/external/storm-kafka-client/pom.xml
index f40ce03..843868f 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>

http://git-wip-us.apache.org/repos/asf/storm/blob/e65f23b7/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryService.java
----------------------------------------------------------------------
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 a1caf2c..1744ffd 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 @@ package org.apache.storm.kafka.spout;
 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);
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/e65f23b7/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutOpaque.java
----------------------------------------------------------------------
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 bdb34b7..4f49c7d 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 class KafkaTridentSpoutOpaque<K,V> implements IOpaquePartitionedTridentSp
     }
 
     @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);
     }
 

http://git-wip-us.apache.org/repos/asf/storm/blob/e65f23b7/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutTransactional.java
----------------------------------------------------------------------
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 ae1481c..e41f95d 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.trident.spout.ISpoutPartition;
 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;
     }
 


Mime
View raw message