This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 512b607eb [Improve][All] Improvement of StringUtils.isEmpty method
(#3126)
512b607eb is described below
commit 512b607eb8681d067b2ab28af7dc7b05ae2d31ee
Author: ChunFuWu <[email protected]>
AuthorDate: Sat Sep 16 12:02:25 2023 +0800
[Improve][All] Improvement of StringUtils.isEmpty method (#3126)
---
.../main/java/org/apache/streampark/common/enums/StorageType.java | 2 +-
.../scala/org/apache/streampark/common/util/PropertiesUtils.scala | 2 +-
.../apache/streampark/common/util/PropertiesUtilsTestCase.scala | 2 +-
.../java/org/apache/streampark/console/base/util/GitUtils.java | 4 ++--
.../java/org/apache/streampark/console/core/bean/MavenConfig.java | 8 ++++----
.../java/org/apache/streampark/console/core/bean/MavenPom.java | 2 +-
.../console/core/controller/FlinkPodTemplateController.java | 2 +-
.../org/apache/streampark/console/core/entity/FlinkCluster.java | 2 +-
.../java/org/apache/streampark/console/core/entity/FlinkEnv.java | 8 ++++----
.../java/org/apache/streampark/console/core/entity/Project.java | 4 ++--
.../core/service/application/impl/ApplicationInfoServiceImpl.java | 2 +-
.../console/core/service/impl/FlinkClusterServiceImpl.java | 2 +-
.../console/core/service/impl/SavePointServiceImpl.java | 6 +++---
.../streampark/console/core/service/impl/VariableServiceImpl.java | 6 +++---
.../console/core/service/impl/YarnQueueServiceImpl.java | 4 ++--
.../apache/streampark/console/core/task/FlinkClusterWatcher.java | 2 +-
.../org/apache/streampark/console/core/task/FlinkHttpWatcher.java | 6 +++---
.../streampark/console/core/utils/YarnQueueLabelExpression.java | 8 ++++----
.../streampark/console/system/controller/PassportController.java | 2 +-
.../console/system/service/impl/AccessTokenServiceImpl.java | 2 +-
.../apache/streampark/flink/client/trait/FlinkClientTrait.scala | 6 +++---
.../flink/connector/doris/internal/DorisSinkFunction.java | 6 +++---
22 files changed, 44 insertions(+), 44 deletions(-)
diff --git
a/streampark-common/src/main/java/org/apache/streampark/common/enums/StorageType.java
b/streampark-common/src/main/java/org/apache/streampark/common/enums/StorageType.java
index 71bc4390a..61033e9e8 100644
---
a/streampark-common/src/main/java/org/apache/streampark/common/enums/StorageType.java
+++
b/streampark-common/src/main/java/org/apache/streampark/common/enums/StorageType.java
@@ -40,7 +40,7 @@ public enum StorageType implements Serializable {
}
public static StorageType of(String identifier) {
- if (StringUtils.isEmpty(identifier)) {
+ if (StringUtils.isBlank(identifier)) {
return LFS;
}
for (StorageType type : values()) {
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/util/PropertiesUtils.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/util/PropertiesUtils.scala
index 87440079b..91b25c2f1 100644
---
a/streampark-common/src/main/scala/org/apache/streampark/common/util/PropertiesUtils.scala
+++
b/streampark-common/src/main/scala/org/apache/streampark/common/util/PropertiesUtils.scala
@@ -278,7 +278,7 @@ object PropertiesUtils extends Logger {
/** extract flink configuration from application.properties */
@Nonnull def extractDynamicProperties(properties: String): Map[String,
String] = {
- if (StringUtils.isEmpty(properties)) Map.empty[String, String]
+ if (StringUtils.isBlank(properties)) Map.empty[String, String]
else {
val map = mutable.Map[String, String]()
val simple = properties.replaceAll(MULTI_PROPERTY_REGEXP, "")
diff --git
a/streampark-common/src/test/scala/org/apache/streampark/common/util/PropertiesUtilsTestCase.scala
b/streampark-common/src/test/scala/org/apache/streampark/common/util/PropertiesUtilsTestCase.scala
index 88f7b3575..01e1b2743 100644
---
a/streampark-common/src/test/scala/org/apache/streampark/common/util/PropertiesUtilsTestCase.scala
+++
b/streampark-common/src/test/scala/org/apache/streampark/common/util/PropertiesUtilsTestCase.scala
@@ -31,7 +31,7 @@ class PropertiesUtilsTestCase {
"--c d\r\n" +
"--including-tables \"BASE_CARD_ETPS|BASE_CHECKED_STAT\"\n"
val programArgs = new ArrayBuffer[String]()
- if (StringUtils.isNotEmpty(argsStr)) {
+ if (StringUtils.isNotBlank(argsStr)) {
val multiChar = "\""
val array = argsStr.split("\\s+")
if (!array.exists(_.startsWith(multiChar))) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/GitUtils.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/GitUtils.java
index ea00a83cf..57531baa9 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/GitUtils.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/GitUtils.java
@@ -82,7 +82,7 @@ public class GitUtils {
GitCredential gitCredential = GitCredential.of(project.getGitCredential());
switch (gitCredential) {
case HTTPS:
- if (!StringUtils.isAllEmpty(project.getUserName(),
project.getPassword())) {
+ if (!StringUtils.isAllBlank(project.getUserName(),
project.getPassword())) {
UsernamePasswordCredentialsProvider credentialsProvider =
new UsernamePasswordCredentialsProvider(project.getUserName(),
project.getPassword());
transportCommand.setCredentialsProvider(credentialsProvider);
@@ -115,7 +115,7 @@ public class GitUtils {
if (prvkeyPath == null) {
return jSch;
}
- if (StringUtils.isEmpty(project.getPassword())) {
+ if (StringUtils.isBlank(project.getPassword())) {
jSch.addIdentity(prvkeyPath);
} else {
jSch.addIdentity(prvkeyPath, project.getPassword());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenConfig.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenConfig.java
index aad2a7062..d073ea7e9 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenConfig.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenConfig.java
@@ -81,19 +81,19 @@ public class MavenConfig {
*/
public void updateConfig() {
- if (StringUtils.isNotEmpty(mvnSettings)) {
+ if (StringUtils.isNotBlank(mvnSettings)) {
InternalConfigHolder.set(CommonConfig.MAVEN_SETTINGS_PATH(),
mvnSettings);
}
- if (StringUtils.isNotEmpty(mvnRepository)) {
+ if (StringUtils.isNotBlank(mvnRepository)) {
InternalConfigHolder.set(CommonConfig.MAVEN_REMOTE_URL(), mvnRepository);
}
- if (StringUtils.isNotEmpty(mvnAuthUser)) {
+ if (StringUtils.isNotBlank(mvnAuthUser)) {
InternalConfigHolder.set(CommonConfig.MAVEN_AUTH_USER(), mvnAuthUser);
}
- if (StringUtils.isNotEmpty(mvnAuthPassword)) {
+ if (StringUtils.isNotBlank(mvnAuthPassword)) {
InternalConfigHolder.set(CommonConfig.MAVEN_AUTH_PASSWORD(),
mvnAuthPassword);
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenPom.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenPom.java
index eb59e7f63..af140543f 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenPom.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenPom.java
@@ -53,6 +53,6 @@ public class MavenPom {
groupId,
artifactId,
version,
- StringUtils.isEmpty(classifier) ? "" : ":".concat(classifier));
+ StringUtils.isBlank(classifier) ? "" : ":".concat(classifier));
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkPodTemplateController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkPodTemplateController.java
index 034a08c29..abf2385a0 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkPodTemplateController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkPodTemplateController.java
@@ -72,7 +72,7 @@ public class FlinkPodTemplateController {
}
private Map<String, String> covertHostsParamToMap(String hosts) {
- if (StringUtils.isEmpty(hosts)) {
+ if (StringUtils.isBlank(hosts)) {
return new HashMap<>(0);
} else {
return Arrays.stream(hosts.split(","))
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
index 81b97be00..390607476 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
@@ -163,7 +163,7 @@ public class FlinkCluster implements Serializable {
String json =
HttpClientUtils.httpGetRequest(
restUrl, RequestConfig.custom().setConnectTimeout(2000,
TimeUnit.MILLISECONDS).build());
- if (StringUtils.isEmpty(json)) {
+ if (StringUtils.isBlank(json)) {
return Collections.emptyMap();
}
List<Map<String, String>> confList =
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java
index 2a498ebc4..b2798e403 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java
@@ -109,28 +109,28 @@ public class FlinkEnv implements Serializable {
}
public String getLargeVersion() {
- if (StringUtils.isNotEmpty(this.version)) {
+ if (StringUtils.isNotBlank(this.version)) {
return this.version.substring(0, this.version.lastIndexOf("."));
}
return null;
}
public String getVersionOfFirst() {
- if (StringUtils.isNotEmpty(this.version)) {
+ if (StringUtils.isNotBlank(this.version)) {
return this.version.split("\\.")[0];
}
return null;
}
public String getVersionOfMiddle() {
- if (StringUtils.isNotEmpty(this.version)) {
+ if (StringUtils.isNotBlank(this.version)) {
return this.version.split("\\.")[1];
}
return null;
}
public String getVersionOfLast() {
- if (StringUtils.isNotEmpty(this.version)) {
+ if (StringUtils.isNotBlank(this.version)) {
return this.version.split("\\.")[2];
}
return null;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
index 25a199002..98b2ff7f9 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
@@ -201,12 +201,12 @@ public class Project implements Serializable {
StringBuilder cmdBuffer = new StringBuilder(mvn).append(" clean package
-DskipTests ");
- if (StringUtils.isNotEmpty(this.buildArgs)) {
+ if (StringUtils.isNotBlank(this.buildArgs)) {
cmdBuffer.append(this.buildArgs.trim());
}
String setting =
InternalConfigHolder.get(CommonConfig.MAVEN_SETTINGS_PATH());
- if (StringUtils.isNotEmpty(setting)) {
+ if (StringUtils.isNotBlank(setting)) {
cmdBuffer.append(" --settings ").append(setting);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java
index 41930d903..a292cde75 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationInfoServiceImpl.java
@@ -512,7 +512,7 @@ public class ApplicationInfoServiceImpl extends
ServiceImpl<ApplicationMapper, A
}
private Boolean checkJobName(String jobName) {
- if (!StringUtils.isEmpty(jobName.trim())) {
+ if (!StringUtils.isBlank(jobName.trim())) {
return JOB_NAME_PATTERN.matcher(jobName).matches()
&& SINGLE_SPACE_PATTERN.matcher(jobName).matches();
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java
index cf6221cb7..bbf30c1f5 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java
@@ -116,7 +116,7 @@ public class FlinkClusterServiceImpl extends
ServiceImpl<FlinkClusterMapper, Fli
// 2) Check target-cluster is already exists
String clusterId = cluster.getClusterId();
- if (StringUtils.isNotEmpty(clusterId) && this.existsByClusterId(clusterId,
cluster.getId())) {
+ if (StringUtils.isNotBlank(clusterId) && this.existsByClusterId(clusterId,
cluster.getId())) {
result.setMsg("The clusterId " + clusterId + " is already exists,please
check!");
result.setStatus(2);
return result;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
index c85d0f1d4..766d5a74f 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
@@ -272,7 +272,7 @@ public class SavePointServiceImpl extends
ServiceImpl<SavePointMapper, SavePoint
private String getFinalSavepointDir(@Nullable String savepointPath,
Application application) {
String result = savepointPath;
- if (StringUtils.isEmpty(savepointPath)) {
+ if (StringUtils.isBlank(savepointPath)) {
try {
result = this.getSavePointPath(application);
} catch (Exception e) {
@@ -388,7 +388,7 @@ public class SavePointServiceImpl extends
ServiceImpl<SavePointMapper, SavePoint
private Optional<Integer> tryGetChkNumRetainedFromDynamicProps(String
dynamicProps) {
String rawCfgValue =
extractDynamicPropertiesAsJava(dynamicProps).get(MAX_RETAINED_CHECKPOINTS.key());
- if (StringUtils.isEmpty(rawCfgValue)) {
+ if (StringUtils.isBlank(rawCfgValue)) {
return Optional.empty();
}
try {
@@ -410,7 +410,7 @@ public class SavePointServiceImpl extends
ServiceImpl<SavePointMapper, SavePoint
@Nonnull FlinkEnv flinkEnv, @Nonnull Application application) {
String flinkConfNumRetained =
flinkEnv.convertFlinkYamlAsMap().get(MAX_RETAINED_CHECKPOINTS.key());
- if (StringUtils.isEmpty(flinkConfNumRetained)) {
+ if (StringUtils.isBlank(flinkConfNumRetained)) {
log.info(
"The application: {} is not set {} in dynamicProperties or value is
invalid, and flink-conf.yaml is the same problem of flink env: {}, default
value: {} will be use.",
application.getJobName(),
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
index 1f30c3fbc..830fb3de1 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/VariableServiceImpl.java
@@ -187,7 +187,7 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
*/
@Override
public String replaceVariable(Long teamId, String mixed) {
- if (StringUtils.isEmpty(mixed)) {
+ if (StringUtils.isBlank(mixed)) {
return mixed;
}
List<Variable> variables = findByTeamId(teamId);
@@ -203,7 +203,7 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
String placeholder = matcher.group();
String variableCode = getCodeFromPlaceholder(placeholder);
String variableValue = variableMap.get(variableCode);
- if (StringUtils.isNotEmpty(variableValue)) {
+ if (StringUtils.isNotBlank(variableValue)) {
restore = restore.replace(placeholder, variableValue);
}
}
@@ -249,7 +249,7 @@ public class VariableServiceImpl extends
ServiceImpl<VariableMapper, Variable>
* @return If mixed can match the variableCode, return true, otherwise
return false
*/
private boolean isDepend(String variableCode, String mixed) {
- if (StringUtils.isEmpty(mixed)) {
+ if (StringUtils.isBlank(mixed)) {
return false;
}
String placeholder = String.format("%s%s%s", PLACEHOLDER_START,
variableCode, PLACEHOLDER_END);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
index 7961f5e06..ef9dd4f18 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/YarnQueueServiceImpl.java
@@ -93,7 +93,7 @@ public class YarnQueueServiceImpl extends
ServiceImpl<YarnQueueMapper, YarnQueue
ResponseResult<String> responseResult = new ResponseResult<>();
- if (StringUtils.isEmpty(yarnQueue.getQueueLabel())) {
+ if (StringUtils.isBlank(yarnQueue.getQueueLabel())) {
responseResult.setStatus(3);
responseResult.setMsg(QUEUE_EMPTY_HINT);
return responseResult;
@@ -184,7 +184,7 @@ public class YarnQueueServiceImpl extends
ServiceImpl<YarnQueueMapper, YarnQueue
@Override
public boolean isDefaultQueue(String queueLabel) {
- return StringUtils.equals(DEFAULT_QUEUE, queueLabel) ||
StringUtils.isEmpty(queueLabel);
+ return StringUtils.equals(DEFAULT_QUEUE, queueLabel) ||
StringUtils.isBlank(queueLabel);
}
@Override
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkClusterWatcher.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkClusterWatcher.java
index 200a548a8..5aba86351 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkClusterWatcher.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkClusterWatcher.java
@@ -216,7 +216,7 @@ public class FlinkClusterWatcher {
String address = flinkCluster.getAddress();
String jobManagerUrl = flinkCluster.getJobManagerUrl();
String flinkUrl =
- StringUtils.isEmpty(jobManagerUrl)
+ StringUtils.isBlank(jobManagerUrl)
? address.concat("/overview")
: jobManagerUrl.concat("/overview");
try {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkHttpWatcher.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkHttpWatcher.java
index b7a69acd5..59eb3f542 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkHttpWatcher.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkHttpWatcher.java
@@ -659,7 +659,7 @@ public class FlinkHttpWatcher {
if
(application.getExecutionModeEnum().equals(ExecutionMode.YARN_APPLICATION)
||
application.getExecutionModeEnum().equals(ExecutionMode.YARN_PER_JOB)) {
String reqURL;
- if (StringUtils.isEmpty(application.getJobManagerUrl())) {
+ if (StringUtils.isBlank(application.getJobManagerUrl())) {
String format = "proxy/%s/overview";
reqURL = String.format(format, appId);
} else {
@@ -677,7 +677,7 @@ public class FlinkHttpWatcher {
ExecutionMode execMode = application.getExecutionModeEnum();
if (ExecutionMode.isYarnMode(execMode)) {
String reqURL;
- if (StringUtils.isEmpty(application.getJobManagerUrl())) {
+ if (StringUtils.isBlank(application.getJobManagerUrl())) {
String format = "proxy/%s/" + flinkUrl;
reqURL = String.format(format, application.getAppId());
} else {
@@ -711,7 +711,7 @@ public class FlinkHttpWatcher {
ExecutionMode execMode = application.getExecutionModeEnum();
if (ExecutionMode.isYarnMode(execMode)) {
String reqURL;
- if (StringUtils.isEmpty(application.getJobManagerUrl())) {
+ if (StringUtils.isBlank(application.getJobManagerUrl())) {
String format = "proxy/%s/" + flinkUrl;
reqURL = String.format(format, application.getAppId(),
application.getJobId());
} else {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/utils/YarnQueueLabelExpression.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/utils/YarnQueueLabelExpression.java
index 3ebba59e0..e44482b58 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/utils/YarnQueueLabelExpression.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/utils/YarnQueueLabelExpression.java
@@ -53,7 +53,7 @@ public class YarnQueueLabelExpression {
private @Nullable final String labelExpression;
private YarnQueueLabelExpression(String queue, String labelExpression) {
- this.labelExpression = StringUtils.isEmpty(labelExpression) ? null :
labelExpression;
+ this.labelExpression = StringUtils.isBlank(labelExpression) ? null :
labelExpression;
this.queue = queue;
}
@@ -67,13 +67,13 @@ public class YarnQueueLabelExpression {
@Override
public String toString() {
- return StringUtils.isEmpty(labelExpression)
+ return StringUtils.isBlank(labelExpression)
? queue
: String.format(QUEUE_LABEL_FORMAT, queue, labelExpression);
}
public static boolean isValid(String queueLabel, boolean ignoreEmpty) {
- if (StringUtils.isEmpty(queueLabel)) {
+ if (StringUtils.isBlank(queueLabel)) {
return ignoreEmpty;
}
return QUEUE_LABEL_PATTERN.matcher(queueLabel).matches();
@@ -104,7 +104,7 @@ public class YarnQueueLabelExpression {
}
public static Map<String, String> getQueueLabelMap(String queueLabelExp) {
- if (StringUtils.isEmpty(queueLabelExp)) {
+ if (StringUtils.isBlank(queueLabelExp)) {
return Collections.emptyMap();
}
YarnQueueLabelExpression yarnQueueLabelExpression = of(queueLabelExp);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
index 2850f3a39..76ea2aac1 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
@@ -79,7 +79,7 @@ public class PassportController {
@NotBlank(message = "{required}") String loginType)
throws Exception {
- if (StringUtils.isEmpty(username)) {
+ if (StringUtils.isBlank(username)) {
return RestResponse.success().put(RestResponse.CODE_KEY, 0);
}
User user = authenticator.authenticate(username, password, loginType);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
index eb9d7ffa8..69c88b9c3 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java
@@ -62,7 +62,7 @@ public class AccessTokenServiceImpl extends
ServiceImpl<AccessTokenMapper, Acces
return RestResponse.success().put(RestResponse.CODE_KEY,
0).message("user not available");
}
- if (StringUtils.isEmpty(expireTime)) {
+ if (StringUtils.isBlank(expireTime)) {
expireTime = AccessToken.DEFAULT_EXPIRE_TIME;
}
Long ttl = DateUtils.getTime(expireTime, DateUtils.fullFormat(),
TimeZone.getDefault());
diff --git
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/FlinkClientTrait.scala
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/FlinkClientTrait.scala
index de7907b89..716c9b2a7 100644
---
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/FlinkClientTrait.scala
+++
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/FlinkClientTrait.scala
@@ -427,7 +427,7 @@ trait FlinkClientTrait extends Logger {
val programArgs = new ArrayBuffer[String]()
val args = submitRequest.args
- if (StringUtils.isNotEmpty(args)) {
+ if (StringUtils.isNotBlank(args)) {
val multiChar = "\""
val array = args.split("\\s+")
if (!array.exists(_.startsWith(multiChar))) {
@@ -585,7 +585,7 @@ trait FlinkClientTrait extends Logger {
private def tryGetSavepointPathIfNeed(request: SavepointRequestTrait):
String = {
if (!request.withSavepoint) null
else {
- if (StringUtils.isNotEmpty(request.savepointPath)) {
+ if (StringUtils.isNotBlank(request.savepointPath)) {
request.savepointPath
} else {
val configDir = getOptionFromDefaultFlinkConfig[String](
@@ -600,7 +600,7 @@ trait FlinkClientTrait extends Logger {
}
)
- if (StringUtils.isEmpty(configDir)) {
+ if (StringUtils.isBlank(configDir)) {
throw new FlinkException(
s"[StreamPark] executionMode: ${request.executionMode.getName},
savePoint path is null or invalid.")
} else configDir
diff --git
a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkFunction.java
b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkFunction.java
index 8360e0d24..210e92e38 100644
---
a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkFunction.java
+++
b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisSinkFunction.java
@@ -78,8 +78,8 @@ public class DorisSinkFunction<T> extends RichSinkFunction<T>
implements Checkpo
long start = System.nanoTime();
if (value instanceof DorisSinkRowDataWithMeta) {
DorisSinkRowDataWithMeta data = (DorisSinkRowDataWithMeta) value;
- if (StringUtils.isEmpty(data.getDatabase())
- || StringUtils.isEmpty(data.getTable())
+ if (StringUtils.isBlank(data.getDatabase())
+ || StringUtils.isBlank(data.getTable())
|| null == data.getDataRows()) {
LOGGER.warn(
String.format(
@@ -89,7 +89,7 @@ public class DorisSinkFunction<T> extends RichSinkFunction<T>
implements Checkpo
}
dorisSinkWriter.writeRecords(data.getDatabase(), data.getTable(),
data.getDataRows());
} else {
- if (StringUtils.isEmpty(dorisConfig.database()) ||
StringUtils.isEmpty(dorisConfig.table())) {
+ if (StringUtils.isBlank(dorisConfig.database()) ||
StringUtils.isBlank(dorisConfig.table())) {
throw new RuntimeException(
" database|table is empty ,please check your config or create
DorisSinkRowDataWithMeta instance");
}
