diff --git a/core/src/main/scala/org/apache/spark/api/java/JavaSparkContextVarargsWorkaround.java b/core/src/main/java/org/apache/spark/api/java/JavaSparkContextVarargsWorkaround.java
similarity index 100%
rename from core/src/main/scala/org/apache/spark/api/java/JavaSparkContextVarargsWorkaround.java
rename to core/src/main/java/org/apache/spark/api/java/JavaSparkContextVarargsWorkaround.java
diff --git a/core/src/main/scala/org/apache/spark/api/java/StorageLevels.java b/core/src/main/java/org/apache/spark/api/java/StorageLevels.java
similarity index 58%
rename from core/src/main/scala/org/apache/spark/api/java/StorageLevels.java
rename to core/src/main/java/org/apache/spark/api/java/StorageLevels.java
index 0744269773f8d7e8bc47d55bac2bc26b44795079..9f13b39909481b50c010803f6c24c48ae90c83b0 100644
--- a/core/src/main/scala/org/apache/spark/api/java/StorageLevels.java
+++ b/core/src/main/java/org/apache/spark/api/java/StorageLevels.java
@@ -23,17 +23,17 @@ import org.apache.spark.storage.StorageLevel;
* Expose some commonly useful storage level constants.
*/
public class StorageLevels {
- public static final StorageLevel NONE = new StorageLevel(false, false, false, 1);
- public static final StorageLevel DISK_ONLY = new StorageLevel(true, false, false, 1);
- public static final StorageLevel DISK_ONLY_2 = new StorageLevel(true, false, false, 2);
- public static final StorageLevel MEMORY_ONLY = new StorageLevel(false, true, true, 1);
- public static final StorageLevel MEMORY_ONLY_2 = new StorageLevel(false, true, true, 2);
- public static final StorageLevel MEMORY_ONLY_SER = new StorageLevel(false, true, false, 1);
- public static final StorageLevel MEMORY_ONLY_SER_2 = new StorageLevel(false, true, false, 2);
- public static final StorageLevel MEMORY_AND_DISK = new StorageLevel(true, true, true, 1);
- public static final StorageLevel MEMORY_AND_DISK_2 = new StorageLevel(true, true, true, 2);
- public static final StorageLevel MEMORY_AND_DISK_SER = new StorageLevel(true, true, false, 1);
- public static final StorageLevel MEMORY_AND_DISK_SER_2 = new StorageLevel(true, true, false, 2);
+ public static final StorageLevel NONE = create(false, false, false, 1);
+ public static final StorageLevel DISK_ONLY = create(true, false, false, 1);
+ public static final StorageLevel DISK_ONLY_2 = create(true, false, false, 2);
+ public static final StorageLevel MEMORY_ONLY = create(false, true, true, 1);
+ public static final StorageLevel MEMORY_ONLY_2 = create(false, true, true, 2);
+ public static final StorageLevel MEMORY_ONLY_SER = create(false, true, false, 1);
+ public static final StorageLevel MEMORY_ONLY_SER_2 = create(false, true, false, 2);
+ public static final StorageLevel MEMORY_AND_DISK = create(true, true, true, 1);
+ public static final StorageLevel MEMORY_AND_DISK_2 = create(true, true, true, 2);
+ public static final StorageLevel MEMORY_AND_DISK_SER = create(true, true, false, 1);
+ public static final StorageLevel MEMORY_AND_DISK_SER_2 = create(true, true, false, 2);
/**
* Create a new StorageLevel object.
diff --git a/core/src/main/scala/org/apache/spark/SparkFiles.java b/core/src/main/scala/org/apache/spark/SparkFiles.scala
similarity index 77%
rename from core/src/main/scala/org/apache/spark/SparkFiles.java
rename to core/src/main/scala/org/apache/spark/SparkFiles.scala
index af9cf85e372bf7b8f22508690552e7e04de8229d..e85b89fd014ef2b80ca6f71a9f68f58466ea24fe 100644
--- a/core/src/main/scala/org/apache/spark/SparkFiles.java
+++ b/core/src/main/scala/org/apache/spark/SparkFiles.scala
@@ -15,28 +15,25 @@
* limitations under the License.
*/
-package org.apache.spark;
+package org.apache.spark
-import java.io.File;
+import java.io.File
/**
* Resolves paths to files added through `SparkContext.addFile()`.
*/
-public class SparkFiles {
-
- private SparkFiles() {}
+object SparkFiles {
/**
* Get the absolute path of a file added through `SparkContext.addFile()`.
*/
- public static String get(String filename) {
- return new File(getRootDirectory(), filename).getAbsolutePath();
- }
+ def get(filename: String): String =
+ new File(getRootDirectory(), filename).getAbsolutePath()
/**
* Get the root directory that contains files added through `SparkContext.addFile()`.
*/
- public static String getRootDirectory() {
- return SparkEnv.get().sparkFilesDir();
- }
+ def getRootDirectory(): String =
+ SparkEnv.get.sparkFilesDir
+
}
diff --git a/core/src/main/scala/org/apache/spark/api/java/function/DoubleFlatMapFunction.java b/core/src/main/scala/org/apache/spark/api/java/function/DoubleFlatMapFunction.scala
similarity index 80%
rename from core/src/main/scala/org/apache/spark/api/java/function/DoubleFlatMapFunction.java
rename to core/src/main/scala/org/apache/spark/api/java/function/DoubleFlatMapFunction.scala
index 30e6a524742c4a8621a3df084cb433fb3dc0bf7c..7500a8943634b1f8396e41463ac1312c2a49b378 100644
--- a/core/src/main/scala/org/apache/spark/api/java/function/DoubleFlatMapFunction.java
+++ b/core/src/main/scala/org/apache/spark/api/java/function/DoubleFlatMapFunction.scala
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.spark.api.java.function;
+package org.apache.spark.api.java.function
-import java.io.Serializable;
+import java.lang.{Double => JDouble, Iterable => JIterable}
/**
* A function that returns zero or more records of type Double from each input record.
*/
// DoubleFlatMapFunction does not extend FlatMapFunction because flatMap is
// overloaded for both FlatMapFunction and DoubleFlatMapFunction.
-public abstract class DoubleFlatMapFunction<T> extends WrappedFunction1<T, Iterable<Double>>
- implements Serializable {
- // Intentionally left blank
+abstract class DoubleFlatMapFunction[T] extends WrappedFunction1[T, JIterable[JDouble]]
+ with Serializable {
+ // Intentionally left blank
}
diff --git a/core/src/main/scala/org/apache/spark/api/java/function/DoubleFunction.java b/core/src/main/scala/org/apache/spark/api/java/function/DoubleFunction.scala
similarity index 85%
rename from core/src/main/scala/org/apache/spark/api/java/function/DoubleFunction.java
rename to core/src/main/scala/org/apache/spark/api/java/function/DoubleFunction.scala
index 490da255bc91203a23b68a50a3b8c34f90b8efce..2cdf2e92c3daa586e7f8157e3daa8657844f26d0 100644
--- a/core/src/main/scala/org/apache/spark/api/java/function/DoubleFunction.java
+++ b/core/src/main/scala/org/apache/spark/api/java/function/DoubleFunction.scala
@@ -15,16 +15,15 @@
* limitations under the License.
*/
-package org.apache.spark.api.java.function;
+package org.apache.spark.api.java.function
-import java.io.Serializable;
+import java.lang.{Double => JDouble}
/**
* A function that returns Doubles, and can be used to construct DoubleRDDs.
*/
// DoubleFunction does not extend Function because some UDF functions, like map,
// are overloaded for both Function and DoubleFunction.
-public abstract class DoubleFunction<T> extends WrappedFunction1<T, Double>
- implements Serializable {
+abstract class DoubleFunction[T] extends WrappedFunction1[T, JDouble] with Serializable {
// Intentionally left blank
}
diff --git a/core/src/main/scala/org/apache/spark/api/java/function/Function.java b/core/src/main/scala/org/apache/spark/api/java/function/Function.scala
similarity index 76%
rename from core/src/main/scala/org/apache/spark/api/java/function/Function.java
rename to core/src/main/scala/org/apache/spark/api/java/function/Function.scala
index e0fcd460c8404972e6a7a2d1a5fea387014131f7..a5e1701f7718f46be4e26b6856a0c34107ff8e92 100644
--- a/core/src/main/scala/org/apache/spark/api/java/function/Function.java
+++ b/core/src/main/scala/org/apache/spark/api/java/function/Function.scala
@@ -15,21 +15,17 @@
* limitations under the License.
*/
-package org.apache.spark.api.java.function;
+package org.apache.spark.api.java.function
-import java.io.Serializable;
-
-import scala.reflect.ClassTag;
-import scala.reflect.ClassTag$;
+import scala.reflect.ClassTag
+import org.apache.spark.api.java.JavaSparkContext
/**
* Base class for functions whose return types do not create special RDDs. PairFunction and
* DoubleFunction are handled separately, to allow PairRDDs and DoubleRDDs to be constructed
* when mapping RDDs of other types.
*/
-public abstract class Function<T, R> extends WrappedFunction1<T, R> implements Serializable {
- public ClassTag<R> returnType() {
- return ClassTag$.MODULE$.apply(Object.class);
- }
+abstract class Function[T, R] extends WrappedFunction1[T, R] with Serializable {
+ def returnType(): ClassTag[R] = JavaSparkContext.fakeClassTag
}
diff --git a/core/src/main/scala/org/apache/spark/api/java/function/Function2.java b/core/src/main/scala/org/apache/spark/api/java/function/Function2.scala
similarity index 72%
rename from core/src/main/scala/org/apache/spark/api/java/function/Function2.java
rename to core/src/main/scala/org/apache/spark/api/java/function/Function2.scala
index 16d7379462e15a96fbe2acfe7eca7f96cb16825b..fa3616cbcb4d2a1b7ea3f5eb984cc45fa98fa2dc 100644
--- a/core/src/main/scala/org/apache/spark/api/java/function/Function2.java
+++ b/core/src/main/scala/org/apache/spark/api/java/function/Function2.scala
@@ -15,21 +15,15 @@
* limitations under the License.
*/
-package org.apache.spark.api.java.function;
+package org.apache.spark.api.java.function
-import java.io.Serializable;
-
-import scala.reflect.ClassTag;
-import scala.reflect.ClassTag$;
+import scala.reflect.ClassTag
+import org.apache.spark.api.java.JavaSparkContext
/**
* A two-argument function that takes arguments of type T1 and T2 and returns an R.
*/
-public abstract class Function2<T1, T2, R> extends WrappedFunction2<T1, T2, R>
- implements Serializable {
-
- public ClassTag<R> returnType() {
- return (ClassTag<R>) ClassTag$.MODULE$.apply(Object.class);
- }
+abstract class Function2[T1, T2, R] extends WrappedFunction2[T1, T2, R] with Serializable {
+ def returnType(): ClassTag[R] = JavaSparkContext.fakeClassTag
}
diff --git a/core/src/main/scala/org/apache/spark/api/java/function/Function3.java b/core/src/main/scala/org/apache/spark/api/java/function/Function3.scala
similarity index 70%
rename from core/src/main/scala/org/apache/spark/api/java/function/Function3.java
rename to core/src/main/scala/org/apache/spark/api/java/function/Function3.scala
index 096eb71f95cd064cf2698772d178b45a86e72d47..45152891e9272c71258ab83368fddaedd954f124 100644
--- a/core/src/main/scala/org/apache/spark/api/java/function/Function3.java
+++ b/core/src/main/scala/org/apache/spark/api/java/function/Function3.scala
@@ -15,21 +15,14 @@
* limitations under the License.
*/
-package org.apache.spark.api.java.function;
+package org.apache.spark.api.java.function
-import java.io.Serializable;
-
-import scala.reflect.ClassTag;
-import scala.reflect.ClassTag$;
+import org.apache.spark.api.java.JavaSparkContext
+import scala.reflect.ClassTag
/**
* A three-argument function that takes arguments of type T1, T2 and T3 and returns an R.
*/
-public abstract class Function3<T1, T2, T3, R> extends WrappedFunction3<T1, T2, T3, R>
- implements Serializable {
-
- public ClassTag<R> returnType() {
- return (ClassTag<R>) ClassTag$.MODULE$.apply(Object.class);
- }
+abstract class Function3[T1, T2, T3, R] extends WrappedFunction3[T1, T2, T3, R] with Serializable {
+ def returnType(): ClassTag[R] = JavaSparkContext.fakeClassTag
}
-
diff --git a/core/src/main/scala/org/apache/spark/api/java/function/PairFlatMapFunction.java b/core/src/main/scala/org/apache/spark/api/java/function/PairFlatMapFunction.scala
similarity index 69%
rename from core/src/main/scala/org/apache/spark/api/java/function/PairFlatMapFunction.java
rename to core/src/main/scala/org/apache/spark/api/java/function/PairFlatMapFunction.scala
index c72b98c28a0cb44438ff993396136898f3699f13..8467bbb892ab0229b064213c3447413b67b0edb8 100644
--- a/core/src/main/scala/org/apache/spark/api/java/function/PairFlatMapFunction.java
+++ b/core/src/main/scala/org/apache/spark/api/java/function/PairFlatMapFunction.scala
@@ -15,13 +15,11 @@
* limitations under the License.
*/
-package org.apache.spark.api.java.function;
+package org.apache.spark.api.java.function
-import java.io.Serializable;
-
-import scala.Tuple2;
-import scala.reflect.ClassTag;
-import scala.reflect.ClassTag$;
+import java.lang.{Iterable => JIterable}
+import org.apache.spark.api.java.JavaSparkContext
+import scala.reflect.ClassTag
/**
* A function that returns zero or more key-value pair records from each input record. The
@@ -29,15 +27,10 @@ import scala.reflect.ClassTag$;
*/
// PairFlatMapFunction does not extend FlatMapFunction because flatMap is
// overloaded for both FlatMapFunction and PairFlatMapFunction.
-public abstract class PairFlatMapFunction<T, K, V>
- extends WrappedFunction1<T, Iterable<Tuple2<K, V>>>
- implements Serializable {
+abstract class PairFlatMapFunction[T, K, V] extends WrappedFunction1[T, JIterable[(K, V)]]
+ with Serializable {
- public ClassTag<K> keyType() {
- return (ClassTag<K>) ClassTag$.MODULE$.apply(Object.class);
- }
+ def keyType(): ClassTag[K] = JavaSparkContext.fakeClassTag
- public ClassTag<V> valueType() {
- return (ClassTag<V>) ClassTag$.MODULE$.apply(Object.class);
- }
+ def valueType(): ClassTag[V] = JavaSparkContext.fakeClassTag
}
diff --git a/core/src/main/scala/org/apache/spark/api/java/function/PairFunction.java b/core/src/main/scala/org/apache/spark/api/java/function/PairFunction.scala
similarity index 68%
rename from core/src/main/scala/org/apache/spark/api/java/function/PairFunction.java
rename to core/src/main/scala/org/apache/spark/api/java/function/PairFunction.scala
index 84b9136d98aa2dbadf9fad265bc4e6ded8723888..d0ba0b6307ee9edc9bd9d7ebf617cbd3bad95787 100644
--- a/core/src/main/scala/org/apache/spark/api/java/function/PairFunction.java
+++ b/core/src/main/scala/org/apache/spark/api/java/function/PairFunction.scala
@@ -15,27 +15,19 @@
* limitations under the License.
*/
-package org.apache.spark.api.java.function;
+package org.apache.spark.api.java.function
-import java.io.Serializable;
-
-import scala.Tuple2;
-import scala.reflect.ClassTag;
-import scala.reflect.ClassTag$;
+import scala.reflect.ClassTag
+import org.apache.spark.api.java.JavaSparkContext
/**
* A function that returns key-value pairs (Tuple2<K, V>), and can be used to construct PairRDDs.
*/
// PairFunction does not extend Function because some UDF functions, like map,
// are overloaded for both Function and PairFunction.
-public abstract class PairFunction<T, K, V> extends WrappedFunction1<T, Tuple2<K, V>>
- implements Serializable {
+abstract class PairFunction[T, K, V] extends WrappedFunction1[T, (K, V)] with Serializable {
- public ClassTag<K> keyType() {
- return (ClassTag<K>) ClassTag$.MODULE$.apply(Object.class);
- }
+ def keyType(): ClassTag[K] = JavaSparkContext.fakeClassTag
- public ClassTag<V> valueType() {
- return (ClassTag<V>) ClassTag$.MODULE$.apply(Object.class);
- }
+ def valueType(): ClassTag[V] = JavaSparkContext.fakeClassTag
}
diff --git a/core/src/test/scala/org/apache/spark/JavaAPISuite.java b/core/src/test/java/org/apache/spark/JavaAPISuite.java
similarity index 100%
rename from core/src/test/scala/org/apache/spark/JavaAPISuite.java
rename to core/src/test/java/org/apache/spark/JavaAPISuite.java