diff --git a/THIRD-PARTY.properties b/THIRD-PARTY.properties index f0c2251b4c9..0204dcbd48f 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 2794fcdc29e..d8b52034ec2 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 String nextKey() { 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 c36d88de468..508a4cd152d 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 @@ public void run() { } } -} \ 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 cfb1bf2ff0f..06b3b7a7b38 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 @@ public void run() { 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 2d398550540..528b98d2b9f 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 Map getComponentConfiguration() { 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 80aef42dfed..e8a7ac791d6 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 @@ private void loadConfigKeys(Map conf) { } } -} \ 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 0f8ef9b4ef5..c89b845273d 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 static void login(Map conf, Configuration hdfsConfig) thr } } } -} \ 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 c952abd128f..32ead0c5dd2 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 af195214cb9..920e84ef9ce 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 bcf3c5e14c2..edc063180e5 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 afa35927366..5ca3810e7dd 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 f8ed50c6b23..b63835c1f5c 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 7bcbe7a55d1..3e3bed8d60c 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 a20d85ee306..019ecbfc23a 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 void execute(TupleWindow inputWindow) { 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 3fbcfd063c0..ab9265d1ee9 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 @@ + + @@ -84,7 +86,7 @@ - + @@ -409,6 +411,7 @@ RECORD_DEF, RECORD_PATTERN_DEF"/> + + + + + + + + + + + + + @@ -535,4 +551,4 @@ - \ No newline at end of file + 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 776371fe9da..5bf0199dbae 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 void close() { 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 f2da7bcb638..40e75aba0f4 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 void haltTransferThd() { 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 d488a626362..157954f5f98 100644 --- a/storm-client/src/jvm/org/apache/storm/executor/Executor.java +++ b/storm-client/src/jvm/org/apache/storm/executor/Executor.java @@ -724,9 +724,7 @@ private Map> outboundComponen return ret; } - // ============================================================================= - // ============================ getter methods ================================= - // ============================================================================= + // getter methods private Map normalizedComponentConf( Map 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 15b690dd399..0aa15fe7f45 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 @@ void resetWeight() { 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 d61494c0f88..1c6c212ba12 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 @@ private byte[] getKeyBytes(List values) { 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 Integer chooseTask(int[] assignedTasks) { 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 a3b282a8236..4dce63a07d3 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 @@ -173,4 +173,4 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { 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 e986ce06d30..36dce34f96f 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 Long getDataFrom(CgroupCore core) throws IOException { 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 0a4da72f23b..16c5d73ef19 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 Object getValueAndReset() { } 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 0e6c4873f43..fcf7fbef6d9 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 interface DimensionHandler { */ void setDimensions(Map 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 20c4389d9c1..05d824493d6 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 boolean equals(Object o) { 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 785271c73c7..00f9c7fff6a 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 @@ void degister(MetricFilter metricFilter) { 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 f4c6958d55b..4630a937258 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 @@ private synchronized int getUserHz() throws IOException { } 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 e4478151ee6..7786586a22a 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 void setDimensions(Map dimensions) { 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 8804c1b54fc..a64ba127595 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 void prepare(MetricRegistry metricsRegistry, Map topoConf 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 f4efc92d5c5..647832ee2ce 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 void prepare(MetricRegistry metricsRegistry, Map topoConf 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 da10ac1590f..cd9da98360f 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 void close() throws IOException { 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 4e81667fdc4..7791bafb7a3 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 @@ default void prepare(MetricRegistryProvider metricRegistryProvider, Map userGroups, Set config } 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 7ea37405caa..ad0aa328910 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 void handle(Callback[] callbacks) throws UnsupportedCallbackException { } } } -} \ 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 ab3f4f0885c..6afde704468 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 KeyStore getKeyStore(String keystorePath, String keystorePassword) throws } 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 1ba978a7c80..e78e11afdf4 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 @@ private synchronized void reloadCert(String trustStorePath, String keystorePassw } } -} \ 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 463b47480fc..5eca654635d 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 static Map windowSetConverter( 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 6cf4bdf01ba..f5ba4b1ec09 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 void close() throws Exception { 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 96df6ae0a10..83ba501590e 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 void log(final ShellMsg shellMsg) { 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 5c4c69583c6..3d6492e9633 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 @@ void afterFlush(boolean wasFull) { } } } -} \ 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 75f154eace0..1440c4c072a 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 @@ void setUpContext(Class ownerCls, ShellProcess process, * @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 4997904b514..0ebdfcc8c7a 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 fcc29fca065..9c5564cabae 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 static void main(String[] args) throws Exception { 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 f366629d401..fe77070f641 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 @@ protected final void addCommandArguments(String... arguments) { 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 a6e03327ab9..505d77678ad 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 @@ private static final class WithAcl { 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 b0efc2c860f..0d943eb5057 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 int compare(TopologyDetails topo1, TopologyDetails topo2) { } } } -} \ 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 6a56247a73a..8bbad3f104a 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 int compare(Object o1, Object o2) { 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 8e4c9b91025..6a45882e5de 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 Map load(String configKey) { } 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 115c050448f..bb73496ab53 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 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 f449e2553ea..095b6d2ac44 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 static List aggWorkerStats(String stormId, String stormNam return new ArrayList(workerSummaryMap.values()); } - // ===================================================================================== // convert thrift stats to java maps - // ===================================================================================== /** * convert thrift executor heartbeats into a java HashMap. @@ -1478,9 +1474,7 @@ public static List> extractNodeInfosFromHbForComp( } - // ===================================================================================== // heartbeats related - // ===================================================================================== /** * extracts a list of executor data from heart beats. @@ -1873,9 +1867,7 @@ private static Map> mergeWithAddPair(Map Map windowSetConverter(Map stats, ClientStatsUtil.KeyTransformer 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 693b5858efa..1ecdfe36e5f 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 static void main(String[] args) throws Exception { } 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 42b7e71225b..96afaff4ddb 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 Response build() { 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 3ca306712ff..b3980ec55f7 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 @@ protected void doStop() throws Exception { } super.doStop(); } -} \ No newline at end of file +}