This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch flink-config in repository https://gitbox.apache.org/repos/asf/streampark.git
commit 989b917005a2ad66bb464bca7652aff0befa129b Author: benjobs <[email protected]> AuthorDate: Wed Sep 17 11:55:27 2025 +0800 [Improve] flink version & conf-file improvement --- .../java/org/apache/streampark/console/core/entity/FlinkEnv.java | 9 +++++++-- .../console/core/service/impl/FlinkEnvServiceImpl.java | 8 +++----- 2 files changed, 10 insertions(+), 7 deletions(-) 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 b99e24ece..0d93b1e84 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 @@ -71,7 +71,12 @@ public class FlinkEnv implements Serializable { private static final String NEW_CONFIG_FILE = "config.yaml"; private static final String CONF_DIR = "/conf/"; - public void doSetFlinkConf() throws ApiDetailException { + public void setup() { + this.setupVersion(); + this.setupConfigFile(); + } + + public void setupConfigFile() throws ApiDetailException { Float version = getVersionNumber(); File configFile = resolveConfigFile(version); this.flinkConf = configFile.getAbsolutePath(); @@ -117,7 +122,7 @@ public class FlinkEnv implements Serializable { } } - public void doSetVersion() { + public void setupVersion() { this.setVersion(this.getFlinkVersion().version()); this.setScalaVersion(this.getFlinkVersion().scalaVersion()); if (!streamParkScalaVersion.startsWith(this.getFlinkVersion().scalaVersion())) { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java index 1f97dd6a0..ea17d5d48 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java @@ -96,8 +96,7 @@ public class FlinkEnvServiceImpl extends ServiceImpl<FlinkEnvMapper, FlinkEnv> long count = this.baseMapper.selectCount(null); version.setIsDefault(count == 0); version.setCreateTime(new Date()); - version.doSetVersion(); - version.doSetFlinkConf(); + version.setup(); return save(version); } @@ -121,8 +120,7 @@ public class FlinkEnvServiceImpl extends ServiceImpl<FlinkEnvMapper, FlinkEnv> flinkEnv.setFlinkName(version.getFlinkName()); if (!version.getFlinkHome().equals(flinkEnv.getFlinkHome())) { flinkEnv.setFlinkHome(version.getFlinkHome()); - flinkEnv.doSetFlinkConf(); - flinkEnv.doSetVersion(); + flinkEnv.setup(); } updateById(flinkEnv); } @@ -155,7 +153,7 @@ public class FlinkEnvServiceImpl extends ServiceImpl<FlinkEnvMapper, FlinkEnv> @Override public void syncConf(Long id) { FlinkEnv flinkEnv = getById(id); - flinkEnv.doSetFlinkConf(); + flinkEnv.setupConfigFile(); updateById(flinkEnv); }
