Skip to content

Commit 031cdf4

Browse files
[Common] Fix StringCastUtils generic cast and restore Flink build log level
Accept Class<?> in cast() so common_2.12 compiles with ConfigOption callers, and keep Flink dependency-merge failures logged at error while Spark stays at warn. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent bcbc485 commit 031cdf4

3 files changed

Lines changed: 20 additions & 4 deletions

File tree

streampark-common/src/main/java/org/apache/streampark/common/util/StringCastUtils.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ public final class StringCastUtils {
2323
private StringCastUtils() {
2424
}
2525

26-
public static <T> T cast(String v, Class<T> classType) {
27-
return classType.cast(parseValue(v, classType));
26+
@SuppressWarnings("unchecked")
27+
public static <T> T cast(String v, Class<?> classType) {
28+
return (T) classType.cast(parseValue(v, classType));
2829
}
2930

3031
private static Object parseValue(String v, Class<?> classType) {

streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,7 @@ private DependencyInfo getMergedDependencyInfo(FlinkApplication application) {
522522
application.getTeamResource(),
523523
application.getTeamId(),
524524
resourceService,
525-
log);
525+
log,
526+
true);
526527
}
527528
}

streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/util/ApplicationBuildPipelineUtils.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,16 @@ public static DependencyInfo getMergedDependencyInfo(
196196
Long teamId,
197197
ResourceService resourceService,
198198
Logger log) {
199+
return getMergedDependencyInfo(dependencyInfo, teamResource, teamId, resourceService, log, false);
200+
}
201+
202+
public static DependencyInfo getMergedDependencyInfo(
203+
DependencyInfo dependencyInfo,
204+
String teamResource,
205+
Long teamId,
206+
ResourceService resourceService,
207+
Logger log,
208+
boolean errorOnFailure) {
199209
if (StringUtils.isBlank(teamResource)) {
200210
return dependencyInfo;
201211
}
@@ -231,7 +241,11 @@ public static DependencyInfo getMergedDependencyInfo(
231241
});
232242
return dependencyInfo.merge(mvnArtifacts, jarLibs);
233243
} catch (Exception e) {
234-
log.warn("Merge team dependency failed.", e);
244+
if (errorOnFailure) {
245+
log.error("Merge team dependency failed.", e);
246+
} else {
247+
log.warn("Merge team dependency failed.", e);
248+
}
235249
return dependencyInfo;
236250
}
237251
}

0 commit comments

Comments
 (0)