Merge pull request #3118 from srdo/STORM-3500

STORM-3500: Fix spelling error in property storm.blobstore.dependency…
diff --git a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/LoadMetricsServer.java b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/LoadMetricsServer.java
index 90e8f05..c02de27 100644
--- a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/LoadMetricsServer.java
+++ b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/LoadMetricsServer.java
@@ -313,7 +313,7 @@
     }
 
     private static class NoCloseOutputStream extends FilterOutputStream {
-        public NoCloseOutputStream(OutputStream out) {
+        NoCloseOutputStream(OutputStream out) {
             super(out);
         }
 
@@ -328,11 +328,11 @@
         protected final Map<String, MetricExtractor> allExtractors;
         public final boolean includesSysOutOrError;
 
-        public FileReporter(Map<String, MetricExtractor> allExtractors) throws FileNotFoundException {
+        FileReporter(Map<String, MetricExtractor> allExtractors) throws FileNotFoundException {
             this(null, Collections.emptyMap(), allExtractors);
         }
 
-        public FileReporter(String path, Map<String, String> query,  Map<String, MetricExtractor> allExtractors)
+        FileReporter(String path, Map<String, String> query,  Map<String, MetricExtractor> allExtractors)
             throws FileNotFoundException {
             boolean append = Boolean.parseBoolean(query.getOrDefault("append", "false"));
             boolean tee = Boolean.parseBoolean(query.getOrDefault("tee", "false"));
@@ -467,12 +467,12 @@
         private final String unit;
         private final BiFunction<Measurements, TimeUnit, Object> func;
 
-        public MetricExtractor(BiFunction<Measurements, TimeUnit, Object> func) {
+        MetricExtractor(BiFunction<Measurements, TimeUnit, Object> func) {
             this.func = func;
             this.unit = null;
         }
 
-        public MetricExtractor(BiFunction<Measurements, TimeUnit, Object> func, String unit) {
+        MetricExtractor(BiFunction<Measurements, TimeUnit, Object> func, String unit) {
             this.func = func;
             this.unit = unit;
         }
@@ -504,12 +504,12 @@
         protected final int precision;
         protected String doubleFormat;
 
-        public ColumnsFileReporter(String path, Map<String, String> query, Map<String, MetricExtractor> extractorsMap)
+        ColumnsFileReporter(String path, Map<String, String> query, Map<String, MetricExtractor> extractorsMap)
             throws FileNotFoundException {
             this(path, query, extractorsMap, null);
         }
 
-        public ColumnsFileReporter(String path, Map<String, String> query, Map<String, MetricExtractor> extractorsMap,
+        ColumnsFileReporter(String path, Map<String, String> query, Map<String, MetricExtractor> extractorsMap,
                                    String defaultPreceision) throws FileNotFoundException {
             super(path, query, extractorsMap);
             targetUnit = UNIT_MAP.get(query.getOrDefault("time", "MILLISECONDS").toUpperCase());
@@ -590,7 +590,7 @@
         public final String longFormat;
         public final String stringFormat;
 
-        public FixedWidthReporter(String path, Map<String, String> query, Map<String, MetricExtractor> extractorsMap)
+        FixedWidthReporter(String path, Map<String, String> query, Map<String, MetricExtractor> extractorsMap)
             throws FileNotFoundException {
             super(path, query, extractorsMap, "3");
             int columnWidth = Integer.parseInt(query.getOrDefault("columnWidth", "15")) - 1;//Always have a space in between
@@ -599,7 +599,7 @@
             stringFormat = "%" + columnWidth + "s";
         }
 
-        public FixedWidthReporter(Map<String, MetricExtractor> allExtractors) throws FileNotFoundException {
+        FixedWidthReporter(Map<String, MetricExtractor> allExtractors) throws FileNotFoundException {
             this(null, Collections.emptyMap(), allExtractors);
         }
 
@@ -652,7 +652,7 @@
     static class SepValReporter extends ColumnsFileReporter {
         private final String separator;
 
-        public SepValReporter(String separator, String path, Map<String, String> query, Map<String, MetricExtractor> extractorsMap)
+        SepValReporter(String separator, String path, Map<String, String> query, Map<String, MetricExtractor> extractorsMap)
             throws FileNotFoundException {
             super(path, query, extractorsMap);
             this.separator = separator;
@@ -702,12 +702,12 @@
     static class LegacyReporter extends FileReporter {
         private final TimeUnit targetUnitOverride;
 
-        public LegacyReporter(Map<String, MetricExtractor> allExtractors) throws FileNotFoundException {
+        LegacyReporter(Map<String, MetricExtractor> allExtractors) throws FileNotFoundException {
             super(allExtractors);
             targetUnitOverride = null;
         }
 
-        public LegacyReporter(String path, Map<String, String> query, Map<String, MetricExtractor> allExtractors)
+        LegacyReporter(String path, Map<String, String> query, Map<String, MetricExtractor> allExtractors)
             throws FileNotFoundException {
             super(path, query, allExtractors);
             if (query.containsKey("time")) {
diff --git a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/LoadSpout.java b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/LoadSpout.java
index ef454c5..611dc63 100644
--- a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/LoadSpout.java
+++ b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/LoadSpout.java
@@ -41,7 +41,7 @@
     private static class OutputStreamEngineWithHisto extends OutputStreamEngine {
         public final HistogramMetric histogram;
 
-        public OutputStreamEngineWithHisto(OutputStream stats, TopologyContext context) {
+        OutputStreamEngineWithHisto(OutputStream stats, TopologyContext context) {
             super(stats);
             histogram = new HistogramMetric(3600000000000L, 3);
             //TODO perhaps we can adjust the frequency later...
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/BackPressureTopo.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/BackPressureTopo.java
index 0443fd4..5fb7022 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/BackPressureTopo.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/BackPressureTopo.java
@@ -88,7 +88,7 @@
         private OutputCollector collector;
         private long sleepMs;
 
-        public ThrottledBolt(Long sleepMs) {
+        ThrottledBolt(Long sleepMs) {
             this.sleepMs = sleepMs;
         }
 
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/LowThroughputTopo.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/LowThroughputTopo.java
index 38e35bc..71ffd7c 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/LowThroughputTopo.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/LowThroughputTopo.java
@@ -93,7 +93,7 @@
         private SpoutOutputCollector collector = null;
         private long sleepTimeMs;
 
-        public ThrottledSpout(long sleepMs) {
+        ThrottledSpout(long sleepMs) {
             this.sleepTimeMs = sleepMs;
         }
 
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Acker.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Acker.java
index e936329..adcc3a3 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Acker.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Acker.java
@@ -27,7 +27,7 @@
     private final JCQueue ackerInQ;
     private final JCQueue spoutInQ;
 
-    public Acker(JCQueue ackerInQ, JCQueue spoutInQ) {
+    Acker(JCQueue ackerInQ, JCQueue spoutInQ) {
         super("Acker");
         this.ackerInQ = ackerInQ;
         this.spoutInQ = spoutInQ;
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/AckingProducer.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/AckingProducer.java
index 132d793..0214515 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/AckingProducer.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/AckingProducer.java
@@ -27,7 +27,7 @@
     private final JCQueue ackerInQ;
     private final JCQueue spoutInQ;
 
-    public AckingProducer(JCQueue ackerInQ, JCQueue spoutInQ) {
+    AckingProducer(JCQueue ackerInQ, JCQueue spoutInQ) {
         super("AckingProducer");
         this.ackerInQ = ackerInQ;
         this.spoutInQ = spoutInQ;
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Consumer.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Consumer.java
index 52ff210..eadb51d 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Consumer.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Consumer.java
@@ -26,7 +26,7 @@
     public final MutableLong counter = new MutableLong(0);
     private final JCQueue queue;
 
-    public Consumer(JCQueue queue) {
+    Consumer(JCQueue queue) {
         super("Consumer");
         this.queue = queue;
     }
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Forwarder.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Forwarder.java
index 2f951dd..a5781d0 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Forwarder.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Forwarder.java
@@ -27,7 +27,7 @@
     private final JCQueue inq;
     private final JCQueue outq;
 
-    public Forwarder(JCQueue inq, JCQueue outq) {
+    Forwarder(JCQueue inq, JCQueue outq) {
         super("Forwarder");
         this.inq = inq;
         this.outq = outq;
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/MyThread.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/MyThread.java
index 4c84316..5a5f6fc 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/MyThread.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/MyThread.java
@@ -22,7 +22,7 @@
     public long count = 0;
     public long runTime = 0;
 
-    public MyThread(String thdName) {
+    MyThread(String thdName) {
         super(thdName);
     }
 
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Producer.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Producer.java
index eb02d5e..2801819 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Producer.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/Producer.java
@@ -23,7 +23,7 @@
 class Producer extends MyThread {
     private final JCQueue queue;
 
-    public Producer(JCQueue queue) {
+    Producer(JCQueue queue) {
         super("Producer");
         this.queue = queue;
     }
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 8df519b..c36d88d 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
@@ -27,7 +27,7 @@
     private final JCQueue q1;
     private final JCQueue q2;
 
-    public Producer2(JCQueue q1, JCQueue q2) {
+    Producer2(JCQueue q1, JCQueue q2) {
         super("Producer2");
         this.q1 = q1;
         this.q2 = q2;
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/Cons.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/Cons.java
index 3783310..257e9e7 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/Cons.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/Cons.java
@@ -26,7 +26,7 @@
     public final MutableLong counter = new MutableLong(0);
     private final MpscArrayQueue<Object> queue;
 
-    public Cons(MpscArrayQueue<Object> queue) {
+    Cons(MpscArrayQueue<Object> queue) {
         super("Consumer");
         this.queue = queue;
     }
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/MyThd.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/MyThd.java
index fbd7aab..0922c23 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/MyThd.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/MyThd.java
@@ -23,7 +23,7 @@
     public long runTime = 0;
     public boolean halt = false;
 
-    public MyThd(String thdName) {
+    MyThd(String thdName) {
         super(thdName);
     }
 
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 3553552..cfb1bf2 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
@@ -23,7 +23,7 @@
 class Prod extends MyThd {
     private final MpscArrayQueue<Object> queue;
 
-    public Prod(MpscArrayQueue<Object> queue) {
+    Prod(MpscArrayQueue<Object> queue) {
         super("Producer");
         this.queue = queue;
     }
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/Prod2.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/Prod2.java
index 470522a..e0eea19 100644
--- a/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/Prod2.java
+++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/toolstest/Prod2.java
@@ -27,7 +27,7 @@
     private final MpscArrayQueue<Object> q1;
     private final MpscArrayQueue<Object> q2;
 
-    public Prod2(MpscArrayQueue<Object> q1, MpscArrayQueue<Object> q2) {
+    Prod2(MpscArrayQueue<Object> q1, MpscArrayQueue<Object> q2) {
         super("Producer2");
         this.q1 = q1;
         this.q2 = q2;
diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java
index 54456ec..243f1bf 100644
--- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java
+++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/LookupWordCount.java
@@ -126,7 +126,7 @@
         private RedisDataTypeDescription description;
         private final String hashKey = "wordCount";
 
-        public WordCountRedisLookupMapper() {
+        WordCountRedisLookupMapper() {
             description = new RedisDataTypeDescription(
                     RedisDataTypeDescription.RedisDataType.HASH, hashKey);
         }
diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/PersistentWordCount.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/PersistentWordCount.java
index eca75ea..93f790b 100644
--- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/PersistentWordCount.java
+++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/PersistentWordCount.java
@@ -79,7 +79,7 @@
         private RedisDataTypeDescription description;
         private final String hashKey = "wordCount";
 
-        public WordCountStoreMapper() {
+        WordCountStoreMapper() {
             description = new RedisDataTypeDescription(
                     RedisDataTypeDescription.RedisDataType.HASH, hashKey);
         }
diff --git a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java
index 8640335..5b47f0c 100644
--- a/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java
+++ b/examples/storm-redis-examples/src/main/java/org/apache/storm/redis/topology/WhitelistWordCount.java
@@ -122,7 +122,7 @@
         private RedisDataTypeDescription description;
         private final String setKey = "whitelist";
 
-        public WhitelistWordFilterMapper() {
+        WhitelistWordFilterMapper() {
             description = new RedisDataTypeDescription(
                     RedisDataTypeDescription.RedisDataType.SET, setKey);
         }
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/Prefix.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/Prefix.java
index 94df975..31f200a 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/Prefix.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/Prefix.java
@@ -17,7 +17,7 @@
 class Prefix implements Serializable {
     private String str;
 
-    public Prefix(String str) {
+    Prefix(String str) {
         this.str = str;
     }
 
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/TridentMinMaxOfDevicesTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/TridentMinMaxOfDevicesTopology.java
index 176326e..5944408 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/TridentMinMaxOfDevicesTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/TridentMinMaxOfDevicesTopology.java
@@ -156,7 +156,7 @@
         final int maxSpeed;
         final double efficiency;
 
-        public Vehicle(String name, int maxSpeed, double efficiency) {
+        Vehicle(String name, int maxSpeed, double efficiency) {
             this.name = name;
             this.maxSpeed = maxSpeed;
             this.efficiency = efficiency;
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/TridentMinMaxOfVehiclesTopology.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/TridentMinMaxOfVehiclesTopology.java
index 83e9d62..3c0ff31 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/TridentMinMaxOfVehiclesTopology.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/trident/TridentMinMaxOfVehiclesTopology.java
@@ -134,7 +134,7 @@
         final int maxSpeed;
         final double efficiency;
 
-        public Vehicle(String name, int maxSpeed, double efficiency) {
+        Vehicle(String name, int maxSpeed, double efficiency) {
             this.name = name;
             this.maxSpeed = maxSpeed;
             this.efficiency = efficiency;
diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java
index 807d2ad..8cea761 100644
--- a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java
+++ b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java
@@ -119,11 +119,11 @@
      */
     protected abstract String getConfigKeyString();
 
-    protected abstract byte[] getHadoopCredentials(Map<String, Object> topologyConf, String configKey, final String topologyOwnerPrincipal);
+    protected abstract byte[] getHadoopCredentials(Map<String, Object> topologyConf, String configKey, String topologyOwnerPrincipal);
 
-    protected abstract byte[] getHadoopCredentials(Map<String, Object> topologyConf, final String topologyOwnerPrincipal);
+    protected abstract byte[] getHadoopCredentials(Map<String, Object> topologyConf, String topologyOwnerPrincipal);
 
-    protected abstract void doRenew(Map<String, String> credentials, Map<String, Object> topologyConf, final String topologyOwnerPrincipal);
+    protected abstract void doRenew(Map<String, String> credentials, Map<String, Object> topologyConf, String topologyOwnerPrincipal);
 
     protected List<String> getConfigKeys(Map<String, Object> conf) {
         String configKeyString = getConfigKeyString();
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BaseBeanFactory.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BaseBeanFactory.java
index de6afaf..37b638a 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BaseBeanFactory.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BaseBeanFactory.java
@@ -45,7 +45,7 @@
     /**
      * Return a new instance of T.
      */
-    protected abstract T make(final Map<String, Object> topoConf);
+    protected abstract T make(Map<String, Object> topoConf);
 
     /**
      * {@inheritDoc}
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BeanFactory.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BeanFactory.java
index 8dbbbae..78414f8 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BeanFactory.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BeanFactory.java
@@ -23,7 +23,7 @@
     /**
      * Sets the storm context.
      */
-    public void setStormContext(WorkerCtx context);
+    void setStormContext(WorkerCtx context);
 
     /**
      * Return an instance, which may be shared or independent, of the specified type.
@@ -36,5 +36,5 @@
      * Returns a new copy if this factory.
      * @return a new {@link BeanFactory} instance.
      */
-    public BeanFactory<T> newInstance();
+    BeanFactory<T> newInstance();
 }
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncExecutor.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncExecutor.java
index eec9026..0b8f66c 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncExecutor.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncExecutor.java
@@ -222,7 +222,7 @@
         private final List<Throwable> exceptions;
         private final Semaphore throttle;
 
-        public AsyncContext(List<T> inputs, Semaphore throttle, SettableFuture<List<T>> settableFuture) {
+        AsyncContext(List<T> inputs, Semaphore throttle, SettableFuture<List<T>> settableFuture) {
             this.inputs = inputs;
             this.latch = new AtomicInteger(inputs.size());
             this.throttle = throttle;
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncResultHandler.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncResultHandler.java
index 2f8766e..8241347 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncResultHandler.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncResultHandler.java
@@ -20,7 +20,7 @@
  */
 public interface AsyncResultHandler<T> extends Serializable {
 
-    public static final AsyncResultHandler NO_OP_HANDLER = new AsyncResultHandler() {
+    AsyncResultHandler NO_OP_HANDLER = new AsyncResultHandler() {
         @Override
         public void failure(Throwable t, Object inputs) {
             /** no-operation **/
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncResultSetHandler.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncResultSetHandler.java
index 7a2159d..23f755a 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncResultSetHandler.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncResultSetHandler.java
@@ -20,7 +20,7 @@
  */
 public interface AsyncResultSetHandler<T> extends Serializable {
 
-    public static final AsyncResultSetHandler NO_OP_HANDLER = new AsyncResultSetHandler() {
+    AsyncResultSetHandler NO_OP_HANDLER = new AsyncResultSetHandler() {
         @Override
         public void failure(Throwable t, Object inputs) {
             /** no-operation **/
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/ExecutionResultCollector.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/ExecutionResultCollector.java
index 8c8057d..258a927 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/ExecutionResultCollector.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/ExecutionResultCollector.java
@@ -25,7 +25,7 @@
 
     void handle(OutputCollector collector, ExecutionResultHandler handler);
 
-    public static final class SucceedCollector implements ExecutionResultCollector {
+    final class SucceedCollector implements ExecutionResultCollector {
 
         private final List<Tuple> inputs;
 
@@ -60,7 +60,7 @@
         }
     }
 
-    public static final class FailedCollector implements ExecutionResultCollector {
+    final class FailedCollector implements ExecutionResultCollector {
 
         private final Throwable cause;
         private final List<Tuple> inputs;
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java
index 29290a2..1b0ab79 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java
@@ -37,7 +37,7 @@
     List<Statement> map(Map<String, Object> conf, Session session, ITuple tuple);
 
     @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
-    public static class DynamicCQLStatementTupleMapper implements CQLStatementTupleMapper {
+    class DynamicCQLStatementTupleMapper implements CQLStatementTupleMapper {
         private List<CQLStatementBuilder> builders;
 
         public DynamicCQLStatementTupleMapper(List<CQLStatementBuilder> builders) {
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java
index f308540..15594ac 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java
@@ -30,12 +30,12 @@
      *
      * @return a string bound query.
      */
-    public String resolves(Map<String, Object> config, ITuple tuple);
+    String resolves(Map<String, Object> config, ITuple tuple);
 
     /**
      * Static implementation of {@link ContextQuery} interface.
      */
-    public static final class StaticContextQuery implements ContextQuery {
+    final class StaticContextQuery implements ContextQuery {
         private final String value;
 
         /**
@@ -55,7 +55,7 @@
      * Default {@link BoundQueryContext} implementation to retrieve a bound query
      * identified by the provided key.
      */
-    public static final class BoundQueryContext implements ContextQuery {
+    final class BoundQueryContext implements ContextQuery {
         private String key;
 
         public BoundQueryContext(String key) {
@@ -76,7 +76,7 @@
      * Default {@link BoundQueryNamedByFieldContext} implementation to retrieve a bound query named by
      * the value of a specified tuple field.
      */
-    public static final class BoundQueryNamedByFieldContext implements ContextQuery {
+    final class BoundQueryNamedByFieldContext implements ContextQuery {
 
         private String fieldName;
 
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CqlMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CqlMapper.java
index 9a1892b..51368fd 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CqlMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CqlMapper.java
@@ -31,7 +31,7 @@
     List<Column> map(ITuple tuple);
 
 
-    public static final class SelectableCqlMapper implements CqlMapper {
+    final class SelectableCqlMapper implements CqlMapper {
 
         private final List<FieldSelector> selectors;
 
@@ -59,7 +59,7 @@
     /**
      * Default {@link CqlMapper} to map all tuple values to column.
      */
-    public static final class DefaultCqlMapper implements CqlMapper {
+    final class DefaultCqlMapper implements CqlMapper {
 
         /**
          * Creates a new {@link org.apache.storm.cassandra.query.CqlMapper.DefaultCqlMapper} instance.
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/PreparedStatementBinder.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/PreparedStatementBinder.java
index 1c82ee6..0019ab0 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/PreparedStatementBinder.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/PreparedStatementBinder.java
@@ -21,9 +21,9 @@
 
 public interface PreparedStatementBinder extends Serializable {
 
-    public BoundStatement apply(PreparedStatement statement, List<Column> columns);
+    BoundStatement apply(PreparedStatement statement, List<Column> columns);
 
-    public static final class DefaultBinder implements PreparedStatementBinder {
+    final class DefaultBinder implements PreparedStatementBinder {
 
         /**
          * {@inheritDoc}
@@ -36,7 +36,7 @@
     }
 
     @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
-    public static final class CQL3NamedSettersBinder implements PreparedStatementBinder {
+    final class CQL3NamedSettersBinder implements PreparedStatementBinder {
 
         /**
          * {@inheritDoc}
diff --git a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsState.java b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsState.java
index 86863d7..3a8e202 100644
--- a/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsState.java
+++ b/external/storm-elasticsearch/src/main/java/org/apache/storm/elasticsearch/trident/EsState.java
@@ -58,7 +58,7 @@
      * @param esConfig Elasticsearch configuration containing node addresses and cluster name {@link EsConfig}
      * @param tupleMapper Tuple to ES document mapper {@link EsTupleMapper}
      */
-    public EsState(EsConfig esConfig, EsTupleMapper tupleMapper) {
+    EsState(EsConfig esConfig, EsTupleMapper tupleMapper) {
         this.esConfig = esConfig;
         this.objectMapper = new ObjectMapper();
         this.tupleMapper = tupleMapper;
diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/IEventDataFormat.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/IEventDataFormat.java
index 08f8e63..fb03a7c 100644
--- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/IEventDataFormat.java
+++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/bolt/IEventDataFormat.java
@@ -25,5 +25,5 @@
  * Serialize a tuple to a byte array to be sent to EventHubs.
  */
 public interface IEventDataFormat extends Serializable {
-    public byte[] serialize(Tuple tuple);
+    byte[] serialize(Tuple tuple);
 }
diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IStateStore.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IStateStore.java
index 311ceb7..a2c4d4f 100755
--- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IStateStore.java
+++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/spout/IStateStore.java
@@ -22,11 +22,11 @@
 
 public interface IStateStore extends Serializable {
 
-    public void open();
+    void open();
 
-    public void close();
+    void close();
 
-    public void saveData(String path, String data);
+    void saveData(String path, String data);
 
-    public String readData(String path);
+    String readData(String path);
 }
diff --git a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/ITridentPartitionManager.java b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/ITridentPartitionManager.java
index e1abdba..aa1e567 100755
--- a/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/ITridentPartitionManager.java
+++ b/external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/ITridentPartitionManager.java
@@ -33,5 +33,5 @@
      * @param count  max number of messages in this batch
      * @return list of EventData, if failed to receive, return empty list
      */
-    public List<EventDataWrap> receiveBatch(String offset, int count);
+    List<EventDataWrap> receiveBatch(String offset, int count);
 }
diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/HBaseValueMapper.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/HBaseValueMapper.java
index d26b125..a234de7 100644
--- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/HBaseValueMapper.java
+++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/bolt/mapper/HBaseValueMapper.java
@@ -27,7 +27,7 @@
      * @param result HBase lookup result instance
      * @return list of values that should be emitted by the lookup bolt
      */
-    public List<Values> toValues(ITuple input, Result result) throws Exception;
+    List<Values> toValues(ITuple input, Result result) throws Exception;
 
     /**
      * declares the output fields for the lookup bolt.
diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/mapper/TridentHBaseMapMapper.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/mapper/TridentHBaseMapMapper.java
index a9ea429..fde9dea 100644
--- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/mapper/TridentHBaseMapMapper.java
+++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/mapper/TridentHBaseMapMapper.java
@@ -25,10 +25,10 @@
     /**
      * Given a tuple's grouped key list, return the HBase rowkey.
      */
-    public byte[] rowKey(List<Object> keys);
+    byte[] rowKey(List<Object> keys);
 
     /**
      * Given a tuple's grouped key list, return the HBase qualifier.
      */
-    public String qualifier(List<Object> keys);
+    String qualifier(List<Object> keys);
 }
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
index a145274..ee82066 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java
@@ -311,7 +311,7 @@
         final long maxWriters;
         final OutputCollector collector;
 
-        public WritersMap(long maxWriters, OutputCollector collector) {
+        WritersMap(long maxWriters, OutputCollector collector) {
             super((int) maxWriters, 0.75f, true);
             this.maxWriters = maxWriters;
             this.collector = collector;
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/FileSizeRotationPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/FileSizeRotationPolicy.java
index 24a46dd..eca10d6 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/FileSizeRotationPolicy.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/FileSizeRotationPolicy.java
@@ -61,7 +61,7 @@
         return new FileSizeRotationPolicy(this.maxBytes);
     }
 
-    public static enum Units {
+    public enum Units {
 
         KB((long) Math.pow(2, 10)),
         MB((long) Math.pow(2, 20)),
@@ -70,7 +70,7 @@
 
         private long byteCount;
 
-        private Units(long byteCount) {
+        Units(long byteCount) {
             this.byteCount = byteCount;
         }
 
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/TimedRotationPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/TimedRotationPolicy.java
index e600831..c2f7e16 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/TimedRotationPolicy.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/TimedRotationPolicy.java
@@ -61,7 +61,7 @@
         return this.interval;
     }
 
-    public static enum TimeUnit {
+    public enum TimeUnit {
 
         SECONDS((long) 1000),
         MINUTES((long) 1000 * 60),
@@ -70,7 +70,7 @@
 
         private long milliSeconds;
 
-        private TimeUnit(long milliSeconds) {
+        TimeUnit(long milliSeconds) {
             this.milliSeconds = milliSeconds;
         }
 
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/Partitioner.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/Partitioner.java
index 1488655..92f6747 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/Partitioner.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/Partitioner.java
@@ -25,5 +25,5 @@
      *
      * @param tuple The tuple for which the relative path is being calculated.
      */
-    public String getPartitionPath(final Tuple tuple);
+    String getPartitionPath(Tuple tuple);
 }
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/AbstractFileReader.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/AbstractFileReader.java
index 6d5537b..614d240 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/AbstractFileReader.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/AbstractFileReader.java
@@ -20,7 +20,7 @@
 
     private final Path file;
 
-    public AbstractFileReader(FileSystem fs, Path file) {
+    AbstractFileReader(FileSystem fs, Path file) {
         if (fs == null) {
             throw new IllegalArgumentException("filesystem arg cannot be null for reader");
         }
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java
index a7ce729..446fb85 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java
@@ -793,7 +793,7 @@
         public String fullPath;
         public FileOffset offset;
 
-        public MessageId(long msgNumber, Path fullPath, FileOffset offset) {
+        MessageId(long msgNumber, Path fullPath, FileOffset offset) {
             this.msgNumber = msgNumber;
             this.fullPath = fullPath.toString();
             this.offset = offset;
@@ -821,13 +821,13 @@
         public final Path oldFile;
         public final Path newFile;
 
-        public RenameException(Path oldFile, Path newFile) {
+        RenameException(Path oldFile, Path newFile) {
             super("Rename of " + oldFile + " to " + newFile + " failed");
             this.oldFile = oldFile;
             this.newFile = newFile;
         }
 
-        public RenameException(Path oldFile, Path newFile, IOException cause) {
+        RenameException(Path oldFile, Path newFile, IOException cause) {
             super("Rename of " + oldFile + " to " + newFile + " failed", cause);
             this.oldFile = oldFile;
             this.newFile = newFile;
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/FileSizeRotationPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/FileSizeRotationPolicy.java
index 18790d8..f9631b7 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/FileSizeRotationPolicy.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/FileSizeRotationPolicy.java
@@ -65,7 +65,7 @@
         return maxBytes;
     }
 
-    public static enum Units {
+    public enum Units {
 
         KB((long) Math.pow(2, 10)),
         MB((long) Math.pow(2, 20)),
@@ -74,7 +74,7 @@
 
         private long byteCount;
 
-        private Units(long byteCount) {
+        Units(long byteCount) {
             this.byteCount = byteCount;
         }
 
diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/TimedRotationPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/TimedRotationPolicy.java
index 4539464..5f4475c 100644
--- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/TimedRotationPolicy.java
+++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/TimedRotationPolicy.java
@@ -77,7 +77,7 @@
         rotationTimer.scheduleAtFixedRate(task, interval, interval);
     }
 
-    public static enum TimeUnit {
+    public enum TimeUnit {
 
         SECONDS((long) 1000),
         MINUTES((long) 1000 * 60),
@@ -86,7 +86,7 @@
 
         private long milliSeconds;
 
-        private TimeUnit(long milliSeconds) {
+        TimeUnit(long milliSeconds) {
             this.milliSeconds = milliSeconds;
         }
 
diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcLookupMapper.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcLookupMapper.java
index 32e98e2..2736814 100644
--- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcLookupMapper.java
+++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcLookupMapper.java
@@ -27,7 +27,7 @@
      * @param columns list of columns that represents a row
      * @return a List of storm values that can be emitted. Each item in list is emitted as an output tuple.
      */
-    public List<Values> toTuple(ITuple input, List<Column> columns);
+    List<Values> toTuple(ITuple input, List<Column> columns);
 
     /**
      * declare what are the fields that this code will output.
diff --git a/external/storm-jms/src/main/java/org/apache/storm/jms/JmsMessageProducer.java b/external/storm-jms/src/main/java/org/apache/storm/jms/JmsMessageProducer.java
index 1dcd608..e9010ab 100644
--- a/external/storm-jms/src/main/java/org/apache/storm/jms/JmsMessageProducer.java
+++ b/external/storm-jms/src/main/java/org/apache/storm/jms/JmsMessageProducer.java
@@ -29,5 +29,5 @@
      * Translate a <code>org.apache.storm.tuple.Tuple</code> object
      * to a <code>javax.jms.Message</code> object.
      */
-    public Message toMessage(Session session, ITuple input) throws JMSException;
+    Message toMessage(Session session, ITuple input) throws JMSException;
 }
diff --git a/external/storm-jms/src/main/java/org/apache/storm/jms/JmsProvider.java b/external/storm-jms/src/main/java/org/apache/storm/jms/JmsProvider.java
index 324ff9d..be81fad 100644
--- a/external/storm-jms/src/main/java/org/apache/storm/jms/JmsProvider.java
+++ b/external/storm-jms/src/main/java/org/apache/storm/jms/JmsProvider.java
@@ -28,11 +28,11 @@
      *
      * @return the connection factory
      */
-    public ConnectionFactory connectionFactory() throws Exception;
+    ConnectionFactory connectionFactory() throws Exception;
 
     /**
      * Provides the <code>Destination</code> (topic or queue) from which the
      * <code>JmsSpout</code> will receive messages.
      */
-    public Destination destination() throws Exception;
+    Destination destination() throws Exception;
 }
diff --git a/external/storm-jms/src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java b/external/storm-jms/src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java
index bf310f4..cd0bf54 100644
--- a/external/storm-jms/src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java
+++ b/external/storm-jms/src/main/java/org/apache/storm/jms/trident/TridentJmsSpout.java
@@ -78,7 +78,7 @@
      * @return A friendly string describing the acknowledge mode
      * @throws IllegalArgumentException if the mode is not recognized
      */
-    private static final String toDeliveryModeString(int acknowledgeMode) {
+    private static String toDeliveryModeString(int acknowledgeMode) {
         switch (acknowledgeMode) {
             case Session.AUTO_ACKNOWLEDGE:
                 return "AUTO_ACKNOWLEDGE";
@@ -188,7 +188,7 @@
         private final Logger log = LoggerFactory.getLogger(JmsEmitter.class);
         private long lastRotate;
 
-        public JmsEmitter(String name, JmsProvider jmsProvider, JmsTupleProducer tupleProducer, int jmsAcknowledgeMode,
+        JmsEmitter(String name, JmsProvider jmsProvider, JmsTupleProducer tupleProducer, int jmsAcknowledgeMode,
                           Map<String, Object> conf) {
             if (jmsProvider == null) {
                 throw new IllegalStateException("JMS provider has not been set.");
@@ -359,7 +359,7 @@
 
         private final Logger log = LoggerFactory.getLogger(JmsBatchCoordinator.class);
 
-        public JmsBatchCoordinator(String name) {
+        JmsBatchCoordinator(String name) {
             this.name = name;
             log.info("Created batch coordinator for " + name);
         }
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
index 27a531c..391aecc 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
@@ -728,7 +728,7 @@
         //The subset of earliest retriable offsets that are on pollable partitions
         private final Map<TopicPartition, Long> pollableEarliestRetriableOffsets;
 
-        public PollablePartitionsInfo(Set<TopicPartition> pollablePartitions, Map<TopicPartition, Long> earliestRetriableOffsets) {
+        PollablePartitionsInfo(Set<TopicPartition> pollablePartitions, Map<TopicPartition, Long> earliestRetriableOffsets) {
             this.pollablePartitions = pollablePartitions;
             this.pollableEarliestRetriableOffsets = earliestRetriableOffsets.entrySet().stream()
                 .filter(entry -> pollablePartitions.contains(entry.getKey()))
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryExponentialBackoff.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryExponentialBackoff.java
index f0db397..0b99a40 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryExponentialBackoff.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryExponentialBackoff.java
@@ -73,7 +73,7 @@
         private final KafkaSpoutMessageId msgId;
         private long nextRetryTimeNanos;
 
-        public RetrySchedule(KafkaSpoutMessageId msgId, long nextRetryTimeNanos) {
+        RetrySchedule(KafkaSpoutMessageId msgId, long nextRetryTimeNanos) {
             this.msgId = msgId;
             this.nextRetryTimeNanos = nextRetryTimeNanos;
             LOG.debug("Created {}", this);
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/RecordTranslator.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/RecordTranslator.java
index 12263bd..e8d938c 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/RecordTranslator.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/RecordTranslator.java
@@ -29,7 +29,7 @@
  * Translate a {@link org.apache.kafka.clients.consumer.ConsumerRecord} to a tuple.
  */
 public interface RecordTranslator<K, V> extends Serializable, Func<ConsumerRecord<K, V>, List<Object>> {
-    public static final List<String> DEFAULT_STREAM = Collections.singletonList("default");
+    List<String> DEFAULT_STREAM = Collections.singletonList("default");
     
     /**
      * Translate the ConsumerRecord into a list of objects that can be emitted.
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/ConsumerFactory.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/ConsumerFactory.java
index 469a5f6..e7f9288 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/ConsumerFactory.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/internal/ConsumerFactory.java
@@ -24,5 +24,5 @@
  * This is here to enable testing.
  */
 public interface ConsumerFactory<K, V> extends Serializable {
-    public Consumer<K,V> createConsumer(Map<String, Object> consumerProps);
+    Consumer<K,V> createConsumer(Map<String, Object> consumerProps);
 }
diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/subscription/ManualPartitioner.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/subscription/ManualPartitioner.java
index 9db0613..b6f3060 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/subscription/ManualPartitioner.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/subscription/ManualPartitioner.java
@@ -40,5 +40,5 @@
      * @param context the context of the topology
      * @return the subset of the partitions that this spout task should handle.
      */
-    public Set<TopicPartition> getPartitionsForThisTask(List<TopicPartition> allPartitionsSorted, TopologyContext context);
+    Set<TopicPartition> getPartitionsForThisTask(List<TopicPartition> allPartitionsSorted, TopologyContext context);
 }
diff --git a/external/storm-kafka-migration/src/main/java/org/apache/storm/kafka/migration/KafkaTridentSpoutMigration.java b/external/storm-kafka-migration/src/main/java/org/apache/storm/kafka/migration/KafkaTridentSpoutMigration.java
index cfec761..25a16dc 100644
--- a/external/storm-kafka-migration/src/main/java/org/apache/storm/kafka/migration/KafkaTridentSpoutMigration.java
+++ b/external/storm-kafka-migration/src/main/java/org/apache/storm/kafka/migration/KafkaTridentSpoutMigration.java
@@ -59,7 +59,7 @@
         private final long firstOffset;
         private final long lastOffset;
 
-        public PartitionMetadata(long firstOffset, long lastOffset) {
+        PartitionMetadata(long firstOffset, long lastOffset) {
             this.firstOffset = firstOffset;
             this.lastOffset = lastOffset;
         }
diff --git a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/ITupleOpenTsdbDatapointMapper.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/ITupleOpenTsdbDatapointMapper.java
index a89448b..c385bba 100644
--- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/ITupleOpenTsdbDatapointMapper.java
+++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/ITupleOpenTsdbDatapointMapper.java
@@ -34,6 +34,6 @@
      *
      * @param tuple tuple instance
      */
-    public OpenTsdbMetricDatapoint getMetricPoint(ITuple tuple);
+    OpenTsdbMetricDatapoint getMetricPoint(ITuple tuple);
 
 }
diff --git a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/client/ClientResponse.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/client/ClientResponse.java
index 96acb12..bb51b5c 100644
--- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/client/ClientResponse.java
+++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/client/ClientResponse.java
@@ -30,7 +30,7 @@
 public interface ClientResponse extends Serializable {
 
 
-    public class Summary implements ClientResponse {
+    class Summary implements ClientResponse {
         private int failed;
         private int success;
         private int timeouts;
@@ -95,7 +95,7 @@
         }
     }
 
-    public class Details extends Summary {
+    class Details extends Summary {
         private List<Error> errors;
 
         public Details() {
diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisCommandsInstanceContainer.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisCommandsInstanceContainer.java
index 82b56cf..49a3373 100644
--- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisCommandsInstanceContainer.java
+++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisCommandsInstanceContainer.java
@@ -35,5 +35,5 @@
      * Release Container.
      */
     @Override
-    public void close();
+    void close();
 }
diff --git a/flux/flux-core/src/main/java/org/apache/storm/flux/api/TopologySource.java b/flux/flux-core/src/main/java/org/apache/storm/flux/api/TopologySource.java
index 1944c38..a18b650 100644
--- a/flux/flux-core/src/main/java/org/apache/storm/flux/api/TopologySource.java
+++ b/flux/flux-core/src/main/java/org/apache/storm/flux/api/TopologySource.java
@@ -35,5 +35,5 @@
  *
  */
 public interface TopologySource {
-    public StormTopology getTopology(Map<String, Object> config);
+    StormTopology getTopology(Map<String, Object> config);
 }
diff --git a/flux/flux-core/src/main/java/org/apache/storm/flux/model/GroupingDef.java b/flux/flux-core/src/main/java/org/apache/storm/flux/model/GroupingDef.java
index f191e3c..06885f6 100644
--- a/flux/flux-core/src/main/java/org/apache/storm/flux/model/GroupingDef.java
+++ b/flux/flux-core/src/main/java/org/apache/storm/flux/model/GroupingDef.java
@@ -28,7 +28,7 @@
     /**
      * Types of stream groupings Storm allows.
      */
-    public static enum Type {
+    public enum Type {
         ALL,
         CUSTOM,
         DIRECT,
diff --git a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlImpl.java b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlImpl.java
index 2f30063..a91dcae 100644
--- a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlImpl.java
+++ b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/StormSqlImpl.java
@@ -36,7 +36,7 @@
 class StormSqlImpl extends StormSql {
     private final StormSqlContext sqlContext;
 
-    public StormSqlImpl() {
+    StormSqlImpl() {
         sqlContext = new StormSqlContext();
     }
 
diff --git a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/RexNodeToJavaCodeCompiler.java b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/RexNodeToJavaCodeCompiler.java
index 99e557f..ed62271 100644
--- a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/RexNodeToJavaCodeCompiler.java
+++ b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/compiler/RexNodeToJavaCodeCompiler.java
@@ -202,7 +202,7 @@
         public final Constructor constructor;
         public final Field field;
 
-        private StormBuiltInMethod(Method method, Constructor constructor, Field field) {
+        StormBuiltInMethod(Method method, Constructor constructor, Field field) {
             this.method = method;
             this.constructor = constructor;
             this.field = field;
diff --git a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/planner/streams/StreamsStormRuleSets.java b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/planner/streams/StreamsStormRuleSets.java
index 0fd2ae1..53a17b8 100644
--- a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/planner/streams/StreamsStormRuleSets.java
+++ b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/planner/streams/StreamsStormRuleSets.java
@@ -90,11 +90,11 @@
     private static class StormRuleSet implements RuleSet {
         final ImmutableSet<RelOptRule> rules;
 
-        public StormRuleSet(ImmutableSet<RelOptRule> rules) {
+        StormRuleSet(ImmutableSet<RelOptRule> rules) {
             this.rules = rules;
         }
 
-        public StormRuleSet(ImmutableList<RelOptRule> rules) {
+        StormRuleSet(ImmutableList<RelOptRule> rules) {
             this.rules = ImmutableSet.<RelOptRule>builder()
                 .addAll(rules)
                 .build();
diff --git a/sql/storm-sql-external/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/KafkaDataSourcesProvider.java b/sql/storm-sql-external/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/KafkaDataSourcesProvider.java
index 2c22cc8..2af340d 100644
--- a/sql/storm-sql-external/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/KafkaDataSourcesProvider.java
+++ b/sql/storm-sql-external/storm-sql-kafka/src/jvm/org/apache/storm/sql/kafka/KafkaDataSourcesProvider.java
@@ -83,7 +83,7 @@
         private final Properties props;
         private final IOutputSerializer serializer;
 
-        public KafkaStreamsDataSource(KafkaSpoutConfig<ByteBuffer, ByteBuffer> kafkaSpoutConfig, String bootstrapServers,
+        KafkaStreamsDataSource(KafkaSpoutConfig<ByteBuffer, ByteBuffer> kafkaSpoutConfig, String bootstrapServers,
             String topic, Properties props, IOutputSerializer serializer) {
             this.kafkaSpoutConfig = kafkaSpoutConfig;
             this.bootstrapServers = bootstrapServers;
diff --git a/storm-buildtools/storm-maven-plugins/src/main/java/org/apache/storm/maven/plugin/util/CommandExec.java b/storm-buildtools/storm-maven-plugins/src/main/java/org/apache/storm/maven/plugin/util/CommandExec.java
index 8bad082..031bf74 100644
--- a/storm-buildtools/storm-maven-plugins/src/main/java/org/apache/storm/maven/plugin/util/CommandExec.java
+++ b/storm-buildtools/storm-maven-plugins/src/main/java/org/apache/storm/maven/plugin/util/CommandExec.java
@@ -56,7 +56,7 @@
         private List<String> output;
         private BufferedReader reader;
 
-        public OutputBufferThread(InputStream is) {
+        OutputBufferThread(InputStream is) {
             this.setDaemon(true);
             output = new ArrayList<String>();
             reader = new BufferedReader(new InputStreamReader(is));
diff --git a/storm-checkstyle/src/main/resources/storm/storm_checkstyle.xml b/storm-checkstyle/src/main/resources/storm/storm_checkstyle.xml
index 4b20a6f..a2a7689 100644
--- a/storm-checkstyle/src/main/resources/storm/storm_checkstyle.xml
+++ b/storm-checkstyle/src/main/resources/storm/storm_checkstyle.xml
@@ -257,5 +257,6 @@
             <property name="exceptionVariableName" value="expected"/>
         </module>
         <module name="CommentsIndentation"/>
+        <module name="RedundantModifier"/>
     </module>
 </module>
diff --git a/storm-client/src/jvm/org/apache/storm/ICredentialsListener.java b/storm-client/src/jvm/org/apache/storm/ICredentialsListener.java
index 975bbe7..bb25b6a 100644
--- a/storm-client/src/jvm/org/apache/storm/ICredentialsListener.java
+++ b/storm-client/src/jvm/org/apache/storm/ICredentialsListener.java
@@ -23,5 +23,5 @@
      *
      * @param credentials the new credentials, could be null.
      */
-    public void setCredentials(Map<String, String> credentials);
+    void setCredentials(Map<String, String> credentials);
 }
diff --git a/storm-client/src/jvm/org/apache/storm/ISubmitterHook.java b/storm-client/src/jvm/org/apache/storm/ISubmitterHook.java
index 84329b4..b4f9268 100644
--- a/storm-client/src/jvm/org/apache/storm/ISubmitterHook.java
+++ b/storm-client/src/jvm/org/apache/storm/ISubmitterHook.java
@@ -21,5 +21,5 @@
  * class's notify method will be invoked when a topology is successfully submitted via StormSubmitter class.
  */
 public interface ISubmitterHook {
-    public void notify(TopologyInfo topologyInfo, Map<String, Object> topoConf, StormTopology topology) throws IllegalAccessException;
+    void notify(TopologyInfo topologyInfo, Map<String, Object> topoConf, StormTopology topology) throws IllegalAccessException;
 }
diff --git a/storm-client/src/jvm/org/apache/storm/StormSubmitter.java b/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
index ed97e13..9302852 100644
--- a/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
+++ b/storm-client/src/jvm/org/apache/storm/StormSubmitter.java
@@ -536,7 +536,7 @@
          * @param targetFile - destination file
          * @param totalBytes - total number of bytes of the file
          */
-        public void onStart(String srcFile, String targetFile, long totalBytes);
+        void onStart(String srcFile, String targetFile, long totalBytes);
 
         /**
          * called whenever a chunk of bytes is uploaded.
@@ -546,7 +546,7 @@
          * @param bytesUploaded - number of bytes transferred so far
          * @param totalBytes    - total number of bytes of the file
          */
-        public void onProgress(String srcFile, String targetFile, long bytesUploaded, long totalBytes);
+        void onProgress(String srcFile, String targetFile, long bytesUploaded, long totalBytes);
 
         /**
          * called when the file is uploaded.
@@ -555,6 +555,6 @@
          * @param targetFile - destination file
          * @param totalBytes - total number of bytes of the file
          */
-        public void onCompleted(String srcFile, String targetFile, long totalBytes);
+        void onCompleted(String srcFile, String targetFile, long totalBytes);
     }
 }
diff --git a/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java b/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java
index 2270142..df6ca54 100644
--- a/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java
+++ b/storm-client/src/jvm/org/apache/storm/blobstore/BlobStoreAclHandler.java
@@ -363,7 +363,7 @@
         return resultAcl;
     }
 
-    private final List<AccessControl> normalizeSettableAcls(String key, List<AccessControl> acls, Subject who,
+    private List<AccessControl> normalizeSettableAcls(String key, List<AccessControl> acls, Subject who,
                                                             int opMask) {
         List<AccessControl> cleanAcls = removeBadAcls(acls);
         Set<String> userNames = getUserNamesFromSubject(who);
diff --git a/storm-client/src/jvm/org/apache/storm/callback/ZKStateChangedCallback.java b/storm-client/src/jvm/org/apache/storm/callback/ZKStateChangedCallback.java
index 30f9b5d..1a15997 100644
--- a/storm-client/src/jvm/org/apache/storm/callback/ZKStateChangedCallback.java
+++ b/storm-client/src/jvm/org/apache/storm/callback/ZKStateChangedCallback.java
@@ -16,5 +16,5 @@
 
 @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
 public interface ZKStateChangedCallback {
-    public void changed(Watcher.Event.EventType type, String path);
+    void changed(Watcher.Event.EventType type, String path);
 }
diff --git a/storm-client/src/jvm/org/apache/storm/cluster/IStateStorage.java b/storm-client/src/jvm/org/apache/storm/cluster/IStateStorage.java
index da16ea3..d0b45af 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/IStateStorage.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/IStateStorage.java
@@ -192,7 +192,7 @@
      *
      * @param listener A StateStorageListener to handle changing cluster state events.
      */
-    void add_listener(final ConnectionStateListener listener);
+    void add_listener(ConnectionStateListener listener);
 
     /**
      * Force consistency on a path. Any writes committed on the path before this call will be completely propagated when it returns.
diff --git a/storm-client/src/jvm/org/apache/storm/container/cgroup/CgroupCommonOperation.java b/storm-client/src/jvm/org/apache/storm/container/cgroup/CgroupCommonOperation.java
index 63802a0..82aa41a 100755
--- a/storm-client/src/jvm/org/apache/storm/container/cgroup/CgroupCommonOperation.java
+++ b/storm-client/src/jvm/org/apache/storm/container/cgroup/CgroupCommonOperation.java
@@ -22,57 +22,57 @@
      *
      * @param taskid task id of task to add
      */
-    public void addTask(int taskid) throws IOException;
+    void addTask(int taskid) throws IOException;
 
     /**
      * Get a list of task ids running in CGroup.
      */
-    public Set<Integer> getTasks() throws IOException;
+    Set<Integer> getTasks() throws IOException;
 
     /**
      * add a process to cgroup.
      *
      * @param pid the PID of the process to add
      */
-    public void addProcs(int pid) throws IOException;
+    void addProcs(int pid) throws IOException;
 
     /**
      * get the PIDs of processes running in cgroup.
      */
-    public Set<Long> getPids() throws IOException;
+    Set<Long> getPids() throws IOException;
 
     /**
      * to get the notify_on_release config.
      */
-    public boolean getNotifyOnRelease() throws IOException;
+    boolean getNotifyOnRelease() throws IOException;
 
     /**
      * to set notify_on_release config in cgroup.
      */
-    public void setNotifyOnRelease(boolean flag) throws IOException;
+    void setNotifyOnRelease(boolean flag) throws IOException;
 
     /**
      * get the command for the relase agent to execute.
      */
-    public String getReleaseAgent() throws IOException;
+    String getReleaseAgent() throws IOException;
 
     /**
      * set a command for the release agent to execute.
      */
-    public void setReleaseAgent(String command) throws IOException;
+    void setReleaseAgent(String command) throws IOException;
 
     /**
      * get the cgroup.clone_children config.
      */
-    public boolean getCgroupCloneChildren() throws IOException;
+    boolean getCgroupCloneChildren() throws IOException;
 
     /**
      * Set the cgroup.clone_children config.
      */
-    public void setCgroupCloneChildren(boolean flag) throws IOException;
+    void setCgroupCloneChildren(boolean flag) throws IOException;
 
     /**
      * set event control config.
      */
-    public void setEventControl(String eventFd, String controlFd, String... args) throws IOException;
+    void setEventControl(String eventFd, String controlFd, String... args) throws IOException;
 }
diff --git a/storm-client/src/jvm/org/apache/storm/container/cgroup/CgroupOperation.java b/storm-client/src/jvm/org/apache/storm/container/cgroup/CgroupOperation.java
index 6387fe3..7897057 100755
--- a/storm-client/src/jvm/org/apache/storm/container/cgroup/CgroupOperation.java
+++ b/storm-client/src/jvm/org/apache/storm/container/cgroup/CgroupOperation.java
@@ -25,50 +25,50 @@
     /**
      * Get a list of hierarchies.
      */
-    public List<Hierarchy> getHierarchies();
+    List<Hierarchy> getHierarchies();
 
     /**
      * get a list of available subsystems.
      */
-    public Set<SubSystem> getSubSystems();
+    Set<SubSystem> getSubSystems();
 
     /**
      * Check if a subsystem is enabled.
      */
-    public boolean isSubSystemEnabled(SubSystemType subsystem);
+    boolean isSubSystemEnabled(SubSystemType subsystem);
 
     /**
      * get the first hierarchy that has a certain subsystem isMounted.
      */
-    public Hierarchy getHierarchyWithSubSystem(SubSystemType subsystem);
+    Hierarchy getHierarchyWithSubSystem(SubSystemType subsystem);
 
     /**
      * get the first hierarchy that has a certain list of subsystems isMounted.
      */
-    public Hierarchy getHierarchyWithSubSystems(List<SubSystemType> subSystems);
+    Hierarchy getHierarchyWithSubSystems(List<SubSystemType> subSystems);
 
     /**
      * check if a hiearchy is mounted.
      */
-    public boolean isMounted(Hierarchy hierarchy);
+    boolean isMounted(Hierarchy hierarchy);
 
     /**
      * mount a hierarchy.
      */
-    public void mount(Hierarchy hierarchy) throws IOException;
+    void mount(Hierarchy hierarchy) throws IOException;
 
     /**
      * umount a heirarchy.
      */
-    public void umount(Hierarchy hierarchy) throws IOException;
+    void umount(Hierarchy hierarchy) throws IOException;
 
     /**
      * create a cgroup.
      */
-    public void createCgroup(CgroupCommon cgroup) throws SecurityException;
+    void createCgroup(CgroupCommon cgroup) throws SecurityException;
 
     /**
      * delete a cgroup.
      */
-    public void deleteCgroup(CgroupCommon cgroup) throws IOException;
+    void deleteCgroup(CgroupCommon cgroup) throws IOException;
 }
diff --git a/storm-client/src/jvm/org/apache/storm/container/cgroup/core/CgroupCore.java b/storm-client/src/jvm/org/apache/storm/container/cgroup/core/CgroupCore.java
index de58226..229f047 100755
--- a/storm-client/src/jvm/org/apache/storm/container/cgroup/core/CgroupCore.java
+++ b/storm-client/src/jvm/org/apache/storm/container/cgroup/core/CgroupCore.java
@@ -16,6 +16,6 @@
 
 public interface CgroupCore {
 
-    public SubSystemType getType();
+    SubSystemType getType();
 
 }
diff --git a/storm-client/src/jvm/org/apache/storm/container/cgroup/core/CpuacctCore.java b/storm-client/src/jvm/org/apache/storm/container/cgroup/core/CpuacctCore.java
index 0370721..09bd0e5 100755
--- a/storm-client/src/jvm/org/apache/storm/container/cgroup/core/CpuacctCore.java
+++ b/storm-client/src/jvm/org/apache/storm/container/cgroup/core/CpuacctCore.java
@@ -58,7 +58,7 @@
         return result;
     }
 
-    public static enum StatType {
+    public enum StatType {
         user, system;
     }
 
diff --git a/storm-client/src/jvm/org/apache/storm/coordination/BatchSubtopologyBuilder.java b/storm-client/src/jvm/org/apache/storm/coordination/BatchSubtopologyBuilder.java
index 222edcf..734be36 100644
--- a/storm-client/src/jvm/org/apache/storm/coordination/BatchSubtopologyBuilder.java
+++ b/storm-client/src/jvm/org/apache/storm/coordination/BatchSubtopologyBuilder.java
@@ -141,7 +141,7 @@
         public final Map<String, Object> componentConf = new HashMap<>();
         public final Set<SharedMemory> sharedMemory = new HashSet<>();
 
-        public Component(IRichBolt bolt, Integer parallelism) {
+        Component(IRichBolt bolt, Integer parallelism) {
             this.bolt = bolt;
             this.parallelism = parallelism;
         }
@@ -150,7 +150,7 @@
     private static class BoltDeclarerImpl extends BaseConfigurationDeclarer<BoltDeclarer> implements BoltDeclarer {
         Component component;
 
-        public BoltDeclarerImpl(Component component) {
+        BoltDeclarerImpl(Component component) {
             this.component = component;
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/coordination/CoordinatedBolt.java b/storm-client/src/jvm/org/apache/storm/coordination/CoordinatedBolt.java
index 18a14db..9e763f3 100644
--- a/storm-client/src/jvm/org/apache/storm/coordination/CoordinatedBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/coordination/CoordinatedBolt.java
@@ -230,17 +230,17 @@
         }
     }
 
-    static enum TupleType {
+    enum TupleType {
         REGULAR,
         ID,
         COORD
     }
 
-    public static interface FinishedCallback {
+    public interface FinishedCallback {
         void finishedId(Object id);
     }
 
-    public static interface TimeoutCallback {
+    public interface TimeoutCallback {
         void timeoutId(Object id);
     }
 
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/DaemonCommon.java b/storm-client/src/jvm/org/apache/storm/daemon/DaemonCommon.java
index 4679177..d4f9376 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/DaemonCommon.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/DaemonCommon.java
@@ -13,5 +13,5 @@
 package org.apache.storm.daemon;
 
 public interface DaemonCommon {
-    public boolean isWaiting();
+    boolean isWaiting();
 }
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/Shutdownable.java b/storm-client/src/jvm/org/apache/storm/daemon/Shutdownable.java
index 5593676..4d9517b 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/Shutdownable.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/Shutdownable.java
@@ -13,5 +13,5 @@
 package org.apache.storm.daemon;
 
 public interface Shutdownable {
-    public void shutdown();
+    void shutdown();
 }
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/AdvancedFSOps.java b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/AdvancedFSOps.java
index 814ec12..23e91bf 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/AdvancedFSOps.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/AdvancedFSOps.java
@@ -357,7 +357,7 @@
     private static class AdvancedRunAsUserFSOps extends AdvancedFSOps {
         private final Map<String, Object> conf;
 
-        public AdvancedRunAsUserFSOps(Map<String, Object> conf) {
+        AdvancedRunAsUserFSOps(Map<String, Object> conf) {
             super(conf);
             if (Utils.isOnWindows()) {
                 throw new UnsupportedOperationException("ERROR: Windows doesn't support running workers as different users yet");
@@ -418,7 +418,7 @@
     @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
     private static class AdvancedWindowsFSOps extends AdvancedFSOps {
 
-        public AdvancedWindowsFSOps(Map<String, Object> conf) {
+        AdvancedWindowsFSOps(Map<String, Object> conf) {
             super(conf);
             if (ObjectReader.getBoolean(conf.get(Config.SUPERVISOR_RUN_WORKER_AS_USER), false)) {
                 throw new RuntimeException("ERROR: Windows doesn't support running workers as different users yet");
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ExitCodeCallback.java b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ExitCodeCallback.java
index de42895..54bf7fa 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ExitCodeCallback.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ExitCodeCallback.java
@@ -22,5 +22,5 @@
      *
      * @param exitCode the exit code of the finished process.
      */
-    public void call(int exitCode);
+    void call(int exitCode);
 }
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/worker/BackPressureTracker.java b/storm-client/src/jvm/org/apache/storm/daemon/worker/BackPressureTracker.java
index 5800a00..dae5cca 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/worker/BackPressureTracker.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/BackPressureTracker.java
@@ -101,7 +101,7 @@
         //No task is under backpressure initially
         private final AtomicBoolean backpressure = new AtomicBoolean(false);
 
-        public BackpressureState(JCQueue queue) {
+        BackpressureState(JCQueue queue) {
             this.queue = queue;
         }
 
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 dac4283..88f5921 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
@@ -49,7 +49,7 @@
 
     private final AtomicBoolean[] remoteBackPressureStatus; // [[remoteTaskId] -> true/false : indicates if remote task is under BP.
 
-    public WorkerTransfer(WorkerState workerState, Map<String, Object> topologyConf, int maxTaskIdInTopo) {
+    WorkerTransfer(WorkerState workerState, Map<String, Object> topologyConf, int maxTaskIdInTopo) {
         this.workerState = workerState;
         this.backPressureWaitStrategy = IWaitStrategy.createBackPressureWaitStrategy(topologyConf);
         this.drainer = new TransferDrainer();
diff --git a/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java b/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java
index 8756fca..4c35c67 100644
--- a/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/drpc/DRPCSpout.java
@@ -258,7 +258,7 @@
         String id;
         int index;
 
-        public DRPCMessageId(String id, int index) {
+        DRPCMessageId(String id, int index) {
             this.id = id;
             this.index = index;
         }
@@ -269,7 +269,7 @@
         private int port;
         private Map<String, Object> conf;
 
-        public Adder(String server, int port, Map<String, Object> conf) {
+        Adder(String server, int port, Map<String, Object> conf) {
             this.server = server;
             this.port = port;
             this.conf = conf;
diff --git a/storm-client/src/jvm/org/apache/storm/drpc/LinearDRPCInputDeclarer.java b/storm-client/src/jvm/org/apache/storm/drpc/LinearDRPCInputDeclarer.java
index d026ec2..af82d04 100644
--- a/storm-client/src/jvm/org/apache/storm/drpc/LinearDRPCInputDeclarer.java
+++ b/storm-client/src/jvm/org/apache/storm/drpc/LinearDRPCInputDeclarer.java
@@ -18,40 +18,40 @@
 
 @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
 public interface LinearDRPCInputDeclarer extends ComponentConfigurationDeclarer<LinearDRPCInputDeclarer> {
-    public LinearDRPCInputDeclarer fieldsGrouping(Fields fields);
+    LinearDRPCInputDeclarer fieldsGrouping(Fields fields);
 
-    public LinearDRPCInputDeclarer fieldsGrouping(String streamId, Fields fields);
+    LinearDRPCInputDeclarer fieldsGrouping(String streamId, Fields fields);
 
-    public LinearDRPCInputDeclarer globalGrouping();
+    LinearDRPCInputDeclarer globalGrouping();
 
-    public LinearDRPCInputDeclarer globalGrouping(String streamId);
+    LinearDRPCInputDeclarer globalGrouping(String streamId);
 
-    public LinearDRPCInputDeclarer shuffleGrouping();
+    LinearDRPCInputDeclarer shuffleGrouping();
 
-    public LinearDRPCInputDeclarer shuffleGrouping(String streamId);
+    LinearDRPCInputDeclarer shuffleGrouping(String streamId);
 
-    public LinearDRPCInputDeclarer localOrShuffleGrouping();
+    LinearDRPCInputDeclarer localOrShuffleGrouping();
 
-    public LinearDRPCInputDeclarer localOrShuffleGrouping(String streamId);
+    LinearDRPCInputDeclarer localOrShuffleGrouping(String streamId);
 
-    public LinearDRPCInputDeclarer noneGrouping();
+    LinearDRPCInputDeclarer noneGrouping();
 
-    public LinearDRPCInputDeclarer noneGrouping(String streamId);
+    LinearDRPCInputDeclarer noneGrouping(String streamId);
 
-    public LinearDRPCInputDeclarer allGrouping();
+    LinearDRPCInputDeclarer allGrouping();
 
-    public LinearDRPCInputDeclarer allGrouping(String streamId);
+    LinearDRPCInputDeclarer allGrouping(String streamId);
 
-    public LinearDRPCInputDeclarer directGrouping();
+    LinearDRPCInputDeclarer directGrouping();
 
-    public LinearDRPCInputDeclarer directGrouping(String streamId);
+    LinearDRPCInputDeclarer directGrouping(String streamId);
 
-    public LinearDRPCInputDeclarer partialKeyGrouping(Fields fields);
+    LinearDRPCInputDeclarer partialKeyGrouping(Fields fields);
 
-    public LinearDRPCInputDeclarer partialKeyGrouping(String streamId, Fields fields);
+    LinearDRPCInputDeclarer partialKeyGrouping(String streamId, Fields fields);
 
-    public LinearDRPCInputDeclarer customGrouping(CustomStreamGrouping grouping);
+    LinearDRPCInputDeclarer customGrouping(CustomStreamGrouping grouping);
 
-    public LinearDRPCInputDeclarer customGrouping(String streamId, CustomStreamGrouping grouping);
+    LinearDRPCInputDeclarer customGrouping(String streamId, CustomStreamGrouping grouping);
 
 }
diff --git a/storm-client/src/jvm/org/apache/storm/drpc/LinearDRPCTopologyBuilder.java b/storm-client/src/jvm/org/apache/storm/drpc/LinearDRPCTopologyBuilder.java
index 6512976..3092f9a 100644
--- a/storm-client/src/jvm/org/apache/storm/drpc/LinearDRPCTopologyBuilder.java
+++ b/storm-client/src/jvm/org/apache/storm/drpc/LinearDRPCTopologyBuilder.java
@@ -174,8 +174,8 @@
         return builder.createTopology();
     }
 
-    private static interface InputDeclaration {
-        public void declare(String prevComponent, InputDeclarer declarer);
+    private interface InputDeclaration {
+        void declare(String prevComponent, InputDeclarer declarer);
     }
 
     private static class Component {
@@ -185,7 +185,7 @@
         public final List<InputDeclaration> declarations = new ArrayList<>();
         public final Set<SharedMemory> sharedMemory = new HashSet<>();
 
-        public Component(IRichBolt bolt, int parallelism) {
+        Component(IRichBolt bolt, int parallelism) {
             this.bolt = bolt;
             this.parallelism = parallelism;
         }
@@ -194,7 +194,7 @@
     private static class InputDeclarerImpl extends BaseConfigurationDeclarer<LinearDRPCInputDeclarer> implements LinearDRPCInputDeclarer {
         Component component;
 
-        public InputDeclarerImpl(Component component) {
+        InputDeclarerImpl(Component component) {
             this.component = component;
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/ConnectionWithStatus.java b/storm-client/src/jvm/org/apache/storm/messaging/ConnectionWithStatus.java
index da20253..f682335 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/ConnectionWithStatus.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/ConnectionWithStatus.java
@@ -19,7 +19,7 @@
      */
     public abstract Status status();
 
-    public static enum Status {
+    public enum Status {
 
         /**
          * we are establishing a active connection with target host. The new data sending request can be buffered for future sending, or
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/IConnectionCallback.java b/storm-client/src/jvm/org/apache/storm/messaging/IConnectionCallback.java
index 5719eb8..4ccda6d 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/IConnectionCallback.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/IConnectionCallback.java
@@ -23,5 +23,5 @@
      *
      * @param batch the messages to be processed
      */
-    public void recv(List<TaskMessage> batch);
+    void recv(List<TaskMessage> batch);
 }
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/local/Context.java b/storm-client/src/jvm/org/apache/storm/messaging/local/Context.java
index 69552f8..67ab6dd 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/local/Context.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/local/Context.java
@@ -79,7 +79,7 @@
         final int port;
         final IConnectionCallback cb;
 
-        public LocalServer(int port, IConnectionCallback cb) {
+        LocalServer(int port, IConnectionCallback cb) {
             this.port = port;
             this.cb = cb;
         }
@@ -129,7 +129,7 @@
         private final int port;
         private final String registryKey;
 
-        public LocalClient(String stormId, int port) {
+        LocalClient(String stormId, int port) {
             this.port = port;
             this.registryKey = getNodeKey(stormId, port);
             pendingDueToUnregisteredServer = new LinkedBlockingQueue<>();
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/Client.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/Client.java
index eac0f22..5819924 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/Client.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/Client.java
@@ -527,7 +527,7 @@
 
         private final InetSocketAddress address;
 
-        public Connect(InetSocketAddress address) {
+        Connect(InetSocketAddress address) {
             this.address = address;
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/ControlMessage.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/ControlMessage.java
index beb4515..5bda0e7 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/ControlMessage.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/ControlMessage.java
@@ -25,8 +25,7 @@
 
     private final short code;
 
-    //private constructor
-    private ControlMessage(short code) {
+    ControlMessage(short code) {
         this.code = code;
     }
 
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java
index e7f0c14..ee410d6 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/KerberosSaslNettyServer.java
@@ -168,7 +168,7 @@
          */
         private List<String> authorizedUsers;
 
-        public KerberosSaslCallbackHandler(List<String> authorizedUsers) {
+        KerberosSaslCallbackHandler(List<String> authorizedUsers) {
             LOG.debug("KerberosSaslCallback: Creating KerberosSaslCallback handler.");
             this.authorizedUsers = authorizedUsers;
         }
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslNettyClient.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslNettyClient.java
index fe4de08..0af993a 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslNettyClient.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslNettyClient.java
@@ -96,7 +96,7 @@
         /**
          * Set private members using topology token.
          */
-        public SaslClientCallbackHandler(String topologyToken, byte[] token) {
+        SaslClientCallbackHandler(String topologyToken, byte[] token) {
             this.userName = SaslUtils
                 .encodeIdentifier(topologyToken.getBytes());
             this.userPassword = SaslUtils.encodePassword(token);
diff --git a/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslNettyServer.java b/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslNettyServer.java
index 6c04d76..45967b9 100644
--- a/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslNettyServer.java
+++ b/storm-client/src/jvm/org/apache/storm/messaging/netty/SaslNettyServer.java
@@ -88,7 +88,7 @@
         private byte[] userPassword;
         private String userName;
 
-        public SaslDigestCallbackHandler(String topologyName, byte[] token) {
+        SaslDigestCallbackHandler(String topologyName, byte[] token) {
             LOG.debug("SaslDigestCallback: Creating SaslDigestCallback handler with topology token: {}", topologyName);
             this.userName = topologyName;
             this.userPassword = token;
diff --git a/storm-client/src/jvm/org/apache/storm/metric/MetricsConsumerBolt.java b/storm-client/src/jvm/org/apache/storm/metric/MetricsConsumerBolt.java
index e76868a..311055f 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/MetricsConsumerBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/MetricsConsumerBolt.java
@@ -107,7 +107,7 @@
         private IMetricsConsumer.TaskInfo taskInfo;
         private Collection<IMetricsConsumer.DataPoint> dataPoints;
 
-        public MetricsTask(IMetricsConsumer.TaskInfo taskInfo, Collection<IMetricsConsumer.DataPoint> dataPoints) {
+        MetricsTask(IMetricsConsumer.TaskInfo taskInfo, Collection<IMetricsConsumer.DataPoint> dataPoints) {
             this.taskInfo = taskInfo;
             this.dataPoints = dataPoints;
         }
diff --git a/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java b/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java
index 5e978a7..f2efc2f 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java
@@ -106,7 +106,7 @@
     private static class MemoryUsageMetric implements IMetric {
         Supplier<MemoryUsage> getUsage;
 
-        public MemoryUsageMetric(Supplier<MemoryUsage> getUsage) {
+        MemoryUsageMetric(Supplier<MemoryUsage> getUsage) {
             this.getUsage = getUsage;
         }
 
@@ -131,7 +131,7 @@
         Long collectionCount;
         Long collectionTime;
 
-        public GarbageCollectorMetric(GarbageCollectorMXBean gcBean) {
+        GarbageCollectorMetric(GarbageCollectorMXBean gcBean) {
             this.gcBean = gcBean;
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/ICombiner.java b/storm-client/src/jvm/org/apache/storm/metric/api/ICombiner.java
index d897ba7..26dcb82 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/api/ICombiner.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/api/ICombiner.java
@@ -13,7 +13,7 @@
 package org.apache.storm.metric.api;
 
 public interface ICombiner<T> {
-    public T identity();
+    T identity();
 
-    public T combine(T a, T b);
+    T combine(T a, T b);
 }
diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/IMetric.java b/storm-client/src/jvm/org/apache/storm/metric/api/IMetric.java
index c6f86f4..b6670fc 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/api/IMetric.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/api/IMetric.java
@@ -23,5 +23,5 @@
      *     java.util.Collection)}. If null is returned nothing will be sent. If this value can be reset, like with a counter, a side effect
      *     of calling this should be that the value is reset.
      */
-    public Object getValueAndReset();
+    Object getValueAndReset();
 }
diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/IMetricsConsumer.java b/storm-client/src/jvm/org/apache/storm/metric/api/IMetricsConsumer.java
index a332dc4..1fe21c7 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/api/IMetricsConsumer.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/api/IMetricsConsumer.java
@@ -25,7 +25,7 @@
 
     void cleanup();
 
-    public static class TaskInfo {
+    class TaskInfo {
         public String srcWorkerHost;
         public int srcWorkerPort;
         public String srcComponentId;
@@ -56,7 +56,7 @@
     }
 
     // We can't move this to outside without breaking backward compatibility.
-    public static class DataPoint {
+    class DataPoint {
         public String name;
         public Object value;
 
diff --git a/storm-client/src/jvm/org/apache/storm/metric/api/rpc/IShellMetric.java b/storm-client/src/jvm/org/apache/storm/metric/api/rpc/IShellMetric.java
index a66e178..910730e 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/api/rpc/IShellMetric.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/api/rpc/IShellMetric.java
@@ -23,5 +23,5 @@
      *     Object can be any json support types: String, Long, Double, Boolean, Null, List, Map
      */
     @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
-    public void updateMetricFromRPC(Object value);
+    void updateMetricFromRPC(Object value);
 }
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/IAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/IAuthorizer.java
index 6662827..fd244c0 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/IAuthorizer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/IAuthorizer.java
@@ -41,5 +41,5 @@
      * @param topoConf  configuration of targeted topology
      * @return true if the request is authorized, false if reject
      */
-    public boolean permit(ReqContext context, String operation, Map<String, Object> topoConf);
+    boolean permit(ReqContext context, String operation, Map<String, Object> topoConf);
 }
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/IAutoCredentials.java b/storm-client/src/jvm/org/apache/storm/security/auth/IAutoCredentials.java
index 2f8edd4..ac836ca 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/IAutoCredentials.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/IAutoCredentials.java
@@ -20,14 +20,14 @@
  */
 public interface IAutoCredentials {
 
-    public void prepare(Map<String, Object> conf);
+    void prepare(Map<String, Object> conf);
 
     /**
      * Called to populate the credentials on the client side.
      *
      * @param credentials the credentials to be populated.
      */
-    public void populateCredentials(Map<String, String> credentials);
+    void populateCredentials(Map<String, String> credentials);
 
     /**
      * Called to initially populate the subject on the worker side with credentials passed in.
@@ -35,7 +35,7 @@
      * @param subject     the subject to optionally put credentials in.
      * @param credentials the credentials to be used.
      */
-    public void populateSubject(Subject subject, Map<String, String> credentials);
+    void populateSubject(Subject subject, Map<String, String> credentials);
 
 
     /**
@@ -45,6 +45,6 @@
      * @param subject     the subject to optionally put credentials in.
      * @param credentials the credentials to be used.
      */
-    public void updateSubject(Subject subject, Map<String, String> credentials);
+    void updateSubject(Subject subject, Map<String, String> credentials);
 
 }
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/IGroupMappingServiceProvider.java b/storm-client/src/jvm/org/apache/storm/security/auth/IGroupMappingServiceProvider.java
index 3c7edda..4bf3b0e 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/IGroupMappingServiceProvider.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/IGroupMappingServiceProvider.java
@@ -31,6 +31,6 @@
      * @param user User's name
      * @return group memberships of user
      */
-    public Set<String> getGroups(String user) throws IOException;
+    Set<String> getGroups(String user) throws IOException;
 
 }
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/ITransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/ITransportPlugin.java
index b1118cb..6bf3b0b 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/ITransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/ITransportPlugin.java
@@ -39,7 +39,7 @@
      * @param processor service handler
      * @return server
      */
-    public TServer getServer(TProcessor processor) throws IOException, TTransportException;
+    TServer getServer(TProcessor processor) throws IOException, TTransportException;
 
     /**
      * Connect to the specified server via framed transport.
@@ -49,14 +49,14 @@
      * @param asUser     the user as which the connection should be established, and all the subsequent actions should be executed. Only
      *                   applicable when using secure storm cluster. A null/blank value here will just indicate to use the logged in user.
      */
-    public TTransport connect(TTransport transport, String serverHost, String asUser) throws IOException, TTransportException;
+    TTransport connect(TTransport transport, String serverHost, String asUser) throws IOException, TTransportException;
 
     /**
      * Get port.
      * @return The port this transport is using. This is not known until
      * {@link #getServer(org.apache.storm.thrift.TProcessor)} has been called
      */
-    public int getPort();
+    int getPort();
 
     /**
      * Check if worker tokens are supported by this transport.
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
index 2cd43ba..915473b 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
@@ -255,7 +255,7 @@
         private final Subject subject;
         private final TTransportFactory wrapped;
 
-        public TUGIAssumingTransportFactory(TTransportFactory wrapped, Subject subject) {
+        TUGIAssumingTransportFactory(TTransportFactory wrapped, Subject subject) {
             this.wrapped = wrapped;
             this.subject = subject;
 
@@ -293,7 +293,7 @@
     private class LoginCacheKey {
         private String keyString = null;
 
-        public LoginCacheKey(SortedMap<String, ?> authConf) throws IOException {
+        LoginCacheKey(SortedMap<String, ?> authConf) throws IOException {
             if (authConf != null) {
                 StringBuilder stringBuilder = new StringBuilder();
                 for (String configKey : authConf.keySet()) {
diff --git a/storm-client/src/jvm/org/apache/storm/serialization/SerializationRegister.java b/storm-client/src/jvm/org/apache/storm/serialization/SerializationRegister.java
index 06954ce..e714d46 100644
--- a/storm-client/src/jvm/org/apache/storm/serialization/SerializationRegister.java
+++ b/storm-client/src/jvm/org/apache/storm/serialization/SerializationRegister.java
@@ -30,5 +30,5 @@
      *
      * @param kryo what to register the serializers with.
      */
-    public void register(Kryo kryo) throws Exception;
+    void register(Kryo kryo) throws Exception;
 }
diff --git a/storm-client/src/jvm/org/apache/storm/spout/MultiScheme.java b/storm-client/src/jvm/org/apache/storm/spout/MultiScheme.java
index dd50490..0d123b3 100644
--- a/storm-client/src/jvm/org/apache/storm/spout/MultiScheme.java
+++ b/storm-client/src/jvm/org/apache/storm/spout/MultiScheme.java
@@ -18,7 +18,7 @@
 import org.apache.storm.tuple.Fields;
 
 public interface MultiScheme extends Serializable {
-    public Iterable<List<Object>> deserialize(ByteBuffer ser);
+    Iterable<List<Object>> deserialize(ByteBuffer ser);
 
-    public Fields getOutputFields();
+    Fields getOutputFields();
 }
diff --git a/storm-client/src/jvm/org/apache/storm/spout/ShellSpout.java b/storm-client/src/jvm/org/apache/storm/spout/ShellSpout.java
index 5312909..07ab24c 100644
--- a/storm-client/src/jvm/org/apache/storm/spout/ShellSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/spout/ShellSpout.java
@@ -282,7 +282,7 @@
     private class SpoutHeartbeatTimerTask extends TimerTask {
         private ShellSpout spout;
 
-        public SpoutHeartbeatTimerTask(ShellSpout spout) {
+        SpoutHeartbeatTimerTask(ShellSpout spout) {
             this.spout = spout;
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/task/IMetricsContext.java b/storm-client/src/jvm/org/apache/storm/task/IMetricsContext.java
index 340cafd..958ce5f 100644
--- a/storm-client/src/jvm/org/apache/storm/task/IMetricsContext.java
+++ b/storm-client/src/jvm/org/apache/storm/task/IMetricsContext.java
@@ -46,13 +46,13 @@
     @Deprecated
     CombinedMetric registerMetric(String name, ICombiner combiner, int timeBucketSizeInSecs);
     
-    public Timer registerTimer(String name);
+    Timer registerTimer(String name);
 
-    public Histogram registerHistogram(String name);
+    Histogram registerHistogram(String name);
 
-    public Meter registerMeter(String name);
+    Meter registerMeter(String name);
 
-    public Counter registerCounter(String name);
+    Counter registerCounter(String name);
 
-    public <T> Gauge<T> registerGauge(String name, Gauge<T> gauge);
+    <T> Gauge<T> registerGauge(String name, Gauge<T> gauge);
 }
diff --git a/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java b/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java
index 0fe3efb..fca718e 100644
--- a/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/task/ShellBolt.java
@@ -308,7 +308,7 @@
     private class BoltHeartbeatTimerTask extends TimerTask {
         private ShellBolt bolt;
 
-        public BoltHeartbeatTimerTask(ShellBolt bolt) {
+        BoltHeartbeatTimerTask(ShellBolt bolt) {
             this.bolt = bolt;
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/testing/AckFailDelegate.java b/storm-client/src/jvm/org/apache/storm/testing/AckFailDelegate.java
index b441d4e..19bf202 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/AckFailDelegate.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/AckFailDelegate.java
@@ -15,7 +15,7 @@
 import java.io.Serializable;
 
 public interface AckFailDelegate extends Serializable {
-    public void ack(Object id);
+    void ack(Object id);
 
-    public void fail(Object id);
+    void fail(Object id);
 }
diff --git a/storm-client/src/jvm/org/apache/storm/testing/SpoutTracker.java b/storm-client/src/jvm/org/apache/storm/testing/SpoutTracker.java
index 39ef158..00ab28d 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/SpoutTracker.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/SpoutTracker.java
@@ -75,7 +75,7 @@
         public int emitted = 0;
         public SpoutOutputCollector collector;
 
-        public SpoutTrackOutputCollector(SpoutOutputCollector collector) {
+        SpoutTrackOutputCollector(SpoutOutputCollector collector) {
             this.collector = collector;
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/topology/InputDeclarer.java b/storm-client/src/jvm/org/apache/storm/topology/InputDeclarer.java
index 92c7c6a..75030ea 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/InputDeclarer.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/InputDeclarer.java
@@ -22,74 +22,74 @@
     /**
      * The stream is partitioned by the fields specified in the grouping.
      */
-    public T fieldsGrouping(String componentId, Fields fields);
+    T fieldsGrouping(String componentId, Fields fields);
 
     /**
      * The stream is partitioned by the fields specified in the grouping.
      */
-    public T fieldsGrouping(String componentId, String streamId, Fields fields);
+    T fieldsGrouping(String componentId, String streamId, Fields fields);
 
     /**
      * The entire stream goes to a single one of the bolt's tasks. Specifically, it goes to the task with the lowest id.
      */
-    public T globalGrouping(String componentId);
+    T globalGrouping(String componentId);
 
     /**
      * The entire stream goes to a single one of the bolt's tasks. Specifically, it goes to the task with the lowest id.
      */
-    public T globalGrouping(String componentId, String streamId);
+    T globalGrouping(String componentId, String streamId);
 
     /**
      * Tuples are randomly distributed across the bolt's tasks in a way such that each bolt is guaranteed to get an equal number of tuples.
      */
-    public T shuffleGrouping(String componentId);
+    T shuffleGrouping(String componentId);
 
     /**
      * Tuples are randomly distributed across the bolt's tasks in a way such that each bolt is guaranteed to get an equal number of tuples.
      */
-    public T shuffleGrouping(String componentId, String streamId);
+    T shuffleGrouping(String componentId, String streamId);
 
     /**
      * If the target bolt has one or more tasks in the same worker process, tuples will be shuffled to just those in-process tasks.
      * Otherwise, this acts like a normal shuffle grouping.
      */
-    public T localOrShuffleGrouping(String componentId);
+    T localOrShuffleGrouping(String componentId);
 
     /**
      * If the target bolt has one or more tasks in the same worker process, tuples will be shuffled to just those in-process tasks.
      * Otherwise, this acts like a normal shuffle grouping.
      */
-    public T localOrShuffleGrouping(String componentId, String streamId);
+    T localOrShuffleGrouping(String componentId, String streamId);
 
     /**
      * This grouping specifies that you don't care how the stream is grouped.
      */
-    public T noneGrouping(String componentId);
+    T noneGrouping(String componentId);
 
     /**
      * This grouping specifies that you don't care how the stream is grouped.
      */
-    public T noneGrouping(String componentId, String streamId);
+    T noneGrouping(String componentId, String streamId);
 
     /**
      * The stream is replicated across all the bolt's tasks. Use this grouping with care.
      */
-    public T allGrouping(String componentId);
+    T allGrouping(String componentId);
 
     /**
      * The stream is replicated across all the bolt's tasks. Use this grouping with care.
      */
-    public T allGrouping(String componentId, String streamId);
+    T allGrouping(String componentId, String streamId);
 
     /**
      * A stream grouped this way means that the producer of the tuple decides which task of the consumer will receive this tuple.
      */
-    public T directGrouping(String componentId);
+    T directGrouping(String componentId);
 
     /**
      * A stream grouped this way means that the producer of the tuple decides which task of the consumer will receive this tuple.
      */
-    public T directGrouping(String componentId, String streamId);
+    T directGrouping(String componentId, String streamId);
 
     /**
      * Tuples are passed to two hashing functions and each target task is decided based on the comparison of the state of candidate nodes.
@@ -97,7 +97,7 @@
      * <p>See https://melmeric.files.wordpress.com/2014/11/the-power-of-both-choices-practical-load-balancing-for-distributed-stream
      * -processing-engines.pdf
      */
-    public T partialKeyGrouping(String componentId, Fields fields);
+    T partialKeyGrouping(String componentId, Fields fields);
 
     /**
      * Tuples are passed to two hashing functions and each target task is decided based on the comparison of the state of candidate nodes.
@@ -105,18 +105,18 @@
      * <p>See https://melmeric.files.wordpress.com/2014/11/the-power-of-both-choices-practical-load-balancing-for-distributed-stream
      * -processing-engines.pdf
      */
-    public T partialKeyGrouping(String componentId, String streamId, Fields fields);
+    T partialKeyGrouping(String componentId, String streamId, Fields fields);
 
     /**
      * A custom stream grouping by implementing the CustomStreamGrouping interface.
      */
-    public T customGrouping(String componentId, CustomStreamGrouping grouping);
+    T customGrouping(String componentId, CustomStreamGrouping grouping);
 
     /**
      * A custom stream grouping by implementing the CustomStreamGrouping interface.
      */
-    public T customGrouping(String componentId, String streamId, CustomStreamGrouping grouping);
+    T customGrouping(String componentId, String streamId, CustomStreamGrouping grouping);
 
-    public T grouping(GlobalStreamId id, Grouping grouping);
+    T grouping(GlobalStreamId id, Grouping grouping);
 
 }
diff --git a/storm-client/src/jvm/org/apache/storm/topology/OutputFieldsDeclarer.java b/storm-client/src/jvm/org/apache/storm/topology/OutputFieldsDeclarer.java
index 453986a..77e51c1 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/OutputFieldsDeclarer.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/OutputFieldsDeclarer.java
@@ -19,11 +19,11 @@
     /**
      * Uses default stream id.
      */
-    public void declare(Fields fields);
+    void declare(Fields fields);
 
-    public void declare(boolean direct, Fields fields);
+    void declare(boolean direct, Fields fields);
 
-    public void declareStream(String streamId, Fields fields);
+    void declareStream(String streamId, Fields fields);
 
-    public void declareStream(String streamId, boolean direct, Fields fields);
+    void declareStream(String streamId, boolean direct, Fields fields);
 }
diff --git a/storm-client/src/jvm/org/apache/storm/topology/PersistentWindowedBoltExecutor.java b/storm-client/src/jvm/org/apache/storm/topology/PersistentWindowedBoltExecutor.java
index f70db21..f055acc 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/PersistentWindowedBoltExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/PersistentWindowedBoltExecutor.java
@@ -236,7 +236,7 @@
      */
     private static class NoAckOutputCollector extends OutputCollector {
 
-        public NoAckOutputCollector(OutputCollector delegate) {
+        NoAckOutputCollector(OutputCollector delegate) {
             super(delegate);
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/topology/base/BaseTickTupleAwareRichBolt.java b/storm-client/src/jvm/org/apache/storm/topology/base/BaseTickTupleAwareRichBolt.java
index d901654..5e406c3 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/base/BaseTickTupleAwareRichBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/base/BaseTickTupleAwareRichBolt.java
@@ -56,5 +56,5 @@
      *
      * @param tuple The input tuple to be processed.
      */
-    protected abstract void process(final Tuple tuple);
+    protected abstract void process(Tuple tuple);
 }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/fluent/ChainedAggregatorDeclarer.java b/storm-client/src/jvm/org/apache/storm/trident/fluent/ChainedAggregatorDeclarer.java
index 81ec21c..20fe5b3 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/fluent/ChainedAggregatorDeclarer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/fluent/ChainedAggregatorDeclarer.java
@@ -170,13 +170,13 @@
         stream = stream.each(inputFields, new CombinerAggregatorInitImpl(agg), functionFields);
     }
 
-    private static enum AggType {
+    private enum AggType {
         PARTITION,
         FULL,
         FULL_COMBINE
     }
 
-    public static interface AggregationPartition {
+    public interface AggregationPartition {
         Stream partition(Stream input);
     }
 
@@ -186,7 +186,7 @@
         Aggregator agg;
         Fields outFields;
 
-        public AggSpec(Fields inFields, Aggregator agg, Fields outFields) {
+        AggSpec(Fields inFields, Aggregator agg, Fields outFields) {
             this.inFields = inFields;
             this.agg = agg;
             this.outFields = outFields;
diff --git a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/SingleEmitAggregator.java b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/SingleEmitAggregator.java
index 0e50439..bc579b3 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/operation/impl/SingleEmitAggregator.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/operation/impl/SingleEmitAggregator.java
@@ -71,7 +71,7 @@
         agg.cleanup();
     }
 
-    public static interface BatchToPartition extends Serializable {
+    public interface BatchToPartition extends Serializable {
         int partitionIndex(Object batchId, int numPartitions);
     }
 
@@ -80,7 +80,7 @@
         Object state;
         Object batchId;
 
-        public SingleEmitState(Object batchId) {
+        SingleEmitState(Object batchId) {
             this.batchId = batchId;
         }
     }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/planner/SpoutNode.java b/storm-client/src/jvm/org/apache/storm/trident/planner/SpoutNode.java
index 15f0e2b..59f543c 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/planner/SpoutNode.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/planner/SpoutNode.java
@@ -27,7 +27,7 @@
         this.type = type;
     }
 
-    public static enum SpoutType {
+    public enum SpoutType {
         DRPC,
         BATCH
     }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/ICommitterTridentSpout.java b/storm-client/src/jvm/org/apache/storm/trident/spout/ICommitterTridentSpout.java
index 34e96bd..ec4081a 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/ICommitterTridentSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/ICommitterTridentSpout.java
@@ -18,9 +18,9 @@
 
 public interface ICommitterTridentSpout<X> extends ITridentSpout<X> {
     @Override
-    public Emitter getEmitter(String txStateId, Map<String, Object> conf, TopologyContext context);
+    Emitter getEmitter(String txStateId, Map<String, Object> conf, TopologyContext context);
 
-    public interface Emitter extends ITridentSpout.Emitter {
+    interface Emitter extends ITridentSpout.Emitter {
         void commit(TransactionAttempt attempt);
     }
 }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/OpaquePartitionedTridentSpoutExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/spout/OpaquePartitionedTridentSpoutExecutor.java
index 5fffe1f..a33351d 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/OpaquePartitionedTridentSpoutExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/OpaquePartitionedTridentSpoutExecutor.java
@@ -63,7 +63,7 @@
         public RotatingTransactionalState rotatingState;
         public ISpoutPartition partition;
 
-        public EmitterPartitionState(RotatingTransactionalState s, ISpoutPartition p) {
+        EmitterPartitionState(RotatingTransactionalState s, ISpoutPartition p) {
             rotatingState = s;
             partition = p;
         }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/PartitionedTridentSpoutExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/spout/PartitionedTridentSpoutExecutor.java
index d0639b9..7f5304e 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/PartitionedTridentSpoutExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/PartitionedTridentSpoutExecutor.java
@@ -62,7 +62,7 @@
         public RotatingTransactionalState rotatingState;
         public ISpoutPartition partition;
 
-        public EmitterPartitionState(RotatingTransactionalState s, ISpoutPartition p) {
+        EmitterPartitionState(RotatingTransactionalState s, ISpoutPartition p) {
             rotatingState = s;
             partition = p;
         }
@@ -71,7 +71,7 @@
     class Coordinator implements ITridentSpout.BatchCoordinator<Object> {
         private IPartitionedTridentSpout.Coordinator<Object> coordinator;
 
-        public Coordinator(Map<String, Object> conf, TopologyContext context) {
+        Coordinator(Map<String, Object> conf, TopologyContext context) {
             coordinator = spout.getCoordinator(conf, context);
         }
 
@@ -115,7 +115,7 @@
         private int index;
         private int numTasks;
 
-        public Emitter(String txStateId, Map<String, Object> conf, TopologyContext context) {
+        Emitter(String txStateId, Map<String, Object> conf, TopologyContext context) {
             emitter = spout.getEmitter(conf, context);
             state = TransactionalState.newUserState(conf, txStateId);
             index = context.getThisTaskIndex();
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchExecutor.java
index 16b86d6..7e87dee 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchExecutor.java
@@ -129,7 +129,7 @@
         long lastRotate = System.currentTimeMillis();
         long rotateTime;
 
-        public RichSpoutEmitter(Map<String, Object> conf, TopologyContext context) {
+        RichSpoutEmitter(Map<String, Object> conf, TopologyContext context) {
             this.conf = conf;
             this.context = context;
             Number batchSize = (Number) conf.get(MAX_BATCH_SIZE_CONF);
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchTriggerer.java b/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchTriggerer.java
index aa0bddf..378824d 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchTriggerer.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/RichSpoutBatchTriggerer.java
@@ -134,7 +134,7 @@
 
         SpoutOutputCollector collector;
 
-        public StreamOverrideCollector(SpoutOutputCollector collector) {
+        StreamOverrideCollector(SpoutOutputCollector collector) {
             this.collector = collector;
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/trident/spout/TridentSpoutExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/spout/TridentSpoutExecutor.java
index 42223a7..e45ec3e 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/spout/TridentSpoutExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/spout/TridentSpoutExecutor.java
@@ -110,7 +110,7 @@
         Object id;
         String stream;
 
-        public AddIdCollector(String stream, BatchOutputCollector c) {
+        AddIdCollector(String stream, BatchOutputCollector c) {
             delegate = c;
             this.stream = stream;
         }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/state/ITupleCollection.java b/storm-client/src/jvm/org/apache/storm/trident/state/ITupleCollection.java
index 9b1eba1..61108b8 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/state/ITupleCollection.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/state/ITupleCollection.java
@@ -17,5 +17,5 @@
 
 /* Container of a collection of tuples */
 public interface ITupleCollection {
-    public Iterator<List<Object>> getTuples();
+    Iterator<List<Object>> getTuples();
 }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/state/map/OpaqueMap.java b/storm-client/src/jvm/org/apache/storm/trident/state/map/OpaqueMap.java
index aeda9f4..5775365 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/state/map/OpaqueMap.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/state/map/OpaqueMap.java
@@ -106,7 +106,7 @@
     static class ReplaceUpdater<T> implements ValueUpdater<T> {
         T value;
 
-        public ReplaceUpdater(T t) {
+        ReplaceUpdater(T t) {
             value = t;
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java b/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java
index 7a65802..2ae6a43 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/testing/FeederBatchSpout.java
@@ -86,7 +86,7 @@
 
         int index;
 
-        public FeederEmitter(int index) {
+        FeederEmitter(int index) {
             this.index = index;
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/trident/testing/FeederCommitterBatchSpout.java b/storm-client/src/jvm/org/apache/storm/trident/testing/FeederCommitterBatchSpout.java
index d65a478..6a71ad5 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/testing/FeederCommitterBatchSpout.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/testing/FeederCommitterBatchSpout.java
@@ -64,7 +64,7 @@
         ITridentSpout.Emitter emitter;
 
 
-        public CommitterEmitter(ITridentSpout.Emitter e) {
+        CommitterEmitter(ITridentSpout.Emitter e) {
             emitter = e;
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/trident/testing/LRUMemoryMapState.java b/storm-client/src/jvm/org/apache/storm/trident/testing/LRUMemoryMapState.java
index d1c2ba8..02edbb6 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/testing/LRUMemoryMapState.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/testing/LRUMemoryMapState.java
@@ -111,7 +111,7 @@
         Map<List<Object>, T> db;
         Long currTx;
 
-        public LRUMemoryMapStateBacking(int cacheSize, String id) {
+        LRUMemoryMapStateBacking(int cacheSize, String id) {
             if (!dbs.containsKey(id)) {
                 dbs.put(id, new LRUMap<List<Object>, Object>(cacheSize));
             }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/testing/MemoryMapState.java b/storm-client/src/jvm/org/apache/storm/trident/testing/MemoryMapState.java
index 2647626..64dfc60 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/testing/MemoryMapState.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/testing/MemoryMapState.java
@@ -127,7 +127,7 @@
         Map<List<Object>, T> db;
         Long currTx;
 
-        public MemoryMapStateBacking(String id) {
+        MemoryMapStateBacking(String id) {
             if (!dbs.containsKey(id)) {
                 dbs.put(id, new HashMap());
             }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/MasterBatchCoordinator.java b/storm-client/src/jvm/org/apache/storm/trident/topology/MasterBatchCoordinator.java
index 3c5bc7f..6b595e4 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/topology/MasterBatchCoordinator.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/topology/MasterBatchCoordinator.java
@@ -286,7 +286,7 @@
                 + "}";
     }
 
-    private static enum AttemptStatus {
+    private enum AttemptStatus {
         PROCESSING,
         PROCESSED,
         COMMITTING
@@ -296,7 +296,7 @@
         TransactionAttempt attempt;
         AttemptStatus status;
 
-        public TransactionStatus(TransactionAttempt attempt) {
+        TransactionStatus(TransactionAttempt attempt) {
             this.attempt = attempt;
             this.status = AttemptStatus.PROCESSING;
         }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java b/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java
index 7a187c9..11b61fb 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/topology/TridentBoltExecutor.java
@@ -285,7 +285,7 @@
         }
     }
 
-    static enum TupleType {
+    enum TupleType {
         REGULAR,
         COMMIT,
         COORD
@@ -380,7 +380,7 @@
 
         TrackedBatch currBatch = null;
 
-        public CoordinatedOutputCollector(IOutputCollector delegate) {
+        CoordinatedOutputCollector(IOutputCollector delegate) {
             this.delegate = delegate;
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/TridentTopologyBuilder.java b/storm-client/src/jvm/org/apache/storm/trident/topology/TridentTopologyBuilder.java
index f433590..843755e 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/topology/TridentTopologyBuilder.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/topology/TridentTopologyBuilder.java
@@ -289,7 +289,7 @@
         return ret;
     }
 
-    private static interface InputDeclaration {
+    private interface InputDeclaration {
         void declare(InputDeclarer declarer);
 
         String getComponent();
@@ -298,14 +298,14 @@
     }
 
     private static class SpoutComponent {
-        public final Object spout;
-        public final Integer parallelism;
-        public final Map<String, Object> componentConf = new HashMap<>();
+        final Object spout;
+        final Integer parallelism;
+        final Map<String, Object> componentConf = new HashMap<>();
         final String batchGroupId;
         final String streamName;
         final Set<SharedMemory> sharedMemory = new HashSet<>();
 
-        public SpoutComponent(Object spout, String streamName, Integer parallelism, String batchGroupId) {
+        SpoutComponent(Object spout, String streamName, Integer parallelism, String batchGroupId) {
             this.spout = spout;
             this.streamName = streamName;
             this.parallelism = parallelism;
@@ -321,7 +321,7 @@
     private static class TransactionalSpoutComponent extends SpoutComponent {
         public String commitStateId;
 
-        public TransactionalSpoutComponent(Object spout, String streamName, Integer parallelism, String commitStateId,
+        TransactionalSpoutComponent(Object spout, String streamName, Integer parallelism, String commitStateId,
                                            String batchGroupId) {
             super(spout, streamName, parallelism, batchGroupId);
             this.commitStateId = commitStateId;
@@ -341,7 +341,7 @@
         public final Set<String> committerBatches;
         public final Set<SharedMemory> sharedMemory = new HashSet<>();
 
-        public Component(ITridentBatchBolt bolt, Integer parallelism, Set<String> committerBatches) {
+        Component(ITridentBatchBolt bolt, Integer parallelism, Set<String> committerBatches) {
             this.bolt = bolt;
             this.parallelism = parallelism;
             this.committerBatches = committerBatches;
@@ -356,7 +356,7 @@
     private static class SpoutDeclarerImpl extends BaseConfigurationDeclarer<SpoutDeclarer> implements SpoutDeclarer {
         SpoutComponent component;
 
-        public SpoutDeclarerImpl(SpoutComponent component) {
+        SpoutDeclarerImpl(SpoutComponent component) {
             this.component = component;
         }
 
@@ -388,7 +388,7 @@
     private static class BoltDeclarerImpl extends BaseConfigurationDeclarer<BoltDeclarer> implements BoltDeclarer {
         Component component;
 
-        public BoltDeclarerImpl(Component component) {
+        BoltDeclarerImpl(Component component) {
             this.component = component;
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/trident/topology/state/RotatingTransactionalState.java b/storm-client/src/jvm/org/apache/storm/trident/topology/state/RotatingTransactionalState.java
index 52b7f05..424ce4a 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/topology/state/RotatingTransactionalState.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/topology/state/RotatingTransactionalState.java
@@ -175,7 +175,7 @@
                 + '}';
     }
 
-    public static interface StateInitializer {
+    public interface StateInitializer {
         Object init(long txid, Object lastState);
     }
 }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/tuple/ComboList.java b/storm-client/src/jvm/org/apache/storm/trident/tuple/ComboList.java
index 3ab06a8..a10dcde 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/tuple/ComboList.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/tuple/ComboList.java
@@ -77,7 +77,7 @@
         int listIndex;
         int subIndex;
 
-        public Pointer(int listIndex, int subIndex) {
+        Pointer(int listIndex, int subIndex) {
             this.listIndex = listIndex;
             this.subIndex = subIndex;
         }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/tuple/TridentTuple.java b/storm-client/src/jvm/org/apache/storm/trident/tuple/TridentTuple.java
index 42df022..d0ec01e 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/tuple/TridentTuple.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/tuple/TridentTuple.java
@@ -19,7 +19,7 @@
 
 public interface TridentTuple extends ITuple, List<Object> {
 
-    public static interface Factory extends Serializable {
+    interface Factory extends Serializable {
         Map<String, ValuePointer> getFieldIndex();
 
         List<String> getOutputFields();
diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/AbstractTridentWindowManager.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/AbstractTridentWindowManager.java
index 81451d3..81f218e 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/windowing/AbstractTridentWindowManager.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/AbstractTridentWindowManager.java
@@ -157,7 +157,7 @@
         final List<List<Object>> values = new ArrayList<>();
         private final BatchOutputCollector delegateCollector;
 
-        public AccumulatedTuplesCollector(BatchOutputCollector delegateCollector) {
+        AccumulatedTuplesCollector(BatchOutputCollector delegateCollector) {
             this.delegateCollector = delegateCollector;
         }
 
@@ -182,7 +182,7 @@
         final int id;
         final List<List<Object>> result;
 
-        public TriggerResult(int id, List<List<Object>> result) {
+        TriggerResult(int id, List<List<Object>> result) {
             this.id = id;
             this.result = result;
         }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/ITridentWindowManager.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/ITridentWindowManager.java
index cf23afc..167e444 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/windowing/ITridentWindowManager.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/ITridentWindowManager.java
@@ -26,22 +26,22 @@
      * done before the topology starts accepting tuples. For ex: initialize window manager with any earlier stored tuples/triggers and start
      * WindowManager.
      */
-    public void prepare();
+    void prepare();
 
     /**
      * This is invoked when from {@code org.apache.storm.trident.planner.TridentProcessor}'s  cleanup method. So, any cleanup operations
      * like clearing cache or close store connection etc can be done.
      */
-    public void shutdown();
+    void shutdown();
 
     /**
      * Add received batch of tuples to cache/store and add them to {@code WindowManager}.
      */
-    public void addTuplesBatch(Object batchId, List<TridentTuple> tuples);
+    void addTuplesBatch(Object batchId, List<TridentTuple> tuples);
 
     /**
      * Returns pending triggers to be emitted.
      */
-    public Queue<StoreBasedTridentWindowManager.TriggerResult> getPendingTriggers();
+    Queue<StoreBasedTridentWindowManager.TriggerResult> getPendingTriggers();
 
 }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStore.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStore.java
index 7e1d051..e8e5b3d 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStore.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStore.java
@@ -26,28 +26,28 @@
     /**
      * This can be used as a separator while generating a key from sequence of strings.
      */
-    public static final String KEY_SEPARATOR = "|";
+    String KEY_SEPARATOR = "|";
 
-    public Object get(String key);
+    Object get(String key);
 
-    public Iterable<Object> get(List<String> keys);
+    Iterable<Object> get(List<String> keys);
 
-    public Iterable<String> getAllKeys();
+    Iterable<String> getAllKeys();
 
-    public void put(String key, Object value);
+    void put(String key, Object value);
 
-    public void putAll(Collection<Entry> entries);
+    void putAll(Collection<Entry> entries);
 
-    public void remove(String key);
+    void remove(String key);
 
-    public void removeAll(Collection<String> keys);
+    void removeAll(Collection<String> keys);
 
-    public void shutdown();
+    void shutdown();
 
     /**
      * This class wraps key and value objects which can be passed to {@code putAll} method.
      */
-    public static class Entry implements Serializable {
+    class Entry implements Serializable {
         public final String key;
         public final Object value;
 
diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStoreFactory.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStoreFactory.java
index b901d51..46621cd 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStoreFactory.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/WindowsStoreFactory.java
@@ -28,5 +28,5 @@
      * @param topoConf storm topology configuration passed in {@link org.apache.storm.trident.planner.TridentProcessor#prepare(Map,
      *                 TopologyContext, TridentContext)}
      */
-    public WindowsStore create(Map<String, Object> topoConf);
+    WindowsStore create(Map<String, Object> topoConf);
 }
diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/config/WindowConfig.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/config/WindowConfig.java
index 7644b8b..49b9d6a 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/windowing/config/WindowConfig.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/config/WindowConfig.java
@@ -23,21 +23,21 @@
     /**
      * Returns the length of the window.
      */
-    public int getWindowLength();
+    int getWindowLength();
 
     /**
      * Returns the sliding length of the moving window.
      */
-    public int getSlidingLength();
+    int getSlidingLength();
 
     /**
      * Gives the type of windowing. It can be any of {@code Type} values.
      */
-    public <T> WindowStrategy<T> getWindowStrategy();
+    <T> WindowStrategy<T> getWindowStrategy();
 
-    public void validate();
+    void validate();
 
-    public enum Type {
+    enum Type {
         SLIDING_COUNT,
         TUMBLING_COUNT,
         SLIDING_DURATION,
diff --git a/storm-client/src/jvm/org/apache/storm/trident/windowing/strategy/WindowStrategy.java b/storm-client/src/jvm/org/apache/storm/trident/windowing/strategy/WindowStrategy.java
index ff814f9..860390e 100644
--- a/storm-client/src/jvm/org/apache/storm/trident/windowing/strategy/WindowStrategy.java
+++ b/storm-client/src/jvm/org/apache/storm/trident/windowing/strategy/WindowStrategy.java
@@ -24,10 +24,10 @@
     /**
      * Returns a {@code TriggerPolicy}  by creating with {@code triggerHandler} and {@code evictionPolicy} with the given configuration.
      */
-    public TriggerPolicy<T, ?> getTriggerPolicy(TriggerHandler triggerHandler, EvictionPolicy<T, ?> evictionPolicy);
+    TriggerPolicy<T, ?> getTriggerPolicy(TriggerHandler triggerHandler, EvictionPolicy<T, ?> evictionPolicy);
 
     /**
      * Returns an {@code EvictionPolicy} instance for this strategy with the given configuration.
      */
-    public EvictionPolicy<T, ?> getEvictionPolicy();
+    EvictionPolicy<T, ?> getEvictionPolicy();
 }
diff --git a/storm-client/src/jvm/org/apache/storm/tuple/ITuple.java b/storm-client/src/jvm/org/apache/storm/tuple/ITuple.java
index 0d0a8fb..d176474 100644
--- a/storm-client/src/jvm/org/apache/storm/tuple/ITuple.java
+++ b/storm-client/src/jvm/org/apache/storm/tuple/ITuple.java
@@ -19,36 +19,36 @@
     /**
      * Returns the number of fields in this tuple.
      */
-    public int size();
+    int size();
 
     /**
      * Returns true if this tuple contains the specified name of the field.
      */
-    public boolean contains(String field);
+    boolean contains(String field);
 
     /**
      * Gets the names of the fields in this tuple.
      */
-    public Fields getFields();
+    Fields getFields();
 
     /**
      * Returns the position of the specified field in this tuple.
      *
      * @throws IllegalArgumentException - if field does not exist
      */
-    public int fieldIndex(String field);
+    int fieldIndex(String field);
 
     /**
      * Returns a subset of the tuple based on the fields selector.
      */
-    public List<Object> select(Fields selector);
+    List<Object> select(Fields selector);
 
     /**
      * Gets the field at position i in the tuple. Returns object since tuples are dynamically typed.
      *
      * @throws IndexOutOfBoundsException - if the index is out of range `(index < 0 || index >= size())`
      */
-    public Object getValue(int i);
+    Object getValue(int i);
 
     /**
      * Returns the String at position i in the tuple.
@@ -56,7 +56,7 @@
      * @throws ClassCastException        If that field is not a String
      * @throws IndexOutOfBoundsException - if the index is out of range `(index < 0 || index >= size())`
      */
-    public String getString(int i);
+    String getString(int i);
 
     /**
      * Returns the Integer at position i in the tuple.
@@ -64,7 +64,7 @@
      * @throws ClassCastException        If that field is not a Integer
      * @throws IndexOutOfBoundsException - if the index is out of range `(index < 0 || index >= size())`
      */
-    public Integer getInteger(int i);
+    Integer getInteger(int i);
 
     /**
      * Returns the Long at position i in the tuple.
@@ -72,7 +72,7 @@
      * @throws ClassCastException        If that field is not a Long
      * @throws IndexOutOfBoundsException - if the index is out of range `(index < 0 || index >= size())`
      */
-    public Long getLong(int i);
+    Long getLong(int i);
 
     /**
      * Returns the Boolean at position i in the tuple.
@@ -80,7 +80,7 @@
      * @throws ClassCastException        If that field is not a Boolean
      * @throws IndexOutOfBoundsException - if the index is out of range `(index < 0 || index >= size())`
      */
-    public Boolean getBoolean(int i);
+    Boolean getBoolean(int i);
 
     /**
      * Returns the Short at position i in the tuple.
@@ -88,7 +88,7 @@
      * @throws ClassCastException        If that field is not a Short
      * @throws IndexOutOfBoundsException - if the index is out of range `(index < 0 || index >= size())`
      */
-    public Short getShort(int i);
+    Short getShort(int i);
 
     /**
      * Returns the Byte at position i in the tuple.
@@ -96,7 +96,7 @@
      * @throws ClassCastException        If that field is not a Byte
      * @throws IndexOutOfBoundsException - if the index is out of range `(index < 0 || index >= size())`
      */
-    public Byte getByte(int i);
+    Byte getByte(int i);
 
     /**
      * Returns the Double at position i in the tuple.
@@ -104,7 +104,7 @@
      * @throws ClassCastException        If that field is not a Double
      * @throws IndexOutOfBoundsException - if the index is out of range `(index < 0 || index >= size())`
      */
-    public Double getDouble(int i);
+    Double getDouble(int i);
 
     /**
      * Returns the Float at position i in the tuple.
@@ -112,7 +112,7 @@
      * @throws ClassCastException        If that field is not a Float
      * @throws IndexOutOfBoundsException - if the index is out of range `(index < 0 || index >= size())`
      */
-    public Float getFloat(int i);
+    Float getFloat(int i);
 
     /**
      * Returns the byte array at position i in the tuple.
@@ -120,14 +120,14 @@
      * @throws ClassCastException        If that field is not a byte array
      * @throws IndexOutOfBoundsException - if the index is out of range `(index < 0 || index >= size())`
      */
-    public byte[] getBinary(int i);
+    byte[] getBinary(int i);
 
     /**
      * Gets the field with a specific name. Returns object since tuples are dynamically typed.
      *
      * @throws IllegalArgumentException - if field does not exist
      */
-    public Object getValueByField(String field);
+    Object getValueByField(String field);
 
     /**
      * Gets the String field with a specific name.
@@ -135,7 +135,7 @@
      * @throws ClassCastException       If that field is not a String
      * @throws IllegalArgumentException - if field does not exist
      */
-    public String getStringByField(String field);
+    String getStringByField(String field);
 
     /**
      * Gets the Integer field with a specific name.
@@ -143,7 +143,7 @@
      * @throws ClassCastException       If that field is not an Integer
      * @throws IllegalArgumentException - if field does not exist
      */
-    public Integer getIntegerByField(String field);
+    Integer getIntegerByField(String field);
 
     /**
      * Gets the Long field with a specific name.
@@ -151,7 +151,7 @@
      * @throws ClassCastException       If that field is not a Long
      * @throws IllegalArgumentException - if field does not exist
      */
-    public Long getLongByField(String field);
+    Long getLongByField(String field);
 
     /**
      * Gets the Boolean field with a specific name.
@@ -159,7 +159,7 @@
      * @throws ClassCastException       If that field is not a Boolean
      * @throws IllegalArgumentException - if field does not exist
      */
-    public Boolean getBooleanByField(String field);
+    Boolean getBooleanByField(String field);
 
     /**
      * Gets the Short field with a specific name.
@@ -167,7 +167,7 @@
      * @throws ClassCastException       If that field is not a Short
      * @throws IllegalArgumentException - if field does not exist
      */
-    public Short getShortByField(String field);
+    Short getShortByField(String field);
 
     /**
      * Gets the Byte field with a specific name.
@@ -175,7 +175,7 @@
      * @throws ClassCastException       If that field is not a Byte
      * @throws IllegalArgumentException - if field does not exist
      */
-    public Byte getByteByField(String field);
+    Byte getByteByField(String field);
 
     /**
      * Gets the Double field with a specific name.
@@ -183,7 +183,7 @@
      * @throws ClassCastException       If that field is not a Double
      * @throws IllegalArgumentException - if field does not exist
      */
-    public Double getDoubleByField(String field);
+    Double getDoubleByField(String field);
 
     /**
      * Gets the Float field with a specific name.
@@ -191,7 +191,7 @@
      * @throws ClassCastException       If that field is not a Float
      * @throws IllegalArgumentException - if field does not exist
      */
-    public Float getFloatByField(String field);
+    Float getFloatByField(String field);
 
     /**
      * Gets the Byte array field with a specific name.
@@ -199,11 +199,11 @@
      * @throws ClassCastException       If that field is not a byte array
      * @throws IllegalArgumentException - if field does not exist
      */
-    public byte[] getBinaryByField(String field);
+    byte[] getBinaryByField(String field);
 
     /**
      * Gets all the values in this tuple.
      */
-    public List<Object> getValues();
+    List<Object> getValues();
 
 }
diff --git a/storm-client/src/jvm/org/apache/storm/tuple/Tuple.java b/storm-client/src/jvm/org/apache/storm/tuple/Tuple.java
index 01d6c88..4dc51a2 100644
--- a/storm-client/src/jvm/org/apache/storm/tuple/Tuple.java
+++ b/storm-client/src/jvm/org/apache/storm/tuple/Tuple.java
@@ -30,30 +30,30 @@
     /**
      * Returns the global stream id (component + stream) of this tuple.
      */
-    public GlobalStreamId getSourceGlobalStreamId();
+    GlobalStreamId getSourceGlobalStreamId();
 
     /**
      * Gets the id of the component that created this tuple.
      */
-    public String getSourceComponent();
+    String getSourceComponent();
 
     /**
      * Gets the id of the task that created this tuple.
      */
-    public int getSourceTask();
+    int getSourceTask();
 
     /**
      * Gets the id of the stream that this tuple was emitted to.
      */
-    public String getSourceStreamId();
+    String getSourceStreamId();
 
     /**
      * Gets the message id that associated with this tuple.
      */
-    public MessageId getMessageId();
+    MessageId getMessageId();
 
     /**
      * Gets the topology context associated with the tuple.
      */
-    public GeneralTopologyContext getContext();
+    GeneralTopologyContext getContext();
 }
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 063447a..b0f2d9f 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java
@@ -289,7 +289,7 @@
     private static class DirectInserter implements Inserter {
         private JCQueue queue;
 
-        public DirectInserter(JCQueue queue) {
+        DirectInserter(JCQueue queue) {
             this.queue = queue;
         }
 
@@ -344,7 +344,7 @@
         private JCQueue queue;
         private ArrayList<Object> currentBatch;
 
-        public BatchInserter(JCQueue queue, int batchSz) {
+        BatchInserter(JCQueue queue, int batchSz) {
             this.queue = queue;
             this.batchSz = batchSz;
             this.currentBatch = new ArrayList<>(batchSz + 1);
diff --git a/storm-client/src/jvm/org/apache/storm/utils/ShellUtils.java b/storm-client/src/jvm/org/apache/storm/utils/ShellUtils.java
index 9e141d7..96b3a02 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/ShellUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/ShellUtils.java
@@ -485,7 +485,7 @@
 
         private ShellUtils shell;
 
-        public ShellTimeoutTimerTask(ShellUtils shell) {
+        ShellTimeoutTimerTask(ShellUtils shell) {
             this.shell = shell;
         }
 
diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
index eb31eaf..afb72c4 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
@@ -1800,7 +1800,7 @@
         private Map<String, Object> stormConf;
         private File file;
 
-        public JarConfigReader(Yaml yaml, Map<String, Object> defaultsConf, Map<String, Object> stormConf, File file) {
+        JarConfigReader(Yaml yaml, Map<String, Object> defaultsConf, Map<String, Object> stormConf, File file) {
             this.yaml = yaml;
             this.defaultsConf = defaultsConf;
             this.stormConf = stormConf;
diff --git a/storm-client/src/jvm/org/apache/storm/validation/ConfigValidationUtils.java b/storm-client/src/jvm/org/apache/storm/validation/ConfigValidationUtils.java
index 1510a1b..21d2cde 100644
--- a/storm-client/src/jvm/org/apache/storm/validation/ConfigValidationUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/validation/ConfigValidationUtils.java
@@ -143,7 +143,7 @@
     /**
      * Declares methods for validating configuration values.
      */
-    public static interface FieldValidator {
+    public interface FieldValidator {
         /**
          * Validates the given field.
          *
@@ -151,7 +151,7 @@
          * @param field The field to be validated.
          * @throws IllegalArgumentException if the field fails validation.
          */
-        public void validateField(String name, Object field) throws IllegalArgumentException;
+        void validateField(String name, Object field) throws IllegalArgumentException;
     }
 
     /**
diff --git a/storm-client/src/jvm/org/apache/storm/windowing/EvictionPolicy.java b/storm-client/src/jvm/org/apache/storm/windowing/EvictionPolicy.java
index 27bea2a..b95414e 100644
--- a/storm-client/src/jvm/org/apache/storm/windowing/EvictionPolicy.java
+++ b/storm-client/src/jvm/org/apache/storm/windowing/EvictionPolicy.java
@@ -70,7 +70,7 @@
     /**
      * The action to be taken when {@link EvictionPolicy#evict(Event)} is invoked.
      */
-    public enum Action {
+    enum Action {
         /**
          * expire the event and remove it from the queue.
          */
diff --git a/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureTuple.java b/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureTuple.java
index 3b4789c..bc47d7b 100644
--- a/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureTuple.java
+++ b/storm-clojure/src/main/java/org/apache/storm/clojure/ClojureTuple.java
@@ -121,7 +121,7 @@
             this.count = count;
         }
 
-        public Seq(IPersistentMap meta, List<String> fields, List<Object> values, int count) {
+        Seq(IPersistentMap meta, List<String> fields, List<Object> values, int count) {
             super(meta);
             this.fields = fields;
             this.values = values;
diff --git a/storm-core/src/jvm/org/apache/storm/command/CLI.java b/storm-core/src/jvm/org/apache/storm/command/CLI.java
index cc5c5dc..d9f3fe1 100644
--- a/storm-core/src/jvm/org/apache/storm/command/CLI.java
+++ b/storm-core/src/jvm/org/apache/storm/command/CLI.java
@@ -221,7 +221,7 @@
         final Assoc assoc;
         final boolean noValue;
 
-        public Opt(String shortName, String longName, Object defaultValue, Parse parse, Assoc assoc, boolean noValue) {
+        Opt(String shortName, String longName, Object defaultValue, Parse parse, Assoc assoc, boolean noValue) {
             this.shortName = shortName;
             this.longName = longName;
             this.defaultValue = defaultValue;
@@ -240,7 +240,7 @@
         final Parse parse;
         final Assoc assoc;
 
-        public Arg(String name, Parse parse, Assoc assoc) {
+        Arg(String name, Parse parse, Assoc assoc) {
             this.name = name;
             this.parse = parse == null ? AS_STRING : parse;
             this.assoc = assoc == null ? INTO_LIST : assoc;
diff --git a/storm-core/src/jvm/org/apache/storm/command/SetLogLevel.java b/storm-core/src/jvm/org/apache/storm/command/SetLogLevel.java
index 7e9815a..411c586 100644
--- a/storm-core/src/jvm/org/apache/storm/command/SetLogLevel.java
+++ b/storm-core/src/jvm/org/apache/storm/command/SetLogLevel.java
@@ -74,7 +74,7 @@
 
         private LogLevelAction action;
 
-        public LogLevelsParser(LogLevelAction action) {
+        LogLevelsParser(LogLevelAction action) {
             this.action = action;
         }
 
diff --git a/storm-server/src/main/java/org/apache/storm/LocalCluster.java b/storm-server/src/main/java/org/apache/storm/LocalCluster.java
index 0af21ad..636fff5 100644
--- a/storm-server/src/main/java/org/apache/storm/LocalCluster.java
+++ b/storm-server/src/main/java/org/apache/storm/LocalCluster.java
@@ -1243,7 +1243,7 @@
 
         private final String id;
 
-        public TrackedStormCommon(String id) {
+        TrackedStormCommon(String id) {
             this.id = id;
         }
 
diff --git a/storm-server/src/main/java/org/apache/storm/Testing.java b/storm-server/src/main/java/org/apache/storm/Testing.java
index 637d01d..45e585c 100644
--- a/storm-server/src/main/java/org/apache/storm/Testing.java
+++ b/storm-server/src/main/java/org/apache/storm/Testing.java
@@ -700,8 +700,8 @@
     /**
      * Simply produces a boolean to see if a specific state is true or false.
      */
-    public static interface Condition {
-        public boolean exec();
+    public interface Condition {
+        boolean exec();
     }
 
     /**
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/HeartbeatCache.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/HeartbeatCache.java
index 4774260..6f8abc3 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/HeartbeatCache.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/HeartbeatCache.java
@@ -49,7 +49,7 @@
         private Integer nimbusTimeSecs;
         private Integer executorReportedTimeSecs;
 
-        public ExecutorCache(Map<String, Object> newBeat) {
+        ExecutorCache(Map<String, Object> newBeat) {
             if (newBeat != null) {
                 executorReportedTimeSecs = (Integer) newBeat.getOrDefault(ClientStatsUtil.TIME_SECS, 0);
             } else {
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
index 7b4a59f..45add73 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
@@ -4793,7 +4793,7 @@
         private final K key;
         private final V value;
 
-        public Assoc(K key, V value) {
+        Assoc(K key, V value) {
             this.key = key;
             this.value = value;
         }
@@ -4811,7 +4811,7 @@
     private static final class Dissoc<K, V> implements UnaryOperator<Map<K, V>> {
         private final K key;
 
-        public Dissoc(K key) {
+        Dissoc(K key) {
             this.key = key;
         }
 
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 591a3b9..a6e0332 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
@@ -229,7 +229,7 @@
         public final List<AccessControl> acl;
         public final T data;
 
-        public WithAcl(List<AccessControl> acl, T data) {
+        WithAcl(List<AccessControl> acl, T data) {
             this.acl = acl;
             this.data = data;
         }
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java
index 2a61523..153ac77 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java
@@ -867,7 +867,7 @@
         private List<String> depLocs = null;
         private String stormVersion = null;
 
-        public TopologyMetaData(final Map<String, Object> conf, final String topologyId, final AdvancedFSOps ops, final String stormRoot) {
+        TopologyMetaData(final Map<String, Object> conf, final String topologyId, final AdvancedFSOps ops, final String stormRoot) {
             this.conf = conf;
             this.topologyId = topologyId;
             this.ops = ops;
@@ -949,7 +949,7 @@
     private class ProcessExitCallback implements ExitCodeCallback {
         private final String logPrefix;
 
-        public ProcessExitCallback(String logPrefix) {
+        ProcessExitCallback(String logPrefix) {
             this.logPrefix = logPrefix;
         }
 
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Container.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Container.java
index a492f16..a25faad 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Container.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Container.java
@@ -737,7 +737,7 @@
         }
     }
 
-    public static enum ContainerType {
+    public enum ContainerType {
         LAUNCH(false, false),
         RECOVER_FULL(true, false),
         RECOVER_PARTIAL(true, true);
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/ContainerMemoryTracker.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/ContainerMemoryTracker.java
index 6d0924e..e79794e 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/ContainerMemoryTracker.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/ContainerMemoryTracker.java
@@ -143,7 +143,7 @@
         public final String topoId;
         public final long memory;
 
-        public TopoAndMemory(String id, long mem) {
+        TopoAndMemory(String id, long mem) {
             topoId = id;
             memory = mem;
         }
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
index e04b080..c8e6f19 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
@@ -1126,7 +1126,7 @@
         public final long startTime;
         private final SlotMetrics slotMetrics;
 
-        public DynamicState(final LocalAssignment currentAssignment, Container container, final LocalAssignment newAssignment,
+        DynamicState(final LocalAssignment currentAssignment, Container container, final LocalAssignment newAssignment,
             SlotMetrics slotMetrics) {
             this.currentAssignment = currentAssignment;
             this.container = container;
@@ -1153,7 +1153,7 @@
             this.slotMetrics = slotMetrics;
         }
 
-        public DynamicState(final MachineState state, final LocalAssignment newAssignment,
+        DynamicState(final MachineState state, final LocalAssignment newAssignment,
                             final Container container, final LocalAssignment currentAssignment,
                             final LocalAssignment pendingLocalization, final long startTime,
                             final Future<Void> pendingDownload, final Set<TopoProfileAction> profileActions,
@@ -1295,7 +1295,7 @@
         public final String topoId;
         public final ProfileRequest request;
 
-        public TopoProfileAction(String topoId, ProfileRequest request) {
+        TopoProfileAction(String topoId, ProfileRequest request) {
             this.topoId = topoId;
             this.request = request;
         }
@@ -1328,7 +1328,7 @@
         private final LocallyCachedBlob blob;
         private final GoodToGo.GoodToGoLatch latch;
 
-        public BlobChanging(LocalAssignment assignment, LocallyCachedBlob blob, GoodToGo.GoodToGoLatch latch) {
+        BlobChanging(LocalAssignment assignment, LocallyCachedBlob blob, GoodToGo.GoodToGoLatch latch) {
             this.assignment = assignment;
             this.blob = blob;
             this.latch = latch;
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/UniFunc.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/UniFunc.java
index e531cb6..b0dfd94 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/UniFunc.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/UniFunc.java
@@ -13,5 +13,5 @@
 package org.apache.storm.daemon.supervisor;
 
 public interface UniFunc<T> {
-    public void call(T arg) throws Exception;
+    void call(T arg) throws Exception;
 }
diff --git a/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java b/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
index 95ab8ae..eaa6384 100644
--- a/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
+++ b/storm-server/src/main/java/org/apache/storm/localizer/AsyncLocalizer.java
@@ -656,7 +656,7 @@
         private final PortAndAssignment pna;
         private final BlobChangingCallback cb;
 
-        public DownloadBlobs(PortAndAssignment pna, BlobChangingCallback cb) {
+        DownloadBlobs(PortAndAssignment pna, BlobChangingCallback cb) {
             this.pna = pna;
             this.cb = cb;
         }
diff --git a/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java b/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java
index ddb59c8..3c31d4e 100644
--- a/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java
+++ b/storm-server/src/main/java/org/apache/storm/localizer/LocalizedResourceRetentionSet.java
@@ -81,10 +81,6 @@
     public void cleanup(ClientBlobStore store) {
         LOG.debug("cleanup target size: {} current size is: {}", targetSize, currentSize);
         long bytesOver = currentSize - targetSize;
-        if (bytesOver <= 0) { // no need to query remote files
-            return;
-        }
-
         //First delete everything that no longer exists...
         for (Iterator<Map.Entry<LocallyCachedBlob, Map<String, ? extends LocallyCachedBlob>>> i = noReferences.entrySet().iterator();
              i.hasNext(); ) {
diff --git a/storm-server/src/main/java/org/apache/storm/localizer/LocallyCachedBlob.java b/storm-server/src/main/java/org/apache/storm/localizer/LocallyCachedBlob.java
index c948240..a198c86 100644
--- a/storm-server/src/main/java/org/apache/storm/localizer/LocallyCachedBlob.java
+++ b/storm-server/src/main/java/org/apache/storm/localizer/LocallyCachedBlob.java
@@ -299,7 +299,7 @@
         private final Path downloadPath;
         private final long version;
 
-        public DownloadMeta(Path downloadPath, long version) {
+        DownloadMeta(Path downloadPath, long version) {
             this.downloadPath = downloadPath;
             this.version = version;
         }
diff --git a/storm-server/src/main/java/org/apache/storm/localizer/PortAndAssignmentImpl.java b/storm-server/src/main/java/org/apache/storm/localizer/PortAndAssignmentImpl.java
index af9bb8b..509ef14 100644
--- a/storm-server/src/main/java/org/apache/storm/localizer/PortAndAssignmentImpl.java
+++ b/storm-server/src/main/java/org/apache/storm/localizer/PortAndAssignmentImpl.java
@@ -21,7 +21,7 @@
     private final int port;
     private final LocalAssignment assignment;
 
-    public PortAndAssignmentImpl(int port, LocalAssignment assignment) {
+    PortAndAssignmentImpl(int port, LocalAssignment assignment) {
         this.port = port;
         this.assignment = assignment;
     }
diff --git a/storm-server/src/main/java/org/apache/storm/nimbus/NimbusHeartbeatsPressureTest.java b/storm-server/src/main/java/org/apache/storm/nimbus/NimbusHeartbeatsPressureTest.java
index 89e732b..e2ac486 100644
--- a/storm-server/src/main/java/org/apache/storm/nimbus/NimbusHeartbeatsPressureTest.java
+++ b/storm-server/src/main/java/org/apache/storm/nimbus/NimbusHeartbeatsPressureTest.java
@@ -176,7 +176,7 @@
         private int tryTimes;
         private NimbusClient client;
 
-        public HeartbeatSendTask(int taskId, int tryTimes) {
+        HeartbeatSendTask(int taskId, int tryTimes) {
             this.taskId = taskId;
             this.tryTimes = tryTimes;
             this.runtimesBook = new double[tryTimes];
diff --git a/storm-server/src/main/java/org/apache/storm/pacemaker/PacemakerServer.java b/storm-server/src/main/java/org/apache/storm/pacemaker/PacemakerServer.java
index d25529f..d8364dc 100644
--- a/storm-server/src/main/java/org/apache/storm/pacemaker/PacemakerServer.java
+++ b/storm-server/src/main/java/org/apache/storm/pacemaker/PacemakerServer.java
@@ -54,7 +54,7 @@
     private final EventLoopGroup bossEventLoopGroup;
     private final EventLoopGroup workerEventLoopGroup;
 
-    public PacemakerServer(IServerMessageHandler handler, Map<String, Object> config) {
+    PacemakerServer(IServerMessageHandler handler, Map<String, Object> config) {
         int port = (int) config.get(Config.PACEMAKER_PORT);
         this.handler = handler;
         this.topologyName = "pacemaker_server";
diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/IsolationScheduler.java b/storm-server/src/main/java/org/apache/storm/scheduler/IsolationScheduler.java
index 7b60ffd..85e752b 100644
--- a/storm-server/src/main/java/org/apache/storm/scheduler/IsolationScheduler.java
+++ b/storm-server/src/main/java/org/apache/storm/scheduler/IsolationScheduler.java
@@ -377,7 +377,7 @@
         private String topologyId;
         private Set<ExecutorDetails> executors;
 
-        public AssignmentInfo(WorkerSlot workerSlot, String topologyId, Set<ExecutorDetails> executors) {
+        AssignmentInfo(WorkerSlot workerSlot, String topologyId, Set<ExecutorDetails> executors) {
             this.workerSlot = workerSlot;
             this.topologyId = topologyId;
             this.executors = executors;
@@ -401,7 +401,7 @@
         private String hostName;
         private List<WorkerSlot> workerSlots;
 
-        public HostAssignableSlots(String hostName, List<WorkerSlot> workerSlots) {
+        HostAssignableSlots(String hostName, List<WorkerSlot> workerSlots) {
             this.hostName = hostName;
             this.workerSlots = workerSlots;
         }
diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/SchedulerAssignment.java b/storm-server/src/main/java/org/apache/storm/scheduler/SchedulerAssignment.java
index e2ad2d4..bf4815e 100644
--- a/storm-server/src/main/java/org/apache/storm/scheduler/SchedulerAssignment.java
+++ b/storm-server/src/main/java/org/apache/storm/scheduler/SchedulerAssignment.java
@@ -30,7 +30,7 @@
      * @param slot the slot to check.
      * @return true if the slot is occupied by this assignment else false.
      */
-    public boolean isSlotOccupied(WorkerSlot slot);
+    boolean isSlotOccupied(WorkerSlot slot);
 
     /**
      * Is the executor assigned or not.
@@ -38,54 +38,54 @@
      * @param executor the executor to check it if is assigned.
      * @return true if it is assigned else false
      */
-    public boolean isExecutorAssigned(ExecutorDetails executor);
+    boolean isExecutorAssigned(ExecutorDetails executor);
 
     /**
      * Return the ID of the topology.
      *
      * @return the topology-id this assignment is for.
      */
-    public String getTopologyId();
+    String getTopologyId();
 
     /**
      * Get the map of executor to WorkerSlot.
      *
      * @return the executor -> slot map.
      */
-    public Map<ExecutorDetails, WorkerSlot> getExecutorToSlot();
+    Map<ExecutorDetails, WorkerSlot> getExecutorToSlot();
 
     /**
      * Get the set of all executors.
      *
      * @return the executors covered by this assignments
      */
-    public Set<ExecutorDetails> getExecutors();
+    Set<ExecutorDetails> getExecutors();
 
     /**
      * Get the set of all slots that are a part of this.
      *
      * @return the set of all slots.
      */
-    public Set<WorkerSlot> getSlots();
+    Set<WorkerSlot> getSlots();
 
     /**
      * Get the mapping of slot to executors on that slot.
      *
      * @return the slot to the executors assigned to that slot.
      */
-    public Map<WorkerSlot, Collection<ExecutorDetails>> getSlotToExecutors();
+    Map<WorkerSlot, Collection<ExecutorDetails>> getSlotToExecutors();
 
     /**
      * Get the slot to resource mapping.
      *
      * @return The slot to resource mapping
      */
-    public Map<WorkerSlot, WorkerResources> getScheduledResources();
+    Map<WorkerSlot, WorkerResources> getScheduledResources();
 
     /**
      * Get the total shared off heap node memory mapping.
      *
      * @return host to total shared off heap node memory mapping.
      */
-    public Map<String, Double> getNodeIdToTotalSharedOffHeapNodeMemory();
+    Map<String, Double> getNodeIdToTotalSharedOffHeapNodeMemory();
 }
diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java
index 6d75b33..55279b8 100644
--- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java
+++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java
@@ -137,8 +137,8 @@
     }
 
     protected abstract TreeSet<ObjectResources> sortObjectResources(
-        final AllResources allResources, ExecutorDetails exec, TopologyDetails topologyDetails,
-        final ExistingScheduleFunc existingScheduleFunc
+        AllResources allResources, ExecutorDetails exec, TopologyDetails topologyDetails,
+        ExistingScheduleFunc existingScheduleFunc
     );
 
     /**
@@ -245,7 +245,7 @@
         private final Iterator<String> post;
         private final Set<String> skip;
 
-        public LazyNodeSortingIterator(LazyNodeSorting parent,
+        LazyNodeSortingIterator(LazyNodeSorting parent,
                                        TreeSet<ObjectResources> sortedRacks) {
             this.parent = parent;
             rackIterator = sortedRacks.iterator();
@@ -315,7 +315,7 @@
         private final List<String> unFavoredNodeIds;
         private final Set<String> skippedNodeIds = new HashSet<>();
 
-        public LazyNodeSorting(TopologyDetails td, ExecutorDetails exec,
+        LazyNodeSorting(TopologyDetails td, ExecutorDetails exec,
                                List<String> favoredNodeIds, List<String> unFavoredNodeIds) {
             this.favoredNodeIds = favoredNodeIds;
             this.unFavoredNodeIds = unFavoredNodeIds;
diff --git a/storm-server/src/main/java/org/apache/storm/testing/TestJob.java b/storm-server/src/main/java/org/apache/storm/testing/TestJob.java
index 205b429..fc636b5 100644
--- a/storm-server/src/main/java/org/apache/storm/testing/TestJob.java
+++ b/storm-server/src/main/java/org/apache/storm/testing/TestJob.java
@@ -34,5 +34,5 @@
      * @param cluster the cluster which created by <code>Testing.withSimulatedTimeLocalCluster</code>
      *        and <code>Testing.withTrackedCluster</code>.
      */
-    public void run(ILocalCluster cluster) throws Exception;
+    void run(ILocalCluster cluster) throws Exception;
 }
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java
index fdec017..1feb6d5 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java
@@ -798,7 +798,7 @@
         private Integer newByteOffset;
         private byte[] newBeforeBytes;
 
-        public SubstringSearchResult(List<Map<String, Object>> matches, Integer newByteOffset, byte[] newBeforeBytes) {
+        SubstringSearchResult(List<Map<String, Object>> matches, Integer newByteOffset, byte[] newBeforeBytes) {
             this.matches = matches;
             this.newByteOffset = newByteOffset;
             this.newBeforeBytes = newBeforeBytes;