[incubator-inlong] branch master updated: [INLONG-4035][Sort] Change the restriction of Hive catalogName from not nullable to nullable (#4036)

[healchow]

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

healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 101b6ae9e [INLONG-4035][Sort] Change the restriction of Hive 
catalogName from not nullable to nullable (#4036)
101b6ae9e is described below

commit 101b6ae9e9c1a1177e6edc38fd0614e7e5051a68
Author: ganfengtan <ganfeng...@users.noreply.github.com>
AuthorDate: Fri Apr 29 20:05:33 2022 +0800

    [INLONG-4035][Sort] Change the restriction of Hive catalogName from not 
nullable to nullable (#4036)
---
 .../java/org/apache/inlong/sort/protocol/node/load/HiveLoadNode.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNode.java
 
b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNode.java
index 71e26b140..c38969c57 100644
--- 
a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNode.java
+++ 
b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNode.java
@@ -55,7 +55,6 @@ public class HiveLoadNode extends LoadNode implements 
Serializable {
     private String tableName;
 
     @JsonProperty("catalogName")
-    @Nonnull
     private String catalogName;
 
     @JsonProperty("database")
@@ -84,7 +83,7 @@ public class HiveLoadNode extends LoadNode implements 
Serializable {
             @JsonProperty("filters") List<FilterFunction> filters,
             @Nullable @JsonProperty("sinkParallelism") Integer sinkParallelism,
             @JsonProperty("properties") Map<String, String> properties,
-            @Nullable @JsonProperty("catalogName") String catalogName,
+            @JsonProperty("catalogName") String catalogName,
             @Nullable @JsonProperty("database") String database,
             @Nullable @JsonProperty("tableName") String tableName,
             @Nullable @JsonProperty("hiveConfDir") String hiveConfDir,
@@ -92,11 +91,11 @@ public class HiveLoadNode extends LoadNode implements 
Serializable {
             @JsonProperty("hadoopConfDir") String hadoopConfDir,
             @JsonProperty("parFields") List<FieldInfo> partitionFields) {
         super(id, name, fields, fieldRelationShips, filters, sinkParallelism, 
properties);
-        this.catalogName = Preconditions.checkNotNull(catalogName, "catalog of 
hive is null");
         this.database = Preconditions.checkNotNull(database, "database of hive 
is null");
         this.tableName = Preconditions.checkNotNull(tableName, "table of hive 
is null");
         this.hiveConfDir = Preconditions.checkNotNull(hiveConfDir, "hive 
config path is null");
         this.hiveVersion = Preconditions.checkNotNull(hiveVersion, "version of 
hive is null");
+        this.catalogName = catalogName;
         this.hadoopConfDir = hadoopConfDir;
         this.partitionFields = partitionFields;
         handleTimestampField();