From 12dcaaa7bbf37df97757dbfa6589c437f145b959 Mon Sep 17 00:00:00 2001 From: Ian O Connell Date: Thu, 17 Jul 2014 11:30:16 -0700 Subject: [PATCH] Rename, remove references to Sink --- .../{OptionalMappable.scala => OptionalSource.scala} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename scalding-core/src/main/scala/com/twitter/scalding/{OptionalMappable.scala => OptionalSource.scala} (80%) diff --git a/scalding-core/src/main/scala/com/twitter/scalding/OptionalMappable.scala b/scalding-core/src/main/scala/com/twitter/scalding/OptionalSource.scala similarity index 80% rename from scalding-core/src/main/scala/com/twitter/scalding/OptionalMappable.scala rename to scalding-core/src/main/scala/com/twitter/scalding/OptionalSource.scala index bd8ce680a6..aefd9f4590 100644 --- a/scalding-core/src/main/scala/com/twitter/scalding/OptionalMappable.scala +++ b/scalding-core/src/main/scala/com/twitter/scalding/OptionalSource.scala @@ -18,16 +18,15 @@ package com.twitter.scalding import scala.util.{ Try, Success, Failure } import cascading.tap.Tap -case class OptionalMappable[T](src: Mappable[T] with TypedSink[T]) extends Source with Mappable[T] with TypedSink[T] { +case class OptionalSource[T](src: Mappable[T]) extends Source with Mappable[T] { override def converter[U >: T] = TupleConverter.asSuperConverter(src.converter) - override def setter[U <: T] = TupleSetter.asSubSetter[T, U](src.setter) def createTap(readOrWrite: AccessMode)(implicit mode: Mode): Tap[_, _, _] = Try(src.validateTaps(mode)) match { case Success(_) => src.createTap(readOrWrite) case Failure(_) => - IterableSource[T](Nil)(src.setter, src.converter) + IterableSource[T](Nil)(TupleSetter.singleSetter[T], src.converter) .createTap(readOrWrite).asInstanceOf[Tap[_, _, _]] } } \ No newline at end of file