Skip to content

Commit 71c36c9

Browse files
author
Alexey Kudinkin
committed
Fixing compilation in tests
1 parent 4796256 commit 71c36c9

4 files changed

Lines changed: 17 additions & 4 deletions

File tree

hudi-client/hudi-spark-client/src/main/scala/org/apache/hudi/util/JFunction.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ package org.apache.hudi.util
2020
// TODO scala-doc
2121
object JFunction {
2222

23-
def apply[T, R](f: java.util.function.Function[T, R]): T => R =
23+
def toScala[T, R](f: java.util.function.Function[T, R]): T => R =
2424
(t: T) => f.apply(t)
2525

26+
def toJava[T](f: T => Unit): java.util.function.Consumer[T] =
27+
new java.util.function.Consumer[T] {
28+
override def accept(t: T): Unit = f.apply(t)
29+
}
30+
2631
}

hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/testutils/HoodieClientTestHarness.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ protected void initSparkContexts(String appName) {
213213
context = new HoodieSparkEngineContext(jsc);
214214

215215
sparkSession = SparkSession.builder()
216-
.withExtensions(JFunction.apply(sparkSessionExtensions -> {
216+
.withExtensions(JFunction.toScala(sparkSessionExtensions -> {
217217
sparkSessionExtensionsInjector.ifPresent(injector -> injector.accept(sparkSessionExtensions));
218218
return null;
219219
}))

hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestCOWDataSource.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import org.apache.hudi.exception.{HoodieException, HoodieUpsertException}
3131
import org.apache.hudi.keygen._
3232
import org.apache.hudi.keygen.constant.KeyGeneratorOptions.Config
3333
import org.apache.hudi.testutils.HoodieClientTestBase
34+
import org.apache.hudi.util.JFunction
3435
import org.apache.hudi.{AvroConversionUtils, DataSourceReadOptions, DataSourceWriteOptions, HoodieDataSourceHelpers}
3536
import org.apache.spark.sql._
3637
import org.apache.spark.sql.functions.{col, concat, lit, udf}
@@ -88,7 +89,10 @@ class TestCOWDataSource extends HoodieClientTestBase {
8889
}
8990

9091
override def getSparkSessionExtensionsInjector: util.Option[Consumer[SparkSessionExtensions]] =
91-
toJavaOption(Some((receiver: SparkSessionExtensions) => new HoodieSparkSessionExtension().apply(receiver)))
92+
toJavaOption(
93+
Some(
94+
JFunction.toJava((receiver: SparkSessionExtensions) => new HoodieSparkSessionExtension().apply(receiver)))
95+
)
9296

9397
@Test def testShortNameStorage() {
9498
// Insert Operation

hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestMORDataSource.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import org.apache.hudi.index.HoodieIndex.IndexType
3131
import org.apache.hudi.keygen.NonpartitionedKeyGenerator
3232
import org.apache.hudi.keygen.constant.KeyGeneratorOptions.Config
3333
import org.apache.hudi.testutils.{DataSourceTestUtils, HoodieClientTestBase}
34+
import org.apache.hudi.util.JFunction
3435
import org.apache.hudi.{DataSourceReadOptions, DataSourceWriteOptions, HoodieDataSourceHelpers, SparkDatasetMixin}
3536
import org.apache.log4j.LogManager
3637
import org.apache.spark.sql._
@@ -80,7 +81,10 @@ class TestMORDataSource extends HoodieClientTestBase with SparkDatasetMixin {
8081
}
8182

8283
override def getSparkSessionExtensionsInjector: util.Option[Consumer[SparkSessionExtensions]] =
83-
toJavaOption(Some((receiver: SparkSessionExtensions) => new HoodieSparkSessionExtension().apply(receiver)))
84+
toJavaOption(
85+
Some(
86+
JFunction.toJava((receiver: SparkSessionExtensions) => new HoodieSparkSessionExtension().apply(receiver)))
87+
)
8488

8589
@Test def testCount() {
8690
// First Operation:

0 commit comments

Comments
 (0)