incubator-crunch-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwi...@apache.org
Subject git commit: Removing serialVersionUID references in DoFns and cleaning up some source indentation
Date Wed, 20 Jun 2012 20:24:41 GMT
Updated Branches:
  refs/heads/master f1210d883 -> e578d29d2


Removing serialVersionUID references in DoFns and cleaning up some source indentation


Project: http://git-wip-us.apache.org/repos/asf/incubator-crunch/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-crunch/commit/e578d29d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-crunch/tree/e578d29d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-crunch/diff/e578d29d

Branch: refs/heads/master
Commit: e578d29d2de98ece2f6cf0cce2f878b011791753
Parents: f1210d8
Author: Josh Wills <jwills@cloudera.com>
Authored: Wed Jun 20 13:24:20 2012 -0700
Committer: Josh Wills <jwills@cloudera.com>
Committed: Wed Jun 20 13:24:20 2012 -0700

----------------------------------------------------------------------
 src/main/java/com/cloudera/crunch/CombineFn.java   |   59 +------
 src/main/java/com/cloudera/crunch/DoFn.java        |    2 -
 src/main/java/com/cloudera/crunch/FilterFn.java    |    6 +-
 src/main/java/com/cloudera/crunch/MapFn.java       |    1 -
 .../com/cloudera/crunch/fn/CompositeMapFn.java     |    1 -
 .../java/com/cloudera/crunch/fn/ExtractKeyFn.java  |    1 -
 .../java/com/cloudera/crunch/fn/IdentityFn.java    |    1 -
 .../java/com/cloudera/crunch/fn/MapKeysFn.java     |    1 -
 .../java/com/cloudera/crunch/fn/MapValuesFn.java   |    1 -
 .../java/com/cloudera/crunch/fn/PairMapFn.java     |    1 -
 .../java/com/cloudera/crunch/lib/Aggregate.java    |   40 +----
 src/main/java/com/cloudera/crunch/lib/Cogroup.java |    6 -
 src/main/java/com/cloudera/crunch/lib/Join.java    |    2 -
 src/main/java/com/cloudera/crunch/lib/PTables.java |    2 -
 src/main/java/com/cloudera/crunch/lib/Sample.java  |   45 +++---
 src/main/java/com/cloudera/crunch/lib/Set.java     |    4 -
 src/main/java/com/cloudera/crunch/lib/Sort.java    |   10 --
 .../cloudera/crunch/lib/join/FullOuterJoinFn.java  |    1 -
 .../com/cloudera/crunch/lib/join/InnerJoinFn.java  |    1 -
 .../java/com/cloudera/crunch/lib/join/JoinFn.java  |    1 -
 .../cloudera/crunch/lib/join/LeftOuterJoinFn.java  |    1 -
 .../cloudera/crunch/lib/join/RightOuterJoinFn.java |    1 -
 .../cloudera/crunch/types/PGroupedTableType.java   |    4 +-
 .../com/cloudera/crunch/types/TupleFactory.java    |    3 +-
 .../crunch/types/avro/AvroKeyConverter.java        |    1 -
 .../crunch/types/avro/AvroPairConverter.java       |    1 -
 .../java/com/cloudera/crunch/types/avro/Avros.java |  123 +++++++--------
 .../crunch/types/writable/TextMapWritable.java     |   68 ++++----
 .../types/writable/WritablePairConverter.java      |    1 -
 .../types/writable/WritableValueConverter.java     |    1 -
 .../cloudera/crunch/types/writable/Writables.java  |  116 ++++++--------
 src/main/java/com/cloudera/crunch/util/PTypes.java |   13 +--
 src/main/java/com/cloudera/crunch/util/Protos.java |    2 -
 .../java/com/cloudera/crunch/TextPairTest.java     |    2 -
 34 files changed, 178 insertions(+), 345 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/CombineFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/CombineFn.java b/src/main/java/com/cloudera/crunch/CombineFn.java
