formatting updates.

sorenmacbeth · Dec 15, 2011 · 185c23f · 185c23f
1 parent d1ca64b
commit 185c23f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,9 @@ autodoc
 .settings/
 .project
 .lein-failures
+.lein-deps-sum
 .DS_Store
-backtype
 *.iml
+*.ipr
+*.iws
+.idea
diff --git a/src/jvm/backtype/cascading/tap/NullTap.java b/src/jvm/backtype/cascading/tap/NullTap.java
@@ -2,18 +2,15 @@
 
 import cascading.scheme.Scheme;
 import cascading.tap.Tap;
-import cascading.tuple.Fields;
-import cascading.tuple.Tuple;
-import cascading.tuple.TupleEntry;
-import cascading.tuple.TupleEntryCollector;
-import cascading.tuple.TupleEntryIterator;
-import java.io.IOException;
+import cascading.tuple.*;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.NullWritable;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.lib.NullOutputFormat;
 
+import java.io.IOException;
+
 
 public class NullTap extends Tap  {
 

diff --git a/src/jvm/backtype/cascading/tap/PailTap.java b/src/jvm/backtype/cascading/tap/PailTap.java
@@ -1,13 +1,6 @@
 package backtype.cascading.tap;
 
-import backtype.hadoop.pail.BinaryPailStructure;
-import backtype.hadoop.pail.DefaultPailStructure;
-import backtype.hadoop.pail.Pail;
-import backtype.hadoop.pail.PailFormatFactory;
-import backtype.hadoop.pail.PailOutputFormat;
-import backtype.hadoop.pail.PailPathLister;
-import backtype.hadoop.pail.PailSpec;
-import backtype.hadoop.pail.PailStructure;
+import backtype.hadoop.pail.*;
 import backtype.support.CascadingUtils;
 import backtype.support.Utils;
 import cascading.flow.Flow;
@@ -20,11 +13,6 @@
 import cascading.tuple.Tuple;
 import cascading.tuple.TupleEntry;
 import cascading.tuple.hadoop.TupleSerialization;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.BytesWritable;
@@ -34,6 +22,12 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.log4j.Logger;
 
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 
 public class PailTap extends Hfs implements FlowListener {
     private static Logger LOG = Logger.getLogger(PailTap.class);

diff --git a/src/jvm/backtype/cascading/tap/RawSequenceFile.java b/src/jvm/backtype/cascading/tap/RawSequenceFile.java
@@ -1,17 +1,17 @@
 package backtype.cascading.tap;
 
 import cascading.scheme.Scheme;
-
 import cascading.tap.Tap;
 import cascading.tap.TapException;
 import cascading.tuple.Fields;
 import cascading.tuple.Tuple;
 import cascading.tuple.TupleEntry;
-import java.io.IOException;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.SequenceFileInputFormat;
 
+import java.io.IOException;
+
 
 public class RawSequenceFile extends Scheme
   {

diff --git a/src/jvm/backtype/support/CascadingUtils.java b/src/jvm/backtype/support/CascadingUtils.java
@@ -7,6 +7,7 @@
 import cascading.pipe.Pipe;
 import cascading.tap.Tap;
 import cascading.tuple.Fields;
+
 import java.util.Map.Entry;
 
 

diff --git a/test/jvm/backtype/cascading/tap/NullTapTest.java b/test/jvm/backtype/cascading/tap/NullTapTest.java
@@ -12,6 +12,7 @@
 import cascading.tuple.Tuple;
 import cascading.tuple.TupleEntryCollector;
 import org.apache.hadoop.mapred.JobConf;
+
 import static backtype.support.TestUtils.*;
 
 

diff --git a/test/jvm/backtype/cascading/tap/PailTapTest.java b/test/jvm/backtype/cascading/tap/PailTapTest.java
@@ -7,27 +7,24 @@
 import cascading.flow.FlowConnector;
 import cascading.flow.FlowException;
 import cascading.flow.FlowProcess;
-import cascading.operation.BaseOperation;
-import cascading.operation.Filter;
-import cascading.operation.FilterCall;
-import cascading.operation.Function;
-import cascading.operation.FunctionCall;
-import cascading.operation.Identity;
+import cascading.operation.*;
 import cascading.pipe.Each;
 import cascading.pipe.Pipe;
 import cascading.tap.Tap;
 import cascading.tuple.Fields;
 import cascading.tuple.Tuple;
 import cascading.tuple.TupleEntry;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.BytesWritable;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import static backtype.support.CascadingUtils.identityFlow;
 import static backtype.support.TestUtils.*;
-import static backtype.support.CascadingUtils.*;
 
 
 public class PailTapTest extends FSTestCase {