You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by xi...@apache.org on 2018/05/18 19:29:31 UTC
samza git commit: SAMZA-1720: Remove javafx.util dependency from
samza-sql tests.
Repository: samza
Updated Branches:
refs/heads/master e44b333f1 -> 3b9e14be3
SAMZA-1720: Remove javafx.util dependency from samza-sql tests.
In samza-sql module, currently few test classes(`TestSamzaSqlRelMessageSerde` and `TestSamzaSqlRelRecordSerde`) are dependent upon `javafx.util.Pair` class(coming from `javafx` module). `javafx.util.Pair` is not supported by default in all JDK builds(example; open-jdk java-8 doesn't support `javafx` module) and it belongs to `javafx` package which is primarily used for developing GUI applications. This dependency is removed and replaced with `Pair` class from `apache-commons`.
Author: Shanthoosh Venkataraman <sa...@gmail.com>
Reviewers: Jagadish V <vj...@gmail.com>
Closes #527 from shanthoosh/SAMZA-1720
Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/3b9e14be
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/3b9e14be
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/3b9e14be
Branch: refs/heads/master
Commit: 3b9e14be3aa5fc2b6003b7e244fba466db34236f
Parents: e44b333
Author: Shanthoosh Venkataraman <sa...@gmail.com>
Authored: Fri May 18 12:29:24 2018 -0700
Committer: xiliu <xi...@linkedin.com>
Committed: Fri May 18 12:29:24 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/samza/sql/TestSamzaSqlRelMessageSerde.java | 4 ++--
.../java/org/apache/samza/sql/TestSamzaSqlRelRecordSerde.java | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/3b9e14be/samza-sql/src/test/java/org/apache/samza/sql/TestSamzaSqlRelMessageSerde.java
----------------------------------------------------------------------
diff --git a/samza-sql/src/test/java/org/apache/samza/sql/TestSamzaSqlRelMessageSerde.java b/samza-sql/src/test/java/org/apache/samza/sql/TestSamzaSqlRelMessageSerde.java
index 381a3cb..14ca3f0 100644
--- a/samza-sql/src/test/java/org/apache/samza/sql/TestSamzaSqlRelMessageSerde.java
+++ b/samza-sql/src/test/java/org/apache/samza/sql/TestSamzaSqlRelMessageSerde.java
@@ -23,10 +23,10 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javafx.util.Pair;
import org.apache.avro.Schema;
import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericRecord;
+import org.apache.commons.lang3.tuple.Pair;
import org.apache.samza.config.MapConfig;
import org.apache.samza.operators.KV;
import org.apache.samza.sql.avro.AvroRelConverter;
@@ -96,7 +96,7 @@ public class TestSamzaSqlRelMessageSerde {
GenericData.Record streetNumRecord = new GenericData.Record(StreetNumRecord.SCHEMA$);
streetNumRecord.put("number", 1200);
addressRecord.put("streetnum", streetNumRecord);
- return new Pair<>(nestedRecordAvroRelConverter.convertToRelMessage(new KV<>("key", record)), record);
+ return Pair.of(nestedRecordAvroRelConverter.convertToRelMessage(new KV<>("key", record)), record);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/samza/blob/3b9e14be/samza-sql/src/test/java/org/apache/samza/sql/TestSamzaSqlRelRecordSerde.java
----------------------------------------------------------------------
diff --git a/samza-sql/src/test/java/org/apache/samza/sql/TestSamzaSqlRelRecordSerde.java b/samza-sql/src/test/java/org/apache/samza/sql/TestSamzaSqlRelRecordSerde.java
index 95b4972..25d1c77 100644
--- a/samza-sql/src/test/java/org/apache/samza/sql/TestSamzaSqlRelRecordSerde.java
+++ b/samza-sql/src/test/java/org/apache/samza/sql/TestSamzaSqlRelRecordSerde.java
@@ -26,6 +26,7 @@ import java.util.Map;
import org.apache.avro.Schema;
import org.apache.avro.generic.GenericData;
+import org.apache.commons.lang3.tuple.Pair;
import org.apache.samza.config.MapConfig;
import org.apache.samza.sql.avro.AvroRelConverter;
import org.apache.samza.sql.avro.AvroRelSchemaProvider;
@@ -37,8 +38,6 @@ import org.apache.samza.system.SystemStream;
import org.junit.Assert;
import org.junit.Test;
-import javafx.util.Pair;
-
import static org.apache.samza.sql.serializers.SamzaSqlRelRecordSerdeFactory.SamzaSqlRelRecordSerde;
import static org.apache.samza.sql.data.SamzaSqlRelMessage.SamzaSqlRelRecord;