update to cascading 2 apis

Cascading · Feb 9, 2012 · 43c7aa0 · 43c7aa0
1 parent ecf62b2
commit 43c7aa0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src/java/multitool/Main.java b/src/java/multitool/Main.java
@@ -36,7 +36,8 @@
 import cascading.cascade.Cascade;
 import cascading.flow.Flow;
 import cascading.flow.FlowConnector;
-import cascading.flow.PlannerException;
+import cascading.flow.hadoop.HadoopFlowConnector;
+import cascading.flow.planner.PlannerException;
 import cascading.pipe.Pipe;
 import cascading.tap.Tap;
 import multitool.factory.CoGroupFactory;
@@ -381,7 +382,7 @@ else if( factory instanceof SinkFactory )
     if( sinks.isEmpty() )
       throw new IllegalArgumentException( "error: must have one sink" );
 
-    return new FlowConnector( properties ).connect( "multitool", sources, sinks, currentPipe );
+    return new HadoopFlowConnector( properties ).connect( "multitool", sources, sinks, currentPipe );
     }
 
   private Map<String, String> getSubParams( String key, ListIterator<String[]> iterator )

diff --git a/src/java/multitool/factory/SinkFactory.java b/src/java/multitool/factory/SinkFactory.java
@@ -25,12 +25,12 @@
 
 import cascading.pipe.Pipe;
 import cascading.scheme.Scheme;
-import cascading.scheme.SequenceFile;
-import cascading.scheme.TextDelimited;
-import cascading.scheme.TextLine;
-import cascading.tap.Hfs;
+import cascading.scheme.hadoop.SequenceFile;
+import cascading.scheme.hadoop.TextDelimited;
+import cascading.scheme.hadoop.TextLine;
 import cascading.tap.SinkMode;
 import cascading.tap.Tap;
+import cascading.tap.hadoop.Hfs;
 import cascading.tuple.Fields;
 
 /**

diff --git a/src/java/multitool/factory/SourceFactory.java b/src/java/multitool/factory/SourceFactory.java
@@ -27,10 +27,10 @@
 import cascading.operation.expression.ExpressionFilter;
 import cascading.pipe.Each;
 import cascading.pipe.Pipe;
-import cascading.scheme.SequenceFile;
-import cascading.scheme.TextLine;
-import cascading.tap.Hfs;
+import cascading.scheme.hadoop.SequenceFile;
+import cascading.scheme.hadoop.TextLine;
 import cascading.tap.Tap;
+import cascading.tap.hadoop.Hfs;
 import cascading.tuple.Fields;
 
 /**

diff --git a/src/test/multitool/RunnerTest.java b/src/test/multitool/RunnerTest.java
@@ -29,8 +29,8 @@
 
 import cascading.CascadingTestCase;
 import cascading.flow.Flow;
-import cascading.scheme.TextLine;
-import cascading.tap.Hfs;
+import cascading.scheme.hadoop.TextLine;
+import cascading.tap.hadoop.Hfs;
 import cascading.tuple.TupleEntryIterator;
 
 /**