PARQUET-116: Fix whitespace

Yash Datta · Yash Datta · commit 9a63611a5b84 · 2015-02-02T12:36:20.000+05:30
diff --git a/parquet-column/src/main/java/parquet/filter2/predicate/FilterApi.java b/parquet-column/src/main/java/parquet/filter2/predicate/FilterApi.java
@@ -152,13 +152,15 @@ public static <T extends Comparable<T>, C extends Column<T> & SupportsLtGt> GtEq
     UserDefined<T, U> userDefined(Column<T> column, Class<U> clazz) {
     return new UserDefined<T, U>(column, clazz);
   }
-
+  
+  /**
+   * Similar to above but allows to pass Serializable {@link UserDefinedPredicate}
+   */
   public static <T extends Comparable<T>, U extends UserDefinedPredicate<T> & Serializable>
     ConfiguredUserDefined<T, U> userDefined(Column<T> column, U udp) {
     return new ConfiguredUserDefined<T, U> (column, udp);
   }
 
-
   /**
    * Constructs the logical and of two predicates. Records will be kept if both the left and right predicate agree
    * that the record should be kept.
diff --git a/parquet-column/src/main/java/parquet/filter2/predicate/FilterPredicate.java b/parquet-column/src/main/java/parquet/filter2/predicate/FilterPredicate.java
@@ -15,6 +15,7 @@
 import parquet.filter2.predicate.Operators.NotEq;
 import parquet.filter2.predicate.Operators.Or;
 import parquet.filter2.predicate.Operators.UserDefined;
+
 /**
  * A FilterPredicate is an expression tree describing the criteria for which records to keep when loading data from
  * a parquet file. These predicates are applied in multiple places. Currently, they are applied to all row groups at
@@ -50,10 +51,10 @@ public static interface Visitor<R> {
     R visit(And and);
     R visit(Or or);
     R visit(Not not);
-    <T extends Comparable<T>, U extends UserDefinedPredicate<T> > R visit(UserDefined<T, U> udp);
-    <T extends Comparable<T>, U extends UserDefinedPredicate<T> & Serializable > R visit(ConfiguredUserDefined<T, U> udp);
-    <T extends Comparable<T>, U extends UserDefinedPredicate<T> > R visit(LogicalNotUserDefined<T, U> udp);
-    <T extends Comparable<T>, U extends UserDefinedPredicate<T> & Serializable > R visit(LogicalNotConfiguredUserDefined<T, U> udp);
+    <T extends Comparable<T>, U extends UserDefinedPredicate<T>> R visit(UserDefined<T, U> udp);
+    <T extends Comparable<T>, U extends UserDefinedPredicate<T> & Serializable> R visit(ConfiguredUserDefined<T, U> udp);
+    <T extends Comparable<T>, U extends UserDefinedPredicate<T>> R visit(LogicalNotUserDefined<T, U> udp);
+    <T extends Comparable<T>, U extends UserDefinedPredicate<T> & Serializable> R visit(LogicalNotConfiguredUserDefined<T, U> udp);
   }
 
 }
diff --git a/parquet-column/src/main/java/parquet/filter2/predicate/LogicalInverseRewriter.java b/parquet-column/src/main/java/parquet/filter2/predicate/LogicalInverseRewriter.java
@@ -88,7 +88,7 @@ public FilterPredicate visit(Not not) {
   }
 
   @Override
-  public <T extends Comparable<T>, U extends UserDefinedPredicate<T> > FilterPredicate visit(UserDefined<T, U> udp) {
+  public <T extends Comparable<T>, U extends UserDefinedPredicate<T>> FilterPredicate visit(UserDefined<T, U> udp) {
     return udp;
   }
 
@@ -98,7 +98,7 @@ public <T extends Comparable<T>, U extends UserDefinedPredicate<T> & Serializabl
   }
 
   @Override
-  public <T extends Comparable<T>, U extends UserDefinedPredicate<T> > FilterPredicate visit(LogicalNotUserDefined<T, U> udp) {
+  public <T extends Comparable<T>, U extends UserDefinedPredicate<T>> FilterPredicate visit(LogicalNotUserDefined<T, U> udp) {
     return udp;
   }
 
diff --git a/parquet-column/src/main/java/parquet/filter2/predicate/LogicalInverter.java b/parquet-column/src/main/java/parquet/filter2/predicate/LogicalInverter.java
@@ -83,7 +83,7 @@ public FilterPredicate visit(Not not) {
   }
 
   @Override
-  public <T extends Comparable<T>,  U extends UserDefinedPredicate<T> > FilterPredicate visit(UserDefined<T, U> udp) {
+  public <T extends Comparable<T>,  U extends UserDefinedPredicate<T>> FilterPredicate visit(UserDefined<T, U> udp) {
     return new LogicalNotUserDefined<T, U>(udp);
   }
 
@@ -93,7 +93,7 @@ public <T extends Comparable<T>,  U extends UserDefinedPredicate<T> & Serializab
   }
 
   @Override
-  public <T extends Comparable<T>,  U extends UserDefinedPredicate<T> > FilterPredicate visit(LogicalNotUserDefined<T, U> udp) {
+  public <T extends Comparable<T>,  U extends UserDefinedPredicate<T>> FilterPredicate visit(LogicalNotUserDefined<T, U> udp) {
     return udp.getUserDefined();
   }
 
diff --git a/parquet-column/src/main/java/parquet/filter2/predicate/Operators.java b/parquet-column/src/main/java/parquet/filter2/predicate/Operators.java
@@ -340,11 +340,10 @@ public int hashCode() {
     }
   }
 
-  public static final class UserDefined<T extends Comparable<T>, U extends UserDefinedPredicate<T> > implements FilterPredicate, Serializable {
+  public static final class UserDefined<T extends Comparable<T>, U extends UserDefinedPredicate<T>> implements FilterPredicate, Serializable {
     private final Column<T> column;
     private final Class<U> udpClass;
     private final String toString;
-
     private static final String INSTANTIATION_ERROR_MESSAGE =
         "Could not instantiate custom filter: %s. User defined predicates must be static classes with a default constructor.";
 
diff --git a/parquet-column/src/main/java/parquet/filter2/predicate/SchemaCompatibilityValidator.java b/parquet-column/src/main/java/parquet/filter2/predicate/SchemaCompatibilityValidator.java
@@ -131,7 +131,7 @@ public Void visit(Not not) {
   }
 
   @Override
-  public <T extends Comparable<T>, U extends UserDefinedPredicate<T> > Void visit(UserDefined<T, U> udp) {
+  public <T extends Comparable<T>, U extends UserDefinedPredicate<T>> Void visit(UserDefined<T, U> udp) {
     validateColumn(udp.getColumn());
     return null;
   }
@@ -143,7 +143,7 @@ public <T extends Comparable<T>, U extends UserDefinedPredicate<T> & Serializabl
   }
 
   @Override
-  public <T extends Comparable<T>, U extends UserDefinedPredicate<T> > Void visit(LogicalNotUserDefined<T, U> udp) {
+  public <T extends Comparable<T>, U extends UserDefinedPredicate<T>> Void visit(LogicalNotUserDefined<T, U> udp) {
     return udp.getUserDefined().accept(this);
   }
 
diff --git a/parquet-column/src/main/java/parquet/filter2/predicate/UserDefinedPredicate.java b/parquet-column/src/main/java/parquet/filter2/predicate/UserDefinedPredicate.java
@@ -10,7 +10,7 @@
  */
 // TODO: consider avoiding autoboxing and adding the specialized methods for each type
 // TODO: downside is that's fairly unwieldy for users
