From 74d7b4d751ac3d3d701db6a4c54e858d089a7e07 Mon Sep 17 00:00:00 2001
From: Dongwook Kwon <dongwook@amazon.com>
Date: Wed, 10 Mar 2021 17:42:09 -0800
Subject: [PATCH] [HUDI-4471] Relocate AWSDmsAvroPayload class to hudi-common

---
 .../java/org/apache/hudi/common/model}/AWSDmsAvroPayload.java  | 3 +--
 .../java/org/apache/hudi/payload/TestAWSDmsAvroPayload.java    | 1 +
 .../org/apache/hudi/utilities/transform/AWSDmsTransformer.java | 2 +-
 .../functional/TestAWSDatabaseMigrationServiceSource.java      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename {hudi-spark-datasource/hudi-spark/src/main/java/org/apache/hudi/payload => hudi-common/src/main/java/org/apache/hudi/common/model}/AWSDmsAvroPayload.java (97%)

diff --git a/hudi-spark-datasource/hudi-spark/src/main/java/org/apache/hudi/payload/AWSDmsAvroPayload.java b/hudi-common/src/main/java/org/apache/hudi/common/model/AWSDmsAvroPayload.java
similarity index 97%
rename from hudi-spark-datasource/hudi-spark/src/main/java/org/apache/hudi/payload/AWSDmsAvroPayload.java
rename to hudi-common/src/main/java/org/apache/hudi/common/model/AWSDmsAvroPayload.java
index 0eba1d9a6..c515338ee 100644
--- a/hudi-spark-datasource/hudi-spark/src/main/java/org/apache/hudi/payload/AWSDmsAvroPayload.java
+++ b/hudi-common/src/main/java/org/apache/hudi/common/model/AWSDmsAvroPayload.java
@@ -16,9 +16,8 @@
  * limitations under the License.
  */
 
-package org.apache.hudi.payload;
+package org.apache.hudi.common.model;
 
-import org.apache.hudi.common.model.OverwriteWithLatestAvroPayload;
 import org.apache.hudi.common.util.Option;
 
 import org.apache.avro.Schema;
diff --git a/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/payload/TestAWSDmsAvroPayload.java b/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/payload/TestAWSDmsAvroPayload.java
index cf3d9a94d..7373553df 100644
--- a/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/payload/TestAWSDmsAvroPayload.java
+++ b/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/payload/TestAWSDmsAvroPayload.java
@@ -18,6 +18,7 @@
 
 package org.apache.hudi.payload;
 
+import org.apache.hudi.common.model.AWSDmsAvroPayload;
 import org.apache.hudi.common.model.OverwriteWithLatestAvroPayload;
 import org.apache.hudi.common.util.Option;
 
diff --git a/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/AWSDmsTransformer.java b/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/AWSDmsTransformer.java
index b8bbfdc34..568f28fff 100644
--- a/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/AWSDmsTransformer.java
+++ b/hudi-utilities/src/main/java/org/apache/hudi/utilities/transform/AWSDmsTransformer.java
@@ -19,8 +19,8 @@
 package org.apache.hudi.utilities.transform;
 
 import org.apache.hudi.common.config.TypedProperties;
+import org.apache.hudi.common.model.AWSDmsAvroPayload;
 import org.apache.hudi.common.util.Option;
-import org.apache.hudi.payload.AWSDmsAvroPayload;
 
 import org.apache.spark.api.java.JavaSparkContext;
 import org.apache.spark.sql.Dataset;
diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/functional/TestAWSDatabaseMigrationServiceSource.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/functional/TestAWSDatabaseMigrationServiceSource.java
index cd6b89b36..3b1da6d00 100644
--- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/functional/TestAWSDatabaseMigrationServiceSource.java
+++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/functional/TestAWSDatabaseMigrationServiceSource.java
@@ -18,7 +18,7 @@
 
 package org.apache.hudi.utilities.functional;
 
-import org.apache.hudi.payload.AWSDmsAvroPayload;
+import org.apache.hudi.common.model.AWSDmsAvroPayload;
 import org.apache.hudi.testutils.SparkClientFunctionalTestHarness;
 import org.apache.hudi.utilities.transform.AWSDmsTransformer;