Add checkstyle to enforce import ordering

Start moving in the direction of consistency with import ordering. Enforce the "Google style" of imports[1] (as much as possible) using the gradle checkstyle extension. Fix all the classes to follow the import style. [1] https://google.github.io/styleguide/javaguide.html#s3.3-import-statements
Netflix · Mar 20, 2018 · 85a1e98 · 85a1e98
1 parent 7789127
commit 85a1e98
Show file tree

Hide file tree

Showing 367 changed files with 725 additions and 1,091 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,8 +8,13 @@ plugins {
 
 subprojects {
   apply plugin: 'nebula.netflixoss'
+  apply plugin: 'checkstyle'
 
   group = 'com.netflix.hollow'
+  checkstyle {
+    configFile = file("$rootProject.projectDir/config/checkstyle/checkstyle.xml")
+    toolVersion = 6.19 // checkstyle v7 dropped Java 1.7 support
+  }
 
   repositories {
     jcenter()

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <module name="TreeWalker">
+  <!-- Import rules -->
+    <module name="AvoidStarImport"/>
+    <module name="RedundantImport"/>
+    <module name="UnusedImports"/>
+    <!-- The vanilla ImportOrder module doesn't enforce separation between static and non-static imports. -->
+    <module name="CustomImportOrder">
+        <property name="customImportOrderRules"
+            value="STATIC###THIRD_PARTY_PACKAGE"/>
+        <property name="standardPackageRegExp" value=""/> <!-- don't special case java/javax -->
+        <property name="sortImportsInGroupAlphabetically" value="true"/>
+        <property name="separateLineBetweenGroups" value="true"/>
+    </module>
+  </module>
+</module>
diff --git a/hollow-diff-ui/build.gradle b/hollow-diff-ui/build.gradle
@@ -3,7 +3,9 @@ apply plugin: 'java'
 sourceSets {
     tools {
         compileClasspath += main.output
+        compileClasspath += test.output
         runtimeClasspath += main.output
+        runtimeClasspath += test.output
     }
 }
 
@@ -16,8 +18,8 @@ dependencies {
 
     testCompile 'junit:junit:4.11'
 
-    toolsCompile configurations.compile
-    toolsRuntime configurations.runtime
+    toolsCompile configurations.compile + configurations.testCompile
+    toolsRuntime configurations.runtime + configurations.testRuntime
 }
 
 configurations {

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/jetty/JettyBasedUIServer.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/diff/ui/jetty/JettyBasedUIServer.java
@@ -17,11 +17,10 @@
  */
 package com.netflix.hollow.diff.ui.jetty;
 
-import org.eclipse.jetty.server.Server;
-
 import com.netflix.hollow.diff.ui.HollowDiffUI;
 import com.netflix.hollow.diff.ui.jetty.HollowDiffUIServer.UIServer;
 import com.netflix.hollow.tools.diff.HollowDiff;
+import org.eclipse.jetty.server.Server;
 
 final class JettyBasedUIServer implements UIServer {
     private final Server server;

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/DiffViewOutputGenerator.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/DiffViewOutputGenerator.java
@@ -19,11 +19,10 @@
 
 import com.netflix.hollow.diffview.effigy.HollowEffigy.Field;
 import com.netflix.hollow.ui.HollowUISession;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.Writer;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 public class DiffViewOutputGenerator {
 

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/HollowObjectViewProvider.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/diffview/HollowObjectViewProvider.java
@@ -18,7 +18,6 @@
 package com.netflix.hollow.diffview;
 
 import com.netflix.hollow.ui.HollowUISession;
-
 import javax.servlet.http.HttpServletRequest;
 
 public interface HollowObjectViewProvider {

diff --git a/...src/main/java/com/netflix/hollow/diffview/effigy/pairer/exact/DiffExactRecordMatcher.java b/...src/main/java/com/netflix/hollow/diffview/effigy/pairer/exact/DiffExactRecordMatcher.java
@@ -17,10 +17,9 @@
  */
 package com.netflix.hollow.diffview.effigy.pairer.exact;
 
-import com.netflix.hollow.tools.diff.exact.DiffEqualOrdinalMap.MatchIterator;
-
 import com.netflix.hollow.core.read.dataaccess.HollowTypeDataAccess;
 import com.netflix.hollow.tools.diff.exact.DiffEqualOrdinalMap;
+import com.netflix.hollow.tools.diff.exact.DiffEqualOrdinalMap.MatchIterator;
 import com.netflix.hollow.tools.diff.exact.DiffEqualityMapping;
 
 public class DiffExactRecordMatcher implements ExactRecordMatcher {

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/jetty/HollowHistoryHandler.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/jetty/HollowHistoryHandler.java
@@ -18,7 +18,6 @@
 package com.netflix.hollow.history.ui.jetty;
 
 import com.netflix.hollow.history.ui.HollowHistoryUI;
-
 import java.io.IOException;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/jetty/HollowHistoryUIServer.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/jetty/HollowHistoryUIServer.java
@@ -18,7 +18,6 @@
 package com.netflix.hollow.history.ui.jetty;
 
 import com.netflix.hollow.api.consumer.HollowConsumer;
-
 import com.netflix.hollow.history.ui.HollowHistoryUI;
 import com.netflix.hollow.tools.history.HollowHistory;
 

diff --git a/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/jetty/JettyBasedUIServer.java b/hollow-diff-ui/src/main/java/com/netflix/hollow/history/ui/jetty/JettyBasedUIServer.java
@@ -17,10 +17,9 @@
  */
 package com.netflix.hollow.history.ui.jetty;
 
-import org.eclipse.jetty.server.Server;
-
 import com.netflix.hollow.history.ui.HollowHistoryUI;
 import com.netflix.hollow.history.ui.jetty.HollowHistoryUIServer.UIServer;
+import org.eclipse.jetty.server.Server;
 
 final class JettyBasedUIServer implements UIServer {
     private final Server server;

diff --git a/hollow-diff-ui/src/tools/java/com/netflix/hollow/diff/ui/DiffUITest.java b/hollow-diff-ui/src/tools/java/com/netflix/hollow/diff/ui/DiffUITest.java
@@ -1,11 +1,9 @@
 package com.netflix.hollow.diff.ui;
 
-import org.junit.Test;
-
 import com.netflix.hollow.diff.ui.jetty.HollowDiffUIServer;
 import com.netflix.hollow.diffview.FakeHollowDiffGenerator;
 import com.netflix.hollow.tools.diff.HollowDiff;
-
+import org.junit.Test;
 
 public class DiffUITest {
 

diff --git a/hollow-diff-ui/src/tools/java/com/netflix/hollow/diff/ui/HistoryUITest.java b/hollow-diff-ui/src/tools/java/com/netflix/hollow/diff/ui/HistoryUITest.java
@@ -1,11 +1,5 @@
 package com.netflix.hollow.diff.ui;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.junit.Test;
-
 import com.netflix.hollow.core.index.key.PrimaryKey;
 import com.netflix.hollow.core.read.engine.HollowBlobReader;
 import com.netflix.hollow.core.read.engine.HollowReadStateEngine;
@@ -22,6 +16,10 @@
 import com.netflix.hollow.history.ui.jetty.HollowHistoryUIServer;
 import com.netflix.hollow.tools.history.HollowHistory;
 import com.netflix.hollow.tools.history.keyindex.HollowHistoryKeyIndex;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import org.junit.Test;
 
 public class HistoryUITest {
 

diff --git a/...explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/jetty/HollowExplorerHandler.java b/...explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/jetty/HollowExplorerHandler.java
@@ -18,7 +18,6 @@
 package com.netflix.hollow.explorer.ui.jetty;
 
 import com.netflix.hollow.explorer.ui.HollowExplorerUI;
-
 import java.io.IOException;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;

diff --git a/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/model/SchemaDisplay.java b/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/model/SchemaDisplay.java
@@ -17,12 +17,12 @@
  */
 package com.netflix.hollow.explorer.ui.model;
 
-import com.netflix.hollow.core.schema.HollowMapSchema;
 import com.netflix.hollow.core.schema.HollowCollectionSchema;
+import com.netflix.hollow.core.schema.HollowMapSchema;
 import com.netflix.hollow.core.schema.HollowObjectSchema;
+import com.netflix.hollow.core.schema.HollowSchema;
 import java.util.ArrayList;
 import java.util.List;
-import com.netflix.hollow.core.schema.HollowSchema;
 
 public class SchemaDisplay {
 

diff --git a/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/model/TypeOverview.java b/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/model/TypeOverview.java
@@ -17,11 +17,10 @@
  */
 package com.netflix.hollow.explorer.ui.model;
 
+import com.netflix.hollow.core.index.key.PrimaryKey;
+import com.netflix.hollow.core.schema.HollowSchema;
 import java.text.DecimalFormat;
-
 import java.text.NumberFormat;
-import com.netflix.hollow.core.schema.HollowSchema;
-import com.netflix.hollow.core.index.key.PrimaryKey;
 
 public class TypeOverview {
     private static final String[] HEAP_SIZE_UNITS = new String[] { "B", "KB", "MB", "GB", "TB" };

diff --git a/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/BrowseSchemaPage.java b/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/BrowseSchemaPage.java
@@ -21,10 +21,9 @@
 import com.netflix.hollow.explorer.ui.model.SchemaDisplay;
 import com.netflix.hollow.explorer.ui.model.SchemaDisplayField;
 import com.netflix.hollow.ui.HollowUISession;
-import org.apache.velocity.VelocityContext;
-
-import javax.servlet.http.HttpServletRequest;
 import java.io.Writer;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.velocity.VelocityContext;
 
 public class BrowseSchemaPage extends HollowExplorerPage {
 

diff --git a/...xplorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/BrowseSelectedTypePage.java b/...xplorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/BrowseSelectedTypePage.java
@@ -33,14 +33,13 @@
 import com.netflix.hollow.tools.stringifier.HollowRecordStringifier;
 import com.netflix.hollow.tools.stringifier.HollowStringifier;
 import com.netflix.hollow.ui.HollowUISession;
-import org.apache.velocity.VelocityContext;
-
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.velocity.VelocityContext;
 
 public class BrowseSelectedTypePage extends HollowExplorerPage {
     private static final String SESSION_ATTR_QUERY_RESULT = "query-result";

diff --git a/...ow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/HollowExplorerPage.java b/...ow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/HollowExplorerPage.java
@@ -19,12 +19,11 @@
 
 import com.netflix.hollow.explorer.ui.HollowExplorerUI;
 import com.netflix.hollow.ui.HollowUISession;
+import java.io.Writer;
+import javax.servlet.http.HttpServletRequest;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 
-import javax.servlet.http.HttpServletRequest;
-import java.io.Writer;
-
 public abstract class HollowExplorerPage {
 
     protected final HollowExplorerUI ui;

diff --git a/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/QueryPage.java b/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/QueryPage.java
@@ -23,13 +23,12 @@
 import com.netflix.hollow.explorer.ui.model.QueryResult;
 import com.netflix.hollow.explorer.ui.model.QueryResult.QueryClause;
 import com.netflix.hollow.ui.HollowUISession;
-import org.apache.velocity.VelocityContext;
-
-import javax.servlet.http.HttpServletRequest;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.velocity.VelocityContext;
 
 public class QueryPage extends HollowExplorerPage {
 

diff --git a/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/ShowAllTypesPage.java b/hollow-explorer-ui/src/main/java/com/netflix/hollow/explorer/ui/pages/ShowAllTypesPage.java
@@ -25,14 +25,13 @@
 import com.netflix.hollow.explorer.ui.HollowExplorerUI;
 import com.netflix.hollow.explorer.ui.model.TypeOverview;
 import com.netflix.hollow.ui.HollowUISession;
-import org.apache.velocity.VelocityContext;
-
-import javax.servlet.http.HttpServletRequest;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.velocity.VelocityContext;
 
 public class ShowAllTypesPage extends HollowExplorerPage {
 

diff --git a/...nadapter/src/main/java/com/netflix/hollow/jsonadapter/discover/HollowDiscoveredField.java b/...nadapter/src/main/java/com/netflix/hollow/jsonadapter/discover/HollowDiscoveredField.java
@@ -17,7 +17,6 @@
  */
 package com.netflix.hollow.jsonadapter.discover;
 
-
 import com.netflix.hollow.core.schema.HollowObjectSchema.FieldType;
 
 public class HollowDiscoveredField {

diff --git a/...adapter/src/main/java/com/netflix/hollow/jsonadapter/discover/HollowDiscoveredSchema.java b/...adapter/src/main/java/com/netflix/hollow/jsonadapter/discover/HollowDiscoveredSchema.java
@@ -17,7 +17,6 @@
  */
 package com.netflix.hollow.jsonadapter.discover;
 
-
 import com.netflix.hollow.core.schema.HollowListSchema;
 import com.netflix.hollow.core.schema.HollowMapSchema;
 import com.netflix.hollow.core.schema.HollowObjectSchema;

diff --git a/...-jsonadapter/src/main/java/com/netflix/hollow/jsonadapter/discover/HollowSchemaNamer.java b/...-jsonadapter/src/main/java/com/netflix/hollow/jsonadapter/discover/HollowSchemaNamer.java
@@ -17,7 +17,6 @@
  */
 package com.netflix.hollow.jsonadapter.discover;
 
-
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 

diff --git a/...w-zenoadapter/src/main/java/com/netflix/hollow/zenoadapter/HollowFrameworkSerializer.java b/...w-zenoadapter/src/main/java/com/netflix/hollow/zenoadapter/HollowFrameworkSerializer.java
@@ -17,7 +17,6 @@
  */
 package com.netflix.hollow.zenoadapter;
 
-
 import com.netflix.hollow.core.schema.HollowListSchema;
 import com.netflix.hollow.core.schema.HollowMapSchema;
 import com.netflix.hollow.core.schema.HollowObjectSchema;

diff --git a/...enoadapter/src/main/java/com/netflix/hollow/zenoadapter/HollowSerializationFramework.java b/...enoadapter/src/main/java/com/netflix/hollow/zenoadapter/HollowSerializationFramework.java
@@ -17,10 +17,6 @@
  */
 package com.netflix.hollow.zenoadapter;
 
-
-import com.netflix.zeno.serializer.common.MapSerializer;
-
-import com.netflix.zeno.serializer.SerializerFactory;
 import com.netflix.hollow.core.schema.HollowListSchema;
 import com.netflix.hollow.core.schema.HollowMapSchema;
 import com.netflix.hollow.core.schema.HollowObjectSchema;
@@ -42,7 +38,9 @@
 import com.netflix.zeno.fastblob.record.schema.TypedFieldDefinition;
 import com.netflix.zeno.serializer.NFTypeSerializer;
 import com.netflix.zeno.serializer.SerializationFramework;
+import com.netflix.zeno.serializer.SerializerFactory;
 import com.netflix.zeno.serializer.common.ListSerializer;
+import com.netflix.zeno.serializer.common.MapSerializer;
 import com.netflix.zeno.serializer.common.SetSerializer;
 import java.util.Collection;
 import java.util.Map;

diff --git a/...w-zenoadapter/src/main/java/com/netflix/hollow/zenoadapter/HollowSerializationRecord.java b/...w-zenoadapter/src/main/java/com/netflix/hollow/zenoadapter/HollowSerializationRecord.java
@@ -17,7 +17,6 @@
  */
 package com.netflix.hollow.zenoadapter;
 
-
 import com.netflix.hollow.core.write.HollowWriteRecord;
 import com.netflix.zeno.serializer.NFSerializationRecord;
 

diff --git a/...noadapter/src/main/java/com/netflix/hollow/zenoadapter/util/HollowStateEngineCreator.java b/...noadapter/src/main/java/com/netflix/hollow/zenoadapter/util/HollowStateEngineCreator.java
@@ -17,8 +17,6 @@
  */
 package com.netflix.hollow.zenoadapter.util;
 
-import com.netflix.zeno.serializer.SerializerFactory;
-
 import com.netflix.hollow.core.util.HollowObjectHashCodeFinder;
 import com.netflix.hollow.core.util.SimultaneousExecutor;
 import com.netflix.hollow.core.write.HollowBlobWriter;
@@ -27,6 +25,7 @@
 import com.netflix.zeno.fastblob.FastBlobStateEngine;
 import com.netflix.zeno.fastblob.state.FastBlobTypeDeserializationState;
 import com.netflix.zeno.serializer.NFTypeSerializer;
+import com.netflix.zeno.serializer.SerializerFactory;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/hollow/src/main/java/com/netflix/hollow/api/client/FailedTransitionTracker.java b/hollow/src/main/java/com/netflix/hollow/api/client/FailedTransitionTracker.java
@@ -18,7 +18,6 @@
 package com.netflix.hollow.api.client;
 
 import com.netflix.hollow.api.consumer.HollowConsumer;
-
 import java.util.HashSet;
 
 /**

diff --git a/hollow/src/main/java/com/netflix/hollow/api/client/HollowAnnouncementWatcher.java b/hollow/src/main/java/com/netflix/hollow/api/client/HollowAnnouncementWatcher.java
@@ -18,7 +18,6 @@
 package com.netflix.hollow.api.client;
 
 import com.netflix.hollow.api.consumer.HollowConsumer;
-
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

diff --git a/hollow/src/main/java/com/netflix/hollow/api/client/HollowBlob.java b/hollow/src/main/java/com/netflix/hollow/api/client/HollowBlob.java
@@ -17,7 +17,6 @@
  */
 package com.netflix.hollow.api.client;
 
-import com.netflix.hollow.api.consumer.HollowConsumer;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -36,7 +35,7 @@
  *      <dd>Implementations will define how to retrieve the actual blob data for this specific blob from a data store as an InputStream.</dd>
  * </dl>
  * 
- * @deprecated Extend the {@link HollowConsumer.Blob} for use with the {@link HollowConsumer.BlobRetriever} instead.
+ * @deprecated Extend the {@link com.netflix.hollow.api.consumer.HollowConsumer.Blob} for use with the {@link HollowConsumer.BlobRetriever} instead.
  * 
  */
 @Deprecated
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ @@
      */
     package com.netflix.hollow.jsonadapter.discover;
     import com.netflix.hollow.core.schema.HollowObjectSchema.FieldType;
     public class HollowDiscoveredField {
@@ Expand Down @@