Skip to content

[SPARK-25362][JavaAPI] Replace Spark Optional class with Java Optional #22383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mmolimar wants to merge 7 commits into from
Closed

[SPARK-25362][JavaAPI] Replace Spark Optional class with Java Optional #22383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4daf0ec
Removing Optional Spark Java API
mmolimar Sep 10, 2018
2ef67c8
Merge branch 'master' of https://github.com/apache/spark into SPARK-2…
mmolimar Oct 11, 2018
054c79a
Removing whitespaces
mmolimar Oct 11, 2018
0348a00
Class exclude for 3.0 version
mmolimar Oct 11, 2018
6eaa3f1
Merge branch 'master' of https://github.com/apache/spark into SPARK-2…
mmolimar Oct 13, 2018
64b43bf
Merge branch 'master' of https://github.com/apache/spark into SPARK-2…
mmolimar Oct 15, 2018
f188243
Updating mima excludes
mmolimar Oct 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
188 changes: 0 additions & 188 deletions core/src/main/java/org/apache/spark/api/java/Optional.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/api/java/JavaPairRDD.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package org.apache.spark.api.java

import java.{lang => jl}
import java.lang.{Iterable => JIterable}
import java.util.{Comparator, Iterator => JIterator, List => JList}
import java.util.{Comparator, List => JList, Optional}

import scala.collection.JavaConverters._
import scala.language.implicitConversions
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package org.apache.spark.api.java

import java.{lang => jl}
import java.lang.{Iterable => JIterable}
import java.util.{Comparator, Iterator => JIterator, List => JList, Map => JMap}
import java.util.{Comparator, Iterator => JIterator, List => JList, Map => JMap, Optional}

import scala.collection.JavaConverters._
import scala.reflect.ClassTag
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package org.apache.spark.api.java

import java.io.Closeable
import java.util
import java.util.{Map => JMap}
import java.util.{Map => JMap, Optional}

import scala.collection.JavaConverters._
import scala.language.implicitConversions
Expand Down
1 change: 1 addition & 0 deletions core/src/main/scala/org/apache/spark/api/java/JavaUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package org.apache.spark.api.java

import java.{util => ju}
import java.util.Map.Entry
import java.util.Optional

import scala.collection.mutable

Expand Down
94 changes: 0 additions & 94 deletions core/src/test/java/org/apache/spark/api/java/OptionalSuite.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion core/src/test/java/test/org/apache/spark/Java8RDDAPISuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.apache.spark.api.java.JavaPairRDD;
import org.apache.spark.api.java.JavaRDD;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.api.java.Optional;
import org.apache.spark.api.java.function.*;
import org.apache.spark.util.Utils;

Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/test/org/apache/spark/JavaAPISuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.*;

import org.apache.spark.Accumulator;
Expand Down Expand Up @@ -67,7 +68,6 @@
import org.apache.spark.api.java.JavaPairRDD;
import org.apache.spark.api.java.JavaRDD;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.api.java.Optional;
import org.apache.spark.api.java.function.*;
import org.apache.spark.input.PortableDataStream;
import org.apache.spark.partial.BoundedDouble;
Expand Down
2 changes: 1 addition & 1 deletion examples/src/main/java/org/apache/spark/examples/streaming/JavaStatefulNetworkWordCount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.regex.Pattern;

import scala.Tuple2;

import org.apache.spark.SparkConf;
import org.apache.spark.api.java.function.*;
import org.apache.spark.api.java.JavaPairRDD;
import org.apache.spark.api.java.Optional;
import org.apache.spark.api.java.StorageLevels;
import org.apache.spark.streaming.Durations;
import org.apache.spark.streaming.State;
Expand Down
10 changes: 8 additions & 2 deletions project/MimaExcludes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,15 @@ object MimaExcludes {

// Exclude rules for 3.0.x
lazy val v30excludes = v24excludes ++ Seq(
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.io.SnappyCompressionCodec.version"),
// [SPARK-19287] JavaPairRDD flatMapValues requires function returning Iterable, not Iterator
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.api.java.JavaPairRDD.flatMapValues"),
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.streaming.api.java.JavaPairDStream.flatMapValues")
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.streaming.api.java.JavaPairDStream.flatMapValues"),

// [SPARK-24109] Remove class SnappyOutputStreamWrapper
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.io.SnappyCompressionCodec.version"),

// [SPARK-25362][JavaAPI] Replace Spark Optional class with Java Optional
ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.api.java.Optional")
)

// Exclude rules for 2.4.x
Expand Down
4 changes: 3 additions & 1 deletion streaming/src/main/scala/org/apache/spark/streaming/StateSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@

package org.apache.spark.streaming

import java.util.Optional

import org.apache.spark.{HashPartitioner, Partitioner}
import org.apache.spark.annotation.Experimental
import org.apache.spark.api.java.{JavaPairRDD, JavaUtils, Optional}
import org.apache.spark.api.java.{JavaPairRDD, JavaUtils}
import org.apache.spark.api.java.function.{Function3 => JFunction3, Function4 => JFunction4}
import org.apache.spark.rdd.RDD
import org.apache.spark.util.ClosureCleaner
Expand Down
Loading