You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2019/07/01 15:44:05 UTC
[storm] branch master updated: STORM-3428: kafka-monitor: fix all
checkstyle warnings
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 b32d1d8 STORM-3428: kafka-monitor: fix all checkstyle warnings
new b43793c Merge pull request #3043 from krichter722/checkstyle-kafka-monitor
b32d1d8 is described below
commit b32d1d80e9b18527c189403035844c5b3449bb6a
Author: Karl-Philipp Richter <kr...@posteo.de>
AuthorDate: Thu Jun 27 21:54:59 2019 +0200
STORM-3428: kafka-monitor: fix all checkstyle warnings
---
external/storm-kafka-monitor/pom.xml | 2 +-
.../storm/kafka/monitor/KafkaOffsetLagResult.java | 48 ++++++++++++++--------
.../storm/kafka/monitor/KafkaOffsetLagUtil.java | 38 ++++++++++-------
.../kafka/monitor/KafkaPartitionOffsetLag.java | 22 ++++++----
.../kafka/monitor/NewKafkaSpoutOffsetQuery.java | 18 ++++----
5 files changed, 81 insertions(+), 47 deletions(-)
diff --git a/external/storm-kafka-monitor/pom.xml b/external/storm-kafka-monitor/pom.xml
index 99d2e62..cd18c76 100644
--- a/external/storm-kafka-monitor/pom.xml
+++ b/external/storm-kafka-monitor/pom.xml
@@ -75,7 +75,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<!--Note - the version would be inherited-->
<configuration>
- <maxAllowedViolations>87</maxAllowedViolations>
+ <maxAllowedViolations>0</maxAllowedViolations>
</configuration>
</plugin>
<plugin>
diff --git a/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaOffsetLagResult.java b/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaOffsetLagResult.java
index 908141c..f6feff1 100644
--- a/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaOffsetLagResult.java
+++ b/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaOffsetLagResult.java
@@ -21,7 +21,7 @@ package org.apache.storm.kafka.monitor;
import org.json.simple.JSONAware;
/**
- * Class representing the log head offsets, spout offsets and the lag for a topic
+ * Class representing the log head offsets, spout offsets and the lag for a topic.
*/
public class KafkaOffsetLagResult implements JSONAware {
private String topic;
@@ -60,26 +60,38 @@ public class KafkaOffsetLagResult implements JSONAware {
@Override
public String toString() {
- return "KafkaOffsetLagResult{" +
- "topic='" + topic + '\'' +
- ", partition=" + partition +
- ", consumerCommittedOffset=" + consumerCommittedOffset +
- ", logHeadOffset=" + logHeadOffset +
- ", lag=" + lag +
- '}';
+ return "KafkaOffsetLagResult{"
+ + "topic='" + topic + '\''
+ + ", partition=" + partition
+ + ", consumerCommittedOffset=" + consumerCommittedOffset
+ + ", logHeadOffset=" + logHeadOffset
+ + ", lag=" + lag
+ + '}';
}
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
KafkaOffsetLagResult that = (KafkaOffsetLagResult) o;
- if (partition != that.partition) return false;
- if (consumerCommittedOffset != that.consumerCommittedOffset) return false;
- if (logHeadOffset != that.logHeadOffset) return false;
- if (lag != that.lag) return false;
+ if (partition != that.partition) {
+ return false;
+ }
+ if (consumerCommittedOffset != that.consumerCommittedOffset) {
+ return false;
+ }
+ if (logHeadOffset != that.logHeadOffset) {
+ return false;
+ }
+ if (lag != that.lag) {
+ return false;
+ }
return !(topic != null ? !topic.equals(that.topic) : that.topic != null);
}
@@ -96,7 +108,11 @@ public class KafkaOffsetLagResult implements JSONAware {
@Override
public String toJSONString() {
- return "{\"topic\":\"" + topic + "\",\"partition\":" + partition + ",\"consumerCommittedOffset\":" + consumerCommittedOffset + "," +
- "\"logHeadOffset\":" + logHeadOffset + ",\"lag\":" + lag + "}";
+ return "{\"topic\":\"" + topic
+ + "\",\"partition\":" + partition
+ + ",\"consumerCommittedOffset\":" + consumerCommittedOffset
+ + ",\"logHeadOffset\":" + logHeadOffset
+ + ",\"lag\":" + lag
+ + "}";
}
}
diff --git a/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaOffsetLagUtil.java b/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaOffsetLagUtil.java
index 398ebae..94956de 100644
--- a/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaOffsetLagUtil.java
+++ b/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaOffsetLagUtil.java
@@ -37,7 +37,7 @@ import org.apache.kafka.common.utils.Utils;
import org.json.simple.JSONValue;
/**
- * Utility class for querying offset lag for kafka spout
+ * Utility class for querying offset lag for kafka spout.
*/
public class KafkaOffsetLagUtil {
private static final String OPTION_TOPIC_SHORT = "t";
@@ -51,7 +51,7 @@ public class KafkaOffsetLagUtil {
private static final String OPTION_CONSUMER_CONFIG_SHORT = "c";
private static final String OPTION_CONSUMER_CONFIG_LONG = "consumer-config";
- public static void main(String args[]) {
+ public static void main(String[] args) {
try {
Options options = buildOptions();
CommandLineParser parser = new DefaultParser();
@@ -106,20 +106,28 @@ public class KafkaOffsetLagUtil {
private static Options buildOptions() {
Options options = new Options();
- options.addOption(OPTION_TOPIC_SHORT, OPTION_TOPIC_LONG, true,
- "REQUIRED Topics (comma separated list) for fetching log head and spout committed " +
- "offset");
- options.addOption(OPTION_BOOTSTRAP_BROKERS_SHORT, OPTION_BOOTSTRAP_BROKERS_LONG, true,
- "Comma separated list of bootstrap broker hosts for new " +
- "consumer/spout e.g. hostname1:9092,hostname2:9092");
+ options.addOption(OPTION_TOPIC_SHORT, OPTION_TOPIC_LONG,
+ true,
+ "REQUIRED Topics (comma separated list) for fetching log head and spout committed "
+ + "offset");
+ options.addOption(OPTION_BOOTSTRAP_BROKERS_SHORT, OPTION_BOOTSTRAP_BROKERS_LONG,
+ true,
+ "Comma separated list of bootstrap broker hosts for new "
+ + "consumer/spout e.g. hostname1:9092,hostname2:9092");
options.addOption(OPTION_GROUP_ID_SHORT, OPTION_GROUP_ID_LONG, true, "Group id of consumer");
- options.addOption(OPTION_SECURITY_PROTOCOL_SHORT, OPTION_SECURITY_PROTOCOL_LONG, true, "Security protocol to connect to kafka");
- options.addOption(OPTION_CONSUMER_CONFIG_SHORT, OPTION_CONSUMER_CONFIG_LONG, true, "Properties file with additional " +
- "Kafka consumer properties");
+ options.addOption(OPTION_SECURITY_PROTOCOL_SHORT,
+ OPTION_SECURITY_PROTOCOL_LONG,
+ true,
+ "Security protocol to connect to kafka");
+ options.addOption(OPTION_CONSUMER_CONFIG_SHORT,
+ OPTION_CONSUMER_CONFIG_LONG,
+ true,
+ "Properties file with additional Kafka consumer properties");
return options;
}
/**
+ * Get offset lags.
* @param newKafkaSpoutOffsetQuery represents the information needed to query kafka for log head and spout offsets
* @return log head offset, spout offset and lag for each partition
*/
@@ -168,9 +176,11 @@ public class KafkaOffsetLagUtil {
}
private static Collection<TopicPartition> toArrayList(final TopicPartition tp) {
- return new ArrayList<TopicPartition>(1) {{
- add(tp);
- }};
+ return new ArrayList<TopicPartition>(1) {
+ {
+ add(tp);
+ }
+ };
}
}
diff --git a/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaPartitionOffsetLag.java b/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaPartitionOffsetLag.java
index a47cef2..bcf3c5e 100644
--- a/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaPartitionOffsetLag.java
+++ b/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaPartitionOffsetLag.java
@@ -43,13 +43,21 @@ public class KafkaPartitionOffsetLag {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof KafkaPartitionOffsetLag)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof KafkaPartitionOffsetLag)) {
+ return false;
+ }
KafkaPartitionOffsetLag that = (KafkaPartitionOffsetLag) o;
- if (getConsumerCommittedOffset() != that.getConsumerCommittedOffset()) return false;
- if (getLogHeadOffset() != that.getLogHeadOffset()) return false;
+ if (getConsumerCommittedOffset() != that.getConsumerCommittedOffset()) {
+ return false;
+ }
+ if (getLogHeadOffset() != that.getLogHeadOffset()) {
+ return false;
+ }
return getLag() == that.getLag();
}
@@ -65,8 +73,8 @@ public class KafkaPartitionOffsetLag {
@Override
public String toString() {
// JSONAware not working for nested element on Map so write JSON format from here
- return "{\"consumerCommittedOffset\": " + consumerCommittedOffset + ", " +
- "\"logHeadOffset\": " + logHeadOffset + ", " +
- "\"lag\": " + lag + "}";
+ return "{\"consumerCommittedOffset\": " + consumerCommittedOffset + ", "
+ + "\"logHeadOffset\": " + logHeadOffset + ", "
+ + "\"lag\": " + lag + "}";
}
}
diff --git a/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/NewKafkaSpoutOffsetQuery.java b/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/NewKafkaSpoutOffsetQuery.java
index 7678ed7..849b713 100644
--- a/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/NewKafkaSpoutOffsetQuery.java
+++ b/external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/NewKafkaSpoutOffsetQuery.java
@@ -19,8 +19,8 @@
package org.apache.storm.kafka.monitor;
/**
- * Class representing information for querying kafka for log head offsets, consumer offsets and the difference for new kafka spout using new
- * consumer api
+ * Class representing information for querying kafka for log head offsets, consumer offsets and the difference for new
+ * kafka spout using new consumer api.
*/
public class NewKafkaSpoutOffsetQuery {
private final String topics; // comma separated list of topics
@@ -60,13 +60,13 @@ public class NewKafkaSpoutOffsetQuery {
@Override
public String toString() {
- return "NewKafkaSpoutOffsetQuery{" +
- "topics='" + topics + '\'' +
- ", consumerGroupId='" + consumerGroupId + '\'' +
- ", bootStrapBrokers='" + bootStrapBrokers + '\'' +
- ", securityProtocol='" + securityProtocol + '\'' +
- ", consumerPropertiesFileName='" + consumerPropertiesFileName + '\'' +
- '}';
+ return "NewKafkaSpoutOffsetQuery{"
+ + "topics='" + topics + '\''
+ + ", consumerGroupId='" + consumerGroupId + '\''
+ + ", bootStrapBrokers='" + bootStrapBrokers + '\''
+ + ", securityProtocol='" + securityProtocol + '\''
+ + ", consumerPropertiesFileName='" + consumerPropertiesFileName + '\''
+ + '}';
}
@Override