From 458d2fb4eeb24f0ff24296c6721d187bca17ebcd Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Wed, 2 Oct 2019 10:05:07 +0200 Subject: [PATCH] Make AvailablePlugin immutable --- .../src/main/java/sonia/scm/plugin/AvailablePlugin.java | 6 +----- .../java/sonia/scm/plugin/PendingPluginInstallation.java | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/plugin/AvailablePlugin.java b/scm-core/src/main/java/sonia/scm/plugin/AvailablePlugin.java index 5a85055a0c..db8d96ca15 100644 --- a/scm-core/src/main/java/sonia/scm/plugin/AvailablePlugin.java +++ b/scm-core/src/main/java/sonia/scm/plugin/AvailablePlugin.java @@ -5,7 +5,7 @@ import com.google.common.base.Preconditions; public class AvailablePlugin implements Plugin { private final AvailablePluginDescriptor pluginDescriptor; - private boolean pending; + private final boolean pending; public AvailablePlugin(AvailablePluginDescriptor pluginDescriptor) { this(pluginDescriptor, false); @@ -25,10 +25,6 @@ public class AvailablePlugin implements Plugin { return pending; } - public void cancelInstallation() { - this.pending = false; - } - public AvailablePlugin install() { Preconditions.checkState(!pending, "installation is already pending"); return new AvailablePlugin(pluginDescriptor, true); diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/PendingPluginInstallation.java b/scm-webapp/src/main/java/sonia/scm/plugin/PendingPluginInstallation.java index f2a8a4d633..933121e992 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/PendingPluginInstallation.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/PendingPluginInstallation.java @@ -28,7 +28,6 @@ class PendingPluginInstallation { LOG.info("cancel installation of plugin {}", name); try { Files.delete(file); - plugin.cancelInstallation(); } catch (IOException ex) { throw new PluginFailedToCancelInstallationException("failed to cancel plugin installation ", name, ex); }