diff --git a/cdap-api-common/src/main/java/co/cask/cdap/api/stream/StreamEventDecoder.java b/cdap-api-common/src/main/java/co/cask/cdap/api/stream/StreamEventDecoder.java
index b437df56ba7b..bc12b24cd484 100644
--- a/cdap-api-common/src/main/java/co/cask/cdap/api/stream/StreamEventDecoder.java
+++ b/cdap-api-common/src/main/java/co/cask/cdap/api/stream/StreamEventDecoder.java
@@ -44,7 +44,7 @@ public interface StreamEventDecoder<K, V>  {
    * @param <V> Type of value.
    */
   @NotThreadSafe
-  static final class DecodeResult<K, V> {
+  final class DecodeResult<K, V> {
     private K key;
     private V value;
 
diff --git a/cdap-api/src/main/java/co/cask/cdap/api/common/Scope.java b/cdap-api/src/main/java/co/cask/cdap/api/common/Scope.java
index 4fba4cfd0409..a010273a31f3 100644
--- a/cdap-api/src/main/java/co/cask/cdap/api/common/Scope.java
+++ b/cdap-api/src/main/java/co/cask/cdap/api/common/Scope.java
@@ -32,7 +32,7 @@ public enum Scope {
   /**
    * Private constructor to force using the enum values.
    */
-  private Scope(String name) {
+  Scope(String name) {
     displayName = name;
   }
 
diff --git a/cdap-app-fabric/src/main/java/co/cask/cdap/app/services/Data.java b/cdap-app-fabric/src/main/java/co/cask/cdap/app/services/Data.java
index 0392434ee302..b5a0fa2f9994 100644
--- a/cdap-app-fabric/src/main/java/co/cask/cdap/app/services/Data.java
+++ b/cdap-app-fabric/src/main/java/co/cask/cdap/app/services/Data.java
@@ -26,7 +26,7 @@ public enum Data {
   private final int dataType;
   private final String name;
 
-  private Data(int type, String prettyName) {
+  Data(int type, String prettyName) {
     this.dataType = type;
     this.name = prettyName;
   }
diff --git a/cdap-app-fabric/src/main/java/co/cask/cdap/app/verification/VerifyResult.java b/cdap-app-fabric/src/main/java/co/cask/cdap/app/verification/VerifyResult.java
index 24856d4bf16e..0949596bf475 100644
--- a/cdap-app-fabric/src/main/java/co/cask/cdap/app/verification/VerifyResult.java
+++ b/cdap-app-fabric/src/main/java/co/cask/cdap/app/verification/VerifyResult.java
@@ -25,7 +25,7 @@ public final class VerifyResult {
   /**
    * Status of verification.
    */
-  public static enum Status {
+  public enum Status {
     SUCCESS,
     FAILED
   }
diff --git a/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/artifact/ArtifactStore.java b/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/artifact/ArtifactStore.java
index 779f4e84270e..6c108e7475c4 100644
--- a/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/artifact/ArtifactStore.java
+++ b/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/artifact/ArtifactStore.java
@@ -998,7 +998,7 @@ private static class AppClassKey {
     private final NamespaceId namespace;
     private final String className;
 
-    public AppClassKey(NamespaceId namespace, String className) {
+    AppClassKey(NamespaceId namespace, String className) {
       this.namespace = namespace;
       this.className = className;
     }
@@ -1088,7 +1088,7 @@ private static class ArtifactData {
     private final URI locationURI;
     private final ArtifactMeta meta;
 
-    public ArtifactData(Location location, ArtifactMeta meta) {
+    ArtifactData(Location location, ArtifactMeta meta) {
       this.locationURI = location.toURI();
       this.meta = meta;
     }
@@ -1100,7 +1100,7 @@ private static class PluginData {
     private final ArtifactRange usableBy;
     private final URI artifactLocationURI;
 
-    public PluginData(PluginClass pluginClass, ArtifactRange usableBy, Location artifactLocation) {
+    PluginData(PluginClass pluginClass, ArtifactRange usableBy, Location artifactLocation) {
       this.pluginClass = pluginClass;
       this.usableBy = usableBy;
       this.artifactLocationURI = artifactLocation.toURI();
@@ -1112,7 +1112,7 @@ private static class AppData {
     private final ApplicationClass appClass;
     private final URI artifactLocationURI;
 
-    public AppData(ApplicationClass appClass, Location artifactLocation) {
+    AppData(ApplicationClass appClass, Location artifactLocation) {
       this.appClass = appClass;
       this.artifactLocationURI = artifactLocation.toURI();
     }
diff --git a/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/batch/dataset/AbstractBatchReadableInputFormat.java b/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/batch/dataset/AbstractBatchReadableInputFormat.java
index 95f440d2ec1b..884992b76766 100644
--- a/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/batch/dataset/AbstractBatchReadableInputFormat.java
+++ b/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/batch/dataset/AbstractBatchReadableInputFormat.java
@@ -155,7 +155,7 @@ private static final class SplitReaderRecordReader<KEY, VALUE> extends RecordRea
 
     private final SplitReader<KEY, VALUE> splitReader;
 
-    public SplitReaderRecordReader(final SplitReader<KEY, VALUE> splitReader) {
+    SplitReaderRecordReader(final SplitReader<KEY, VALUE> splitReader) {
       this.splitReader = splitReader;
     }
 
diff --git a/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/batch/dataset/output/MultipleOutputs.java b/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/batch/dataset/output/MultipleOutputs.java
index 9a773c7151a5..47ab1e8d11d6 100644
--- a/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/batch/dataset/output/MultipleOutputs.java
+++ b/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/batch/dataset/output/MultipleOutputs.java
@@ -266,7 +266,7 @@ private static class MeteredRecordWriter<K, V> extends RecordWriter<K, V> {
     private final String counterName;
     private final TaskInputOutputContext context;
 
-    public MeteredRecordWriter(RecordWriter<K, V> writer, TaskInputOutputContext context) {
+    MeteredRecordWriter(RecordWriter<K, V> writer, TaskInputOutputContext context) {
       this.writer = writer;
       this.context = context;
       this.groupName = TaskCounter.class.getName();
@@ -299,7 +299,7 @@ private static class WrappedStatusReporter extends StatusReporter {
 
     TaskAttemptContext context;
 
-    public WrappedStatusReporter(TaskAttemptContext context) {
+    WrappedStatusReporter(TaskAttemptContext context) {
       this.context = context;
     }
 
diff --git a/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/plugin/PluginInstantiator.java b/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/plugin/PluginInstantiator.java
index 83274e959040..b39844455318 100644
--- a/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/plugin/PluginInstantiator.java
+++ b/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/plugin/PluginInstantiator.java
@@ -377,7 +377,7 @@ private static final class ConfigFieldSetter extends FieldVisitor {
     private final ArtifactId artifactId;
     private final Set<String> macroFields;
 
-    public ConfigFieldSetter(PluginClass pluginClass, ArtifactId artifactId,
+    ConfigFieldSetter(PluginClass pluginClass, ArtifactId artifactId,
                              PluginProperties properties, Set<String> macroFields) {
       this.pluginClass = pluginClass;
       this.artifactId = artifactId;
diff --git a/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/schedule/store/DatasetBasedTimeScheduleStore.java b/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/schedule/store/DatasetBasedTimeScheduleStore.java
index 8f5bbd330008..4f16c255aaba 100644
--- a/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/schedule/store/DatasetBasedTimeScheduleStore.java
+++ b/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/runtime/schedule/store/DatasetBasedTimeScheduleStore.java
@@ -350,7 +350,7 @@ private TriggerStatusV2(OperableTrigger trigger, Trigger.TriggerState state) {
       this.state = state;
     }
 
-    public TriggerStatusV2() {
+    TriggerStatusV2() {
       // no-op
     }
 
diff --git a/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/store/WorkflowDataset.java b/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/store/WorkflowDataset.java
index 6c20b738da63..6e5f356d37c3 100644
--- a/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/store/WorkflowDataset.java
+++ b/cdap-app-fabric/src/main/java/co/cask/cdap/internal/app/store/WorkflowDataset.java
@@ -295,7 +295,7 @@ private static final class ProgramRunDetails {
     private final ProgramType programType;
     private final List<Long> programRunList;
 
-    public ProgramRunDetails(String name, ProgramType programType, List<Long> programRunList) {
+    ProgramRunDetails(String name, ProgramType programType, List<Long> programRunList) {
       this.name = name;
       this.programType = programType;
       this.programRunList = programRunList;
diff --git a/cdap-app-fabric/src/main/java/co/cask/cdap/security/ApplicationPermissionCollection.java b/cdap-app-fabric/src/main/java/co/cask/cdap/security/ApplicationPermissionCollection.java
index 3a9a9552674d..c8080c716804 100644
--- a/cdap-app-fabric/src/main/java/co/cask/cdap/security/ApplicationPermissionCollection.java
+++ b/cdap-app-fabric/src/main/java/co/cask/cdap/security/ApplicationPermissionCollection.java
@@ -47,7 +47,7 @@ class ApplicationPermissionCollection extends PermissionCollection {
   /**
    * Constructor that defines some predefined {@link Permission}
    */
-  public ApplicationPermissionCollection() {
+  ApplicationPermissionCollection() {
     perms.add(new RuntimePermission("getenv.*"));
     perms.add(new RuntimePermission("setContextClassLoader"));
   }
diff --git a/cdap-app-fabric/src/main/java/co/cask/cdap/security/hive/JobHistoryServerTokenUtils.java b/cdap-app-fabric/src/main/java/co/cask/cdap/security/hive/JobHistoryServerTokenUtils.java
index 04b3d000a871..35248a31633a 100644
--- a/cdap-app-fabric/src/main/java/co/cask/cdap/security/hive/JobHistoryServerTokenUtils.java
+++ b/cdap-app-fabric/src/main/java/co/cask/cdap/security/hive/JobHistoryServerTokenUtils.java
@@ -83,7 +83,7 @@ public static Credentials obtainToken(Configuration configuration, Credentials c
    */
   private static class MRClientCache extends ClientCache {
 
-    public MRClientCache(Configuration conf, ResourceMgrDelegate rm) {
+    MRClientCache(Configuration conf, ResourceMgrDelegate rm) {
       super(conf, rm);
     }
 
diff --git a/cdap-app-fabric/src/main/java/org/apache/hadoop/mapred/LocalDistributedCacheManagerWithFix.java b/cdap-app-fabric/src/main/java/org/apache/hadoop/mapred/LocalDistributedCacheManagerWithFix.java
index f89e84855c5a..c56d6fdf8222 100644
--- a/cdap-app-fabric/src/main/java/org/apache/hadoop/mapred/LocalDistributedCacheManagerWithFix.java
+++ b/cdap-app-fabric/src/main/java/org/apache/hadoop/mapred/LocalDistributedCacheManagerWithFix.java
@@ -78,7 +78,7 @@ class LocalDistributedCacheManagerWithFix {
   private boolean setupCalled = false;
   private JobID jobId;
 
-  public LocalDistributedCacheManagerWithFix(JobID jobId) {
+  LocalDistributedCacheManagerWithFix(JobID jobId) {
     this.jobId = jobId;
   }
 
diff --git a/cdap-app-fabric/src/main/java/org/apache/twill/internal/appmaster/ApplicationMasterMain.java b/cdap-app-fabric/src/main/java/org/apache/twill/internal/appmaster/ApplicationMasterMain.java
index 1dfcbbd03b5e..8e01a3e78bd8 100644
--- a/cdap-app-fabric/src/main/java/org/apache/twill/internal/appmaster/ApplicationMasterMain.java
+++ b/cdap-app-fabric/src/main/java/org/apache/twill/internal/appmaster/ApplicationMasterMain.java
@@ -255,7 +255,7 @@ private static final class AppMasterTwillZKPathService extends TwillZKPathServic
     private static final Logger LOG = LoggerFactory.getLogger(AppMasterTwillZKPathService.class);
     private final ZKClient zkClient;
 
-    public AppMasterTwillZKPathService(ZKClient zkClient, RunId runId) {
+    AppMasterTwillZKPathService(ZKClient zkClient, RunId runId) {
       super(zkClient, runId);
       this.zkClient = zkClient;
     }
diff --git a/cdap-app-templates/cdap-etl/cdap-etl-batch/src/main/java/co/cask/cdap/etl/batch/mapreduce/MultiOutputWriter.java b/cdap-app-templates/cdap-etl/cdap-etl-batch/src/main/java/co/cask/cdap/etl/batch/mapreduce/MultiOutputWriter.java
index b339b7ef4f82..95e839a24db6 100644
--- a/cdap-app-templates/cdap-etl/cdap-etl-batch/src/main/java/co/cask/cdap/etl/batch/mapreduce/MultiOutputWriter.java
+++ b/cdap-app-templates/cdap-etl/cdap-etl-batch/src/main/java/co/cask/cdap/etl/batch/mapreduce/MultiOutputWriter.java
@@ -31,7 +31,7 @@ class MultiOutputWriter<KEY_OUT, VAL_OUT> extends OutputWriter<KEY_OUT, VAL_OUT>
   // sink name -> outputs for that sink
   private final Map<String, SinkOutput> sinkOutputs;
 
-  public MultiOutputWriter(MapReduceTaskContext<KEY_OUT, VAL_OUT> context, Map<String, SinkOutput> sinkOutputs) {
+  MultiOutputWriter(MapReduceTaskContext<KEY_OUT, VAL_OUT> context, Map<String, SinkOutput> sinkOutputs) {
     super(context);
     this.sinkOutputs = sinkOutputs;
   }
diff --git a/cdap-app-templates/cdap-etl/cdap-etl-batch/src/main/java/co/cask/cdap/etl/batch/mapreduce/OutputWriter.java b/cdap-app-templates/cdap-etl/cdap-etl-batch/src/main/java/co/cask/cdap/etl/batch/mapreduce/OutputWriter.java
index 8e14ab4988c8..d1b4551a7f04 100644
--- a/cdap-app-templates/cdap-etl/cdap-etl-batch/src/main/java/co/cask/cdap/etl/batch/mapreduce/OutputWriter.java
+++ b/cdap-app-templates/cdap-etl/cdap-etl-batch/src/main/java/co/cask/cdap/etl/batch/mapreduce/OutputWriter.java
@@ -31,7 +31,7 @@
 abstract class OutputWriter<KEY_OUT, VAL_OUT> {
   protected final MapReduceTaskContext<KEY_OUT, VAL_OUT> context;
 
-  public OutputWriter(MapReduceTaskContext<KEY_OUT, VAL_OUT> context) {
+  OutputWriter(MapReduceTaskContext<KEY_OUT, VAL_OUT> context) {
     this.context = context;
   }
 
diff --git a/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/common/ETLConfig.java b/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/common/ETLConfig.java
index a31ee605e740..a7d0a0b570f2 100644
--- a/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/common/ETLConfig.java
+++ b/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/common/ETLConfig.java
@@ -173,6 +173,8 @@ public int hashCode() {
 
   /**
    * Builder for creating configs.
+   *
+   * @param <T> The actual builder type
    */
   @SuppressWarnings("unchecked")
   public abstract static class Builder<T extends Builder> {
diff --git a/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/common/macro/TimeParser.java b/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/common/macro/TimeParser.java
index d398eaff8bcb..b83b00d7e22f 100644
--- a/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/common/macro/TimeParser.java
+++ b/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/common/macro/TimeParser.java
@@ -115,7 +115,7 @@ private interface MathNode {
   private static class ValueNode implements MathNode {
     private long value;
 
-    public ValueNode(long value) {
+    ValueNode(long value) {
       this.value = value;
     }
 
@@ -128,7 +128,7 @@ private static class AddNode implements MathNode {
     private final MathNode left;
     private final MathNode right;
 
-    public AddNode(MathNode left, MathNode right) {
+    AddNode(MathNode left, MathNode right) {
       this.left = left;
       this.right = right;
     }
@@ -143,7 +143,7 @@ private static class SubtractNode implements MathNode {
     private final MathNode left;
     private final MathNode right;
 
-    public SubtractNode(MathNode left, MathNode right) {
+    SubtractNode(MathNode left, MathNode right) {
       this.left = left;
       this.right = right;
     }
diff --git a/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/log/LogStageAppender.java b/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/log/LogStageAppender.java
index 67d8a35d725e..22e73790f8b1 100644
--- a/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/log/LogStageAppender.java
+++ b/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/log/LogStageAppender.java
@@ -74,7 +74,7 @@ private static class StageEvent implements ILoggingEvent {
     private final String eventMessage;
     private final String formattedMessage;
 
-    public StageEvent(ILoggingEvent event) {
+    StageEvent(ILoggingEvent event) {
       this.event = event;
       Map<String, String> mdcMap = event.getMDCPropertyMap();
       String stage = mdcMap.get(LogContext.STAGE);
diff --git a/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/spec/PipelineSpec.java b/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/spec/PipelineSpec.java
index 6f685effe5f9..5e8a05b5212e 100644
--- a/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/spec/PipelineSpec.java
+++ b/cdap-app-templates/cdap-etl/cdap-etl-core/src/main/java/co/cask/cdap/etl/spec/PipelineSpec.java
@@ -106,6 +106,8 @@ public static Builder builder() {
 
   /**
    * Base builder for creating pipeline specs.
+   *
+   * @param <T> the actual builder type
    */
   @SuppressWarnings("unchecked")
   public static class Builder<T extends Builder> {
diff --git a/cdap-app-templates/cdap-etl/cdap-etl-proto/src/main/java/co/cask/cdap/etl/proto/v1/ETLConfig.java b/cdap-app-templates/cdap-etl/cdap-etl-proto/src/main/java/co/cask/cdap/etl/proto/v1/ETLConfig.java
index 9f8125cbd3a7..e519182f74ad 100644
--- a/cdap-app-templates/cdap-etl/cdap-etl-proto/src/main/java/co/cask/cdap/etl/proto/v1/ETLConfig.java
+++ b/cdap-app-templates/cdap-etl/cdap-etl-proto/src/main/java/co/cask/cdap/etl/proto/v1/ETLConfig.java
@@ -193,6 +193,8 @@ public int hashCode() {
 
   /**
    * Builder for creating configs.
+   *
+   * @param <T> The actual builder type
    */
   @SuppressWarnings("unchecked")
   public abstract static class Builder<T extends Builder> {
diff --git a/cdap-app-templates/cdap-etl/cdap-etl-proto/src/main/java/co/cask/cdap/etl/proto/v2/ETLConfig.java b/cdap-app-templates/cdap-etl/cdap-etl-proto/src/main/java/co/cask/cdap/etl/proto/v2/ETLConfig.java
index 95c9fbf5b361..7d4276ad1cc2 100644
--- a/cdap-app-templates/cdap-etl/cdap-etl-proto/src/main/java/co/cask/cdap/etl/proto/v2/ETLConfig.java
+++ b/cdap-app-templates/cdap-etl/cdap-etl-proto/src/main/java/co/cask/cdap/etl/proto/v2/ETLConfig.java
@@ -167,6 +167,8 @@ public UpgradeableConfig upgrade(UpgradeContext upgradeContext) {
 
   /**
    * Builder for creating configs.
+   *
+   * @param <T> The actual builder type
    */
   @SuppressWarnings("unchecked")
   public abstract static class Builder<T extends Builder> {
diff --git a/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/AggregatorAggregateFunction.java b/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/AggregatorAggregateFunction.java
index 507c0459be7e..ce452d3f43c2 100644
--- a/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/AggregatorAggregateFunction.java
+++ b/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/AggregatorAggregateFunction.java
@@ -57,7 +57,7 @@ private static class AggregateTransform<GROUP_KEY, GROUP_VAL, OUT_VAL>
     implements Transformation<Tuple2<GROUP_KEY, Iterable<GROUP_VAL>>, OUT_VAL> {
     private final BatchAggregator<GROUP_KEY, GROUP_VAL, OUT_VAL> aggregator;
 
-    public AggregateTransform(BatchAggregator<GROUP_KEY, GROUP_VAL, OUT_VAL> aggregator) {
+    AggregateTransform(BatchAggregator<GROUP_KEY, GROUP_VAL, OUT_VAL> aggregator) {
       this.aggregator = aggregator;
     }
 
diff --git a/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/AggregatorGroupByFunction.java b/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/AggregatorGroupByFunction.java
index fb0b7ff4939a..99afe4b550bb 100644
--- a/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/AggregatorGroupByFunction.java
+++ b/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/AggregatorGroupByFunction.java
@@ -58,7 +58,7 @@ private static class GroupByTransform<GROUP_KEY, GROUP_VAL>
     private final BatchAggregator<GROUP_KEY, GROUP_VAL, ?> aggregator;
     private final DefaultEmitter<GROUP_KEY> keyEmitter;
 
-    public GroupByTransform(BatchAggregator<GROUP_KEY, GROUP_VAL, ?> aggregator) {
+    GroupByTransform(BatchAggregator<GROUP_KEY, GROUP_VAL, ?> aggregator) {
       this.aggregator = aggregator;
       this.keyEmitter = new DefaultEmitter<>();
     }
diff --git a/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/JoinMergeFunction.java b/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/JoinMergeFunction.java
index 663af0ae3b70..207a0e1435cb 100644
--- a/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/JoinMergeFunction.java
+++ b/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/JoinMergeFunction.java
@@ -62,7 +62,7 @@ private static class JoinOnTransform<JOIN_KEY, INPUT, OUT>
     implements Transformation<Tuple2<JOIN_KEY, List<JoinElement<INPUT>>>, OUT> {
     private final BatchJoiner<JOIN_KEY, INPUT, OUT> joiner;
 
-    public JoinOnTransform(BatchJoiner<JOIN_KEY, INPUT, OUT> joiner) {
+    JoinOnTransform(BatchJoiner<JOIN_KEY, INPUT, OUT> joiner) {
       this.joiner = joiner;
     }
 
diff --git a/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/JoinOnFunction.java b/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/JoinOnFunction.java
index de2a673d4c74..50af95628cf6 100644
--- a/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/JoinOnFunction.java
+++ b/cdap-app-templates/cdap-etl/hydrator-spark-core/src/main/java/co/cask/cdap/etl/spark/function/JoinOnFunction.java
@@ -61,7 +61,7 @@ private static class JoinOnTransform<INPUT, JOIN_KEY> implements Transformation<
     private final BatchJoiner<JOIN_KEY, INPUT, ?> joiner;
     private final String inputStageName;
 
-    public JoinOnTransform(BatchJoiner<JOIN_KEY, INPUT, ?> joiner, String inputStageName) {
+    JoinOnTransform(BatchJoiner<JOIN_KEY, INPUT, ?> joiner, String inputStageName) {
       this.joiner = joiner;
       this.inputStageName = inputStageName;
     }
diff --git a/cdap-cli/src/main/java/co/cask/cdap/cli/CLIConfig.java b/cdap-cli/src/main/java/co/cask/cdap/cli/CLIConfig.java
index 597840415cd1..3f52c4d11bc1 100644
--- a/cdap-cli/src/main/java/co/cask/cdap/cli/CLIConfig.java
+++ b/cdap-cli/src/main/java/co/cask/cdap/cli/CLIConfig.java
@@ -89,7 +89,7 @@ private class UserAccessToken {
     private final AccessToken accessToken;
     private final String username;
 
-    public UserAccessToken(AccessToken accessToken, String username) {
+    UserAccessToken(AccessToken accessToken, String username) {
       this.accessToken = accessToken;
       this.username = username;
     }
diff --git a/cdap-cli/src/main/java/co/cask/cdap/cli/command/GetStreamStatsCommand.java b/cdap-cli/src/main/java/co/cask/cdap/cli/command/GetStreamStatsCommand.java
index 94412d98d1f8..c2ee068636d7 100644
--- a/cdap-cli/src/main/java/co/cask/cdap/cli/command/GetStreamStatsCommand.java
+++ b/cdap-cli/src/main/java/co/cask/cdap/cli/command/GetStreamStatsCommand.java
@@ -272,7 +272,7 @@ private static final class HistogramProcessor implements StatsProcessor {
     private static final int BUCKET_SIZE = 100;
     private final CLIConfig cliConfig;
 
-    public HistogramProcessor(CLIConfig cliConfig) {
+    HistogramProcessor(CLIConfig cliConfig) {
       this.cliConfig = cliConfig;
     }
 
diff --git a/cdap-cli/src/main/java/co/cask/cdap/cli/commandset/ScheduleCommands.java b/cdap-cli/src/main/java/co/cask/cdap/cli/commandset/ScheduleCommands.java
index 16c41caf0d5d..014e1d4a9c26 100644
--- a/cdap-cli/src/main/java/co/cask/cdap/cli/commandset/ScheduleCommands.java
+++ b/cdap-cli/src/main/java/co/cask/cdap/cli/commandset/ScheduleCommands.java
@@ -191,7 +191,7 @@ private static final class ListWorkflowSchedulesCommand extends AbstractCommand
     private final ScheduleClient scheduleClient;
 
     @Inject
-    public ListWorkflowSchedulesCommand(CLIConfig cliConfig, ScheduleClient scheduleClient) {
+    ListWorkflowSchedulesCommand(CLIConfig cliConfig, ScheduleClient scheduleClient) {
       super(cliConfig);
       this.scheduleClient = scheduleClient;
     }
diff --git a/cdap-client-tests/src/main/java/co/cask/cdap/client/app/ConfigTestApp.java b/cdap-client-tests/src/main/java/co/cask/cdap/client/app/ConfigTestApp.java
index 535e19955c51..b4e4362c9e15 100644
--- a/cdap-client-tests/src/main/java/co/cask/cdap/client/app/ConfigTestApp.java
+++ b/cdap-client-tests/src/main/java/co/cask/cdap/client/app/ConfigTestApp.java
@@ -90,7 +90,7 @@ private static class SimpleFlow extends AbstractFlow {
     private final String streamName;
     private final String datasetName;
 
-    public SimpleFlow(String streamName, String datasetName) {
+    SimpleFlow(String streamName, String datasetName) {
       this.streamName = streamName;
       this.datasetName = datasetName;
     }
@@ -108,7 +108,7 @@ private static class SimpleFlowlet extends AbstractFlowlet {
     @Property
     private final String datasetName;
 
-    public SimpleFlowlet(String datasetName) {
+    SimpleFlowlet(String datasetName) {
       this.datasetName = datasetName;
     }
 
@@ -124,7 +124,7 @@ private static class DefaultWorker extends AbstractWorker {
     private final String streamName;
     private volatile boolean stopped;
 
-    public DefaultWorker(String streamName) {
+    DefaultWorker(String streamName) {
       this.streamName = streamName;
     }
 
diff --git a/cdap-client-tests/src/main/java/co/cask/cdap/client/app/ConfigurableProgramsApp.java b/cdap-client-tests/src/main/java/co/cask/cdap/client/app/ConfigurableProgramsApp.java
index 57e43f121917..302f76486e1a 100644
--- a/cdap-client-tests/src/main/java/co/cask/cdap/client/app/ConfigurableProgramsApp.java
+++ b/cdap-client-tests/src/main/java/co/cask/cdap/client/app/ConfigurableProgramsApp.java
@@ -79,7 +79,7 @@ private static class Floh extends AbstractFlow {
     private final String stream;
     private final String dataset;
 
-    public Floh(String name, String stream, String dataset) {
+    Floh(String name, String stream, String dataset) {
       this.name = name;
       this.stream = stream;
       this.dataset = dataset;
@@ -100,7 +100,7 @@ private static class Flohlet extends AbstractFlowlet {
 
     private KeyValueTable keyValueTable;
 
-    public Flohlet(String datasetName) {
+    Flohlet(String datasetName) {
       this.datasetName = datasetName;
     }
 
@@ -122,7 +122,7 @@ private static class Wurker extends AbstractWorker {
     private final String streamName;
     private volatile boolean running;
 
-    public Wurker(String streamName) {
+    Wurker(String streamName) {
       this.streamName = streamName;
     }
 
diff --git a/cdap-client-tests/src/main/java/co/cask/cdap/client/app/ConfigurableProgramsApp2.java b/cdap-client-tests/src/main/java/co/cask/cdap/client/app/ConfigurableProgramsApp2.java
index 64e1045ccb80..3de0c5562a43 100644
--- a/cdap-client-tests/src/main/java/co/cask/cdap/client/app/ConfigurableProgramsApp2.java
+++ b/cdap-client-tests/src/main/java/co/cask/cdap/client/app/ConfigurableProgramsApp2.java
@@ -86,7 +86,7 @@ private static class Floh extends AbstractFlow {
     private final String stream;
     private final String dataset;
 
-    public Floh(String name, String stream, String dataset) {
+    Floh(String name, String stream, String dataset) {
       this.name = name;
       this.stream = stream;
       this.dataset = dataset;
@@ -107,7 +107,7 @@ private static class Flohlet extends AbstractFlowlet {
 
     private KeyValueTable keyValueTable;
 
-    public Flohlet(String datasetName) {
+    Flohlet(String datasetName) {
       this.datasetName = datasetName;
     }
 
@@ -129,7 +129,7 @@ private static class Wurker extends AbstractWorker {
     private final String streamName;
     private volatile boolean running;
 
-    public Wurker(String streamName) {
+    Wurker(String streamName) {
       this.streamName = streamName;
     }
 
diff --git a/cdap-common/src/main/java/co/cask/cdap/common/app/RunIds.java b/cdap-common/src/main/java/co/cask/cdap/common/app/RunIds.java
index 49cabb931a78..e2ddc926e6ea 100644
--- a/cdap-common/src/main/java/co/cask/cdap/common/app/RunIds.java
+++ b/cdap-common/src/main/java/co/cask/cdap/common/app/RunIds.java
@@ -135,7 +135,7 @@ static UUID generateUUIDForTime(long timeInMillis) {
   private static class RunIdImpl implements RunId {
     private final UUID id;
 
-    public RunIdImpl(UUID id) {
+    RunIdImpl(UUID id) {
       this.id = id;
     }
 
diff --git a/cdap-common/src/main/java/co/cask/cdap/common/conf/ArtifactConfigReader.java b/cdap-common/src/main/java/co/cask/cdap/common/conf/ArtifactConfigReader.java
index f6c2c52fbc00..e9ffb4dbd45c 100644
--- a/cdap-common/src/main/java/co/cask/cdap/common/conf/ArtifactConfigReader.java
+++ b/cdap-common/src/main/java/co/cask/cdap/common/conf/ArtifactConfigReader.java
@@ -104,7 +104,7 @@ public ArtifactConfig read(Id.Namespace namespace, File configFile) throws IOExc
   private static class ArtifactRangeDeserializer implements JsonDeserializer<ArtifactRange> {
     private final Id.Namespace namespace;
 
-    public ArtifactRangeDeserializer(Id.Namespace namespace) {
+    ArtifactRangeDeserializer(Id.Namespace namespace) {
       this.namespace = namespace;
     }
 
diff --git a/cdap-common/src/main/java/co/cask/cdap/common/conf/Configuration.java b/cdap-common/src/main/java/co/cask/cdap/common/conf/Configuration.java
index e8446d5f7521..318b37005d02 100644
--- a/cdap-common/src/main/java/co/cask/cdap/common/conf/Configuration.java
+++ b/cdap-common/src/main/java/co/cask/cdap/common/conf/Configuration.java
@@ -1073,7 +1073,7 @@ private static class RangeNumberIterator implements Iterator<Integer> {
       int at;
       int end;
 
-      public RangeNumberIterator(List<Range> ranges) {
+      RangeNumberIterator(List<Range> ranges) {
         if (ranges != null) {
           internal = ranges.iterator();
         }
@@ -1982,7 +1982,7 @@ private class ConfigurationIterator implements Iterator<Map.Entry<String, String
     private String currentName;
     private Iterator<String> nameIter;
 
-    public ConfigurationIterator() {
+    ConfigurationIterator() {
       nameIter = getProps().stringPropertyNames().iterator();
     }
 
diff --git a/cdap-common/src/main/java/co/cask/cdap/common/conf/StringUtils.java b/cdap-common/src/main/java/co/cask/cdap/common/conf/StringUtils.java
index ac1e8f41b294..9d9e216273d8 100644
--- a/cdap-common/src/main/java/co/cask/cdap/common/conf/StringUtils.java
+++ b/cdap-common/src/main/java/co/cask/cdap/common/conf/StringUtils.java
@@ -107,7 +107,7 @@ public static String arrayToString(String[] strs) {
    * which can be represented by a 64-bit integer.
    * TraditionalBinaryPrefix symbol are case insensitive.
    */
-  public static enum TraditionalBinaryPrefix {
+  public enum TraditionalBinaryPrefix {
     KILO(1024),
     MEGA(KILO.value << 10),
     GIGA(MEGA.value << 10),
diff --git a/cdap-common/src/main/java/org/apache/twill/filesystem/FileContextLocation.java b/cdap-common/src/main/java/org/apache/twill/filesystem/FileContextLocation.java
index 55bced11d198..aff8e0684f15 100644
--- a/cdap-common/src/main/java/org/apache/twill/filesystem/FileContextLocation.java
+++ b/cdap-common/src/main/java/org/apache/twill/filesystem/FileContextLocation.java
@@ -220,5 +220,7 @@ public int hashCode() {
   }
 
   @Override
-  public String toString() { return toURI().toString(); }
+  public String toString() {
+    return toURI().toString();
+  }
 }
diff --git a/cdap-common/src/main/java/org/apache/twill/internal/yarn/Hadoop21YarnAppClient.java b/cdap-common/src/main/java/org/apache/twill/internal/yarn/Hadoop21YarnAppClient.java
index 785a440420c8..37a55da0b52b 100644
--- a/cdap-common/src/main/java/org/apache/twill/internal/yarn/Hadoop21YarnAppClient.java
+++ b/cdap-common/src/main/java/org/apache/twill/internal/yarn/Hadoop21YarnAppClient.java
@@ -168,7 +168,7 @@ private static final class ProcessControllerImpl implements ProcessController<Ya
     private final YarnClient yarnClient;
     private final ApplicationId appId;
 
-    public ProcessControllerImpl(YarnClient yarnClient, ApplicationId appId) {
+    ProcessControllerImpl(YarnClient yarnClient, ApplicationId appId) {
       this.yarnClient = yarnClient;
       this.appId = appId;
     }
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data/stream/StreamFileType.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data/stream/StreamFileType.java
index 9b7420f48040..8307d05cc4d6 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data/stream/StreamFileType.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data/stream/StreamFileType.java
@@ -25,7 +25,7 @@ public enum StreamFileType {
 
   private final String suffix;
 
-  private StreamFileType(String suffix) {
+  StreamFileType(String suffix) {
     this.suffix = suffix;
   }
 
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data/stream/service/upload/AvroStreamBodyConsumer.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data/stream/service/upload/AvroStreamBodyConsumer.java
index 6c6dfc9e10a3..523c4244e497 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data/stream/service/upload/AvroStreamBodyConsumer.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data/stream/service/upload/AvroStreamBodyConsumer.java
@@ -135,7 +135,7 @@ private static final class ContentWriterThread extends Thread {
     private final ContentWriterFactory contentWriterFactory;
     private volatile Throwable failure;
 
-    public ContentWriterThread(InputStream contentStream, ContentWriterFactory contentWriterFactory) {
+    ContentWriterThread(InputStream contentStream, ContentWriterFactory contentWriterFactory) {
       super("avro-uploader-" + contentWriterFactory.getStream() + "-" + id.getAndIncrement());
       this.contentStream = contentStream;
       this.contentWriterFactory = contentWriterFactory;
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/audit/AuditModule.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/audit/AuditModule.java
index daf838ca8d36..dcd75a89e285 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/audit/AuditModule.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/audit/AuditModule.java
@@ -72,7 +72,7 @@ private static class KafkaAuditPublisherProvider implements Provider<AuditPublis
     private final CConfiguration cConf;
 
     @Inject
-    public KafkaAuditPublisherProvider(Injector injector, CConfiguration cConf) {
+    KafkaAuditPublisherProvider(Injector injector, CConfiguration cConf) {
       this.injector = injector;
       this.cConf = cConf;
     }
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/datafabric/dataset/service/executor/InternalDatasetDropParams.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/datafabric/dataset/service/executor/InternalDatasetDropParams.java
index dd34e8ff6d70..9cff9fa6ea9c 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/datafabric/dataset/service/executor/InternalDatasetDropParams.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/datafabric/dataset/service/executor/InternalDatasetDropParams.java
@@ -27,7 +27,7 @@ final class InternalDatasetDropParams {
   private final DatasetTypeMeta typeMeta;
   private final DatasetSpecification instanceSpec;
 
-  public InternalDatasetDropParams(DatasetTypeMeta typeMeta, DatasetSpecification instanceSpec) {
+  InternalDatasetDropParams(DatasetTypeMeta typeMeta, DatasetSpecification instanceSpec) {
     this.typeMeta = typeMeta;
     this.instanceSpec = instanceSpec;
   }
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/datafabric/dataset/type/DirectoryClassLoaderProvider.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/datafabric/dataset/type/DirectoryClassLoaderProvider.java
index 0b336d7320fd..0174ba9fe715 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/datafabric/dataset/type/DirectoryClassLoaderProvider.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/datafabric/dataset/type/DirectoryClassLoaderProvider.java
@@ -95,7 +95,7 @@ private final class CacheKey {
     private final URI uri;
     private final ClassLoader parentClassLoader;
 
-    public CacheKey(URI uri, ClassLoader parentClassLoader) {
+    CacheKey(URI uri, ClassLoader parentClassLoader) {
       this.uri = uri;
       this.parentClassLoader = parentClassLoader;
     }
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/cube/MetricsTableOnTable.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/cube/MetricsTableOnTable.java
index 970f68a687e8..b0db02b4c139 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/cube/MetricsTableOnTable.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/cube/MetricsTableOnTable.java
@@ -36,7 +36,7 @@
 class MetricsTableOnTable implements MetricsTable {
   private final Table table;
 
-  public MetricsTableOnTable(Table table) {
+  MetricsTableOnTable(Table table) {
     this.table = table;
   }
 
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/cube/TimeSeriesInterpolator.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/cube/TimeSeriesInterpolator.java
index 2542b4e6455b..d560b31ac7e0 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/cube/TimeSeriesInterpolator.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/cube/TimeSeriesInterpolator.java
@@ -53,8 +53,7 @@ class TimeSeriesInterpolator implements Iterable<TimeValue> {
   private final Interpolator interpolator;
   private final int resolution;
 
-  public TimeSeriesInterpolator(Collection<TimeValue> timeValues,
-                                @Nullable Interpolator interpolator, int resolution) {
+  TimeSeriesInterpolator(Collection<TimeValue> timeValues, @Nullable Interpolator interpolator, int resolution) {
     this.timeSeries = ImmutableList.copyOf(timeValues);
     this.interpolator = interpolator;
     this.resolution = resolution;
@@ -110,7 +109,7 @@ public final class BiDirectionalPeekingIterator implements PeekingIterator<TimeV
       PeekingIterator<TimeValue> iter;
       TimeValue lastValue;
 
-      public BiDirectionalPeekingIterator(PeekingIterator<TimeValue> iter) {
+      BiDirectionalPeekingIterator(PeekingIterator<TimeValue> iter) {
         this.iter = iter;
         this.lastValue = null;
       }
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/partitioned/PathOperation.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/partitioned/PathOperation.java
index d53afd2dc0e6..73f2f42434de 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/partitioned/PathOperation.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/partitioned/PathOperation.java
@@ -28,7 +28,7 @@ enum OperationType {
     CREATE, DROP
   }
 
-  public PathOperation(String relativePath, OperationType operationType) {
+  PathOperation(String relativePath, OperationType operationType) {
     this.relativePath = relativePath;
     this.operationType = operationType;
   }
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/FuzzyRowFilter.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/FuzzyRowFilter.java
index b2649a556fb2..7fe581d747b4 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/FuzzyRowFilter.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/FuzzyRowFilter.java
@@ -146,7 +146,7 @@ public String toString() {
 
   // Utility methods
 
-  static enum SatisfiesCode {
+  enum SatisfiesCode {
     // row satisfies fuzzy rule
     YES,
     // row doesn't satisfy fuzzy rule, but there's possible greater row that does
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/hbase/MetricHBaseTableUtil.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/hbase/MetricHBaseTableUtil.java
index 4be52a4cb718..7fd0c73a5b0f 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/hbase/MetricHBaseTableUtil.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/hbase/MetricHBaseTableUtil.java
@@ -35,7 +35,7 @@ public MetricHBaseTableUtil(HBaseTableUtil tableUtil) {
   /**
    * Denotes version of Metric System's HBase table.
    */
-  public static enum Version {
+  public enum Version {
     VERSION_2_6_OR_LOWER,
     VERSION_2_7,
     VERSION_2_8_OR_HIGHER
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/leveldb/KeyValue.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/leveldb/KeyValue.java
index e213609720e9..b8dace818b9c 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/leveldb/KeyValue.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/leveldb/KeyValue.java
@@ -76,7 +76,7 @@ public class KeyValue {
    * Has space for other key types to be added later.  Cannot rely on
    * enum ordinals . They change if item is removed or moved.  Do our own codes.
    */
-  public static enum Type {
+  public enum Type {
     Minimum((byte) 0),
     Put((byte) 4),
 
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/leveldb/LevelDBTableCore.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/leveldb/LevelDBTableCore.java
index 2e43cdfab9f7..a8d8b3a10c19 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/leveldb/LevelDBTableCore.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/dataset2/lib/table/leveldb/LevelDBTableCore.java
@@ -491,8 +491,8 @@ private static class LevelDBScanner implements Scanner {
     private final byte[][] columns;
     private final FuzzyRowFilter filter;
 
-    public LevelDBScanner(DBIterator iterator, byte[] endKey,
-                          @Nullable FuzzyRowFilter filter, @Nullable byte[][] columns, @Nullable Transaction tx) {
+    LevelDBScanner(DBIterator iterator, byte[] endKey,
+                   @Nullable FuzzyRowFilter filter, @Nullable byte[][] columns, @Nullable Transaction tx) {
       this.tx = tx;
       this.endKey = endKey;
       this.iterator = iterator;
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/metadata/lineage/LineageCollapser.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/metadata/lineage/LineageCollapser.java
index 2a6c2e3e168e..97744ee4a2b0 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/metadata/lineage/LineageCollapser.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/metadata/lineage/LineageCollapser.java
@@ -96,7 +96,7 @@ private static final class CollapseKeyBuilder {
     private RunId run;
     private Set<Id.NamespacedId> components;
 
-    public CollapseKeyBuilder(Id.NamespacedId data, Id.Program program) {
+    CollapseKeyBuilder(Id.NamespacedId data, Id.Program program) {
       this.data = data;
       this.program = program;
     }
@@ -136,8 +136,8 @@ private static final class CollapseKey {
     private final RunId run;
     private final Set<? extends Id.NamespacedId> components;
 
-    public CollapseKey(Id.NamespacedId data, Id.Program program, AccessType access, RunId run,
-                       Set<? extends Id.NamespacedId> components) {
+    CollapseKey(Id.NamespacedId data, Id.Program program, AccessType access, RunId run,
+                Set<? extends Id.NamespacedId> components) {
       this.data = data;
       this.program = program;
       this.access = access;
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/metadata/lineage/LineageDataset.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/metadata/lineage/LineageDataset.java
index 055058a6f1d8..d72e327f35e2 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/metadata/lineage/LineageDataset.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/metadata/lineage/LineageDataset.java
@@ -525,7 +525,7 @@ private static final class RowKey {
     private final Id.NamespacedId data;
     private final RunId runId;
 
-    public RowKey(Id.Program program, Id.NamespacedId data, RunId runId) {
+    RowKey(Id.Program program, Id.NamespacedId data, RunId runId) {
       this.program = program;
       this.data = data;
       this.runId = runId;
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/queue/DequeueResult.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/queue/DequeueResult.java
index 9bcc6d7a6f3b..bd927df0deff 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/queue/DequeueResult.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/queue/DequeueResult.java
@@ -67,7 +67,7 @@ public interface DequeueResult<T> extends Iterable<T> {
   /**
    * Static helper class for creating empty result of different result type.
    */
-  static final class Empty {
+  final class Empty {
     public static <T> DequeueResult<T> result() {
       return new DequeueResult<T>() {
         @Override
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/transaction/queue/ConsumerEntryState.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/transaction/queue/ConsumerEntryState.java
index 964552009897..dec1c7cac21d 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/transaction/queue/ConsumerEntryState.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/transaction/queue/ConsumerEntryState.java
@@ -25,7 +25,7 @@ public enum ConsumerEntryState {
 
   private final byte state;
 
-  private ConsumerEntryState(int state) {
+  ConsumerEntryState(int state) {
     this.state = (byte) state;
   }
 
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/transaction/queue/QueueEntryRow.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/transaction/queue/QueueEntryRow.java
index 5d9df6dcd493..353846a5d220 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/transaction/queue/QueueEntryRow.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/transaction/queue/QueueEntryRow.java
@@ -210,7 +210,7 @@ private static boolean isPrefix(byte[] bytes, int off, int len, byte[] prefix) {
   /**
    * Defines if queue entry can be consumed
    */
-  public static enum CanConsume {
+  public enum CanConsume {
     YES,
     NO,
     NO_INCLUDING_ALL_OLDER
diff --git a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/transaction/queue/hbase/HBaseQueueScanner.java b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/transaction/queue/hbase/HBaseQueueScanner.java
index ea849491a60f..757ab2dba715 100644
--- a/cdap-data-fabric/src/main/java/co/cask/cdap/data2/transaction/queue/hbase/HBaseQueueScanner.java
+++ b/cdap-data-fabric/src/main/java/co/cask/cdap/data2/transaction/queue/hbase/HBaseQueueScanner.java
@@ -38,7 +38,7 @@ final class HBaseQueueScanner implements QueueScanner {
   private final int numRows;
   private final Function<byte[], byte[]> rowKeyConverter;
 
-  public HBaseQueueScanner(ResultScanner scanner, int numRows, Function<byte[], byte[]> rowKeyConverter) {
+  HBaseQueueScanner(ResultScanner scanner, int numRows, Function<byte[], byte[]> rowKeyConverter) {
     this.scanner = scanner;
     this.numRows = numRows;
     this.rowKeyConverter = rowKeyConverter;
diff --git a/cdap-explore-client/src/main/java/co/cask/cdap/explore/service/MetaDataInfo.java b/cdap-explore-client/src/main/java/co/cask/cdap/explore/service/MetaDataInfo.java
index 910309463ba5..fc27adcb7375 100644
--- a/cdap-explore-client/src/main/java/co/cask/cdap/explore/service/MetaDataInfo.java
+++ b/cdap-explore-client/src/main/java/co/cask/cdap/explore/service/MetaDataInfo.java
@@ -76,7 +76,7 @@ public enum InfoType {
 
     private final MetaDataInfo defaultValue;
 
-    private InfoType(MetaDataInfo defaultValue) {
+    InfoType(MetaDataInfo defaultValue) {
       this.defaultValue = defaultValue;
     }
 
diff --git a/cdap-explore/src/main/java/co/cask/cdap/explore/executor/AbstractExploreMetadataHttpHandler.java b/cdap-explore/src/main/java/co/cask/cdap/explore/executor/AbstractExploreMetadataHttpHandler.java
index a9ebe8ce2562..75b64e5bc4e4 100644
--- a/cdap-explore/src/main/java/co/cask/cdap/explore/executor/AbstractExploreMetadataHttpHandler.java
+++ b/cdap-explore/src/main/java/co/cask/cdap/explore/executor/AbstractExploreMetadataHttpHandler.java
@@ -89,6 +89,8 @@ protected <T> T decodeArguments(HttpRequest request, Class<T> argsType, T defaul
 
   /**
    * Represents the core execution of an endpoint.
+   *
+   * @param <T> type of result object from the {@link #execute(HttpRequest, HttpResponder)} method
    */
   protected interface EndpointCoreExecution<T> {
     T execute(HttpRequest request, HttpResponder responder)
diff --git a/cdap-explore/src/main/java/co/cask/cdap/explore/guice/ExploreRuntimeModule.java b/cdap-explore/src/main/java/co/cask/cdap/explore/guice/ExploreRuntimeModule.java
index 28c60fa6aeae..2b40900621bd 100644
--- a/cdap-explore/src/main/java/co/cask/cdap/explore/guice/ExploreRuntimeModule.java
+++ b/cdap-explore/src/main/java/co/cask/cdap/explore/guice/ExploreRuntimeModule.java
@@ -121,7 +121,7 @@ protected void configure() {
   private static final class ExploreLocalModule extends PrivateModule {
     private final boolean isInMemory;
 
-    public ExploreLocalModule(boolean isInMemory) {
+    ExploreLocalModule(boolean isInMemory) {
       this.isInMemory = isInMemory;
     }
 
@@ -141,7 +141,7 @@ private static final class PreviewsDirProvider implements Provider<File> {
       private final CConfiguration cConf;
 
       @Inject
-      public PreviewsDirProvider(CConfiguration cConf) {
+      PreviewsDirProvider(CConfiguration cConf) {
         this.cConf = cConf;
       }
 
@@ -162,7 +162,7 @@ private static final class ExploreServiceProvider implements Provider<ExploreSer
       private final boolean isInMemory;
 
       @Inject
-      public ExploreServiceProvider(CConfiguration cConf, Configuration hConf,
+      ExploreServiceProvider(CConfiguration cConf, Configuration hConf,
                                     @Named("explore.service.impl") ExploreService exploreService,
                                     @Named("explore.inmemory") boolean isInMemory) {
         this.exploreService = exploreService;
diff --git a/cdap-explore/src/main/java/co/cask/cdap/hive/datasets/DatasetInputFormat.java b/cdap-explore/src/main/java/co/cask/cdap/hive/datasets/DatasetInputFormat.java
index c9d06389cea4..11eaddbaf8a6 100644
--- a/cdap-explore/src/main/java/co/cask/cdap/hive/datasets/DatasetInputFormat.java
+++ b/cdap-explore/src/main/java/co/cask/cdap/hive/datasets/DatasetInputFormat.java
@@ -153,7 +153,7 @@ private class DatasetRecordReader implements RecordReader<Void, ObjectWritable>
     private RecordScannable recordScannable;
     private RecordScanner recordScanner;
 
-    public DatasetRecordReader(Configuration conf, DatasetInputSplit datasetInputSplit) throws IOException {
+    DatasetRecordReader(Configuration conf, DatasetInputSplit datasetInputSplit) throws IOException {
       this.initialized = new AtomicBoolean(false);
       this.datasetAccessor = new DatasetAccessor(conf);
       this.datasetInputSplit = datasetInputSplit;
diff --git a/cdap-explore/src/main/java/co/cask/cdap/hive/datasets/DatasetOutputFormat.java b/cdap-explore/src/main/java/co/cask/cdap/hive/datasets/DatasetOutputFormat.java
index e7f9479e903f..6526028aa275 100644
--- a/cdap-explore/src/main/java/co/cask/cdap/hive/datasets/DatasetOutputFormat.java
+++ b/cdap-explore/src/main/java/co/cask/cdap/hive/datasets/DatasetOutputFormat.java
@@ -88,7 +88,7 @@ private class DatasetRecordWriter implements RecordWriter<Void, Text> {
     private final Type recordType;
     private Schema recordSchema;
 
-    public DatasetRecordWriter(DatasetAccessor datasetAccessor) {
+    DatasetRecordWriter(DatasetAccessor datasetAccessor) {
       this.datasetAccessor = datasetAccessor;
       this.recordWritable = datasetAccessor.getDataset();
       this.recordType = recordWritable.getRecordType();
diff --git a/cdap-formats/src/main/java/co/cask/cdap/format/AvroRecordFormat.java b/cdap-formats/src/main/java/co/cask/cdap/format/AvroRecordFormat.java
index 4a6a8a7ab639..97ef9537cc82 100644
--- a/cdap-formats/src/main/java/co/cask/cdap/format/AvroRecordFormat.java
+++ b/cdap-formats/src/main/java/co/cask/cdap/format/AvroRecordFormat.java
@@ -123,7 +123,7 @@ private static final class ByteBufferInputStream extends InputStream {
 
     private ByteBuffer buffer;
 
-    public ByteBufferInputStream(ByteBuffer buffer) {
+    ByteBufferInputStream(ByteBuffer buffer) {
       reset(buffer);
     }
 
diff --git a/cdap-gateway/src/main/java/co/cask/cdap/gateway/router/RouterModules.java b/cdap-gateway/src/main/java/co/cask/cdap/gateway/router/RouterModules.java
index bd35f23655d5..63397c3376ed 100644
--- a/cdap-gateway/src/main/java/co/cask/cdap/gateway/router/RouterModules.java
+++ b/cdap-gateway/src/main/java/co/cask/cdap/gateway/router/RouterModules.java
@@ -56,7 +56,7 @@ protected void configure() {
       @Provides
       @Named(Constants.Router.ADDRESS)
       @SuppressWarnings("unused")
-      public final InetAddress providesHostname(CConfiguration cConf) {
+      public InetAddress providesHostname(CConfiguration cConf) {
         return Networks.resolve(cConf.get(Constants.Router.ADDRESS),
                                 new InetSocketAddress("localhost", 0).getAddress());
       }
diff --git a/cdap-hbase-compat-0.96/src/main/java/co/cask/cdap/data2/increment/hbase96/IncrementSummingScanner.java b/cdap-hbase-compat-0.96/src/main/java/co/cask/cdap/data2/increment/hbase96/IncrementSummingScanner.java
index a486ac2bd904..eedc84fe085b 100644
--- a/cdap-hbase-compat-0.96/src/main/java/co/cask/cdap/data2/increment/hbase96/IncrementSummingScanner.java
+++ b/cdap-hbase-compat-0.96/src/main/java/co/cask/cdap/data2/increment/hbase96/IncrementSummingScanner.java
@@ -286,7 +286,7 @@ private static class WrappedScanner implements Closeable {
     private int currentIdx;
     private final InternalScanner scanner;
 
-    public WrappedScanner(InternalScanner scanner) {
+    WrappedScanner(InternalScanner scanner) {
       this.scanner = scanner;
     }
 
diff --git a/cdap-hbase-compat-0.98/src/main/java/co/cask/cdap/data2/increment/hbase98/IncrementSummingScanner.java b/cdap-hbase-compat-0.98/src/main/java/co/cask/cdap/data2/increment/hbase98/IncrementSummingScanner.java
index 5aae5404cf8f..60d4b5f64537 100644
--- a/cdap-hbase-compat-0.98/src/main/java/co/cask/cdap/data2/increment/hbase98/IncrementSummingScanner.java
+++ b/cdap-hbase-compat-0.98/src/main/java/co/cask/cdap/data2/increment/hbase98/IncrementSummingScanner.java
@@ -286,7 +286,7 @@ private static class WrappedScanner implements Closeable {
     private int currentIdx;
     private final InternalScanner scanner;
 
-    public WrappedScanner(InternalScanner scanner) {
+    WrappedScanner(InternalScanner scanner) {
       this.scanner = scanner;
     }
 
diff --git a/cdap-hbase-compat-1.0-cdh/src/main/java/co/cask/cdap/data2/increment/hbase10cdh/IncrementSummingScanner.java b/cdap-hbase-compat-1.0-cdh/src/main/java/co/cask/cdap/data2/increment/hbase10cdh/IncrementSummingScanner.java
index 2e5aab1124af..a3c13ee855f3 100644
--- a/cdap-hbase-compat-1.0-cdh/src/main/java/co/cask/cdap/data2/increment/hbase10cdh/IncrementSummingScanner.java
+++ b/cdap-hbase-compat-1.0-cdh/src/main/java/co/cask/cdap/data2/increment/hbase10cdh/IncrementSummingScanner.java
@@ -286,7 +286,7 @@ private static class WrappedScanner implements Closeable {
     private int currentIdx;
     private final InternalScanner scanner;
 
-    public WrappedScanner(InternalScanner scanner) {
+    WrappedScanner(InternalScanner scanner) {
       this.scanner = scanner;
     }
 
diff --git a/cdap-hbase-compat-1.0-cdh5.5.0/src/main/java/co/cask/cdap/data2/increment/hbase10cdh550/IncrementSummingScanner.java b/cdap-hbase-compat-1.0-cdh5.5.0/src/main/java/co/cask/cdap/data2/increment/hbase10cdh550/IncrementSummingScanner.java
index b2dd216671c9..6c166acb8a73 100644
--- a/cdap-hbase-compat-1.0-cdh5.5.0/src/main/java/co/cask/cdap/data2/increment/hbase10cdh550/IncrementSummingScanner.java
+++ b/cdap-hbase-compat-1.0-cdh5.5.0/src/main/java/co/cask/cdap/data2/increment/hbase10cdh550/IncrementSummingScanner.java
@@ -331,7 +331,7 @@ private static class WrappedScanner implements Closeable {
     private int currentIdx;
     private final InternalScanner scanner;
 
-    public WrappedScanner(InternalScanner scanner) {
+    WrappedScanner(InternalScanner scanner) {
       this.scanner = scanner;
     }
 
diff --git a/cdap-hbase-compat-1.0/src/main/java/co/cask/cdap/data2/increment/hbase10/IncrementSummingScanner.java b/cdap-hbase-compat-1.0/src/main/java/co/cask/cdap/data2/increment/hbase10/IncrementSummingScanner.java
index c165efc4d325..066725e3f06e 100644
--- a/cdap-hbase-compat-1.0/src/main/java/co/cask/cdap/data2/increment/hbase10/IncrementSummingScanner.java
+++ b/cdap-hbase-compat-1.0/src/main/java/co/cask/cdap/data2/increment/hbase10/IncrementSummingScanner.java
@@ -286,7 +286,7 @@ private static class WrappedScanner implements Closeable {
     private int currentIdx;
     private final InternalScanner scanner;
 
-    public WrappedScanner(InternalScanner scanner) {
+    WrappedScanner(InternalScanner scanner) {
       this.scanner = scanner;
     }
 
diff --git a/cdap-hbase-compat-1.1/src/main/java/co/cask/cdap/data2/increment/hbase11/IncrementSummingScanner.java b/cdap-hbase-compat-1.1/src/main/java/co/cask/cdap/data2/increment/hbase11/IncrementSummingScanner.java
index 26be6f7680eb..55c631b210a7 100644
--- a/cdap-hbase-compat-1.1/src/main/java/co/cask/cdap/data2/increment/hbase11/IncrementSummingScanner.java
+++ b/cdap-hbase-compat-1.1/src/main/java/co/cask/cdap/data2/increment/hbase11/IncrementSummingScanner.java
@@ -336,7 +336,7 @@ private static class WrappedScanner implements Closeable {
     private int currentIdx;
     private final InternalScanner scanner;
 
-    public WrappedScanner(InternalScanner scanner) {
+    WrappedScanner(InternalScanner scanner) {
       this.scanner = scanner;
     }
 
diff --git a/cdap-hbase-compat-1.2-cdh5.7.0/src/main/java/co/cask/cdap/data2/increment/hbase12cdh570/IncrementSummingScanner.java b/cdap-hbase-compat-1.2-cdh5.7.0/src/main/java/co/cask/cdap/data2/increment/hbase12cdh570/IncrementSummingScanner.java
index 97823623e82d..6d285aa345bc 100644
--- a/cdap-hbase-compat-1.2-cdh5.7.0/src/main/java/co/cask/cdap/data2/increment/hbase12cdh570/IncrementSummingScanner.java
+++ b/cdap-hbase-compat-1.2-cdh5.7.0/src/main/java/co/cask/cdap/data2/increment/hbase12cdh570/IncrementSummingScanner.java
@@ -336,7 +336,7 @@ private static class WrappedScanner implements Closeable {
     private int currentIdx;
     private final InternalScanner scanner;
 
-    public WrappedScanner(InternalScanner scanner) {
+    WrappedScanner(InternalScanner scanner) {
       this.scanner = scanner;
     }
 
diff --git a/cdap-master/src/main/java/co/cask/cdap/data/tools/DataMigration.java b/cdap-master/src/main/java/co/cask/cdap/data/tools/DataMigration.java
index cc1362b1dfde..61fcd668f949 100644
--- a/cdap-master/src/main/java/co/cask/cdap/data/tools/DataMigration.java
+++ b/cdap-master/src/main/java/co/cask/cdap/data/tools/DataMigration.java
@@ -60,7 +60,7 @@ private enum Action {
 
     private final String description;
 
-    private Action(String description) {
+    Action(String description) {
       this.description = description;
     }
 
@@ -167,7 +167,7 @@ private static final class MetricsMigration implements MigrationAction {
 
     boolean keepOldMetricsData;
 
-    public MetricsMigration(boolean keepOldMetricsData) {
+    MetricsMigration(boolean keepOldMetricsData) {
       this.keepOldMetricsData = keepOldMetricsData;
     }
 
diff --git a/cdap-notifications/src/main/java/co/cask/cdap/notifications/service/kafka/KafkaMessage.java b/cdap-notifications/src/main/java/co/cask/cdap/notifications/service/kafka/KafkaMessage.java
index e96625ad6865..e7c8878e64bf 100644
--- a/cdap-notifications/src/main/java/co/cask/cdap/notifications/service/kafka/KafkaMessage.java
+++ b/cdap-notifications/src/main/java/co/cask/cdap/notifications/service/kafka/KafkaMessage.java
@@ -26,7 +26,7 @@ class KafkaMessage {
   private final String messageKey;
   private final JsonElement notificationJson;
 
-  public KafkaMessage(String messageKey, JsonElement notificationJson) {
+  KafkaMessage(String messageKey, JsonElement notificationJson) {
     this.messageKey = messageKey;
     this.notificationJson = notificationJson;
   }
diff --git a/cdap-proto/src/main/java/co/cask/cdap/proto/ProgramType.java b/cdap-proto/src/main/java/co/cask/cdap/proto/ProgramType.java
index a0788eea3b0c..5b03bec0b4f8 100644
--- a/cdap-proto/src/main/java/co/cask/cdap/proto/ProgramType.java
+++ b/cdap-proto/src/main/java/co/cask/cdap/proto/ProgramType.java
@@ -164,7 +164,7 @@ private static final class Parameters {
     private final String categoryName;
     private final SchedulableProgramType schedulableType;
 
-    public Parameters(String prettyName, Boolean listable, String categoryName,
+    Parameters(String prettyName, Boolean listable, String categoryName,
                       @Nullable SchedulableProgramType schedulableType) {
       if (prettyName == null) {
         throw new IllegalArgumentException("prettyName cannot be null");
diff --git a/cdap-security/src/main/java/co/cask/cdap/security/auth/KeyManager.java b/cdap-security/src/main/java/co/cask/cdap/security/auth/KeyManager.java
index c1ffdbd44cf6..0d9b207fa1ea 100644
--- a/cdap-security/src/main/java/co/cask/cdap/security/auth/KeyManager.java
+++ b/cdap-security/src/main/java/co/cask/cdap/security/auth/KeyManager.java
@@ -30,7 +30,7 @@ public interface KeyManager extends Service {
    * Represents the combination of a digest computed on a message using a secret key, and the ID of the secret key
    * used to compute the digest.  Both elements are needed in order to later recompute (validate) the digest.
    */
-  public static class DigestId {
+  class DigestId {
     private final int id;
     private final byte[] digest;
 
diff --git a/cdap-security/src/main/java/co/cask/cdap/security/guice/SecurityModule.java b/cdap-security/src/main/java/co/cask/cdap/security/guice/SecurityModule.java
index 2fc0cbfc10ea..249e6d9ca350 100644
--- a/cdap-security/src/main/java/co/cask/cdap/security/guice/SecurityModule.java
+++ b/cdap-security/src/main/java/co/cask/cdap/security/guice/SecurityModule.java
@@ -121,7 +121,7 @@ private static final class AuthenticationHandlerMapProvider implements Provider<
     private final Map<String, Object> handlerMap;
 
     @Inject
-    public AuthenticationHandlerMapProvider(@Named("security.handlers.map") Map<String, Object> handlers) {
+    AuthenticationHandlerMapProvider(@Named("security.handlers.map") Map<String, Object> handlers) {
       handlerMap = new HashMap<>(handlers);
     }
 
diff --git a/cdap-security/src/main/java/co/cask/cdap/security/server/JAASLoginService.java b/cdap-security/src/main/java/co/cask/cdap/security/server/JAASLoginService.java
index 4f582384b2cd..0bed217e4f42 100644
--- a/cdap-security/src/main/java/co/cask/cdap/security/server/JAASLoginService.java
+++ b/cdap-security/src/main/java/co/cask/cdap/security/server/JAASLoginService.java
@@ -181,8 +181,7 @@ public UserIdentity login(final String username, final Object credentials) {
 
       if (callbackHandlerClass == null) {
         callbackHandler = new CallbackHandler() {
-          public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
-          {
+          public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
             for (Callback callback: callbacks) {
               if (callback instanceof NameCallback) {
                 ((NameCallback) callback).setName(username);
diff --git a/cdap-standalone/src/main/java/co/cask/cdap/UserInterfaceService.java b/cdap-standalone/src/main/java/co/cask/cdap/UserInterfaceService.java
index dd0602d8ca62..5d373a609d18 100644
--- a/cdap-standalone/src/main/java/co/cask/cdap/UserInterfaceService.java
+++ b/cdap-standalone/src/main/java/co/cask/cdap/UserInterfaceService.java
@@ -62,7 +62,7 @@ final class UserInterfaceService extends AbstractExecutionThreadService {
   private File sConfJsonFile;
 
   @Inject
-  public UserInterfaceService(CConfiguration cConf, SConfiguration sConf) {
+  UserInterfaceService(CConfiguration cConf, SConfiguration sConf) {
     this.cConf = cConf;
     this.sConf = sConf;
   }
diff --git a/cdap-watchdog-api/src/main/java/co/cask/cdap/api/log/LogMarkerFilterList.java b/cdap-watchdog-api/src/main/java/co/cask/cdap/api/log/LogMarkerFilterList.java
index df45560607e7..eab739ea0205 100644
--- a/cdap-watchdog-api/src/main/java/co/cask/cdap/api/log/LogMarkerFilterList.java
+++ b/cdap-watchdog-api/src/main/java/co/cask/cdap/api/log/LogMarkerFilterList.java
@@ -26,7 +26,7 @@
  */
 public class LogMarkerFilterList implements LogMarkerFilter {
   /** Set operator. */
-  public static enum Operator {
+  public enum Operator {
     /* !AND */
     MUST_PASS_ALL,
     /* !OR */
diff --git a/cdap-watchdog-api/src/main/java/co/cask/cdap/api/log/LogMessage.java b/cdap-watchdog-api/src/main/java/co/cask/cdap/api/log/LogMessage.java
index 094ae6f3a3fb..339490da37f5 100644
--- a/cdap-watchdog-api/src/main/java/co/cask/cdap/api/log/LogMessage.java
+++ b/cdap-watchdog-api/src/main/java/co/cask/cdap/api/log/LogMessage.java
@@ -24,7 +24,7 @@ public interface LogMessage {
   /**
    *
    */
-  public static enum LogLevel {
+  enum LogLevel {
     TRACE,
     DEBUG,
     INFO,
diff --git a/cdap-watchdog/src/main/java/co/cask/cdap/metrics/collect/AggregatedMetricsEmitter.java b/cdap-watchdog/src/main/java/co/cask/cdap/metrics/collect/AggregatedMetricsEmitter.java
index 2a652e03b121..b34ced1f0421 100644
--- a/cdap-watchdog/src/main/java/co/cask/cdap/metrics/collect/AggregatedMetricsEmitter.java
+++ b/cdap-watchdog/src/main/java/co/cask/cdap/metrics/collect/AggregatedMetricsEmitter.java
@@ -36,7 +36,7 @@ final class AggregatedMetricsEmitter implements MetricsEmitter {
   // specifies if the metric type is gauge or counter
   private final AtomicBoolean gaugeUsed;
 
-  public AggregatedMetricsEmitter(String name) {
+  AggregatedMetricsEmitter(String name) {
     if (name == null || name.isEmpty()) {
       LOG.warn("Creating emmitter with " + (name == null ? "null" : "empty") + " name, ");
     }
diff --git a/cdap-watchdog/src/main/java/co/cask/cdap/metrics/query/MetricQueryParser.java b/cdap-watchdog/src/main/java/co/cask/cdap/metrics/query/MetricQueryParser.java
index d54b4d9dee5d..4e7d636fdc6d 100644
--- a/cdap-watchdog/src/main/java/co/cask/cdap/metrics/query/MetricQueryParser.java
+++ b/cdap-watchdog/src/main/java/co/cask/cdap/metrics/query/MetricQueryParser.java
@@ -75,7 +75,7 @@ public enum ProgramType {
     private final String code;
     private final String tagName;
 
-    private ProgramType(String code, String tagName) {
+    ProgramType(String code, String tagName) {
       this.code = code;
       this.tagName = tagName;
     }
@@ -95,7 +95,7 @@ private enum MapReduceType {
 
     private final String id;
 
-    private MapReduceType(String id) {
+    MapReduceType(String id) {
       this.id = id;
     }
 
@@ -110,7 +110,7 @@ enum Resolution {
     HOUR(3600);
 
     private int resolution;
-    private Resolution(int resolution) {
+    Resolution(int resolution) {
       this.resolution = resolution;
     }
 
diff --git a/cdap-watchdog/src/main/java/co/cask/cdap/metrics/store/upgrade/MetricsEntityType.java b/cdap-watchdog/src/main/java/co/cask/cdap/metrics/store/upgrade/MetricsEntityType.java
index d076e20dcb64..66ee3ff2d696 100644
--- a/cdap-watchdog/src/main/java/co/cask/cdap/metrics/store/upgrade/MetricsEntityType.java
+++ b/cdap-watchdog/src/main/java/co/cask/cdap/metrics/store/upgrade/MetricsEntityType.java
@@ -26,7 +26,7 @@ public enum MetricsEntityType {
 
   private final String type;
 
-  private MetricsEntityType(String type) {
+  MetricsEntityType(String type) {
     this.type = type;
   }
 
diff --git a/checkstyle.xml b/checkstyle.xml
index 87f09eafa42a..c215e461f37f 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -386,8 +386,13 @@ page at http://checkstyle.sourceforge.net/config.html -->
 
   </module>
 
+  <!--
+    Optional suppression filter. It is optional because when running with Maven, it should be the
+     checkstyle plugin who provides it. It is only used when this file is used in IntelliJ.
+    -->
   <module name="SuppressionFilter">
     <property name="file" value="suppressions.xml"/>
+    <property name="optional" value="true"/>
   </module>
 
   <module name="SuppressionCommentFilter">
diff --git a/pom.xml b/pom.xml
index 9db26b8882d0..efa28c92f270 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1541,7 +1541,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.12.1</version>
+          <version>2.17</version>
           <executions>
             <execution>
               <id>validate</id>
@@ -1559,6 +1559,13 @@
               </goals>
             </execution>
           </executions>
+          <dependencies>
+            <dependency>
+              <groupId>com.puppycrawl.tools</groupId>
+              <artifactId>checkstyle</artifactId>
+              <version>6.19</version>
+            </dependency>
+          </dependencies>
         </plugin>
 
         <!-- Scala code compilation -->
@@ -1639,7 +1646,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.12.1</version>
+        <version>2.17</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/suppressions.xml b/suppressions.xml
index 8dc4d8e99639..eecb69ed4adb 100644
--- a/suppressions.xml
+++ b/suppressions.xml
@@ -30,6 +30,8 @@
   <suppress checks="JavadocStyle" files=".*[/\\]src[/\\](main|integration)[/\\]java[/\\].*" />
   <suppress checks="JavadocStyle" files=".*[/\\]src[/\\].*[/\\]internal[/\\].*" />
 
+  <suppress checks="RedundantModifier" files=".*[/\\]src[/\\]test[/\\]java[/\\].*" />
+
 
   <!-- copied from apache hadoop, won't fix style to keep diff minimal -->
   <suppress checks=".*" files=".*[/\\]LocalJobRunnerWithFix.java" />