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 81c2bc9c4 [Improve] Improve streampark-common module base on
https://rules.sonarsource.com/java/RSPEC-3457/ (#3258)
81c2bc9c4 is described below
commit 81c2bc9c40ec0c7ea604a7252a2716ff704252e0
Author: VampireAchao <[email protected]>
AuthorDate: Sun Oct 22 09:20:52 2023 +0800
[Improve] Improve streampark-common module base on
https://rules.sonarsource.com/java/RSPEC-3457/ (#3258)
---
.../streampark/console/base/config/P6spySqlFormatConfig.java | 2 +-
.../org/apache/streampark/console/core/entity/Project.java | 4 ++--
.../service/alert/impl/DingTalkAlertNotifyServiceImpl.java | 6 +++---
.../service/alert/impl/HttpCallbackAlertNotifyServiceImpl.java | 4 ++--
.../core/service/alert/impl/LarkAlertNotifyServiceImpl.java | 6 +++---
.../core/service/alert/impl/WeComAlertNotifyServiceImpl.java | 8 ++++----
.../apache/streampark/console/core/task/ProjectBuildTask.java | 2 +-
.../flink/connector/doris/internal/DorisStreamLoader.java | 10 +++++-----
.../org/apache/streampark/gateway/factories/FactoryUtil.java | 4 ++--
.../testcontainer/flink/FlinkStandaloneSessionCluster.java | 4 ++--
10 files changed, 25 insertions(+), 25 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/P6spySqlFormatConfig.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/P6spySqlFormatConfig.java
index 95184779f..a3b9b07b7 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/P6spySqlFormatConfig.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/P6spySqlFormatConfig.java
@@ -40,7 +40,7 @@ public class P6spySqlFormatConfig implements
MessageFormattingStrategy {
return StringUtils.isBlank(sql)
? ""
: String.format(
- "%s | consume %d ms | SQL statement：\n %s;",
+ "%s | consume %d ms | SQL statement：%n %s;",
DateUtils.formatFullTime(LocalDateTime.now()),
elapsed,
sql.replaceAll("\\s+", StringUtils.SPACE));
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 ec201a65a..1db459925 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
@@ -237,14 +237,14 @@ public class Project implements Serializable {
@JsonIgnore
public String getLog4BuildStart() {
return String.format(
- "%sproject : %s\nbranches: %s\ncommand : %s\n\n",
+ "%sproject : %s%nbranches: %s%ncommand : %s%n%n",
getLogHeader("maven install"), getName(), getBranches(),
getMavenArgs());
}
@JsonIgnore
public String getLog4CloneStart() {
return String.format(
- "%sproject : %s\nbranches : %s\nworkspace: %s\n\n",
+ "%sproject : %s%nbranches : %s%nworkspace: %s%n%n",
getLogHeader("git clone"), getName(), getBranches(), getAppSource());
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java
index cd4a39332..9016d7aeb 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java
@@ -118,16 +118,16 @@ public class DingTalkAlertNotifyServiceImpl implements
AlertNotifyService {
} catch (Exception e) {
log.error("Failed to request DingTalk robot alarm,\nurl:{}", url, e);
throw new AlertException(
- String.format("Failed to request DingTalk robot alert,\nurl:%s",
url), e);
+ String.format("Failed to request DingTalk robot alert,%nurl:%s",
url), e);
}
if (robotResponse == null) {
throw new AlertException(
- String.format("Failed to request DingTalk robot alert,\nurl:%s",
url));
+ String.format("Failed to request DingTalk robot alert,%nurl:%s",
url));
}
if (robotResponse.getErrcode() != 0) {
throw new AlertException(
String.format(
- "Failed to request DingTalk robot
alert,\nurl:%s,\nerrorCode:%d,\nerrorMsg:%s",
+ "Failed to request DingTalk robot
alert,%nurl:%s,%nerrorCode:%d,%nerrorMsg:%s",
url, robotResponse.getErrcode(), robotResponse.getErrmsg()));
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/HttpCallbackAlertNotifyServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/HttpCallbackAlertNotifyServiceImpl.java
index 976152d57..7568f9dff 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/HttpCallbackAlertNotifyServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/HttpCallbackAlertNotifyServiceImpl.java
@@ -112,11 +112,11 @@ public class HttpCallbackAlertNotifyServiceImpl
implements AlertNotifyService {
} catch (Exception e) {
log.error("Failed to request httpCallback alert,\nurl:{}", url, e);
throw new AlertException(
- String.format("Failed to request httpCallback alert,\nurl:%s", url),
e);
+ String.format("Failed to request httpCallback alert,%nurl:%s", url),
e);
}
if (response == null) {
- throw new AlertException(String.format("Failed to request httpCallback
alert,\nurl:%s", url));
+ throw new AlertException(String.format("Failed to request httpCallback
alert,%nurl:%s", url));
}
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/LarkAlertNotifyServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/LarkAlertNotifyServiceImpl.java
index 8bea1f67e..248c6b46a 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/LarkAlertNotifyServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/LarkAlertNotifyServiceImpl.java
@@ -106,16 +106,16 @@ public class LarkAlertNotifyServiceImpl implements
AlertNotifyService {
} catch (Exception e) {
log.error("Failed to request Lark robot alarm,\nurl:{}", url, e);
throw new AlertException(
- String.format("Failed to request Lark robot alert,\nurl:%s", url),
e);
+ String.format("Failed to request Lark robot alert,%nurl:%s", url),
e);
}
if (robotResponse == null) {
- throw new AlertException(String.format("Failed to request Lark robot
alert,\nurl:%s", url));
+ throw new AlertException(String.format("Failed to request Lark robot
alert,%nurl:%s", url));
}
if (robotResponse.getStatusCode() == null || robotResponse.getStatusCode()
!= 0) {
throw new AlertException(
String.format(
- "Failed to request Lark robot
alert,\nurl:%s,\nerrorCode:%d,\nerrorMsg:%s",
+ "Failed to request Lark robot
alert,%nurl:%s,%nerrorCode:%d,%nerrorMsg:%s",
url, robotResponse.getCode(), robotResponse.getMsg()));
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/WeComAlertNotifyServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/WeComAlertNotifyServiceImpl.java
index b0354618c..f648bd5a9 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/WeComAlertNotifyServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/WeComAlertNotifyServiceImpl.java
@@ -85,18 +85,18 @@ public class WeComAlertNotifyServiceImpl implements
AlertNotifyService {
try {
robotResponse = alertRestTemplate.postForObject(url, entity,
RobotResponse.class);
} catch (Exception e) {
- log.error("Failed to request WeCom robot alarm,\nurl:{}", url, e);
+ log.error("Failed to request WeCom robot alarm,%nurl:{}", url, e);
throw new AlertException(
- String.format("Failed to request WeCom robot alert,\nurl:%s", url),
e);
+ String.format("Failed to request WeCom robot alert,%nurl:%s", url),
e);
}
if (robotResponse == null) {
- throw new AlertException(String.format("Failed to request WeCom robot
alert,\nurl:%s", url));
+ throw new AlertException(String.format("Failed to request WeCom robot
alert,%nurl:%s", url));
}
if (robotResponse.getErrcode() != 0) {
throw new AlertException(
String.format(
- "Failed to request WeCom robot
alert,\nurl:%s,\nerrorCode:%d,\nerrorMsg:%s",
+ "Failed to request WeCom robot
alert,%nurl:%s,%nerrorCode:%d,%nerrorMsg:%s",
url, robotResponse.getErrcode(), robotResponse.getErrmsg()));
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java
index b3d44ebca..ded8897e6 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java
@@ -100,7 +100,7 @@ public class ProjectBuildTask extends AbstractLogFileTask {
File workTree = git.getRepository().getWorkTree();
printWorkTree(workTree, "");
String successMsg =
- String.format("[StreamPark] project [%s] git clone successful!\n",
project.getName());
+ String.format("[StreamPark] project [%s] git clone successful!%n",
project.getName());
fileLogger.info(successMsg);
git.close();
return true;
diff --git
a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisStreamLoader.java
b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisStreamLoader.java
index cc5ab8294..e8a850bd3 100644
---
a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisStreamLoader.java
+++
b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/src/main/java/org/apache/streampark/flink/connector/doris/internal/DorisStreamLoader.java
@@ -138,7 +138,7 @@ public class DorisStreamLoader implements Serializable {
throw new LoadStatusFailedException(
String.format(
"Failed to flush data to doris, Error "
- + "could not get the final state of label[%s].\n",
+ + "could not get the final state of label[%s].%n",
label),
null);
}
@@ -148,11 +148,11 @@ public class DorisStreamLoader implements Serializable {
throw new LoadStatusFailedException(
String.format(
"Failed to flush data to doris, Error "
- + "could not get the final state of label[%s].
response[%s]\n",
+ + "could not get the final state of label[%s].
response[%s]%n",
label, loadResult),
null);
}
- LOG.info(String.format("Checking label[%s] state[%s]\n", label,
labelState));
+ LOG.info(String.format("Checking label[%s] state[%s]%n", label,
labelState));
switch (labelState) {
case LAEBL_STATE_VISIBLE:
return;
@@ -163,7 +163,7 @@ public class DorisStreamLoader implements Serializable {
case RESULT_LABEL_ABORTED:
throw new LoadStatusFailedException(
String.format(
- "Failed to flush data to doris, Error " + "label[%s]
state[%s]\n",
+ "Failed to flush data to doris, Error " + "label[%s]
state[%s]%n",
label, labelState),
null,
true);
@@ -171,7 +171,7 @@ public class DorisStreamLoader implements Serializable {
default:
throw new LoadStatusFailedException(
String.format(
- "Failed to flush data to doris, Error " + "label[%s]
state[%s]\n",
+ "Failed to flush data to doris, Error " + "label[%s]
state[%s]%n",
label, labelState),
null);
}
diff --git
a/streampark-flink/streampark-flink-sql-gateway/streampark-flink-sql-gateway-base/src/main/java/org/apache/streampark/gateway/factories/FactoryUtil.java
b/streampark-flink/streampark-flink-sql-gateway/streampark-flink-sql-gateway-base/src/main/java/org/apache/streampark/gateway/factories/FactoryUtil.java
index a5fb8e263..a6e516657 100644
---
a/streampark-flink/streampark-flink-sql-gateway/streampark-flink-sql-gateway-base/src/main/java/org/apache/streampark/gateway/factories/FactoryUtil.java
+++
b/streampark-flink/streampark-flink-sql-gateway/streampark-flink-sql-gateway-base/src/main/java/org/apache/streampark/gateway/factories/FactoryUtil.java
@@ -62,8 +62,8 @@ public class FactoryUtil {
if (matchingFactories.isEmpty()) {
throw new ValidationException(
String.format(
- "Could not find any factory for identifier '%s' that implements
'%s' in the classpath.\n\n"
- + "Available factory identifiers are:\n\n"
+ "Could not find any factory for identifier '%s' that implements
'%s' in the classpath.%n%n"
+ + "Available factory identifiers are:%n%n"
+ "%s",
factoryIdentifier,
factoryClass.getName(),
diff --git
a/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkStandaloneSessionCluster.java
b/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkStandaloneSessionCluster.java
index 7d1da5f22..5b253722a 100644
---
a/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkStandaloneSessionCluster.java
+++
b/streampark-tests/streampark-testcontainer/src/main/java/org/apache/streampark/testcontainer/flink/FlinkStandaloneSessionCluster.java
@@ -120,7 +120,7 @@ public class FlinkStandaloneSessionCluster implements
Startable {
if (!this.yamlConfContent.contains(TM_SLOT_NUM_KEY)) {
this.yamlConfContent =
String.format(
- "%s\n%s\n", this.yamlConfContent,
String.format(SLOT_CONF_FORMAT, slotsNumPerTm));
+ "%s%n%s%n", this.yamlConfContent,
String.format(SLOT_CONF_FORMAT, slotsNumPerTm));
}
}
@@ -130,7 +130,7 @@ public class FlinkStandaloneSessionCluster implements
Startable {
? this.yamlConfContent
: (yamlConfStr.contains(JM_RPC_ADDR_KEY)
? yamlConfStr
- : String.format("%s\n%s\n", this.yamlConfContent,
yamlConfStr));
+ : String.format("%s%n%s%n", this.yamlConfContent,
yamlConfStr));
}
/** A tool class to create a flink standalone session cluster quickly. */
