(hudi) branch master updated: [HUDI-8279] Throw HoodieJsonToAvroConversionException when converting from json to avro (#12694)

[wombatukun]

This is an automated email from the ASF dual-hosted git repository.

wombatukun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git


The following commit(s) were added to refs/heads/master by this push:
     new 661e5d9499d [HUDI-8279] Throw HoodieJsonToAvroConversionException when 
converting from json to avro (#12694)
661e5d9499d is described below

commit 661e5d9499d9f241abdab13c8a778c5d4047fec7
Author: Ekaterina Belousova <grantired....@gmail.com>
AuthorDate: Thu Jan 23 12:51:04 2025 +0700

    [HUDI-8279] Throw HoodieJsonToAvroConversionException when converting from 
json to avro (#12694)
---
 .../src/main/java/org/apache/hudi/avro/MercifulJsonConverter.java    | 5 ++---
 .../java/org/apache/hudi/avro/processors/JsonFieldProcessor.java     | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/hudi-common/src/main/java/org/apache/hudi/avro/MercifulJsonConverter.java 
b/hudi-common/src/main/java/org/apache/hudi/avro/MercifulJsonConverter.java
index f086ef62c88..a8f5cec20f1 100644
--- a/hudi-common/src/main/java/org/apache/hudi/avro/MercifulJsonConverter.java
+++ b/hudi-common/src/main/java/org/apache/hudi/avro/MercifulJsonConverter.java
@@ -35,7 +35,6 @@ import org.apache.hudi.common.util.CollectionUtils;
 import org.apache.hudi.common.util.ValidationUtils;
 import org.apache.hudi.common.util.collection.Pair;
 import org.apache.hudi.exception.HoodieException;
-import org.apache.hudi.exception.HoodieJsonConversionException;
 import org.apache.hudi.exception.HoodieJsonToAvroConversionException;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -547,14 +546,14 @@ public class MercifulJsonConverter {
     };
   }
 
-  protected HoodieJsonConversionException buildConversionException(Object 
value, String fieldName, Schema schema, boolean shouldSanitize, String 
invalidCharMask) {
+  protected HoodieJsonToAvroConversionException 
buildConversionException(Object value, String fieldName, Schema schema, boolean 
shouldSanitize, String invalidCharMask) {
     String errorMsg;
     if (shouldSanitize) {
       errorMsg = String.format("Json to Avro Type conversion error for field 
%s, %s for %s. Field sanitization is enabled with a mask of %s.", fieldName, 
value, schema, invalidCharMask);
     } else {
       errorMsg = String.format("Json to Avro Type conversion error for field 
%s, %s for %s", fieldName, value, schema);
     }
-    return new HoodieJsonConversionException(errorMsg);
+    return new HoodieJsonToAvroConversionException(errorMsg);
   }
 
 }
\ No newline at end of file
diff --git 
a/hudi-common/src/main/java/org/apache/hudi/avro/processors/JsonFieldProcessor.java
 
b/hudi-common/src/main/java/org/apache/hudi/avro/processors/JsonFieldProcessor.java
index dd76c463eca..519e129e151 100644
--- 
a/hudi-common/src/main/java/org/apache/hudi/avro/processors/JsonFieldProcessor.java
+++ 
b/hudi-common/src/main/java/org/apache/hudi/avro/processors/JsonFieldProcessor.java
@@ -19,7 +19,7 @@
 package org.apache.hudi.avro.processors;
 
 import org.apache.hudi.common.util.collection.Pair;
-import org.apache.hudi.exception.HoodieJsonConversionException;
+import org.apache.hudi.exception.HoodieJsonToAvroConversionException;
 
 import org.apache.avro.Schema;
 
@@ -30,7 +30,7 @@ public abstract class JsonFieldProcessor implements 
Serializable {
   public Object convertField(Object value, String name, Schema schema) {
     Pair<Boolean, Object> res = convert(value, name, schema);
     if (!res.getLeft()) {
-      throw new HoodieJsonConversionException("failed to convert json to 
avro");
+      throw new HoodieJsonToAvroConversionException("failed to convert json to 
avro");
     }
     return res.getRight();
   }