From 0243edf58515627c5b3a80d9976bf26a7ac43571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 16 Sep 2019 17:49:21 +0200 Subject: [PATCH] Fix tracker --- .../java/sonia/scm/plugin/PluginDependencyTracker.java | 8 +------- .../sonia/scm/plugin/PluginDependencyTrackerTest.java | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/PluginDependencyTracker.java b/scm-webapp/src/main/java/sonia/scm/plugin/PluginDependencyTracker.java index bc5cd1dc6d..2ec956237a 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/PluginDependencyTracker.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/PluginDependencyTracker.java @@ -27,16 +27,10 @@ class PluginDependencyTracker { } private void addDependency(String from, String to) { - plugins.computeIfAbsent(to, name -> createInitialDependencyCollection(from)); + plugins.computeIfAbsent(to, name -> new HashSet<>()).add(from); } private void removeDependency(String from, String to) { plugins.get(to).remove(from); } - - private Collection createInitialDependencyCollection(String from) { - Collection dependencies = new HashSet<>(); - dependencies.add(from); - return dependencies; - } } diff --git a/scm-webapp/src/test/java/sonia/scm/plugin/PluginDependencyTrackerTest.java b/scm-webapp/src/test/java/sonia/scm/plugin/PluginDependencyTrackerTest.java index c38409eb51..150d4356e7 100644 --- a/scm-webapp/src/test/java/sonia/scm/plugin/PluginDependencyTrackerTest.java +++ b/scm-webapp/src/test/java/sonia/scm/plugin/PluginDependencyTrackerTest.java @@ -73,7 +73,7 @@ class PluginDependencyTrackerTest { PluginDependencyTracker pluginDependencyTracker = new PluginDependencyTracker(); pluginDependencyTracker.addInstalled(review); pluginDependencyTracker.addInstalled(jira); - pluginDependencyTracker.removeInstalled(jira); + pluginDependencyTracker.removeInstalled(review); boolean mayUninstall = pluginDependencyTracker.mayUninstall("scm-mail-plugin"); assertThat(mayUninstall).isFalse();