Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 00:45:44 +01:00
Code Issues Packages Projects Releases Activity

Mirror uninstall state in plugin object

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-09-16 14:32:14 +02:00
parent 7ec2b0c31d
commit 5a8ed638dd
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-core/src/main/java/sonia/scm/plugin/InstalledPlugin.java
View File

@@ -127,6 +127,14 @@ public final class InstalledPlugin implements Plugin
return core; return core;
} }
public boolean isMarkedForUninstall() {
return markedForUninstall;
}
public void setMarkedForUninstall(boolean markedForUninstall) {
this.markedForUninstall = markedForUninstall;
}
//~--- fields --------------------------------------------------------------- //~--- fields ---------------------------------------------------------------
/** plugin class loader */ /** plugin class loader */
@@ -142,4 +150,6 @@ public final class InstalledPlugin implements Plugin
private final WebResourceLoader webResourceLoader; private final WebResourceLoader webResourceLoader;
private final boolean core; private final boolean core;
private boolean markedForUninstall;
} }

1
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
View File

@@ -190,6 +190,7 @@ public class DefaultPluginManager implements PluginManager {
doThrow().violation("plugin is a core plugin and cannot be uninstalled").when(installed.isCore()); doThrow().violation("plugin is a core plugin and cannot be uninstalled").when(installed.isCore());
dependencyTracker.removeInstalled(installed.getDescriptor()); dependencyTracker.removeInstalled(installed.getDescriptor());
installed.setMarkedForUninstall(true);
try { try {
Files.createFile(installed.getDirectory().resolve(InstalledPlugin.UNINSTALL_MARKER_FILENAME)); Files.createFile(installed.getDirectory().resolve(InstalledPlugin.UNINSTALL_MARKER_FILENAME));

12
scm-webapp/src/test/java/sonia/scm/plugin/DefaultPluginManagerTest.java
View File

@@ -345,6 +345,18 @@ class DefaultPluginManagerTest {
assertThat(temp.resolve("uninstall")).exists(); assertThat(temp.resolve("uninstall")).exists();
} }
@Test
void shouldMarkPluginForUninstall(@TempDirectory.TempDir Path temp) {
InstalledPlugin mailPlugin = createInstalled("scm-mail-plugin");
when(mailPlugin.getDirectory()).thenReturn(temp);
when(loader.getInstalledPlugins()).thenReturn(singletonList(mailPlugin));
manager.uninstall("scm-mail-plugin", false);
verify(mailPlugin).setMarkedForUninstall(true);
}
@Test @Test
void shouldThrowExceptionWhenUninstallingCorePlugin(@TempDirectory.TempDir Path temp) { void shouldThrowExceptionWhenUninstallingCorePlugin(@TempDirectory.TempDir Path temp) {
InstalledPlugin mailPlugin = createInstalled("scm-mail-plugin"); InstalledPlugin mailPlugin = createInstalled("scm-mail-plugin");