SLCORE-672 remove explicit dependency check for DBD plugins

SonarSource · May 30, 2024 · e2fa6ff · e2fa6ff
1 parent 7c9c130
commit e2fa6ff
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/...org/sonarsource/sonarlint/core/plugin/commons/loading/SonarPluginRequirementsChecker.java b/...org/sonarsource/sonarlint/core/plugin/commons/loading/SonarPluginRequirementsChecker.java
@@ -173,17 +173,9 @@ private static PluginRequirementsCheckResult checkUnsatisfiedPluginDependency(Pl
     if (basePluginKey != null && checkForPluginSkipped(currentResultsByKey.get(basePluginKey))) {
       return processUnsatisfiedDependency(currentResult.getPlugin(), basePluginKey);
     }
-    if (DataflowBugDetection.PLUGIN_ALLOW_LIST.contains(plugin.getKey())) {
-      // Workaround for SLCORE-667
-      // dbd and dbdpythonfrontend require Python to be working
-      if (!enableDataflowBugDetection) {
+    if (DataflowBugDetection.PLUGIN_ALLOW_LIST.contains(plugin.getKey()) && !enableDataflowBugDetection) {
         LOG.debug("DBD feature disabled. Skip loading plugin '{}'.", plugin.getName());
         return new PluginRequirementsCheckResult(plugin, SkipReason.UnsupportedFeature.INSTANCE);
-      }
-      var pythonPluginResult = currentResultsByKey.get(SonarLanguage.PYTHON.getPluginKey());
-      if (checkForPluginSkipped(pythonPluginResult)) {
-        return processUnsatisfiedDependency(currentResult.getPlugin(), SonarLanguage.PYTHON.getPluginKey());
-      }
     }
     return currentResult;
   }

diff --git a/...onarsource/sonarlint/core/plugin/commons/loading/SonarPluginRequirementsCheckerTests.java b/...onarsource/sonarlint/core/plugin/commons/loading/SonarPluginRequirementsCheckerTests.java
@@ -390,10 +390,11 @@ void load_plugin_skip_plugins_having_unsatisfied_python_frontend_dbd(@TempDir Pa
     assertThat(logsWithoutStartStop()).contains("DBD feature disabled. Skip loading plugin 'dbdpythonfrontend'.");
   }
 
+
   @Test
   void load_plugin_skip_plugins_having_unsatisfied_python_dbd(@TempDir Path storage) throws IOException {
     var fakePlugin = fakePlugin(storage, "fake.jar",
-      path -> createPluginManifest(path, "dbd", V1_0));
+      path -> createPluginManifest(path, "dbd", V1_0, withRequiredPlugins("python:1.15")));
     Set<Path> jars = Set.of(fakePlugin);
 
     var loadedPlugins = underTest.checkRequirements(jars, NONE, null, Optional.empty(), true);
@@ -403,6 +404,18 @@ void load_plugin_skip_plugins_having_unsatisfied_python_dbd(@TempDir Path storag
     assertThat(logsWithoutStartStop()).contains("Plugin 'dbd' dependency on 'python' is unsatisfied. Skip loading it.");
   }
 
+  @Test
+  void load_plugin_skip_plugins_having_unsatisfied_java_dbd(@TempDir Path storage) throws IOException {
+    var fakePlugin = fakePlugin(storage, "fake.jar",
+      path -> createPluginManifest(path, "dbd", V1_0, withRequiredPlugins("java:7.35")));
+    Set<Path> jars = Set.of(fakePlugin);
+
+    var loadedPlugins = underTest.checkRequirements(jars, NONE, null, Optional.empty(), true);
+
+    assertThat(loadedPlugins.values()).extracting(r -> r.getPlugin().getKey(), PluginRequirementsCheckResult::isSkipped, p -> p.getSkipReason().orElse(null))
+      .containsOnly(tuple("dbd", true, new SkipReason.UnsatisfiedDependency(SonarLanguage.JAVA.getPluginKey())));
+    assertThat(logsWithoutStartStop()).contains("Plugin 'dbd' dependency on 'java' is unsatisfied. Skip loading it.");
+  }
   @Test
   void load_plugin_having_satisfied_python_frontend_dbd(@TempDir Path storage) throws IOException {
     var fakePlugin = fakePlugin(storage, "fake.jar",