[Improve] maven dependency check improvement

apache · Nov 11, 2023 · 5fb3c6c · 5fb3c6c
1 parent 33c1629
commit 5fb3c6c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/...onsole-service/src/main/java/org/apache/streampark/console/core/bean/MavenDependency.java b/...onsole-service/src/main/java/org/apache/streampark/console/core/bean/MavenDependency.java
@@ -51,20 +51,27 @@ public static MavenDependency of(String dependency) {
     return new MavenDependency();
   }
 
-  public boolean eq(MavenDependency that) {
-    if (that == null) {
+  @Override
+  public boolean equals(Object that) {
+    if (this == that) {
+      return true;
+    }
+
+    if (that == null || getClass() != that.getClass()) {
       return false;
     }
 
-    if (this.pom.size() != that.pom.size()
-        || this.jar.size() != that.jar.size()
-        || !this.pom.containsAll(that.pom)) {
+    MavenDependency thatDep = (MavenDependency) that;
+
+    if (this.pom.size() != thatDep.pom.size()
+        || this.jar.size() != thatDep.jar.size()
+        || !this.pom.containsAll(thatDep.pom)) {
       return false;
     }
 
     File localJar = WebUtils.getAppTempDir();
     File localUploads = new File(Workspace.local().APP_UPLOADS());
-    HashSet<String> otherJars = new HashSet<>(that.jar);
+    HashSet<String> otherJars = new HashSet<>(thatDep.jar);
     for (String jarName : jar) {
       if (!otherJars.contains(jarName)
           || !FileUtils.equals(new File(localJar, jarName), new File(localUploads, jarName))) {

diff --git a/...mpark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenPom.java b/...mpark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenPom.java
@@ -59,7 +59,7 @@ public boolean equals(Object o) {
           this.exclusions == null ? Collections.emptySet() : this.exclusions;
       Set<MavenExclusion> thatEx =
           that.exclusions == null ? Collections.emptySet() : that.exclusions;
-      return thisEx.containsAll(thatEx);
+      return thisEx.size() == thatEx.size() && thisEx.containsAll(thatEx);
     }
     return false;
   }

diff --git a/...ark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkSql.java b/...ark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkSql.java
@@ -86,7 +86,7 @@ public ChangedType checkChange(FlinkSql target) {
     MavenDependency thisDependency = MavenDependency.of(this.getDependency());
     MavenDependency targetDependency = MavenDependency.of(target.getDependency());
 
-    boolean depDifference = !thisDependency.eq(targetDependency);
+    boolean depDifference = !thisDependency.equals(targetDependency);
     if (sqlDifference && depDifference) {
       return ChangedType.ALL;
     }

diff --git a/...src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java b/...src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
@@ -856,7 +856,7 @@ public boolean update(Application appParam) {
       MavenDependency thisDependency = MavenDependency.of(appParam.getDependency());
       MavenDependency targetDependency = MavenDependency.of(application.getDependency());
 
-      if (!thisDependency.eq(targetDependency)) {
+      if (!thisDependency.equals(targetDependency)) {
         application.setDependency(appParam.getDependency());
         application.setBuild(true);
       } else if (!ObjectUtils.safeEquals(application.getJar(), appParam.getJar())) {

diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/components/Dependency.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/components/Dependency.vue
@@ -33,6 +33,7 @@
   import { fetchUpload } from '/@/api/flink/app/app';
   import { fetchUploadJars } from '/@/api/flink/app/flinkHistory';
   import UploadJobJar from './UploadJobJar.vue';
+  import { fetchFlinkEnv } from '/@/api/flink/setting/flinkEnv';
 
   interface DependencyType {
     artifactId: string;
@@ -89,7 +90,12 @@
       Swal.fire('Failed', t('flink.app.dependencyError'), 'error');
       return;
     }
-    const scalaVersion = props.flinkEnvs.find((v) => v.id === versionId)?.scalaVersion;
+
+    let flinkEnv = props.flinkEnvs || [];
+    if (props.flinkEnvs?.length == 0) {
+      flinkEnv = await fetchFlinkEnv();
+    }
+    const scalaVersion = flinkEnv.find((v) => v.id === versionId)?.scalaVersion;
     if (props.value == null || props.value.trim() === '') {
       return;
     }