This is an automated email from the ASF dual-hosted git repository.
rzo1 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 26ad76e7e Sync checkstyle config with upstream google_checks.xml
(#8969)
26ad76e7e is described below
commit 26ad76e7e8cc2eb53df032680e86bedd3e7addde
Author: sergio <[email protected]>
AuthorDate: Fri Aug 28 09:34:40 2026 +0200
Sync checkstyle config with upstream google_checks.xml (#8969)
* [STORM-8585] fix violations surfaced by the newly enabled BoxComments
check
* [STORM-8585] add NewlineAtEndOfFile checkstyle rule
* [STORM-8585] add missing trailing newline to files flagged by the new rule
* [STORM-8585] fix additional violations surfaced by the BoxComments check
Same fix as the earlier BoxComments cleanup: replace box-border
comments with plain single-line comments in files that hadn't been
touched yet.
---
THIRD-PARTY.properties | 2 +-
.../org/apache/storm/loadgen/OutputStreamEngine.java | 2 +-
.../org/apache/storm/perf/queuetest/Producer2.java | 2 +-
.../java/org/apache/storm/perf/toolstest/Prod.java | 2 +-
.../storm/starter/MultiThreadWordCountTopology.java | 2 +-
.../apache/storm/common/AbstractHadoopAutoCreds.java | 2 +-
.../apache/storm/hdfs/security/HdfsSecurityUtil.java | 2 +-
.../storm-hdfs/src/test/resources/log4j.properties | 2 +-
.../storm-jms/src/test/resources/jndi.properties | 2 +-
.../storm/kafka/monitor/KafkaPartitionOffsetLag.java | 4 ++--
.../src/test/resources/configs/test.properties | 2 +-
.../src/main/resources/hbase_bolt.properties | 2 +-
.../src/main/resources/hdfs_bolt.properties | 2 +-
.../st/topology/window/TimeDataVerificationBolt.java | 2 +-
.../src/main/resources/storm/storm_checkstyle.xml | 20 ++++++++++++++++++--
.../storm/blobstore/LocalModeClientBlobStore.java | 2 +-
.../apache/storm/daemon/worker/WorkerTransfer.java | 2 +-
.../src/jvm/org/apache/storm/executor/Executor.java | 4 +---
.../storm/grouping/LoadAwareShuffleGrouping.java | 2 +-
.../apache/storm/grouping/PartialKeyGrouping.java | 6 ++----
.../apache/storm/messaging/netty/MessageDecoder.java | 2 +-
.../metric/cgroup/CGroupCpuGuaranteeByCfsQuota.java | 2 +-
.../storm/metric/cgroup/CGroupMetricsBase.java | 2 +-
.../apache/storm/metrics2/DimensionalReporter.java | 2 +-
.../apache/storm/metrics2/TaskMetricDimensions.java | 2 +-
.../org/apache/storm/metrics2/TaskMetricRepo.java | 2 +-
.../org/apache/storm/metrics2/cgroup/CGroupCpu.java | 2 +-
.../metrics2/reporters/ConsoleStormReporter.java | 2 +-
.../storm/metrics2/reporters/CsvStormReporter.java | 2 +-
.../metrics2/reporters/GraphiteStormReporter.java | 2 +-
.../storm/metrics2/reporters/JmxStormReporter.java | 2 +-
.../storm/metrics2/reporters/StormReporter.java | 2 +-
.../security/auth/X509CertPrincipalToLocal.java | 2 +-
.../authorizer/SupervisorSimpleACLAuthorizer.java | 2 +-
.../auth/sasl/SimpleSaslClientCallbackHandler.java | 2 +-
.../security/auth/tls/ReloadableX509KeyManager.java | 2 +-
.../auth/tls/ReloadableX509TrustManager.java | 2 +-
.../jvm/org/apache/storm/stats/ClientStatsUtil.java | 2 --
.../src/jvm/org/apache/storm/utils/DRPCClient.java | 2 +-
.../apache/storm/utils/DefaultShellLogHandler.java | 2 +-
.../src/jvm/org/apache/storm/utils/JCQueue.java | 2 +-
.../jvm/org/apache/storm/utils/ShellLogHandler.java | 2 +-
.../resources/storm-core-version-info.properties | 2 +-
.../org/apache/storm/command/ShellSubmission.java | 2 +-
.../apache/storm/container/docker/DockerCommand.java | 2 +-
.../org/apache/storm/daemon/nimbus/TopoCache.java | 2 +-
.../priority/DefaultSchedulingPriorityStrategy.java | 2 +-
.../scheduler/utils/ArtifactoryConfigLoader.java | 2 +-
.../storm/scheduler/utils/FileConfigLoader.java | 2 +-
.../storm/scheduler/utils/IConfigLoaderFactory.java | 2 +-
.../main/java/org/apache/storm/stats/StatsUtil.java | 12 ------------
.../org/apache/storm/zookeeper/AclEnforcement.java | 2 +-
.../storm/daemon/common/JsonResponseBuilder.java | 2 +-
.../daemon/common/ReloadableSslContextFactory.java | 2 +-
54 files changed, 71 insertions(+), 73 deletions(-)
diff --git a/THIRD-PARTY.properties b/THIRD-PARTY.properties
index f0c2251b4..0204dcbd4 100644
--- a/THIRD-PARTY.properties
+++ b/THIRD-PARTY.properties
@@ -32,4 +32,4 @@ javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND
DISTRIBUTION LICENSE (CDD
javax.servlet.jsp--jsp-api--2.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
(CDDL) Version 1.1
javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
Version 1.1
javax.transaction--transaction-api--1.1=COMMON DEVELOPMENT AND DISTRIBUTION
LICENSE (CDDL) Version 1.1
-org.glassfish.jersey--jersey-bom--2.27=COMMON DEVELOPMENT AND DISTRIBUTION
LICENSE (CDDL) Version 1.1
\ No newline at end of file
+org.glassfish.jersey--jersey-bom--2.27=COMMON DEVELOPMENT AND DISTRIBUTION
LICENSE (CDDL) Version 1.1
diff --git
a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/OutputStreamEngine.java
b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/OutputStreamEngine.java
index 2794fcdc2..d8b52034e 100644
---
a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/OutputStreamEngine.java
+++
b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/OutputStreamEngine.java
@@ -119,4 +119,4 @@ public class OutputStreamEngine {
public int nextInt(int bound) {
return rand.nextInt(bound);
}
-}
\ No newline at end of file
+}
diff --git
a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Producer2.java
b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Producer2.java
index c36d88de4..508a4cd15 100644
---
a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Producer2.java
+++
b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Producer2.java
@@ -47,4 +47,4 @@ class Producer2 extends MyThread {
}
}
-}
\ No newline at end of file
+}
diff --git
a/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/Prod.java
b/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/Prod.java
index cfb1bf2ff..06b3b7a7b 100644
---
a/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/Prod.java
+++
b/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/Prod.java
@@ -43,4 +43,4 @@ class Prod extends MyThd {
runTime = System.currentTimeMillis() - start;
}
-}
\ No newline at end of file
+}
diff --git
a/examples/storm-starter/src/jvm/org/apache/storm/starter/MultiThreadWordCountTopology.java
b/examples/storm-starter/src/jvm/org/apache/storm/starter/MultiThreadWordCountTopology.java
index 2d3985505..528b98d2b 100644
---
a/examples/storm-starter/src/jvm/org/apache/storm/starter/MultiThreadWordCountTopology.java
+++
b/examples/storm-starter/src/jvm/org/apache/storm/starter/MultiThreadWordCountTopology.java
@@ -104,4 +104,4 @@ public class MultiThreadWordCountTopology extends
ConfigurableTopology {
public void cleanup() {
}
}
-}
\ No newline at end of file
+}
diff --git
a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java
b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java
index 80aef42df..e8a7ac791 100644
---
a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java
+++
b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java
@@ -147,4 +147,4 @@ public abstract class AbstractHadoopAutoCreds implements
IAutoCredentials, Crede
}
}
-}
\ No newline at end of file
+}
diff --git
a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java
b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java
index 0f8ef9b4e..c89b84527 100644
---
a/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java
+++
b/external/storm-autocreds/src/main/java/org/apache/storm/hdfs/security/HdfsSecurityUtil.java
@@ -73,4 +73,4 @@ public final class HdfsSecurityUtil {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/external/storm-hdfs/src/test/resources/log4j.properties
b/external/storm-hdfs/src/test/resources/log4j.properties
index c952abd12..32ead0c5d 100644
--- a/external/storm-hdfs/src/test/resources/log4j.properties
+++ b/external/storm-hdfs/src/test/resources/log4j.properties
@@ -20,4 +20,4 @@ log4j.rootLogger = WARN, out
log4j.appender.out = org.apache.log4j.ConsoleAppender
log4j.appender.out.layout = org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern = %d (%t) [%p - %l] %m%n
\ No newline at end of file
+log4j.appender.out.layout.ConversionPattern = %d (%t) [%p - %l] %m%n
diff --git a/external/storm-jms/src/test/resources/jndi.properties
b/external/storm-jms/src/test/resources/jndi.properties
index af195214c..920e84ef9 100644
--- a/external/storm-jms/src/test/resources/jndi.properties
+++ b/external/storm-jms/src/test/resources/jndi.properties
@@ -15,4 +15,4 @@
# limitations under the License.
java.naming.factory.initial =
org.apache.activemq.jndi.ActiveMQInitialContextFactory
-java.naming.provider.url = vm://localhost?broker.persistent=false
\ No newline at end of file
+java.naming.provider.url = vm://localhost?broker.persistent=false
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 bcf3c5e14..edc063180 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
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* 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
@@ -14,7 +14,7 @@
* 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.storm.kafka.monitor;
diff --git a/flux/flux-core/src/test/resources/configs/test.properties
b/flux/flux-core/src/test/resources/configs/test.properties
index afa359273..5ca3810e7 100644
--- a/flux/flux-core/src/test/resources/configs/test.properties
+++ b/flux/flux-core/src/test/resources/configs/test.properties
@@ -16,4 +16,4 @@
topology.name: substitution-topology
a.list.property: ["A string list"]
-some.other.property: foo bar
\ No newline at end of file
+some.other.property: foo bar
diff --git a/flux/flux-examples/src/main/resources/hbase_bolt.properties
b/flux/flux-examples/src/main/resources/hbase_bolt.properties
index f8ed50c6b..b63835c1f 100644
--- a/flux/flux-examples/src/main/resources/hbase_bolt.properties
+++ b/flux/flux-examples/src/main/resources/hbase_bolt.properties
@@ -15,4 +15,4 @@
# limitations under the License.
hbase.rootdir=hdfs://hadoop:54310/hbase
-hbase.zookeeper.quorum=hadoop
\ No newline at end of file
+hbase.zookeeper.quorum=hadoop
diff --git a/flux/flux-examples/src/main/resources/hdfs_bolt.properties
b/flux/flux-examples/src/main/resources/hdfs_bolt.properties
index 7bcbe7a55..3e3bed8d6 100644
--- a/flux/flux-examples/src/main/resources/hdfs_bolt.properties
+++ b/flux/flux-examples/src/main/resources/hdfs_bolt.properties
@@ -23,4 +23,4 @@ hdfs.write.dir=/incoming
# The HDFS directory where files will be moved once the bolt has
# finished writing to it.
-hdfs.dest.dir=/complete
\ No newline at end of file
+hdfs.dest.dir=/complete
diff --git
a/integration-test/src/main/java/org/apache/storm/st/topology/window/TimeDataVerificationBolt.java
b/integration-test/src/main/java/org/apache/storm/st/topology/window/TimeDataVerificationBolt.java
index a20d85ee3..019ecbfc2 100644
---
a/integration-test/src/main/java/org/apache/storm/st/topology/window/TimeDataVerificationBolt.java
+++
b/integration-test/src/main/java/org/apache/storm/st/topology/window/TimeDataVerificationBolt.java
@@ -66,4 +66,4 @@ public class TimeDataVerificationBolt extends
BaseWindowedBolt {
public void declareOutputFields(OutputFieldsDeclarer declarer) {
declarer.declare(new Fields(DUMMY_FIELD));
}
-}
\ No newline at end of file
+}
diff --git a/storm-checkstyle/src/main/resources/storm/storm_checkstyle.xml
b/storm-checkstyle/src/main/resources/storm/storm_checkstyle.xml
index 3fbcfd063..ab9265d1e 100644
--- a/storm-checkstyle/src/main/resources/storm/storm_checkstyle.xml
+++ b/storm-checkstyle/src/main/resources/storm/storm_checkstyle.xml
@@ -70,6 +70,8 @@
<property name="eachLine" value="true"/>
</module>
+ <module name="NewlineAtEndOfFile"/>
+
<module name="LineLength">
<property name="fileExtensions" value="java"/>
<property name="max" value="100"/>
@@ -84,7 +86,7 @@
<property name="onCommentFormat" value='^\s*"""\s*(?:[,;]|.+)$'/>
</module>
<module name="SuppressWithPlainTextCommentFilter">
- <property name="checkFormat" value="IndentationCheck"/>
+ <property name="checkFormat" value="\.IndentationCheck$"/>
<property name="offCommentFormat" value='^""".?'/>
<property name="onCommentFormat" value='.'/>
</module>
@@ -409,6 +411,7 @@
RECORD_DEF, RECORD_PATTERN_DEF"/>
</module>
<module name="OperatorWrap">
+ <property name="id" value="OperatorWrapNL"/>
<property name="option" value="NL"/>
<property name="tokens"
value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND,
LE, LITERAL_INSTANCEOF, LOR,
@@ -416,6 +419,12 @@
TYPE_EXTENSION_AND "/>
<property name="severity" value="warning"/>
</module>
+ <module name="OperatorWrap">
+ <property name="id" value="OperatorWrapEOL"/>
+ <property name="option" value="EOL"/>
+ <property name="tokens" value="LAMBDA"/>
+ <property name="severity" value="warning"/>
+ </module>
<module name="AnnotationLocation">
<property name="id" value="AnnotationLocationTypeAndPackage"/>
<property name="tokens"
@@ -505,10 +514,17 @@
<property name="severity" value="warning"/>
</module>
<module name="TodoComment">
+ <property name="id" value="TodoFormat"/>
<property name="format" value="^[ \t]*(?!TODO:)(?i:TODO)\b:?"/>
<message key="todo.match"
value="''TODO:'' must be written in all caps and followed
by a colon."/>
</module>
+ <module name="TodoComment">
+ <property name="id" value="BoxComments"/>
+ <property name="format" value="^[ \t]*([*=#])\1{8,}[ \t]*$"/>
+ <message key="todo.match"
+ value="Comment uses box-like repetitive character
pattern."/>
+ </module>
<module name="EmptyCatchBlock">
<property name="commentFormat" value="\w+"/>
</module>
@@ -535,4 +551,4 @@
<property name="influenceFormat" value="1"/>
</module>
</module>
-</module>
\ No newline at end of file
+</module>
diff --git
a/storm-client/src/jvm/org/apache/storm/blobstore/LocalModeClientBlobStore.java
b/storm-client/src/jvm/org/apache/storm/blobstore/LocalModeClientBlobStore.java
index 776371fe9..5bf0199db 100644
---
a/storm-client/src/jvm/org/apache/storm/blobstore/LocalModeClientBlobStore.java
+++
b/storm-client/src/jvm/org/apache/storm/blobstore/LocalModeClientBlobStore.java
@@ -129,4 +129,4 @@ public class LocalModeClientBlobStore extends
ClientBlobStore {
public long getRemoteBlobstoreUpdateTime() throws IOException {
return -1L; // not supported
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerTransfer.java
b/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerTransfer.java
index f2da7bcb6..40e75aba0 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerTransfer.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerTransfer.java
@@ -141,4 +141,4 @@ public class WorkerTransfer implements JCQueue.Consumer {
transferQueue.close();
}
-}
\ No newline at end of file
+}
diff --git a/storm-client/src/jvm/org/apache/storm/executor/Executor.java
b/storm-client/src/jvm/org/apache/storm/executor/Executor.java
index 716ec48c4..9a319bf07 100644
--- a/storm-client/src/jvm/org/apache/storm/executor/Executor.java
+++ b/storm-client/src/jvm/org/apache/storm/executor/Executor.java
@@ -725,9 +725,7 @@ public abstract class Executor implements Callable,
JCQueue.Consumer {
return ret;
}
- //
=============================================================================
- // ============================ getter methods
=================================
- //
=============================================================================
+ // getter methods
private Map<String, Object> normalizedComponentConf(
Map<String, Object> topoConf, WorkerTopologyContext topologyContext,
String componentId) {
diff --git
a/storm-client/src/jvm/org/apache/storm/grouping/LoadAwareShuffleGrouping.java
b/storm-client/src/jvm/org/apache/storm/grouping/LoadAwareShuffleGrouping.java
index 15b690dd3..0aa15fe7f 100644
---
a/storm-client/src/jvm/org/apache/storm/grouping/LoadAwareShuffleGrouping.java
+++
b/storm-client/src/jvm/org/apache/storm/grouping/LoadAwareShuffleGrouping.java
@@ -361,4 +361,4 @@ public class LoadAwareShuffleGrouping implements
LoadAwareCustomStreamGrouping,
weight = MAX_WEIGHT;
}
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/grouping/PartialKeyGrouping.java
b/storm-client/src/jvm/org/apache/storm/grouping/PartialKeyGrouping.java
index d61494c0f..1c6c212ba 100644
--- a/storm-client/src/jvm/org/apache/storm/grouping/PartialKeyGrouping.java
+++ b/storm-client/src/jvm/org/apache/storm/grouping/PartialKeyGrouping.java
@@ -126,9 +126,7 @@ public class PartialKeyGrouping implements
CustomStreamGrouping, Serializable {
return raw;
}
- /*==================================================
- * Helper Classes
- *==================================================*/
+ // Helper Classes
/**
* This interface is responsible for choosing a subset of the target tasks
to use for a given key.
@@ -196,4 +194,4 @@ public class PartialKeyGrouping implements
CustomStreamGrouping, Serializable {
return taskIdWithMinLoad;
}
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/messaging/netty/MessageDecoder.java
b/storm-client/src/jvm/org/apache/storm/messaging/netty/MessageDecoder.java
index d063cf68f..7dcf206d0 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/MessageDecoder.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/MessageDecoder.java
@@ -207,4 +207,4 @@ public class MessageDecoder extends ByteToMessageDecoder {
LOG.error("Exception thrown while decoding messages in channel {};
exception: ", ctx.channel(), cause);
ctx.close();
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/metric/cgroup/CGroupCpuGuaranteeByCfsQuota.java
b/storm-client/src/jvm/org/apache/storm/metric/cgroup/CGroupCpuGuaranteeByCfsQuota.java
index e986ce06d..36dce34f9 100644
---
a/storm-client/src/jvm/org/apache/storm/metric/cgroup/CGroupCpuGuaranteeByCfsQuota.java
+++
b/storm-client/src/jvm/org/apache/storm/metric/cgroup/CGroupCpuGuaranteeByCfsQuota.java
@@ -50,4 +50,4 @@ public class CGroupCpuGuaranteeByCfsQuota extends
CGroupMetricsBase<Long> {
previousTime = now;
return msGuarantee;
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/metric/cgroup/CGroupMetricsBase.java
b/storm-client/src/jvm/org/apache/storm/metric/cgroup/CGroupMetricsBase.java
index 0a4da72f2..16c5d73ef 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/cgroup/CGroupMetricsBase.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/cgroup/CGroupMetricsBase.java
@@ -119,4 +119,4 @@ public abstract class CGroupMetricsBase<T> implements
IMetric {
}
public abstract T getDataFrom(CgroupCore core) throws Exception;
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/metrics2/DimensionalReporter.java
b/storm-client/src/jvm/org/apache/storm/metrics2/DimensionalReporter.java
index 0e6c4873f..fcf7fbef6 100644
--- a/storm-client/src/jvm/org/apache/storm/metrics2/DimensionalReporter.java
+++ b/storm-client/src/jvm/org/apache/storm/metrics2/DimensionalReporter.java
@@ -94,4 +94,4 @@ public class DimensionalReporter extends ScheduledReporter {
*/
void setDimensions(Map<String, String> dimensions);
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/metrics2/TaskMetricDimensions.java
b/storm-client/src/jvm/org/apache/storm/metrics2/TaskMetricDimensions.java
index 20c4389d9..05d824493 100644
--- a/storm-client/src/jvm/org/apache/storm/metrics2/TaskMetricDimensions.java
+++ b/storm-client/src/jvm/org/apache/storm/metrics2/TaskMetricDimensions.java
@@ -68,4 +68,4 @@ public class TaskMetricDimensions {
public int hashCode() {
return taskId + componentId.hashCode() + streamId.hashCode();
}
-}
\ No newline at end of file
+}
diff --git a/storm-client/src/jvm/org/apache/storm/metrics2/TaskMetricRepo.java
b/storm-client/src/jvm/org/apache/storm/metrics2/TaskMetricRepo.java
index 785271c73..00f9c7fff 100644
--- a/storm-client/src/jvm/org/apache/storm/metrics2/TaskMetricRepo.java
+++ b/storm-client/src/jvm/org/apache/storm/metrics2/TaskMetricRepo.java
@@ -100,4 +100,4 @@ public class TaskMetricRepo {
meters.entrySet().removeIf(entry ->
metricFilter.matches(entry.getKey(), entry.getValue()));
timers.entrySet().removeIf(entry ->
metricFilter.matches(entry.getKey(), entry.getValue()));
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/metrics2/cgroup/CGroupCpu.java
b/storm-client/src/jvm/org/apache/storm/metrics2/cgroup/CGroupCpu.java
index f4c6958d5..4630a9372 100644
--- a/storm-client/src/jvm/org/apache/storm/metrics2/cgroup/CGroupCpu.java
+++ b/storm-client/src/jvm/org/apache/storm/metrics2/cgroup/CGroupCpu.java
@@ -77,4 +77,4 @@ public class CGroupCpu extends CGroupMetricsBase implements
WorkerMetricRegistra
}
return userHz;
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/ConsoleStormReporter.java
b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/ConsoleStormReporter.java
index e4478151e..7786586a2 100644
---
a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/ConsoleStormReporter.java
+++
b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/ConsoleStormReporter.java
@@ -107,4 +107,4 @@ public class ConsoleStormReporter extends
ScheduledStormReporter implements Dime
public void close() throws IOException {
super.close();
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/CsvStormReporter.java
b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/CsvStormReporter.java
index 8804c1b54..a64ba1275 100644
---
a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/CsvStormReporter.java
+++
b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/CsvStormReporter.java
@@ -93,4 +93,4 @@ public class CsvStormReporter extends ScheduledStormReporter {
public void close() throws IOException {
super.close();
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/GraphiteStormReporter.java
b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/GraphiteStormReporter.java
index f4efc92d5..647832ee2 100644
---
a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/GraphiteStormReporter.java
+++
b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/GraphiteStormReporter.java
@@ -99,4 +99,4 @@ public class GraphiteStormReporter extends
ScheduledStormReporter {
public void close() throws IOException {
super.close();
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java
b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java
index da10ac159..cd9da9836 100644
---
a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java
+++
b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java
@@ -92,4 +92,4 @@ public class JmxStormReporter implements StormReporter {
reporter.close();
}
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/StormReporter.java
b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/StormReporter.java
index 4e81667fd..7791bafb7 100644
---
a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/StormReporter.java
+++
b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/StormReporter.java
@@ -34,4 +34,4 @@ public interface StormReporter extends Reporter {
void start();
void stop();
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/security/auth/X509CertPrincipalToLocal.java
b/storm-client/src/jvm/org/apache/storm/security/auth/X509CertPrincipalToLocal.java
index 761496102..0a8d6fed7 100644
---
a/storm-client/src/jvm/org/apache/storm/security/auth/X509CertPrincipalToLocal.java
+++
b/storm-client/src/jvm/org/apache/storm/security/auth/X509CertPrincipalToLocal.java
@@ -70,4 +70,4 @@ public class X509CertPrincipalToLocal implements
IPrincipalToLocal {
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SupervisorSimpleACLAuthorizer.java
b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SupervisorSimpleACLAuthorizer.java
index 156ca0bf4..194e8721b 100644
---
a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SupervisorSimpleACLAuthorizer.java
+++
b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SupervisorSimpleACLAuthorizer.java
@@ -153,4 +153,4 @@ public class SupervisorSimpleACLAuthorizer implements
IAuthorizer {
}
return false;
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/security/auth/sasl/SimpleSaslClientCallbackHandler.java
b/storm-client/src/jvm/org/apache/storm/security/auth/sasl/SimpleSaslClientCallbackHandler.java
index 7ea37405c..ad0aa3289 100644
---
a/storm-client/src/jvm/org/apache/storm/security/auth/sasl/SimpleSaslClientCallbackHandler.java
+++
b/storm-client/src/jvm/org/apache/storm/security/auth/sasl/SimpleSaslClientCallbackHandler.java
@@ -69,4 +69,4 @@ public class SimpleSaslClientCallbackHandler implements
CallbackHandler {
}
}
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/security/auth/tls/ReloadableX509KeyManager.java
b/storm-client/src/jvm/org/apache/storm/security/auth/tls/ReloadableX509KeyManager.java
index ab3f4f088..6afde7044 100644
---
a/storm-client/src/jvm/org/apache/storm/security/auth/tls/ReloadableX509KeyManager.java
+++
b/storm-client/src/jvm/org/apache/storm/security/auth/tls/ReloadableX509KeyManager.java
@@ -133,4 +133,4 @@ public class ReloadableX509KeyManager implements
X509KeyManager {
}
return keystore;
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/security/auth/tls/ReloadableX509TrustManager.java
b/storm-client/src/jvm/org/apache/storm/security/auth/tls/ReloadableX509TrustManager.java
index 1ba978a7c..e78e11afd 100644
---
a/storm-client/src/jvm/org/apache/storm/security/auth/tls/ReloadableX509TrustManager.java
+++
b/storm-client/src/jvm/org/apache/storm/security/auth/tls/ReloadableX509TrustManager.java
@@ -114,4 +114,4 @@ public class ReloadableX509TrustManager extends
X509ExtendedTrustManager {
}
}
-}
\ No newline at end of file
+}
diff --git a/storm-client/src/jvm/org/apache/storm/stats/ClientStatsUtil.java
b/storm-client/src/jvm/org/apache/storm/stats/ClientStatsUtil.java
index 463b47480..5eca65463 100644
--- a/storm-client/src/jvm/org/apache/storm/stats/ClientStatsUtil.java
+++ b/storm-client/src/jvm/org/apache/storm/stats/ClientStatsUtil.java
@@ -168,9 +168,7 @@ public class ClientStatsUtil {
return ret;
}
- //
=====================================================================================
// key transformers
- //
=====================================================================================
/**
* Provides a way to transform one key into another.
diff --git a/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java
b/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java
index 6cf4bdf01..f5ba4b1ec 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/DRPCClient.java
@@ -145,4 +145,4 @@ public class DRPCClient extends ThriftClient implements
DistributedRPC.Iface {
localOverrideClient = null;
}
}
-}
\ No newline at end of file
+}
diff --git
a/storm-client/src/jvm/org/apache/storm/utils/DefaultShellLogHandler.java
b/storm-client/src/jvm/org/apache/storm/utils/DefaultShellLogHandler.java
index 96df6ae0a..83ba50159 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/DefaultShellLogHandler.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/DefaultShellLogHandler.java
@@ -97,4 +97,4 @@ public class DefaultShellLogHandler implements
ShellLogHandler {
break;
}
}
-}
\ No newline at end of file
+}
diff --git a/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java
b/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java
index 5c4c69583..3d6492e96 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java
@@ -582,4 +582,4 @@ public class JCQueue implements Closeable {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/storm-client/src/jvm/org/apache/storm/utils/ShellLogHandler.java
b/storm-client/src/jvm/org/apache/storm/utils/ShellLogHandler.java
index 75f154eac..1440c4c07 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/ShellLogHandler.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/ShellLogHandler.java
@@ -37,4 +37,4 @@ public interface ShellLogHandler {
* @param msg - the {@link ShellMsg} containing the message to log.
*/
void log(ShellMsg msg);
-}
\ No newline at end of file
+}
diff --git a/storm-client/test/resources/storm-core-version-info.properties
b/storm-client/test/resources/storm-core-version-info.properties
index 4997904b5..0ebdfcc8c 100644
--- a/storm-client/test/resources/storm-core-version-info.properties
+++ b/storm-client/test/resources/storm-core-version-info.properties
@@ -20,4 +20,4 @@ branch=not-a-real-branch
date=today
user=me
url=https://storm.apache.org/
-srcChecksum=0
\ No newline at end of file
+srcChecksum=0
diff --git a/storm-core/src/jvm/org/apache/storm/command/ShellSubmission.java
b/storm-core/src/jvm/org/apache/storm/command/ShellSubmission.java
index fcc29fca0..9c5564cab 100644
--- a/storm-core/src/jvm/org/apache/storm/command/ShellSubmission.java
+++ b/storm-core/src/jvm/org/apache/storm/command/ShellSubmission.java
@@ -43,4 +43,4 @@ public class ShellSubmission {
ServerUtils.execCommand(newArgs);
}
}
-}
\ No newline at end of file
+}
diff --git
a/storm-server/src/main/java/org/apache/storm/container/docker/DockerCommand.java
b/storm-server/src/main/java/org/apache/storm/container/docker/DockerCommand.java
index f366629d4..fe77070f6 100644
---
a/storm-server/src/main/java/org/apache/storm/container/docker/DockerCommand.java
+++
b/storm-server/src/main/java/org/apache/storm/container/docker/DockerCommand.java
@@ -48,4 +48,4 @@ public abstract class DockerCommand {
public String getCommandWithArguments() {
return StringUtils.join(commandWithArguments, " ");
}
-}
\ No newline at end of file
+}
diff --git
a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopoCache.java
b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopoCache.java
index a6e03327a..505d77678 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopoCache.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopoCache.java
@@ -234,4 +234,4 @@ public class TopoCache {
this.data = data;
}
}
-}
\ No newline at end of file
+}
diff --git
a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/priority/DefaultSchedulingPriorityStrategy.java
b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/priority/DefaultSchedulingPriorityStrategy.java
index b0efc2c86..0d943eb50 100644
---
a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/priority/DefaultSchedulingPriorityStrategy.java
+++
b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/priority/DefaultSchedulingPriorityStrategy.java
@@ -159,4 +159,4 @@ public class DefaultSchedulingPriorityStrategy implements
ISchedulingPriorityStr
}
}
}
-}
\ No newline at end of file
+}
diff --git
a/storm-server/src/main/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoader.java
b/storm-server/src/main/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoader.java
index 6a56247a7..8bbad3f10 100644
---
a/storm-server/src/main/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoader.java
+++
b/storm-server/src/main/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoader.java
@@ -386,4 +386,4 @@ public class ArtifactoryConfigLoader implements
IConfigLoader {
return ((String) j1.get("uri")).compareTo((String) j2.get("uri"));
}
}
-}
\ No newline at end of file
+}
diff --git
a/storm-server/src/main/java/org/apache/storm/scheduler/utils/FileConfigLoader.java
b/storm-server/src/main/java/org/apache/storm/scheduler/utils/FileConfigLoader.java
index 8e4c9b910..6a45882e5 100644
---
a/storm-server/src/main/java/org/apache/storm/scheduler/utils/FileConfigLoader.java
+++
b/storm-server/src/main/java/org/apache/storm/scheduler/utils/FileConfigLoader.java
@@ -62,4 +62,4 @@ public class FileConfigLoader implements IConfigLoader {
}
return null;
}
-}
\ No newline at end of file
+}
diff --git
a/storm-server/src/main/java/org/apache/storm/scheduler/utils/IConfigLoaderFactory.java
b/storm-server/src/main/java/org/apache/storm/scheduler/utils/IConfigLoaderFactory.java
index 115c05044..bb73496ab 100644
---
a/storm-server/src/main/java/org/apache/storm/scheduler/utils/IConfigLoaderFactory.java
+++
b/storm-server/src/main/java/org/apache/storm/scheduler/utils/IConfigLoaderFactory.java
@@ -26,4 +26,4 @@ public interface IConfigLoaderFactory {
*/
IConfigLoader createIfSupported(URI uri, Map<String, Object> conf);
-}
\ No newline at end of file
+}
diff --git a/storm-server/src/main/java/org/apache/storm/stats/StatsUtil.java
b/storm-server/src/main/java/org/apache/storm/stats/StatsUtil.java
index f449e2553..095b6d2ac 100644
--- a/storm-server/src/main/java/org/apache/storm/stats/StatsUtil.java
+++ b/storm-server/src/main/java/org/apache/storm/stats/StatsUtil.java
@@ -109,9 +109,7 @@ public class StatsUtil {
private static final FromGlobalStreamIdTransformer FROM_GSID = new
FromGlobalStreamIdTransformer();
- //
=====================================================================================
// aggregation stats methods
- //
=====================================================================================
/**
* Aggregates number executed, process latency, and execute latency across
all streams.
@@ -1315,9 +1313,7 @@ public class StatsUtil {
return new ArrayList<WorkerSummary>(workerSummaryMap.values());
}
- //
=====================================================================================
// convert thrift stats to java maps
- //
=====================================================================================
/**
* convert thrift executor heartbeats into a java HashMap.
@@ -1478,9 +1474,7 @@ public class StatsUtil {
}
- //
=====================================================================================
// heartbeats related
- //
=====================================================================================
/**
* extracts a list of executor data from heart beats.
@@ -1873,9 +1867,7 @@ public class StatsUtil {
return ret;
}
- //
=====================================================================================
// thriftify stats methods
- //
=====================================================================================
/**
* Used for local test.
@@ -2089,9 +2081,7 @@ public class StatsUtil {
}
- //
=====================================================================================
// helper methods
- //
=====================================================================================
private static GlobalStreamId toGlobalStreamId(List list) {
return new GlobalStreamId((String) list.get(0), (String) list.get(1));
@@ -2352,9 +2342,7 @@ public class StatsUtil {
}
- //
=====================================================================================
// key transformers
- //
=====================================================================================
public static <K> Map windowSetConverter(Map stats,
ClientStatsUtil.KeyTransformer<K> firstKeyFunc) {
return ClientStatsUtil.windowSetConverter(stats,
ClientStatsUtil.IDENTITY, firstKeyFunc);
diff --git
a/storm-server/src/main/java/org/apache/storm/zookeeper/AclEnforcement.java
b/storm-server/src/main/java/org/apache/storm/zookeeper/AclEnforcement.java
index 693b5858e..1ecdfe36e 100644
--- a/storm-server/src/main/java/org/apache/storm/zookeeper/AclEnforcement.java
+++ b/storm-server/src/main/java/org/apache/storm/zookeeper/AclEnforcement.java
@@ -313,4 +313,4 @@ public class AclEnforcement {
}
verifyAcls(conf, fixUp);
}
-}
\ No newline at end of file
+}
diff --git
a/storm-webapp/src/main/java/org/apache/storm/daemon/common/JsonResponseBuilder.java
b/storm-webapp/src/main/java/org/apache/storm/daemon/common/JsonResponseBuilder.java
index 42b7e7122..96afaff4d 100644
---
a/storm-webapp/src/main/java/org/apache/storm/daemon/common/JsonResponseBuilder.java
+++
b/storm-webapp/src/main/java/org/apache/storm/daemon/common/JsonResponseBuilder.java
@@ -72,4 +72,4 @@ public class JsonResponseBuilder {
respHeaders.forEach(respBuilder::header);
return respBuilder.build();
}
-}
\ No newline at end of file
+}
diff --git
a/storm-webapp/src/main/java/org/apache/storm/daemon/common/ReloadableSslContextFactory.java
b/storm-webapp/src/main/java/org/apache/storm/daemon/common/ReloadableSslContextFactory.java
index 3ca306712..b3980ec55 100644
---
a/storm-webapp/src/main/java/org/apache/storm/daemon/common/ReloadableSslContextFactory.java
+++
b/storm-webapp/src/main/java/org/apache/storm/daemon/common/ReloadableSslContextFactory.java
@@ -81,4 +81,4 @@ public class ReloadableSslContextFactory extends
SslContextFactory.Server {
}
super.doStop();
}
-}
\ No newline at end of file
+}
