This is an automated email from the ASF dual-hosted git repository. pacinogong pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push: new 7c9044a54 [INLONG-7080][Manager] Use the StringUtils.isNotBlank uniformly (#7081) 7c9044a54 is described below commit 7c9044a5434dcbb54481055f3a18ca2037e3b68b Author: fuweng11 <76141879+fuwen...@users.noreply.github.com> AuthorDate: Wed Dec 28 14:25:24 2022 +0800 [INLONG-7080][Manager] Use the StringUtils.isNotBlank uniformly (#7081) --- .../inlong/manager/pojo/stream/InlongStreamExtParam.java | 12 ++++++------ .../service/resource/sink/greenplum/GreenplumSqlBuilder.java | 2 +- .../service/resource/sink/oracle/OracleSqlBuilder.java | 2 +- .../resource/sink/postgresql/PostgreSQLSqlBuilder.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamExtParam.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamExtParam.java index 6186b7dc4..2b2e61bfc 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamExtParam.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/stream/InlongStreamExtParam.java @@ -17,11 +17,6 @@ package org.apache.inlong.manager.pojo.stream; -import org.apache.commons.lang3.StringUtils; -import org.apache.inlong.manager.common.util.CommonBeanUtils; -import org.apache.inlong.manager.common.util.JsonUtils; - -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -29,6 +24,11 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.apache.inlong.manager.common.util.CommonBeanUtils; +import org.apache.inlong.manager.common.util.JsonUtils; + +import java.io.Serializable; /** * Extended params, will be saved as JSON string @@ -68,7 +68,7 @@ public class InlongStreamExtParam implements Serializable { public static void unpackExtParams( String extParams, Object targetObject) { - if (StringUtils.isNoneBlank(extParams)) { + if (StringUtils.isNotBlank(extParams)) { InlongStreamExtParam inlongStreamExtParam = JsonUtils.parseObject(extParams, InlongStreamExtParam.class); if (inlongStreamExtParam != null) { CommonBeanUtils.copyProperties(inlongStreamExtParam, targetObject, true); diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/greenplum/GreenplumSqlBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/greenplum/GreenplumSqlBuilder.java index 735351d9f..f9aa76276 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/greenplum/GreenplumSqlBuilder.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/greenplum/GreenplumSqlBuilder.java @@ -211,7 +211,7 @@ public class GreenplumSqlBuilder { List<GreenplumColumnInfo> columns) { final List<String> commentList = new ArrayList<>(); for (GreenplumColumnInfo columnInfo : columns) { - if (StringUtils.isNoneBlank(columnInfo.getComment())) { + if (StringUtils.isNotBlank(columnInfo.getComment())) { StringBuilder commSql = new StringBuilder(); commSql.append("COMMENT ON COLUMN \"") .append(schemaName) diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/oracle/OracleSqlBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/oracle/OracleSqlBuilder.java index 9d026a62a..2dd4e28f4 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/oracle/OracleSqlBuilder.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/oracle/OracleSqlBuilder.java @@ -162,7 +162,7 @@ public class OracleSqlBuilder { final List<String> commentList = new ArrayList<>(); final StringBuilder sqlBuilder = new StringBuilder(); columns.stream() - .filter(columnInfo -> StringUtils.isNoneBlank(columnInfo.getComment())) + .filter(columnInfo -> StringUtils.isNotBlank(columnInfo.getComment())) .forEach(columnInfo -> { sqlBuilder.append("COMMENT ON COLUMN \"") .append(tableName) diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/postgresql/PostgreSQLSqlBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/postgresql/PostgreSQLSqlBuilder.java index 33c8db820..f72528a7d 100644 --- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/postgresql/PostgreSQLSqlBuilder.java +++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/postgresql/PostgreSQLSqlBuilder.java @@ -160,7 +160,7 @@ public class PostgreSQLSqlBuilder { List<PostgreSQLColumnInfo> columns) { final List<String> commentList = new ArrayList<>(); for (PostgreSQLColumnInfo columnInfo : columns) { - if (StringUtils.isNoneBlank(columnInfo.getComment())) { + if (StringUtils.isNotBlank(columnInfo.getComment())) { StringBuilder commSql = new StringBuilder(); commSql.append("COMMENT ON COLUMN \"") .append(schemaName)