diff options
| author | Sean Owen <sowen@cloudera.com> | 2016-01-08 13:02:30 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2016-01-08 13:02:30 -0800 |
| commit | 659fd9d04b988d48960eac4f352ca37066f43f5c (patch) | |
| tree | 1893735497a7cfae284d7a9eb4dd07bed62b4ac4 /core/src/main/scala/org/apache/spark/api/java/JavaUtils.scala | |
| parent | 553fd7b912a32476b481fd3f80c1d0664b6c6484 (diff) | |
| download | spark-659fd9d04b988d48960eac4f352ca37066f43f5c.tar.gz spark-659fd9d04b988d48960eac4f352ca37066f43f5c.tar.bz2 spark-659fd9d04b988d48960eac4f352ca37066f43f5c.zip | |
[SPARK-4819] Remove Guava's "Optional" from public API
Replace Guava `Optional` with (an API clone of) Java 8 `java.util.Optional` (edit: and a clone of Guava `Optional`)
See also https://github.com/apache/spark/pull/10512
Author: Sean Owen <sowen@cloudera.com>
Closes #10513 from srowen/SPARK-4819.
Diffstat (limited to 'core/src/main/scala/org/apache/spark/api/java/JavaUtils.scala')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/api/java/JavaUtils.scala | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/src/main/scala/org/apache/spark/api/java/JavaUtils.scala b/core/src/main/scala/org/apache/spark/api/java/JavaUtils.scala index b2a4d053fa..f820401da2 100644 --- a/core/src/main/scala/org/apache/spark/api/java/JavaUtils.scala +++ b/core/src/main/scala/org/apache/spark/api/java/JavaUtils.scala @@ -22,13 +22,12 @@ import java.util.Map.Entry import scala.collection.mutable -import com.google.common.base.Optional - private[spark] object JavaUtils { def optionToOptional[T](option: Option[T]): Optional[T] = - option match { - case Some(value) => Optional.of(value) - case None => Optional.absent() + if (option.isDefined) { + Optional.of(option.get) + } else { + Optional.empty[T] } // Workaround for SPARK-3926 / SI-8911 |