index a9cd874..9c766cc 100644
--- a/src/main/java/com/cloudera/crunch/CombineFn.java
+++ b/src/main/java/com/cloudera/crunch/CombineFn.java
@@ -35,7 +35,6 @@ import com.google.common.collect.Sets;
  *
  */
 public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S, T>> {
-  private static final long serialVersionUID = 1L;
   
   public static interface Aggregator<T> extends Serializable {
     /**
@@ -67,7 +66,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
    * instance.
    */
   public static class AggregatorCombineFn<K, V> extends CombineFn<K, V> {
-    private static final long serialVersionUID = 1L;
     
     private final Aggregator<V> aggregator;
     
@@ -87,9 +85,7 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
     }    
   }
   
-  private static abstract class TupleAggregator<T> implements Aggregator<T> {
-    private static final long serialVersionUID = 1L;
-    
+  private static abstract class TupleAggregator<T> implements Aggregator<T> {   
     private final List<Aggregator<Object>> aggregators;
     
     public TupleAggregator(Aggregator<?>...aggregators) {
@@ -118,7 +114,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   }
   
   public static class PairAggregator<V1, V2> extends TupleAggregator<Pair<V1, V2>> {
-    private static final long serialVersionUID = 1L;
     
     public PairAggregator(Aggregator<V1> a1, Aggregator<V2> a2) {
       super(a1, a2);
@@ -136,7 +131,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   }
   
   public static class TripAggregator<A, B, C> extends TupleAggregator<Tuple3<A, B, C>> {
-    private static final long serialVersionUID = 1L;
     
     public TripAggregator(Aggregator<A> a1, Aggregator<B> a2, Aggregator<C> a3) {
       super(a1, a2, a3);
@@ -155,7 +149,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   }
 
   public static class QuadAggregator<A, B, C, D> extends TupleAggregator<Tuple4<A, B, C, D>> {
-    private static final long serialVersionUID = 1L;
     
     public QuadAggregator(Aggregator<A> a1, Aggregator<B> a2, Aggregator<C> a3, Aggregator<D> a4) {
       super(a1, a2, a3, a4);
@@ -174,7 +167,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   }
   
   public static class TupleNAggregator extends TupleAggregator<TupleN> {
-    private static final long serialVersionUID = 1L;
     
     private final int size;
     
@@ -340,9 +332,7 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
     return aggregator(new LastNAggregator<V>(n));
   }
   
-  public static class SumLongs implements Aggregator<Long> {
-    private static final long serialVersionUID = 1L;
-    
+  public static class SumLongs implements Aggregator<Long> {    
     private long sum = 0;
     
     @Override
@@ -365,8 +355,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   };
   
   public static class SumInts implements Aggregator<Integer> {
-    private static final long serialVersionUID = 1L;
-    
     private int sum = 0;
     
     @Override
@@ -388,9 +376,7 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
     public Aggregator<Integer> create() { return new SumInts(); }
   };
   
-  public static class SumFloats implements Aggregator<Float> {
-    private static final long serialVersionUID = 1L;
-    
+  public static class SumFloats implements Aggregator<Float> {    
     private float sum = 0;
     
     @Override
@@ -412,9 +398,7 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
     public Aggregator<Float> create() { return new SumFloats(); }
   };
   
-  public static class SumDoubles implements Aggregator<Double> {
-    private static final long serialVersionUID = 1L;
-    
+  public static class SumDoubles implements Aggregator<Double> {    
     private double sum = 0;
     
     @Override
@@ -436,9 +420,7 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
     public Aggregator<Double> create() { return new SumDoubles(); }
   };
   
-  public static class SumBigInts implements Aggregator<BigInteger> {
-    private static final long serialVersionUID = 1L;
-    
+  public static class SumBigInts implements Aggregator<BigInteger> {    
     private BigInteger sum = BigInteger.ZERO;
     
     @Override
@@ -461,8 +443,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   };
   
   public static class MaxLongs implements Aggregator<Long> {
-    private static final long serialVersionUID = 1L;
-    
     private Long max = null;
     
     @Override
@@ -487,8 +467,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   };
   
   public static class MaxInts implements Aggregator<Integer> {
-    private static final long serialVersionUID = 1L;
-    
     private Integer max = null;
     
     @Override
@@ -513,8 +491,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   };
   
   public static class MaxFloats implements Aggregator<Float> {
-    private static final long serialVersionUID = 1L;
-    
     private Float max = null;
     
     @Override
@@ -539,8 +515,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   };
   
   public static class MaxDoubles implements Aggregator<Double> {
-    private static final long serialVersionUID = 1L;
-    
     private Double max = null;
     
     @Override
@@ -565,8 +539,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   };
   
   public static class MaxBigInts implements Aggregator<BigInteger> {
-    private static final long serialVersionUID = 1L;
-    
     private BigInteger max = null;
     
     @Override
@@ -591,8 +563,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   };
   
   public static class MinLongs implements Aggregator<Long> {
-    private static final long serialVersionUID = 1L;
-    
     private Long min = null;
     
     @Override
@@ -616,9 +586,7 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
     public Aggregator<Long> create() { return new MinLongs(); }
   };
   
-  public static class MinInts implements Aggregator<Integer> {
-    private static final long serialVersionUID = 1L;
-    
+  public static class MinInts implements Aggregator<Integer> {    
     private Integer min = null;
     
     @Override
@@ -643,8 +611,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   };
   
   public static class MinFloats implements Aggregator<Float> {
-    private static final long serialVersionUID = 1L;
-    
     private Float min = null;
     
     @Override
@@ -669,8 +635,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   };
   
   public static class MinDoubles implements Aggregator<Double> {
-    private static final long serialVersionUID = 1L;
-    
     private Double min = null;
     
     @Override
@@ -695,8 +659,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   };
 
   public static class MinBigInts implements Aggregator<BigInteger> {
-    private static final long serialVersionUID = 1L;
-    
     private BigInteger min = null;
     
     @Override
@@ -721,8 +683,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   };
   
   public static class MaxNAggregator<V extends Comparable<V>> implements Aggregator<V> {
-    private static final long serialVersionUID = 1L;
-    
     private final int arity;
     private transient SortedSet<V> elements;
 
@@ -756,8 +716,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   }
   
   public static class MinNAggregator<V extends Comparable<V>> implements Aggregator<V> {
-    private static final long serialVersionUID = 1L;
-    
     private final int arity;
     private transient SortedSet<V> elements;
     
@@ -791,8 +749,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   }
   
   public static class FirstNAggregator<V> implements Aggregator<V> {
-    private static final long serialVersionUID = 1L;
-    
     private final int arity;
     private final List<V> elements;
     
@@ -820,8 +776,6 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
   }
 
   public static class LastNAggregator<V> implements Aggregator<V> {
-    private static final long serialVersionUID = 1L;
-    
     private final int arity;
     private final LinkedList<V> elements;
     
@@ -848,5 +802,4 @@ public abstract class CombineFn<S, T> extends DoFn<Pair<S, Iterable<T>>, Pair<S,
       return ImmutableList.copyOf(elements);
     }
   }
-
 }

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/DoFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/DoFn.java b/src/main/java/com/cloudera/crunch/DoFn.java
index bbd4e8e..b45f6aa 100644
--- a/src/main/java/com/cloudera/crunch/DoFn.java
+++ b/src/main/java/com/cloudera/crunch/DoFn.java
@@ -35,8 +35,6 @@ import com.cloudera.crunch.test.TestCounters;
  *
  */
 public abstract class DoFn<S, T> implements Serializable {
-  private static final long serialVersionUID = 1L;
-  
   private transient TaskInputOutputContext<?, ?, ?, ?> context;
   private transient Configuration testConf;
   private transient String internalStatus;

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/FilterFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/FilterFn.java b/src/main/java/com/cloudera/crunch/FilterFn.java
index fee4879..5fa7d75 100644
--- a/src/main/java/com/cloudera/crunch/FilterFn.java
+++ b/src/main/java/com/cloudera/crunch/FilterFn.java
@@ -25,8 +25,7 @@ import com.google.common.collect.ImmutableList;
  *
  */
 public abstract class FilterFn<T> extends DoFn<T, T> {
-  private static final long serialVersionUID = 1L;
-  
+
   /**
    * If true, emit the given record.
    */
@@ -49,7 +48,6 @@ public abstract class FilterFn<T> extends DoFn<T, T> {
   }
   
   public static class AndFn<S> extends FilterFn<S> {
-    private static final long serialVersionUID = 1L;
     
     private final List<FilterFn<S>> fns;
     
@@ -82,7 +80,6 @@ public abstract class FilterFn<T> extends DoFn<T, T> {
   }
   
   public static class OrFn<S> extends FilterFn<S> {
-    private static final long serialVersionUID = 1L;
     
     private final List<FilterFn<S>> fns;
     
@@ -115,7 +112,6 @@ public abstract class FilterFn<T> extends DoFn<T, T> {
   }
   
   public static class NotFn<S> extends FilterFn<S> {
-    private static final long serialVersionUID = 1L;
     
     private final FilterFn<S> base;
     

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/MapFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/MapFn.java b/src/main/java/com/cloudera/crunch/MapFn.java
index 32ab9e6..8c11fa6 100644
--- a/src/main/java/com/cloudera/crunch/MapFn.java
+++ b/src/main/java/com/cloudera/crunch/MapFn.java
@@ -21,7 +21,6 @@ package com.cloudera.crunch;
  *
  */
 public abstract class MapFn<S, T> extends DoFn<S, T> {
-  private static final long serialVersionUID = 1L;
   
   /**
    * Maps the given input into an instance of the output type.

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/fn/CompositeMapFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/fn/CompositeMapFn.java b/src/main/java/com/cloudera/crunch/fn/CompositeMapFn.java
index d0ba32a..9b4e6cd 100644
--- a/src/main/java/com/cloudera/crunch/fn/CompositeMapFn.java
+++ b/src/main/java/com/cloudera/crunch/fn/CompositeMapFn.java
@@ -20,7 +20,6 @@ import com.cloudera.crunch.Emitter;
 import com.cloudera.crunch.MapFn;
 
 public class CompositeMapFn<R, S, T> extends MapFn<R, T> {
-  private static final long serialVersionUID = 1L;
   
   private final MapFn<R, S> first;
   private final MapFn<S, T> second;

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/fn/ExtractKeyFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/fn/ExtractKeyFn.java b/src/main/java/com/cloudera/crunch/fn/ExtractKeyFn.java
index d3942d2..716d4eb 100644
--- a/src/main/java/com/cloudera/crunch/fn/ExtractKeyFn.java
+++ b/src/main/java/com/cloudera/crunch/fn/ExtractKeyFn.java
@@ -22,7 +22,6 @@ import com.cloudera.crunch.Pair;
  * is used to convert from a {@code PCollection<V>} to a {@code PTable<K, V>}.
  */
 public class ExtractKeyFn<K, V> extends MapFn<V, Pair<K, V>> {
-  private static final long serialVersionUID = 1L;
   
   private final MapFn<V, K> mapFn;
   

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/fn/IdentityFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/fn/IdentityFn.java b/src/main/java/com/cloudera/crunch/fn/IdentityFn.java
index d10e608..fd75215 100644
--- a/src/main/java/com/cloudera/crunch/fn/IdentityFn.java
+++ b/src/main/java/com/cloudera/crunch/fn/IdentityFn.java
@@ -17,7 +17,6 @@ package com.cloudera.crunch.fn;
 import com.cloudera.crunch.MapFn;
 
 public class IdentityFn<T> extends MapFn<T, T> {
-  private static final long serialVersionUID = 1L;
   
   private static final IdentityFn<Object> INSTANCE = new IdentityFn<Object>();
 

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/fn/MapKeysFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/fn/MapKeysFn.java b/src/main/java/com/cloudera/crunch/fn/MapKeysFn.java
index eaf0ed0..26397d4 100644
--- a/src/main/java/com/cloudera/crunch/fn/MapKeysFn.java
+++ b/src/main/java/com/cloudera/crunch/fn/MapKeysFn.java
@@ -19,7 +19,6 @@ import com.cloudera.crunch.Emitter;
 import com.cloudera.crunch.Pair;
 
 public abstract class MapKeysFn<K1, K2, V> extends DoFn<Pair<K1, V>, Pair<K2, V>> {
-  private static final long serialVersionUID = 1L;
   
   @Override
   public void process(Pair<K1, V> input, Emitter<Pair<K2, V>> emitter) {

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/fn/MapValuesFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/fn/MapValuesFn.java b/src/main/java/com/cloudera/crunch/fn/MapValuesFn.java
index df75579..881ba1c 100644
--- a/src/main/java/com/cloudera/crunch/fn/MapValuesFn.java
+++ b/src/main/java/com/cloudera/crunch/fn/MapValuesFn.java
@@ -19,7 +19,6 @@ import com.cloudera.crunch.Emitter;
 import com.cloudera.crunch.Pair;
 
 public abstract class MapValuesFn<K, V1, V2> extends DoFn<Pair<K, V1>, Pair<K, V2>> {
-  private static final long serialVersionUID = 1L;
   
   @Override
   public void process(Pair<K, V1> input, Emitter<Pair<K, V2>> emitter) {

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/fn/PairMapFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/fn/PairMapFn.java b/src/main/java/com/cloudera/crunch/fn/PairMapFn.java
index 93491dc..f0c731f 100644
--- a/src/main/java/com/cloudera/crunch/fn/PairMapFn.java
+++ b/src/main/java/com/cloudera/crunch/fn/PairMapFn.java
@@ -21,7 +21,6 @@ import com.cloudera.crunch.MapFn;
 import com.cloudera.crunch.Pair;
 
 public class PairMapFn<K, V, S, T> extends MapFn<Pair<K, V>, Pair<S, T>> {
-  private static final long serialVersionUID = 1L;
   
   private MapFn<K, S> keys;
   private MapFn<V, T> values;

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/lib/Aggregate.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/lib/Aggregate.java b/src/main/java/com/cloudera/crunch/lib/Aggregate.java
index 411083b..1d8ebc5 100644
--- a/src/main/java/com/cloudera/crunch/lib/Aggregate.java
+++ b/src/main/java/com/cloudera/crunch/lib/Aggregate.java
@@ -46,10 +46,7 @@ public class Aggregate {
    */
   public static <S> PTable<S, Long> count(PCollection<S> collect) {
     PTypeFamily tf = collect.getTypeFamily();
-    return collect.parallelDo("Aggregate.count", new MapFn<S, Pair<S, Long>>() {
-      private static final long serialVersionUID = 1L;
-      
-      @Override
+    return collect.parallelDo("Aggregate.count", new MapFn<S, Pair<S, Long>>() {      
       public Pair<S, Long> map(S input) {
         return Pair.of(input, 1L);
       }
@@ -73,7 +70,6 @@ public class Aggregate {
   }
   
   public static class TopKFn<K, V> extends DoFn<Pair<K, V>, Pair<Integer, Pair<K, V>>> {
-    private static final long serialVersionUID = 1L;
     
     private final int limit;
     private final boolean maximize;
@@ -84,12 +80,10 @@ public class Aggregate {
       this.maximize = ascending;
     }
     
-    @Override
     public void initialize() {
       this.values = new PriorityQueue<Pair<K, V>>(limit, new PairValueComparator<K, V>(maximize));
     }
     
-    @Override
     public void process(Pair<K, V> input, Emitter<Pair<Integer, Pair<K, V>>> emitter) {
       values.add(input);
       if (values.size() > limit) {
@@ -97,7 +91,6 @@ public class Aggregate {
       }
     }
     
-    @Override
     public void cleanup(Emitter<Pair<Integer, Pair<K, V>>> emitter) {
       for (Pair<K, V> p : values) {
         emitter.emit(Pair.of(0, p));
@@ -106,7 +99,6 @@ public class Aggregate {
   }
   
   public static class TopKCombineFn<K, V> extends CombineFn<Integer, Pair<K, V>> {
-    private static final long serialVersionUID = 1L;
     
     private final int limit;
     private final boolean maximize;
@@ -145,8 +137,6 @@ public class Aggregate {
         .groupByKey(1)
         .combineValues(new TopKCombineFn<K, V>(limit, maximize))
         .parallelDo("top" + limit + "reduce", new DoFn<Pair<Integer, Pair<K, V>>, Pair<K, V>>() {
-          private static final long serialVersionUID = 1L;
-          @Override
           public void process(Pair<Integer, Pair<K, V>> input,
               Emitter<Pair<K, V>> emitter) {
             emitter.emit(input.second()); 
@@ -166,18 +156,14 @@ public class Aggregate {
     PTypeFamily tf = collect.getTypeFamily();
     return PTables.values(
         collect.parallelDo("max", new DoFn<S, Pair<Boolean, S>>() {
-          private static final long serialVersionUID = 1L;
-          
           private transient S max = null;
           
-          @Override
           public void process(S input, Emitter<Pair<Boolean, S>> emitter) {
             if (max == null || ((Comparable<S>) max).compareTo(input) < 0) {
               max = input;
             }
           }
           
-          @Override
           public void cleanup(Emitter<Pair<Boolean, S>> emitter) {
             if (max != null) {
               emitter.emit(Pair.of(true, max));
@@ -185,9 +171,6 @@ public class Aggregate {
           }
         }, tf.tableOf(tf.booleans(), collect.getPType()))
         .groupByKey(1).combineValues(new CombineFn<Boolean, S>() {
-          private static final long serialVersionUID = 1L;
-          
-          @Override
           public void process(Pair<Boolean, Iterable<S>> input,
               Emitter<Pair<Boolean, S>> emitter) {
             S max = null;
@@ -204,25 +187,22 @@ public class Aggregate {
    * Returns the smallest numerical element from the input collection.
    */
   public static <S> PCollection<S> min(PCollection<S> collect) {
-	Class<S> clazz = collect.getPType().getTypeClass();
-	if (!clazz.isPrimitive() && !Comparable.class.isAssignableFrom(clazz)) {
-	  throw new IllegalArgumentException(
-	      "Can only get min for Comparable elements, not for: " + collect.getPType().getTypeClass());
-	}
+    Class<S> clazz = collect.getPType().getTypeClass();
+    if (!clazz.isPrimitive() && !Comparable.class.isAssignableFrom(clazz)) {
+      throw new IllegalArgumentException(
+          "Can only get min for Comparable elements, not for: " + collect.getPType().getTypeClass());
+    }
     PTypeFamily tf = collect.getTypeFamily();
     return PTables.values(
         collect.parallelDo("min", new DoFn<S, Pair<Boolean, S>>() {
-          private static final long serialVersionUID = 1L;
           private transient S min = null;
-          
-          @Override
+
           public void process(S input, Emitter<Pair<Boolean, S>> emitter) {
             if (min == null || ((Comparable<S>) min).compareTo(input) > 0) {
               min = input;
             }
           }
-          
-          @Override
+
           public void cleanup(Emitter<Pair<Boolean, S>> emitter) {
             if (min != null) {
               emitter.emit(Pair.of(false, min));
@@ -230,8 +210,6 @@ public class Aggregate {
           }
         }, tf.tableOf(tf.booleans(), collect.getPType()))
         .groupByKey().combineValues(new CombineFn<Boolean, S>() {
-          private static final long serialVersionUID = 1L;
-          @Override
           public void process(Pair<Boolean, Iterable<S>> input,
               Emitter<Pair<Boolean, S>> emitter) {
             S min = null;
@@ -247,8 +225,6 @@ public class Aggregate {
   public static <K, V> PTable<K, Collection<V>> collectValues(PTable<K, V> collect) {
     PTypeFamily tf = collect.getTypeFamily();
     return collect.groupByKey().parallelDo("collect", new MapValuesFn<K, Iterable<V>, Collection<V>>() {
-      private static final long serialVersionUID = 1L;
-      @Override
       public Collection<V> map(Iterable<V> v) {
         return Lists.newArrayList(v);
       }

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/lib/Cogroup.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/lib/Cogroup.java b/src/main/java/com/cloudera/crunch/lib/Cogroup.java
index f8b02ed..b3cc81b 100644
--- a/src/main/java/com/cloudera/crunch/lib/Cogroup.java
+++ b/src/main/java/com/cloudera/crunch/lib/Cogroup.java
@@ -54,8 +54,6 @@ public class Cogroup {
   }
 
   private static class CogroupFn1<K, V, U> extends MapValuesFn<K, V, Pair<V, U>> {
-    private static final long serialVersionUID = 1L;
-
     @Override
     public Pair<V, U> map(V v) {
       return Pair.of(v, null);
@@ -63,8 +61,6 @@ public class Cogroup {
   }
 
   private static class CogroupFn2<K, V, U> extends MapValuesFn<K, U, Pair<V, U>> {
-    private static final long serialVersionUID = 1L;
-    
     @Override
     public Pair<V, U> map(U u) {
       return Pair.of(null, u);
@@ -73,8 +69,6 @@ public class Cogroup {
 
   private static class PostGroupFn<K, V, U> extends
       DoFn<Pair<K, Iterable<Pair<V, U>>>, Pair<K, Pair<Collection<V>, Collection<U>>>> {
-    private static final long serialVersionUID = 1L;
-    
     @Override
     public void process(Pair<K, Iterable<Pair<V, U>>> input,
         Emitter<Pair<K, Pair<Collection<V>, Collection<U>>>> emitter) {

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/lib/Join.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/lib/Join.java b/src/main/java/com/cloudera/crunch/lib/Join.java
index c47ac8d..ca68aec 100644
--- a/src/main/java/com/cloudera/crunch/lib/Join.java
+++ b/src/main/java/com/cloudera/crunch/lib/Join.java
@@ -127,7 +127,6 @@ public class Join {
 
     PTable<Pair<K, Integer>, Pair<U, V>> tag1 = left.parallelDo("joinTagLeft",
         new MapFn<Pair<K, U>, Pair<Pair<K, Integer>, Pair<U, V>>>() {
-      private static final long serialVersionUID = 1L;
       @Override
       public Pair<Pair<K, Integer>, Pair<U, V>> map(Pair<K, U> input) {
         return Pair.of(Pair.of(input.first(), 0), Pair.of(input.second(), (V) null));
@@ -135,7 +134,6 @@ public class Join {
     }, ptt);
     PTable<Pair<K, Integer>, Pair<U, V>> tag2 = right.parallelDo("joinTagRight",
         new MapFn<Pair<K, V>, Pair<Pair<K, Integer>, Pair<U, V>>>() {
-      private static final long serialVersionUID = 1L;
       @Override
       public Pair<Pair<K, Integer>, Pair<U, V>> map(Pair<K, V> input) {
         return Pair.of(Pair.of(input.first(), 1), Pair.of((U) null, input.second()));

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/lib/PTables.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/lib/PTables.java b/src/main/java/com/cloudera/crunch/lib/PTables.java
index 0e86a0b..0c0f246 100644
--- a/src/main/java/com/cloudera/crunch/lib/PTables.java
+++ b/src/main/java/com/cloudera/crunch/lib/PTables.java
@@ -28,7 +28,6 @@ public class PTables {
 
   public static <K, V> PCollection<K> keys(PTable<K, V> ptable) {
     return ptable.parallelDo("PTables.keys", new DoFn<Pair<K, V>, K>() {
-      private static final long serialVersionUID = 1L;
       @Override
       public void process(Pair<K, V> input, Emitter<K> emitter) {
         emitter.emit(input.first());
@@ -38,7 +37,6 @@ public class PTables {
   
   public static <K, V> PCollection<V> values(PTable<K, V> ptable) {
     return ptable.parallelDo("PTables.values", new DoFn<Pair<K, V>, V>() {
-      private static final long serialVersionUID = 1L;
       @Override
       public void process(Pair<K, V> input, Emitter<V> emitter) {
         emitter.emit(input.second());

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/lib/Sample.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/lib/Sample.java b/src/main/java/com/cloudera/crunch/lib/Sample.java
index faa958f..ba30be6 100644
--- a/src/main/java/com/cloudera/crunch/lib/Sample.java
+++ b/src/main/java/com/cloudera/crunch/lib/Sample.java
@@ -24,29 +24,28 @@ import com.google.common.base.Preconditions;
 public class Sample {
 
   public static class SamplerFn<S> extends DoFn<S, S> {
-    private static final long serialVersionUID = 1L;
-    
-	private final long seed;
-	private final double acceptanceProbability;
-	private transient Random r;
-	
-	public SamplerFn(long seed, double acceptanceProbability) {
-	  Preconditions.checkArgument(0.0 < acceptanceProbability && acceptanceProbability < 1.0);
-	  this.seed = seed;
-	  this.acceptanceProbability = acceptanceProbability;
-	}
-	
-	@Override
-	public void initialize() {
-	  r = new Random(seed);
-	}
-	
-	@Override
-	public void process(S input, Emitter<S> emitter) {
-	  if (r.nextDouble() < acceptanceProbability) {
-		emitter.emit(input);
-	  }
-	}
+
+    private final long seed;
+    private final double acceptanceProbability;
+    private transient Random r;
+
+    public SamplerFn(long seed, double acceptanceProbability) {
+      Preconditions.checkArgument(0.0 < acceptanceProbability && acceptanceProbability < 1.0);
+      this.seed = seed;
+      this.acceptanceProbability = acceptanceProbability;
+    }
+
+    @Override
+    public void initialize() {
+      r = new Random(seed);
+    }
+
+    @Override
+    public void process(S input, Emitter<S> emitter) {
+      if (r.nextDouble() < acceptanceProbability) {
+        emitter.emit(input);
+      }
+    }
   }
   
   public static <S> PCollection<S> sample(PCollection<S> input, double probability) {

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/lib/Set.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/lib/Set.java b/src/main/java/com/cloudera/crunch/lib/Set.java
index f152d86..95bb34c 100644
--- a/src/main/java/com/cloudera/crunch/lib/Set.java
+++ b/src/main/java/com/cloudera/crunch/lib/Set.java
@@ -41,7 +41,6 @@ public class Set {
       PCollection<T> coll2) {
     return Cogroup.cogroup(toTable(coll1), toTable(coll2))
         .parallelDo(new DoFn<Pair<T, Pair<Collection<Boolean>, Collection<Boolean>>>, T>() {
-          private static final long serialVersionUID = 1L;
           @Override
           public void process(Pair<T, Pair<Collection<Boolean>, Collection<Boolean>>> input,
               Emitter<T> emitter) {
@@ -63,7 +62,6 @@ public class Set {
       PCollection<T> coll2) {
     return Cogroup.cogroup(toTable(coll1), toTable(coll2))
         .parallelDo(new DoFn<Pair<T, Pair<Collection<Boolean>, Collection<Boolean>>>, T>() {
-          private static final long serialVersionUID = 1L;
           @Override
           public void process(Pair<T, Pair<Collection<Boolean>, Collection<Boolean>>> input,
               Emitter<T> emitter) {
@@ -96,7 +94,6 @@ public class Set {
     return Cogroup.cogroup(toTable(coll1), toTable(coll2))
         .parallelDo(new DoFn<Pair<T, Pair<Collection<Boolean>, Collection<Boolean>>>,
             Tuple3<T, T, T>>() {
-          private static final long serialVersionUID = 1L;
           @Override
           public void process(Pair<T, Pair<Collection<Boolean>, Collection<Boolean>>> input,
               Emitter<Tuple3<T, T, T>> emitter) {
@@ -115,7 +112,6 @@ public class Set {
   private static <T> PTable<T, Boolean> toTable(PCollection<T> coll) {
     PTypeFamily typeFamily = coll.getTypeFamily();
     return coll.parallelDo(new DoFn<T, Pair<T, Boolean>>() {
-      private static final long serialVersionUID = 1L;
       @Override
       public void process(T input, Emitter<Pair<T, Boolean>> emitter) {
         emitter.emit(Pair.of(input, Boolean.TRUE));

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/lib/Sort.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/lib/Sort.java b/src/main/java/com/cloudera/crunch/lib/Sort.java
index 760d37e..0c8632d 100644
--- a/src/main/java/com/cloudera/crunch/lib/Sort.java
+++ b/src/main/java/com/cloudera/crunch/lib/Sort.java
@@ -111,7 +111,6 @@ public class Sort {
         collection.getPType(), order);
     PTable<T, Void> pt =
       collection.parallelDo("sort-pre", new DoFn<T, Pair<T, Void>>() {
-        private static final long serialVersionUID = 1L;
         @Override
         public void process(T input,
             Emitter<Pair<T, Void>> emitter) {
@@ -120,7 +119,6 @@ public class Sort {
       }, type);
     PTable<T, Void> sortedPt = pt.groupByKey(options).ungroup();
     return sortedPt.parallelDo("sort-post", new DoFn<Pair<T, Void>, T>() {
-      private static final long serialVersionUID = 1L;
       @Override
       public void process(Pair<T, Void> input, Emitter<T> emitter) {
         emitter.emit(input.first());
@@ -168,7 +166,6 @@ public class Sort {
         tf.nulls());
     PTable<Pair<U, V>, Void> pt =
       collection.parallelDo(new DoFn<Pair<U, V>, Pair<Pair<U, V>, Void>>() {
-        private static final long serialVersionUID = 1L;
         @Override
         public void process(Pair<U, V> input,
             Emitter<Pair<Pair<U, V>, Void>> emitter) {
@@ -179,7 +176,6 @@ public class Sort {
     GroupingOptions options = buildGroupingOptions(conf, tf, pType, columnOrders);
     PTable<Pair<U, V>, Void> sortedPt = pt.groupByKey(options).ungroup();
     return sortedPt.parallelDo(new DoFn<Pair<Pair<U, V>,Void>, Pair<U, V>>() {
-      private static final long serialVersionUID = 1L;
       @Override
       public void process(Pair<Pair<U, V>, Void> input,
           Emitter<Pair<U, V>> emitter) {
@@ -204,7 +200,6 @@ public class Sort {
         tf.nulls());
     PTable<Tuple3<V1, V2, V3>, Void> pt =
       collection.parallelDo(new DoFn<Tuple3<V1, V2, V3>, Pair<Tuple3<V1, V2, V3>, Void>>() {
-        private static final long serialVersionUID = 1L;
         @Override
         public void process(Tuple3<V1, V2, V3> input,
             Emitter<Pair<Tuple3<V1, V2, V3>, Void>> emitter) {
@@ -215,7 +210,6 @@ public class Sort {
     GroupingOptions options = buildGroupingOptions(conf, tf, pType, columnOrders);
     PTable<Tuple3<V1, V2, V3>, Void> sortedPt = pt.groupByKey(options).ungroup();
     return sortedPt.parallelDo(new DoFn<Pair<Tuple3<V1, V2, V3>,Void>, Tuple3<V1, V2, V3>>() {
-      private static final long serialVersionUID = 1L;
       @Override
       public void process(Pair<Tuple3<V1, V2, V3>, Void> input,
           Emitter<Tuple3<V1, V2, V3>> emitter) {
@@ -240,7 +234,6 @@ public class Sort {
         tf.nulls());
     PTable<Tuple4<V1, V2, V3, V4>, Void> pt =
       collection.parallelDo(new DoFn<Tuple4<V1, V2, V3, V4>, Pair<Tuple4<V1, V2, V3, V4>, Void>>() {
-        private static final long serialVersionUID = 1L;
         @Override
         public void process(Tuple4<V1, V2, V3, V4> input,
             Emitter<Pair<Tuple4<V1, V2, V3, V4>, Void>> emitter) {
@@ -251,7 +244,6 @@ public class Sort {
     GroupingOptions options = buildGroupingOptions(conf, tf, pType, columnOrders);
     PTable<Tuple4<V1, V2, V3, V4>, Void> sortedPt = pt.groupByKey(options).ungroup();
     return sortedPt.parallelDo(new DoFn<Pair<Tuple4<V1, V2, V3, V4>,Void>, Tuple4<V1, V2, V3, V4>>() {
-      private static final long serialVersionUID = 1L;
       @Override
       public void process(Pair<Tuple4<V1, V2, V3, V4>, Void> input,
           Emitter<Tuple4<V1, V2, V3, V4>> emitter) {
@@ -275,7 +267,6 @@ public class Sort {
         tf.nulls());
     PTable<TupleN, Void> pt =
       collection.parallelDo(new DoFn<TupleN, Pair<TupleN, Void>>() {
-        private static final long serialVersionUID = 1L;
         @Override
         public void process(TupleN input,
             Emitter<Pair<TupleN, Void>> emitter) {
@@ -286,7 +277,6 @@ public class Sort {
     GroupingOptions options = buildGroupingOptions(conf, tf, pType, columnOrders);
     PTable<TupleN, Void> sortedPt = pt.groupByKey(options).ungroup();
     return sortedPt.parallelDo(new DoFn<Pair<TupleN,Void>, TupleN>() {
-      private static final long serialVersionUID = 1L;
       @Override
       public void process(Pair<TupleN, Void> input,
           Emitter<TupleN> emitter) {

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/lib/join/FullOuterJoinFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/lib/join/FullOuterJoinFn.java b/src/main/java/com/cloudera/crunch/lib/join/FullOuterJoinFn.java
index a6874a0..80728a7 100644
--- a/src/main/java/com/cloudera/crunch/lib/join/FullOuterJoinFn.java
+++ b/src/main/java/com/cloudera/crunch/lib/join/FullOuterJoinFn.java
@@ -28,7 +28,6 @@ import com.google.common.collect.Lists;
  * @param <V> Type of the second {@link com.cloudera.crunch.PTable}'s values
  */
 public class FullOuterJoinFn<K, U, V> extends JoinFn<K, U, V> {
-  private static final long serialVersionUID = 1L;
   
   private transient int lastId;
   private transient K lastKey;

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/lib/join/InnerJoinFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/lib/join/InnerJoinFn.java b/src/main/java/com/cloudera/crunch/lib/join/InnerJoinFn.java
index 91ab455..e5013e5 100644
--- a/src/main/java/com/cloudera/crunch/lib/join/InnerJoinFn.java
+++ b/src/main/java/com/cloudera/crunch/lib/join/InnerJoinFn.java
@@ -28,7 +28,6 @@ import com.google.common.collect.Lists;
  * @param <V> Type of the second {@link com.cloudera.crunch.PTable}'s values
  */
 public class InnerJoinFn<K, U, V> extends JoinFn<K, U, V> {
-  private static final long serialVersionUID = 1L;
   
   private transient K lastKey;
   private transient List<U> LeftValues;

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/lib/join/JoinFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/lib/join/JoinFn.java b/src/main/java/com/cloudera/crunch/lib/join/JoinFn.java
index b60a12c..ee3d293 100644
--- a/src/main/java/com/cloudera/crunch/lib/join/JoinFn.java
+++ b/src/main/java/com/cloudera/crunch/lib/join/JoinFn.java
@@ -27,7 +27,6 @@ import com.cloudera.crunch.Pair;
  */
 public abstract class JoinFn<K, U, V>
     extends DoFn<Pair<Pair<K, Integer>, Iterable<Pair<U, V>>>, Pair<K, Pair<U, V>>> {
-  private static final long serialVersionUID = 1L;
   
   /** @return The name of this join type (e.g. innerJoin, leftOuterJoin). */
   public abstract String getJoinType();

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/lib/join/LeftOuterJoinFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/lib/join/LeftOuterJoinFn.java b/src/main/java/com/cloudera/crunch/lib/join/LeftOuterJoinFn.java
index a2c576b..9927964 100644
--- a/src/main/java/com/cloudera/crunch/lib/join/LeftOuterJoinFn.java
+++ b/src/main/java/com/cloudera/crunch/lib/join/LeftOuterJoinFn.java
@@ -28,7 +28,6 @@ import com.google.common.collect.Lists;
  * @param <V> Type of the second {@link com.cloudera.crunch.PTable}'s values
  */
 public class LeftOuterJoinFn<K, U, V> extends JoinFn<K, U, V> {
-  private static final long serialVersionUID = 1L;
   
   private transient int lastId;
   private transient K lastKey;

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/lib/join/RightOuterJoinFn.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/lib/join/RightOuterJoinFn.java b/src/main/java/com/cloudera/crunch/lib/join/RightOuterJoinFn.java
index 55f1a3c..99c046f 100644
--- a/src/main/java/com/cloudera/crunch/lib/join/RightOuterJoinFn.java
+++ b/src/main/java/com/cloudera/crunch/lib/join/RightOuterJoinFn.java
@@ -28,7 +28,6 @@ import com.google.common.collect.Lists;
  * @param <V> Type of the second {@link com.cloudera.crunch.PTable}'s values
  */
 public class RightOuterJoinFn<K, U, V> extends JoinFn<K, U, V> {
-  private static final long serialVersionUID = 1L;
   
   private transient K lastKey;
   private transient List<U> leftValues;

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/types/PGroupedTableType.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/types/PGroupedTableType.java b/src/main/java/com/cloudera/crunch/types/PGroupedTableType.java
index b6ab4fa..be90e49 100644
--- a/src/main/java/com/cloudera/crunch/types/PGroupedTableType.java
+++ b/src/main/java/com/cloudera/crunch/types/PGroupedTableType.java
@@ -64,9 +64,7 @@ public abstract class PGroupedTableType<K, V> implements PType<Pair<K, Iterable<
   }
 
   public static class PairIterableMapFn<K, V> extends
-      MapFn<Pair<Object, Iterable<Object>>, Pair<K, Iterable<V>>> {
-    private static final long serialVersionUID = 1L;
-    
+      MapFn<Pair<Object, Iterable<Object>>, Pair<K, Iterable<V>>> {    
     private final MapFn<Object, K> keys;
     private final MapFn<Object, V> values;
 

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/types/TupleFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/types/TupleFactory.java b/src/main/java/com/cloudera/crunch/types/TupleFactory.java
index 5d967cc..c34e677 100644
--- a/src/main/java/com/cloudera/crunch/types/TupleFactory.java
+++ b/src/main/java/com/cloudera/crunch/types/TupleFactory.java
@@ -25,8 +25,7 @@ import com.cloudera.crunch.TupleN;
 import com.cloudera.crunch.impl.mr.run.CrunchRuntimeException;
 
 public abstract class TupleFactory<T extends Tuple> implements Serializable {
-  private static final long serialVersionUID = 1L;
-  
+
   public void initialize() { }
   
   public abstract T makeTuple(Object...values);

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/types/avro/AvroKeyConverter.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/types/avro/AvroKeyConverter.java b/src/main/java/com/cloudera/crunch/types/avro/AvroKeyConverter.java
index af2c968..3894b8c 100644
--- a/src/main/java/com/cloudera/crunch/types/avro/AvroKeyConverter.java
+++ b/src/main/java/com/cloudera/crunch/types/avro/AvroKeyConverter.java
@@ -20,7 +20,6 @@ import org.apache.hadoop.io.NullWritable;
 import com.cloudera.crunch.types.Converter;
 
 public class AvroKeyConverter<K> implements Converter<AvroWrapper<K>, NullWritable, K, Iterable<K>> {
-  private static final long serialVersionUID = 1L;
   
   private transient AvroWrapper<K> wrapper = null;
   

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/types/avro/AvroPairConverter.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/types/avro/AvroPairConverter.java b/src/main/java/com/cloudera/crunch/types/avro/AvroPairConverter.java
index 6e8af5c..b4ff01b 100644
--- a/src/main/java/com/cloudera/crunch/types/avro/AvroPairConverter.java
+++ b/src/main/java/com/cloudera/crunch/types/avro/AvroPairConverter.java
@@ -23,7 +23,6 @@ import com.cloudera.crunch.Pair;
 import com.cloudera.crunch.types.Converter;
 
 public class AvroPairConverter<K, V> implements Converter<AvroKey<K>, AvroValue<V>, Pair<K, V>, Pair<K, Iterable<V>>> {
-  private static final long serialVersionUID = 1L;
   
   private transient AvroKey<K> keyWrapper = null;
   private transient AvroValue<V> valueWrapper = null;

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/types/avro/Avros.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/types/avro/Avros.java b/src/main/java/com/cloudera/crunch/types/avro/Avros.java
index bb78e31..d084e3b 100644
--- a/src/main/java/com/cloudera/crunch/types/avro/Avros.java
+++ b/src/main/java/com/cloudera/crunch/types/avro/Avros.java
@@ -80,7 +80,6 @@ public class Avros {
   }
   
   public static MapFn<CharSequence, String> UTF8_TO_STRING = new MapFn<CharSequence, String>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public String map(CharSequence input) {
       return input.toString();
@@ -88,7 +87,6 @@ public class Avros {
   };
   
   public static MapFn<String, Utf8> STRING_TO_UTF8 = new MapFn<String, Utf8>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public Utf8 map(String input) {
       return new Utf8(input);
@@ -96,14 +94,13 @@ public class Avros {
   };
 
   public static MapFn<Object, ByteBuffer> BYTES_IN = new MapFn<Object, ByteBuffer>() {
-    private static final long serialVersionUID = 1L;
-	@Override
-	public ByteBuffer map(Object input) {
-	  if (input instanceof ByteBuffer) {
-		return (ByteBuffer) input;
-	  }
-	  return ByteBuffer.wrap((byte[]) input);
-	}
+    @Override
+    public ByteBuffer map(Object input) {
+      if (input instanceof ByteBuffer) {
+        return (ByteBuffer) input;
+      }
+      return ByteBuffer.wrap((byte[]) input);
+    }
   };
 
   private static final AvroType<String> strings = new AvroType<String>(
@@ -181,7 +178,7 @@ public class Avros {
   }
 
   public static final AvroType<GenericData.Record> generics(Schema schema) {
-	return new AvroType<GenericData.Record>(GenericData.Record.class, schema);
+    return new AvroType<GenericData.Record>(GenericData.Record.class, schema);
   }
   
   public static final <T> AvroType<T> containers(Class<T> clazz) {
@@ -189,11 +186,10 @@ public class Avros {
   }
   
   public static final <T> AvroType<T> reflects(Class<T> clazz) {
-	return new AvroType<T>(clazz, REFLECT_DATA_FACTORY.getReflectData().getSchema(clazz));
+    return new AvroType<T>(clazz, REFLECT_DATA_FACTORY.getReflectData().getSchema(clazz));
   }
   
   private static class BytesToWritableMapFn<T extends Writable> extends MapFn<ByteBuffer, T> {
-    private static final long serialVersionUID = 1L;
     private static final Log LOG = LogFactory.getLog(BytesToWritableMapFn.class);
     
     private final Class<T> writableClazz;
@@ -216,7 +212,6 @@ public class Avros {
   }
   
   private static class WritableToBytesMapFn<T extends Writable> extends MapFn<T, ByteBuffer> {
-    private static final long serialVersionUID = 1L;
     private static final Log LOG = LogFactory.getLog(WritableToBytesMapFn.class);
     
     @Override
@@ -238,7 +233,6 @@ public class Avros {
   }
   
   private static class GenericDataArrayToCollection<T> extends MapFn<Object, Collection<T>> {
-    private static final long serialVersionUID = 1L;
 
     private final MapFn<Object,T> mapFn;
     
@@ -280,7 +274,6 @@ public class Avros {
   }
   
   private static class CollectionToGenericDataArray extends MapFn<Collection<?>, GenericData.Array<?>> {
-    private static final long serialVersionUID = 1L;
     
     private final MapFn mapFn;
     private final String jsonSchema;
@@ -328,13 +321,12 @@ public class Avros {
   }
 
   private static class AvroMapToMap<T> extends MapFn<Map<CharSequence, Object>, Map<String, T>> {
-    private static final long serialVersionUID = 1L;
-	private final MapFn<Object, T> mapFn;
-	
-	public AvroMapToMap(MapFn<Object, T> mapFn) {
-	  this.mapFn = mapFn;
-	}
-	
+    private final MapFn<Object, T> mapFn;
+
+    public AvroMapToMap(MapFn<Object, T> mapFn) {
+      this.mapFn = mapFn;
+    }
+
     @Override
     public void configure(Configuration conf) {
       mapFn.configure(conf);
@@ -345,29 +337,28 @@ public class Avros {
       mapFn.setConfigurationForTest(conf);
     }
 
-	@Override
-	public void initialize() {
-	  this.mapFn.setContext(getContext());
-	}
-	
-	@Override
-	public Map<String, T> map(Map<CharSequence, Object> input) {
-	  Map<String, T> out = Maps.newHashMap();
-	  for (Map.Entry<CharSequence, Object> e : input.entrySet()) {
-		out.put(e.getKey().toString(), mapFn.map(e.getValue()));
-	  }
-	  return out;
-	}
+    @Override
+    public void initialize() {
+      this.mapFn.setContext(getContext());
+    }
+
+    @Override
+    public Map<String, T> map(Map<CharSequence, Object> input) {
+      Map<String, T> out = Maps.newHashMap();
+      for (Map.Entry<CharSequence, Object> e : input.entrySet()) {
+        out.put(e.getKey().toString(), mapFn.map(e.getValue()));
+      }
+      return out;
+    }
   }
-  
+
   private static class MapToAvroMap<T> extends MapFn<Map<String, T>, Map<Utf8, Object>> {
-    private static final long serialVersionUID = 1L;
-	private final MapFn<T, Object> mapFn;
-	
-	public MapToAvroMap(MapFn<T, Object> mapFn) {
-	  this.mapFn = mapFn;
-	}
-	
+    private final MapFn<T, Object> mapFn;
+
+    public MapToAvroMap(MapFn<T, Object> mapFn) {
+      this.mapFn = mapFn;
+    }
+
     @Override
     public void configure(Configuration conf) {
       mapFn.configure(conf);
@@ -378,31 +369,30 @@ public class Avros {
       mapFn.setConfigurationForTest(conf);
     }
 
-	@Override
-	public void initialize() {
-	  this.mapFn.setContext(getContext());
-	}
-	
-	@Override
-	public Map<Utf8, Object> map(Map<String, T> input) {
-	  Map<Utf8, Object> out = Maps.newHashMap();
-	  for (Map.Entry<String, T> e : input.entrySet()) {
-		out.put(new Utf8(e.getKey()), mapFn.map(e.getValue()));
-	  }
-	  return out;
-	}
+    @Override
+    public void initialize() {
+      this.mapFn.setContext(getContext());
+    }
+
+    @Override
+    public Map<Utf8, Object> map(Map<String, T> input) {
+      Map<Utf8, Object> out = Maps.newHashMap();
+      for (Map.Entry<String, T> e : input.entrySet()) {
+        out.put(new Utf8(e.getKey()), mapFn.map(e.getValue()));
+      }
+      return out;
+    }
   }
-  
+
   public static final <T> AvroType<Map<String, T>> maps(PType<T> ptype) {
-	AvroType<T> avroType = (AvroType<T>) ptype;
-	Schema mapSchema = Schema.createMap(allowNulls(avroType.getSchema()));
-	AvroMapToMap<T> inputFn = new AvroMapToMap<T>(avroType.getInputMapFn());
-	MapToAvroMap<T> outputFn = new MapToAvroMap<T>(avroType.getOutputMapFn());
-	return new AvroType(Map.class, mapSchema, inputFn, outputFn, ptype);
+    AvroType<T> avroType = (AvroType<T>) ptype;
+    Schema mapSchema = Schema.createMap(allowNulls(avroType.getSchema()));
+    AvroMapToMap<T> inputFn = new AvroMapToMap<T>(avroType.getInputMapFn());
+    MapToAvroMap<T> outputFn = new MapToAvroMap<T>(avroType.getOutputMapFn());
+    return new AvroType(Map.class, mapSchema, inputFn, outputFn, ptype);
   }
   
   private static class GenericRecordToTuple extends MapFn<GenericRecord, Tuple> {
-    private static final long serialVersionUID = 1L;
     private final TupleFactory<?> tupleFactory;
     private final List<MapFn> fns;
     
@@ -455,7 +445,6 @@ public class Avros {
   }
   
   private static class TupleToGenericRecord extends MapFn<Tuple, GenericRecord> {
-    private static final long serialVersionUID = 1L;
     private final List<MapFn> fns;
     private final String jsonSchema;
     
@@ -551,8 +540,8 @@ public class Avros {
   }
   
   private static Schema createTupleSchema(PType<?>... ptypes) {
-	// Guarantee each tuple schema has a globally unique name
-	String tupleName = "tuple" + UUID.randomUUID().toString().replace('-', 'x');
+    // Guarantee each tuple schema has a globally unique name
+    String tupleName = "tuple" + UUID.randomUUID().toString().replace('-', 'x');
     Schema schema = Schema.createRecord(tupleName, "", "crunch", false);
     List<Schema.Field> fields = Lists.newArrayList();
     for (int i = 0; i < ptypes.length; i++) {

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/types/writable/TextMapWritable.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/types/writable/TextMapWritable.java b/src/main/java/com/cloudera/crunch/types/writable/TextMapWritable.java
index cf24a01..d34728e 100644
--- a/src/main/java/com/cloudera/crunch/types/writable/TextMapWritable.java
+++ b/src/main/java/com/cloudera/crunch/types/writable/TextMapWritable.java
@@ -31,56 +31,56 @@ public class TextMapWritable<T extends Writable> implements Writable {
 
   private Class<T> valueClazz;
   private final Map<Text, T> instance;
-  
+
   public TextMapWritable() {
-	this.instance = Maps.newHashMap();
+    this.instance = Maps.newHashMap();
   }
-  
+
   public TextMapWritable(Class<T> valueClazz) {
-	this.valueClazz = valueClazz;
-	this.instance = Maps.newHashMap();
+    this.valueClazz = valueClazz;
+    this.instance = Maps.newHashMap();
   }
-  
+
   public void put(Text txt, T value) {
-	instance.put(txt, value);
+    instance.put(txt, value);
   }
-  
+
   public Set<Map.Entry<Text, T>> entrySet() {
-	return instance.entrySet();
+    return instance.entrySet();
   }
-  
+
   @Override
   public void readFields(DataInput in) throws IOException {
-	instance.clear();
-	try {
-	  this.valueClazz = (Class<T>) Class.forName(Text.readString(in));
-	} catch (ClassNotFoundException e) {
-	  throw (IOException) new IOException("Failed map init").initCause(e);
-	}
-	int entries = WritableUtils.readVInt(in);
-	try {
-	  for (int i = 0; i < entries; i++) {
-	    Text txt = new Text();
-	    txt.readFields(in);
-		T value = valueClazz.newInstance();
-  	    value.readFields(in);
-	    instance.put(txt, value);
-	  }
-	} catch (IllegalAccessException e) {
-	  throw (IOException) new IOException("Failed map init").initCause(e);
-	} catch (InstantiationException e) {
+    instance.clear();
+    try {
+      this.valueClazz = (Class<T>) Class.forName(Text.readString(in));
+    } catch (ClassNotFoundException e) {
+      throw (IOException) new IOException("Failed map init").initCause(e);
+    }
+    int entries = WritableUtils.readVInt(in);
+    try {
+      for (int i = 0; i < entries; i++) {
+        Text txt = new Text();
+        txt.readFields(in);
+        T value = valueClazz.newInstance();
+        value.readFields(in);
+        instance.put(txt, value);
+      }
+    } catch (IllegalAccessException e) {
+      throw (IOException) new IOException("Failed map init").initCause(e);
+    } catch (InstantiationException e) {
       throw (IOException) new IOException("Failed map init").initCause(e);
     }
   }
 
   @Override
   public void write(DataOutput out) throws IOException {
-	Text.writeString(out, valueClazz.getName());
-	WritableUtils.writeVInt(out, instance.size());
-	for (Map.Entry<Text, T> e : instance.entrySet()) {
-	  e.getKey().write(out);
-	  e.getValue().write(out);
-	}
+    Text.writeString(out, valueClazz.getName());
+    WritableUtils.writeVInt(out, instance.size());
+    for (Map.Entry<Text, T> e : instance.entrySet()) {
+      e.getKey().write(out);
+      e.getValue().write(out);
+    }
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/types/writable/WritablePairConverter.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/types/writable/WritablePairConverter.java b/src/main/java/com/cloudera/crunch/types/writable/WritablePairConverter.java
index 1f66adf..0ff73d8 100644
--- a/src/main/java/com/cloudera/crunch/types/writable/WritablePairConverter.java
+++ b/src/main/java/com/cloudera/crunch/types/writable/WritablePairConverter.java
@@ -18,7 +18,6 @@ import com.cloudera.crunch.Pair;
 import com.cloudera.crunch.types.Converter;
 
 public class WritablePairConverter<K, V> implements Converter<K, V, Pair<K, V>, Pair<K, Iterable<V>>> {
-  private static final long serialVersionUID = 1L;
   
   private final Class<K> keyClass;
   private final Class<V> valueClass;

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/types/writable/WritableValueConverter.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/types/writable/WritableValueConverter.java b/src/main/java/com/cloudera/crunch/types/writable/WritableValueConverter.java
index d516d36..b63947e 100644
--- a/src/main/java/com/cloudera/crunch/types/writable/WritableValueConverter.java
+++ b/src/main/java/com/cloudera/crunch/types/writable/WritableValueConverter.java
@@ -19,7 +19,6 @@ import org.apache.hadoop.io.NullWritable;
 import com.cloudera.crunch.types.Converter;
 
 class WritableValueConverter<W> implements Converter<Object, W, W, Iterable<W>> {
-  private static final long serialVersionUID = 1L;
   
   private final Class<W> serializationClass;
   

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/types/writable/Writables.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/types/writable/Writables.java b/src/main/java/com/cloudera/crunch/types/writable/Writables.java
index 1b73f2d..bb07833 100644
--- a/src/main/java/com/cloudera/crunch/types/writable/Writables.java
+++ b/src/main/java/com/cloudera/crunch/types/writable/Writables.java
@@ -53,7 +53,6 @@ import com.google.common.collect.Maps;
  */
 public class Writables {
   private static final MapFn<NullWritable, Void> NULL_WRITABLE_TO_VOID = new MapFn<NullWritable, Void>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public Void map(NullWritable input) {
       return null;
@@ -61,7 +60,6 @@ public class Writables {
   };
 
   private static final MapFn<Void, NullWritable> VOID_TO_NULL_WRITABLE = new MapFn<Void, NullWritable>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public NullWritable map(Void input) {
       return NullWritable.get();
@@ -69,7 +67,6 @@ public class Writables {
   };
   
   private static final MapFn<Text, String> TEXT_TO_STRING = new MapFn<Text, String>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public String map(Text input) {
       return input.toString();
@@ -77,7 +74,6 @@ public class Writables {
   };
 
   private static final MapFn<String, Text> STRING_TO_TEXT = new MapFn<String, Text>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public Text map(String input) {
       return new Text(input);
@@ -85,7 +81,6 @@ public class Writables {
   };
 
   private static final MapFn<IntWritable, Integer> IW_TO_INT = new MapFn<IntWritable, Integer>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public Integer map(IntWritable input) {
       return input.get();
@@ -93,7 +88,6 @@ public class Writables {
   };
 
   private static final MapFn<Integer, IntWritable> INT_TO_IW = new MapFn<Integer, IntWritable>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public IntWritable map(Integer input) {
       return new IntWritable(input);
@@ -101,7 +95,6 @@ public class Writables {
   };
 
   private static final MapFn<LongWritable, Long> LW_TO_LONG = new MapFn<LongWritable, Long>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public Long map(LongWritable input) {
       return input.get();
@@ -109,7 +102,6 @@ public class Writables {
   };
 
   private static final MapFn<Long, LongWritable> LONG_TO_LW = new MapFn<Long, LongWritable>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public LongWritable map(Long input) {
       return new LongWritable(input);
@@ -117,7 +109,6 @@ public class Writables {
   };
 
   private static final MapFn<FloatWritable, Float> FW_TO_FLOAT = new MapFn<FloatWritable, Float>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public Float map(FloatWritable input) {
       return input.get();
@@ -125,7 +116,6 @@ public class Writables {
   };
 
   private static final MapFn<Float, FloatWritable> FLOAT_TO_FW = new MapFn<Float, FloatWritable>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public FloatWritable map(Float input) {
       return new FloatWritable(input);
@@ -133,7 +123,6 @@ public class Writables {
   };
 
   private static final MapFn<DoubleWritable, Double> DW_TO_DOUBLE = new MapFn<DoubleWritable, Double>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public Double map(DoubleWritable input) {
       return input.get();
@@ -141,7 +130,6 @@ public class Writables {
   };
 
   private static final MapFn<Double, DoubleWritable> DOUBLE_TO_DW = new MapFn<Double, DoubleWritable>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public DoubleWritable map(Double input) {
       return new DoubleWritable(input);
@@ -149,7 +137,6 @@ public class Writables {
   };
 
   private static final MapFn<BooleanWritable, Boolean> BW_TO_BOOLEAN = new MapFn<BooleanWritable, Boolean>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public Boolean map(BooleanWritable input) {
       return input.get();
@@ -159,7 +146,6 @@ public class Writables {
   private static final BooleanWritable TRUE = new BooleanWritable(true);
   private static final BooleanWritable FALSE = new BooleanWritable(false);
   private static final MapFn<Boolean, BooleanWritable> BOOLEAN_TO_BW = new MapFn<Boolean, BooleanWritable>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public BooleanWritable map(Boolean input) {
       return input == Boolean.TRUE ? TRUE : FALSE;
@@ -167,7 +153,6 @@ public class Writables {
   };
   
   private static final MapFn<BytesWritable, ByteBuffer> BW_TO_BB = new MapFn<BytesWritable, ByteBuffer>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public ByteBuffer map(BytesWritable input) {
       return ByteBuffer.wrap(input.getBytes(), 0, input.getLength());
@@ -175,7 +160,6 @@ public class Writables {
   };
   
   private static final MapFn<ByteBuffer, BytesWritable> BB_TO_BW = new MapFn<ByteBuffer, BytesWritable>() {
-    private static final long serialVersionUID = 1L;
     @Override
     public BytesWritable map(ByteBuffer input) {
       BytesWritable bw = new BytesWritable();
@@ -350,7 +334,6 @@ public class Writables {
    * 
    */
   private static class TupleTWMapFn extends MapFn<Tuple, TupleWritable> {
-    private static final long serialVersionUID = 1L;
     
     private transient TupleWritable writable;
     private transient Writable[] values;
@@ -487,7 +470,6 @@ public class Writables {
 
   private static class CollectionArrayMapFn<T> extends
       MapFn<Collection<T>, GenericArrayWritable> {
-    private static final long serialVersionUID = 1L;
     
     private final Class<? extends Writable> clazz;
     private final MapFn<T, Object> mapFn;
@@ -534,72 +516,70 @@ public class Writables {
   }
 
   private static class MapInputMapFn<T> extends MapFn<TextMapWritable<Writable>, Map<String, T>> {
-    private static final long serialVersionUID = 1L;
     private final MapFn<Writable, T> mapFn;
-	
-	public MapInputMapFn(MapFn<Writable, T> mapFn) {
-	  this.mapFn = mapFn;
-	}
-	
-	@Override
-	public void configure(Configuration conf) {
-	  mapFn.configure(conf);
-	}
+
+    public MapInputMapFn(MapFn<Writable, T> mapFn) {
+      this.mapFn = mapFn;
+    }
+
+    @Override
+    public void configure(Configuration conf) {
+      mapFn.configure(conf);
+    }
 
     @Override
     public void setConfigurationForTest(Configuration conf) {
       mapFn.setConfigurationForTest(conf);
     }
 
-	@Override
-	public void initialize() {
-	  mapFn.setContext(getContext());
-	}
-	
-	@Override
-	public Map<String, T> map(TextMapWritable<Writable> input) {
-	  Map<String, T> out = Maps.newHashMap();
-	  for (Map.Entry<Text, Writable> e : input.entrySet()) {
-		out.put(e.getKey().toString(), mapFn.map(e.getValue()));
-	  }
-	  return out;
-	}
+    @Override
+    public void initialize() {
+      mapFn.setContext(getContext());
+    }
+
+    @Override
+    public Map<String, T> map(TextMapWritable<Writable> input) {
+      Map<String, T> out = Maps.newHashMap();
+      for (Map.Entry<Text, Writable> e : input.entrySet()) {
+        out.put(e.getKey().toString(), mapFn.map(e.getValue()));
+      }
+      return out;
+    }
   }
   
   private static class MapOutputMapFn<T> extends MapFn<Map<String, T>, TextMapWritable<Writable>> {
-    private static final long serialVersionUID = 1L;
-    
-	private final Class<Writable> clazz;
-	private final MapFn<T, Writable> mapFn;
-	
-	public MapOutputMapFn(Class<Writable> clazz, MapFn<T, Writable> mapFn) {
-	  this.clazz = clazz;
-	  this.mapFn = mapFn;
-	}
 
-	@Override
-	public void configure(Configuration conf) {
-	  mapFn.configure(conf);
-	}
+    private final Class<Writable> clazz;
+    private final MapFn<T, Writable> mapFn;
+
+    public MapOutputMapFn(Class<Writable> clazz, MapFn<T, Writable> mapFn) {
+      this.clazz = clazz;
+      this.mapFn = mapFn;
+    }
+
+    @Override
+    public void configure(Configuration conf) {
+      mapFn.configure(conf);
+    }
 
     @Override
     public void setConfigurationForTest(Configuration conf) {
       mapFn.setConfigurationForTest(conf);
     }
-	
-	@Override
-	public void initialize() {
-	  mapFn.setContext(getContext());
-	}
-
-	@Override
-	public TextMapWritable<Writable> map(Map<String, T> input) {
-	  TextMapWritable<Writable> tmw = new TextMapWritable<Writable>(clazz);
-	  for (Map.Entry<String, T> e : input.entrySet()) {
-		tmw.put(new Text(e.getKey()), mapFn.map(e.getValue()));
-	  }
-	  return tmw;
-	}	
+
+    @Override
+    public void initialize() {
+      mapFn.setContext(getContext());
+    }
+
+    @Override
+    public TextMapWritable<Writable> map(Map<String, T> input) {
+      TextMapWritable<Writable> tmw = new TextMapWritable<Writable>(clazz);
+      for (Map.Entry<String, T> e : input.entrySet()) {
+        tmw.put(new Text(e.getKey()), mapFn.map(e.getValue()));
+      }
+      return tmw;
+    }	
   }
   
   public static <T> WritableType<Map<String, T>, MapWritable> maps(PType<T> ptype) {

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/util/PTypes.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/util/PTypes.java b/src/main/java/com/cloudera/crunch/util/PTypes.java
index 88664d0..f7410aa 100644
--- a/src/main/java/com/cloudera/crunch/util/PTypes.java
+++ b/src/main/java/com/cloudera/crunch/util/PTypes.java
@@ -65,23 +65,18 @@ public class PTypes {
   }
   
   public static MapFn<ByteBuffer, BigInteger> BYTE_TO_BIGINT = new MapFn<ByteBuffer, BigInteger>() {
-    private static final long serialVersionUID = 1L;
-    @Override
     public BigInteger map(ByteBuffer input) {
       return input == null ? null : new BigInteger(input.array());
     }
   };
 
   public static MapFn<BigInteger, ByteBuffer> BIGINT_TO_BYTE = new MapFn<BigInteger, ByteBuffer>() {
-    private static final long serialVersionUID = 1L;
-    @Override
     public ByteBuffer map(BigInteger input) {
       return input == null ? null : ByteBuffer.wrap(input.toByteArray());
     }
   };
   
   public static class SmileInputMapFn<T> extends MapFn<ByteBuffer, T> {
-    private static final long serialVersionUID = 1L;
 
     private final Class<T> clazz;
     private transient ObjectMapper mapper;
@@ -106,7 +101,6 @@ public class PTypes {
   }
   
   public static class SmileOutputMapFn<T> extends MapFn<T, ByteBuffer> {
-    private static final long serialVersionUID = 1L;
     private transient ObjectMapper mapper;
     
     @Override
@@ -125,7 +119,6 @@ public class PTypes {
   }
 
   public static class JacksonInputMapFn<T> extends MapFn<String, T> {
-    private static final long serialVersionUID = 1L;
     
     private final Class<T> clazz;
     private transient ObjectMapper mapper;
@@ -150,7 +143,6 @@ public class PTypes {
   }
   
   public static class JacksonOutputMapFn<T> extends MapFn<T, String> {
-    private static final long serialVersionUID = 1L;
     
     private transient ObjectMapper mapper;
     
@@ -170,7 +162,6 @@ public class PTypes {
   }
   
   public static class ProtoInputMapFn<T extends Message> extends MapFn<ByteBuffer, T> {
-    private static final long serialVersionUID = 1L;
     
     private final Class<T> clazz;
     private transient T instance;
@@ -196,7 +187,6 @@ public class PTypes {
   }
   
   public static class ProtoOutputMapFn<T extends Message> extends MapFn<T, ByteBuffer> {
-    private static final long serialVersionUID = 1L;
     
     public ProtoOutputMapFn() {
     }
@@ -208,7 +198,6 @@ public class PTypes {
   }
 
   public static class ThriftInputMapFn<T extends TBase> extends MapFn<ByteBuffer, T> {
-    private static final long serialVersionUID = 1L;
 
     private final Class<T> clazz;
     private transient T instance;
@@ -244,7 +233,7 @@ public class PTypes {
   }
   
   public static class ThriftOutputMapFn<T extends TBase> extends MapFn<T, ByteBuffer> {
-    private static final long serialVersionUID = 1L;
+
     private transient TSerializer serializer;
     
     public ThriftOutputMapFn() {

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/main/java/com/cloudera/crunch/util/Protos.java
----------------------------------------------------------------------
diff --git a/src/main/java/com/cloudera/crunch/util/Protos.java b/src/main/java/com/cloudera/crunch/util/Protos.java
index 571a2d3..f9c724e 100644
--- a/src/main/java/com/cloudera/crunch/util/Protos.java
+++ b/src/main/java/com/cloudera/crunch/util/Protos.java
@@ -41,7 +41,6 @@ public class Protos {
   }
   
   public static class ExtractKeyFn<M extends Message, K> extends MapFn<M, K> {
-    private static final long serialVersionUID = 1L;
     
     private final String fieldName;
     
@@ -68,7 +67,6 @@ public class Protos {
   }
   
   public static class TextToProtoFn<M extends Message> extends DoFn<String, M> {
-    private static final long serialVersionUID = 1L;
     
     private final String sep;
     private final Class<M> msgClass;

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e578d29d/src/test/java/com/cloudera/crunch/TextPairTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/cloudera/crunch/TextPairTest.java b/src/test/java/com/cloudera/crunch/TextPairTest.java
index eba2f1c..9fa3058 100644
--- a/src/test/java/com/cloudera/crunch/TextPairTest.java
+++ b/src/test/java/com/cloudera/crunch/TextPairTest.java
@@ -36,8 +36,6 @@ public class TextPairTest  {
   
   public static PCollection<Pair<String, String>> wordDuplicate(PCollection<String> words) {
     return words.parallelDo("my word duplicator", new DoFn<String, Pair<String, String>>() {
-      private static final long serialVersionUID = 1L;
-      @Override
       public void process(String line, Emitter<Pair<String, String>> emitter) {
         for (String word : line.split("\\W+")) {
           if(word.length() > 0) {


Mime
View raw message