-public abstract class UserDefinedPredicate<T extends Comparable<T> > {
+public abstract class UserDefinedPredicate<T extends Comparable<T>> {
   /**
    * A udp must have a default constructor.
    * The udp passed to {@link FilterApi} will not be serialized along with its state.
@@ -86,4 +86,4 @@ public UserDefinedPredicate() { }
    * }
    */
   public abstract boolean inverseCanDrop(Statistics<T> statistics);
-}
+}
diff --git a/parquet-column/src/test/java/parquet/filter2/predicate/DummyUdp.java b/parquet-column/src/test/java/parquet/filter2/predicate/DummyUdp.java
@@ -1,7 +1,5 @@
 package parquet.filter2.predicate;
 
-import java.io.Serializable;
-
 public class DummyUdp extends UserDefinedPredicate<Integer> {
 
   @Override
diff --git a/parquet-column/src/test/java/parquet/filter2/predicate/TestSchemaCompatibilityValidator.java b/parquet-column/src/test/java/parquet/filter2/predicate/TestSchemaCompatibilityValidator.java
@@ -1,6 +1,5 @@
 package parquet.filter2.predicate;
 
-import java.io.Serializable;
 import org.junit.Test;
 
 import parquet.filter2.predicate.Operators.BinaryColumn;
diff --git a/parquet-generator/src/main/java/parquet/filter2/IncrementallyUpdatedFilterPredicateGenerator.java b/parquet-generator/src/main/java/parquet/filter2/IncrementallyUpdatedFilterPredicateGenerator.java
@@ -110,7 +110,7 @@ public void run() throws IOException {
     addVisitEnd();
 
     add("  @Override\n" +
-        "  public <T extends Comparable<T>, U extends UserDefinedPredicate<T> > IncrementallyUpdatedFilterPredicate visit(UserDefined<T, U> pred) {\n");
+        "  public <T extends Comparable<T>, U extends UserDefinedPredicate<T>> IncrementallyUpdatedFilterPredicate visit(UserDefined<T, U> pred) {\n");
     addUdpBegin();
     for (TypeInfo info : TYPES) {
       addUdpCase(info, false);
@@ -126,7 +126,7 @@ public void run() throws IOException {
     addVisitEnd();
 
     add("  @Override\n" +
-        "  public <T extends Comparable<T>, U extends UserDefinedPredicate<T> > IncrementallyUpdatedFilterPredicate visit(LogicalNotUserDefined<T, U> notPred) {\n" +
+        "  public <T extends Comparable<T>, U extends UserDefinedPredicate<T>> IncrementallyUpdatedFilterPredicate visit(LogicalNotUserDefined<T, U> notPred) {\n" +
         "    UserDefined<T, U> pred = notPred.getUserDefined();\n");
     addUdpBegin();
     for (TypeInfo info : TYPES) {
diff --git a/parquet-hadoop/src/main/java/parquet/filter2/statisticslevel/StatisticsFilter.java b/parquet-hadoop/src/main/java/parquet/filter2/statisticslevel/StatisticsFilter.java
@@ -219,7 +219,7 @@ public Boolean visit(Not not) {
         "This predicate contains a not! Did you forget to run this predicate through LogicalInverseRewriter? " + not);
   }
 
-  private <T extends Comparable<T>, U extends UserDefinedPredicate<T> > Boolean visit(UserDefined<T, U> ud, boolean inverted) {
+  private <T extends Comparable<T>, U extends UserDefinedPredicate<T>> Boolean visit(UserDefined<T, U> ud, boolean inverted) {
     Column<T> filterColumn = ud.getColumn();
     ColumnChunkMetaData columnChunk = getColumnChunk(filterColumn.getColumnPath());
     U udp = ud.getUserDefinedPredicate();
@@ -250,7 +250,7 @@ private <T extends Comparable<T>, U extends UserDefinedPredicate<T> & Serializab
   }
 
   @Override
-  public <T extends Comparable<T>, U extends UserDefinedPredicate<T> > Boolean visit(UserDefined<T, U> ud) {
+  public <T extends Comparable<T>, U extends UserDefinedPredicate<T>> Boolean visit(UserDefined<T, U> ud) {
     return visit(ud, false);
   }
 
@@ -260,12 +260,12 @@ public <T extends Comparable<T>, U extends UserDefinedPredicate<T> & Serializabl
   }
 
   @Override
-  public <T extends Comparable<T>, U extends UserDefinedPredicate<T> > Boolean visit(LogicalNotUserDefined<T, U> lnud) {
+  public <T extends Comparable<T>, U extends UserDefinedPredicate<T>> Boolean visit(LogicalNotUserDefined<T, U> lnud) {
     return visit(lnud.getUserDefined(), true);
   }
 
   @Override
-  public <T extends Comparable<T>, U extends UserDefinedPredicate<T> & Serializable > Boolean visit(LogicalNotConfiguredUserDefined<T, U> lnud) {
+  public <T extends Comparable<T>, U extends UserDefinedPredicate<T> & Serializable> Boolean visit(LogicalNotConfiguredUserDefined<T, U> lnud) {
     return visit(lnud.getUserDefined(), true);
   }
 }
diff --git a/parquet-hadoop/src/test/java/parquet/filter2/statisticslevel/TestStatisticsFilter.java b/parquet-hadoop/src/test/java/parquet/filter2/statisticslevel/TestStatisticsFilter.java
@@ -3,7 +3,6 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.io.Serializable;
 
 import org.junit.Test;
 

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public FilterPredicate visit(Not not) {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`@Override`
`91`		`- public <T extends Comparable<T>, U extends UserDefinedPredicate<T> > FilterPredicate visit(UserDefined<T, U> udp) {`
	`91`	`+ public <T extends Comparable<T>, U extends UserDefinedPredicate<T>> FilterPredicate visit(UserDefined<T, U> udp) {`
`92`	`92`	`return udp;`
`93`	`93`	`}`
`94`	`94`
`@@ -98,7 +98,7 @@ public <T extends Comparable<T>, U extends UserDefinedPredicate<T> & Serializabl`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Override`
`101`		`- public <T extends Comparable<T>, U extends UserDefinedPredicate<T> > FilterPredicate visit(LogicalNotUserDefined<T, U> udp) {`
	`101`	`+ public <T extends Comparable<T>, U extends UserDefinedPredicate<T>> FilterPredicate visit(LogicalNotUserDefined<T, U> udp) {`
`102`	`102`	`return udp;`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public FilterPredicate visit(Not not) {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`@Override`
`86`		`- public <T extends Comparable<T>, U extends UserDefinedPredicate<T> > FilterPredicate visit(UserDefined<T, U> udp) {`
	`86`	`+ public <T extends Comparable<T>, U extends UserDefinedPredicate<T>> FilterPredicate visit(UserDefined<T, U> udp) {`
`87`	`87`	`return new LogicalNotUserDefined<T, U>(udp);`
`88`	`88`	`}`
`89`	`89`
`@@ -93,7 +93,7 @@ public <T extends Comparable<T>, U extends UserDefinedPredicate<T> & Serializab`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`@Override`
`96`		`- public <T extends Comparable<T>, U extends UserDefinedPredicate<T> > FilterPredicate visit(LogicalNotUserDefined<T, U> udp) {`
	`96`	`+ public <T extends Comparable<T>, U extends UserDefinedPredicate<T>> FilterPredicate visit(LogicalNotUserDefined<T, U> udp) {`
`97`	`97`	`return udp.getUserDefined();`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -340,11 +340,10 @@ public int hashCode() {`
`340`	`340`	`}`
`341`	`341`	`}`
`342`	`342`
`343`		`- public static final class UserDefined<T extends Comparable<T>, U extends UserDefinedPredicate<T> > implements FilterPredicate, Serializable {`
	`343`	`+ public static final class UserDefined<T extends Comparable<T>, U extends UserDefinedPredicate<T>> implements FilterPredicate, Serializable {`
`344`	`344`	`private final Column<T> column;`
`345`	`345`	`private final Class<U> udpClass;`
`346`	`346`	`private final String toString;`
`347`		`-`
`348`	`347`	`private static final String INSTANTIATION_ERROR_MESSAGE =`
`349`	`348`	`"Could not instantiate custom filter: %s. User defined predicates must be static classes with a default constructor.";`
`350`	`349`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public Void visit(Not not) {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`@Override`
`134`		`- public <T extends Comparable<T>, U extends UserDefinedPredicate<T> > Void visit(UserDefined<T, U> udp) {`
	`134`	`+ public <T extends Comparable<T>, U extends UserDefinedPredicate<T>> Void visit(UserDefined<T, U> udp) {`
`135`	`135`	`validateColumn(udp.getColumn());`
`136`	`136`	`return null;`
`137`	`137`	`}`
`@@ -143,7 +143,7 @@ public <T extends Comparable<T>, U extends UserDefinedPredicate<T> & Serializabl`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`@Override`
`146`		`- public <T extends Comparable<T>, U extends UserDefinedPredicate<T> > Void visit(LogicalNotUserDefined<T, U> udp) {`
	`146`	`+ public <T extends Comparable<T>, U extends UserDefinedPredicate<T>> Void visit(LogicalNotUserDefined<T, U> udp) {`
`147`	`147`	`return udp.getUserDefined().accept(this);`
`148`	`148`	`}`
`149`	`149`