This is an automated email from the ASF dual-hosted git repository.
yihua 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 0e55f0900d8 [HUDI-7817] Use Jackson Core instead of
org.codehaus.jackson for JSON encoding (#11369)
0e55f0900d8 is described below
commit 0e55f0900d80b64398d9e8d50b32e8e1680df9f0
Author: Y Ethan Guo <[email protected]>
AuthorDate: Thu May 30 21:39:23 2024 -0700
[HUDI-7817] Use Jackson Core instead of org.codehaus.jackson for JSON
encoding (#11369)
---
hudi-common/src/main/java/org/apache/hudi/avro/JsonEncoder.java | 8 ++++----
style/checkstyle.xml | 3 ++-
style/scalastyle.xml | 8 +-------
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/hudi-common/src/main/java/org/apache/hudi/avro/JsonEncoder.java
b/hudi-common/src/main/java/org/apache/hudi/avro/JsonEncoder.java
index 86d6a6ad9e2..01b44ead24f 100644
--- a/hudi-common/src/main/java/org/apache/hudi/avro/JsonEncoder.java
+++ b/hudi-common/src/main/java/org/apache/hudi/avro/JsonEncoder.java
@@ -19,6 +19,10 @@
package org.apache.hudi.avro;
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.util.MinimalPrettyPrinter;
import org.apache.avro.AvroTypeException;
import org.apache.avro.Schema;
import org.apache.avro.io.Encoder;
@@ -27,10 +31,6 @@ import org.apache.avro.io.parsing.JsonGrammarGenerator;
import org.apache.avro.io.parsing.Parser;
import org.apache.avro.io.parsing.Symbol;
import org.apache.avro.util.Utf8;
-import org.codehaus.jackson.JsonEncoding;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.util.MinimalPrettyPrinter;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/style/checkstyle.xml b/style/checkstyle.xml
index 92883af6ff5..24fd704ba46 100644
--- a/style/checkstyle.xml
+++ b/style/checkstyle.xml
@@ -267,7 +267,8 @@
<module name="CommentsIndentation"/>
<module name="IllegalImport">
<property name="regexp" value="true"/>
- <property name="illegalPkgs" value="org\.apache\.commons,
com\.google\.common, org\.apache\.log4j"/>
+ <property name="illegalPkgs"
+ value="org\.apache\.commons, com\.google\.common,
org\.apache\.log4j, org\.codehaus\.jackson"/>
<property name="illegalClasses"
value="^java\.util\.Optional,
^org\.junit\.(?!jupiter|platform|contrib|Rule|runner)(.*)"/>
</module>
diff --git a/style/scalastyle.xml b/style/scalastyle.xml
index 463ceebef30..dd4ddb3b801 100644
--- a/style/scalastyle.xml
+++ b/style/scalastyle.xml
@@ -57,7 +57,7 @@
<check level="error" class="org.scalastyle.scalariform.EqualsHashCodeChecker"
enabled="true"/>
<check level="error" class="org.scalastyle.scalariform.IllegalImportsChecker"
enabled="true">
<parameters>
- <parameter name="illegalImports"><![CDATA[sun._,java.awt._]]></parameter>
+ <parameter
name="illegalImports"><![CDATA[sun._,java.awt._,com.google.common,org.codehaus.jackson]]></parameter>
</parameters>
</check>
<check level="error"
class="org.scalastyle.scalariform.ParameterNumberChecker" enabled="true">
@@ -130,10 +130,4 @@
<parameter name="group.scala">scala\..*</parameter>
</parameters>
</check>
- <check level="error" class="org.scalastyle.scalariform.IllegalImportsChecker"
enabled="true">
- <parameters>
- <parameter name="illegalImports"><![CDATA[com.google.common]]></parameter>
- </parameters>
- </check>
-
</scalastyle>
