{
const hunkDiffFiles = parser.parse(hunksDiff);
return
;
+ })
+ .add("Binaries", () => {
+ const binaryDiffFiles = parser.parse(binaryDiff);
+ return
;
});
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
index 5612b0395c..e5ab89821f 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
@@ -99,7 +99,7 @@ public class DefaultPluginLoader implements PluginLoader
modules = getInstalled(parent, context, PATH_MODULECONFIG);
- collector = new ExtensionCollector(Iterables.concat(modules, unwrap()));
+ collector = new ExtensionCollector(parent, modules, installedPlugins);
extensionProcessor = new DefaultExtensionProcessor(collector);
}
catch (IOException | JAXBException ex)
@@ -170,19 +170,6 @@ public class DefaultPluginLoader implements PluginLoader
return uberWebResourceLoader;
}
- //~--- methods --------------------------------------------------------------
-
- /**
- * Method description
- *
- *
- * @return
- */
- private Iterable
unwrap()
- {
- return PluginsInternal.unwrap(installedPlugins);
- }
-
//~--- get methods ----------------------------------------------------------
/**
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/ExplodedSmp.java b/scm-webapp/src/main/java/sonia/scm/plugin/ExplodedSmp.java
index ee2514dc3e..60bcc09dcb 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/ExplodedSmp.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/ExplodedSmp.java
@@ -98,8 +98,8 @@ public final class ExplodedSmp implements Comparable
{
int result;
- Set depends = plugin.getDependencies();
- Set odepends = o.plugin.getDependencies();
+ Set depends = plugin.getDependenciesInclusiveOptionals();
+ Set odepends = o.plugin.getDependenciesInclusiveOptionals();
if (depends.isEmpty() && odepends.isEmpty())
{
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/ExtensionBinder.java b/scm-webapp/src/main/java/sonia/scm/plugin/ExtensionBinder.java
index 935bcbb3b6..a6e4c3281c 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/ExtensionBinder.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/ExtensionBinder.java
@@ -55,63 +55,37 @@ import sonia.scm.util.Util;
public final class ExtensionBinder
{
- /** Field description */
private static final String TYPE_LOOSE_EXT = "loose extension";
-
- /** Field description */
private static final String TYPE_REST_RESOURCE = "rest resource";
+ private static final String AS_EAGER_SINGLETON = " as eager singleton";
/**
* the logger for ExtensionBinder
*/
- private static final Logger logger =
- LoggerFactory.getLogger(ExtensionBinder.class);
+ private static final Logger logger = LoggerFactory.getLogger(ExtensionBinder.class);
- //~--- constructors ---------------------------------------------------------
-
- /**
- * Constructs ...
- *
- *
- * @param binder
- */
public ExtensionBinder(Binder binder)
{
this.binder = binder;
}
- //~--- methods --------------------------------------------------------------
-
- /**
- * Method description
- *
- *
- * @param collector
- */
public void bind(ExtensionCollector collector)
{
- logger.info("bind extensions to extension points");
+ logger.debug("bind extensions to extension points");
for (ExtensionPointElement epe : collector.getExtensionPointElements())
{
bindExtensionPoint(collector, epe);
}
- logger.info("bind loose extensions");
+ logger.debug("bind loose extensions");
bindLooseExtensions(collector.getLooseExtensions());
- logger.info("bind rest providers");
+ logger.debug("bind rest providers");
bindRestProviders(collector.getRestProviders());
- logger.info("bind rest resources");
+ logger.debug("bind rest resources");
bindRestResource(collector.getRestResources());
}
- /**
- * Method description
- *
- *
- * @param collector
- * @param epe
- */
private void bindExtensionPoint(ExtensionCollector collector,
ExtensionPointElement epe)
{
@@ -142,12 +116,6 @@ public final class ExtensionBinder
}
}
- /**
- * Method description
- *
- *
- * @param extensions
- */
private void bindLooseExtensions(Iterable extensions)
{
for (Class extension : extensions)
@@ -156,46 +124,27 @@ public final class ExtensionBinder
}
}
- /**
- * Method description
- *
- *
- *
- * @param found
- *
- * @param extensionPoint
- *
- * @param boundClasses
- * @param extensionPointClass
- * @param extensions
- */
- private void bindMultiExtensionPoint(ExtensionPointElement extensionPoint,
- Iterable extensions)
+ private void bindMultiExtensionPoint(ExtensionPointElement extensionPoint, Iterable extensions)
{
Class extensionPointClass = extensionPoint.getClazz();
- if (logger.isInfoEnabled())
- {
- logger.info("create multibinder for {}", extensionPointClass.getName());
- }
-
- Multibinder multibinder = Multibinder.newSetBinder(binder,
- extensionPointClass);
+ logger.debug("create multibinder for {}", extensionPointClass.getName());
+ Multibinder multibinder = Multibinder.newSetBinder(binder, extensionPointClass);
for (Class extensionClass : extensions)
{
boolean eagerSingleton = isEagerSingleton(extensionClass);
- if (logger.isInfoEnabled())
+ if (logger.isDebugEnabled())
{
String as = Util.EMPTY_STRING;
if (eagerSingleton)
{
- as = " as eager singleton";
+ as = AS_EAGER_SINGLETON;
}
- logger.info("bind {} to multibinder of {}{}", extensionClass.getName(),
+ logger.debug("bind {} to multibinder of {}{}", extensionClass.getName(),
extensionPointClass.getName(), as);
}
@@ -208,27 +157,15 @@ public final class ExtensionBinder
}
}
- /**
- * Method description
- *
- *
- * @param restProviders
- */
private void bindRestProviders(Iterable restProviders)
{
for (Class restProvider : restProviders)
{
- logger.info("bind rest provider {}", restProvider);
+ logger.debug("bind rest provider {}", restProvider);
binder.bind(restProvider).in(Singleton.class);
}
}
- /**
- * Method description
- *
- *
- * @param restResources
- */
private void bindRestResource(Iterable restResources)
{
for (Class restResource : restResources)
@@ -237,31 +174,22 @@ public final class ExtensionBinder
}
}
- /**
- * Method description
- *
- *
- * @param extensionPointClass
- *
- * @param extensionPoint
- * @param extensionClass
- */
private void bindSingleInstance(ExtensionPointElement extensionPoint,
Class extensionClass)
{
Class extensionPointClass = extensionPoint.getClazz();
boolean eagerSingleton = isEagerSingleton(extensionClass);
- if (logger.isInfoEnabled())
+ if (logger.isDebugEnabled())
{
String as = Util.EMPTY_STRING;
if (eagerSingleton)
{
- as = " as eager singleton";
+ as = AS_EAGER_SINGLETON;
}
- logger.info("bind {} to {}{}", extensionClass.getName(),
+ logger.debug("bind {} to {}{}", extensionClass.getName(),
extensionPointClass.getName(), as);
}
@@ -274,13 +202,6 @@ public final class ExtensionBinder
}
}
- /**
- * Method description
- *
- *
- * @param type
- * @param extension
- */
private void singleBind(String type, Class extension)
{
StringBuilder log = new StringBuilder();
@@ -291,30 +212,19 @@ public final class ExtensionBinder
if (isEagerSingleton(extension))
{
- log.append(" as eager singleton");
+ log.append(AS_EAGER_SINGLETON);
abb.asEagerSingleton();
}
- logger.info(log.toString());
+ if (logger.isDebugEnabled()) {
+ logger.debug(log.toString());
+ }
}
- //~--- get methods ----------------------------------------------------------
-
- /**
- * Method description
- *
- *
- * @param extensionClass
- *
- * @return
- */
private boolean isEagerSingleton(Class extensionClass)
{
return extensionClass.isAnnotationPresent(EagerSingleton.class);
}
- //~--- fields ---------------------------------------------------------------
-
- /** Field description */
private final Binder binder;
}
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/ExtensionCollector.java b/scm-webapp/src/main/java/sonia/scm/plugin/ExtensionCollector.java
index 9ecf9a9da8..b4d4451596 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/ExtensionCollector.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/ExtensionCollector.java
@@ -39,6 +39,8 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
//~--- JDK imports ------------------------------------------------------------
@@ -47,6 +49,7 @@ import java.util.Collections;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.stream.Collectors;
/**
*
@@ -56,23 +59,33 @@ import java.util.Set;
public final class ExtensionCollector
{
- /**
- * Constructs ...
- *
- *
- * @param modules
- */
- ExtensionCollector(Iterable modules)
- {
- for (ScmModule module : modules)
- {
+ private static final Logger LOG = LoggerFactory.getLogger(ExtensionCollector.class);
+
+ private final Set pluginIndex;
+
+ public ExtensionCollector(ClassLoader moduleClassLoader, Set modules, Set installedPlugins) {
+ this.pluginIndex = createPluginIndex(installedPlugins);
+
+ for (ScmModule module : modules) {
collectRootElements(module);
}
-
- for (ScmModule module : modules)
- {
- collectExtensions(module);
+ for (ScmModule plugin : PluginsInternal.unwrap(installedPlugins)) {
+ collectRootElements(plugin);
}
+
+ for (ScmModule module : modules) {
+ collectExtensions(moduleClassLoader, module);
+ }
+
+ for (InstalledPlugin plugin : installedPlugins) {
+ collectExtensions(plugin.getClassLoader(), plugin.getDescriptor());
+ }
+ }
+
+ private Set createPluginIndex(Set installedPlugins) {
+ return installedPlugins.stream()
+ .map(p -> p.getDescriptor().getInformation().getName())
+ .collect(Collectors.toSet());
}
//~--- methods --------------------------------------------------------------
@@ -245,20 +258,35 @@ public final class ExtensionCollector
}
}
- /**
- * Method description
- *
- *
- * @param module
- */
- private void collectExtensions(ScmModule module)
- {
- for (Class extension : module.getExtensions())
- {
- appendExtension(extension);
+ private void collectExtensions(ClassLoader defaultClassLoader, ScmModule module) {
+ for (ExtensionElement extension : module.getExtensions()) {
+ if (isRequirementFulfilled(extension)) {
+ Class extensionClass = loadExtension(defaultClassLoader, extension);
+ appendExtension(extensionClass);
+ }
}
}
+ private Class loadExtension(ClassLoader classLoader, ExtensionElement extension) {
+ try {
+ return classLoader.loadClass(extension.getClazz());
+ } catch (ClassNotFoundException ex) {
+ throw new PluginLoadException("failed to load clazz", ex);
+ }
+ }
+
+ private boolean isRequirementFulfilled(ExtensionElement extension) {
+ if (extension.getRequires() != null) {
+ for (String requiredPlugin : extension.getRequires()) {
+ if (!pluginIndex.contains(requiredPlugin)) {
+ LOG.debug("skip loading of extension {}, because the required plugin {} is not installed", extension.getClazz(), requiredPlugin);
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
/**
* Method description
*
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java b/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
index 2bbab3c650..431cb44e1b 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
@@ -189,7 +189,7 @@ public final class PluginProcessor
PluginTree pluginTree = new PluginTree(smps);
- logger.trace("build plugin tree: {}", pluginTree);
+ logger.info("install plugin tree:\n{}", pluginTree);
List rootNodes = pluginTree.getRootNodes();
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/PluginTree.java b/scm-webapp/src/main/java/sonia/scm/plugin/PluginTree.java
index bd338c0741..2ebe06db02 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/PluginTree.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/PluginTree.java
@@ -35,15 +35,13 @@ package sonia.scm.plugin;
import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-//~--- JDK imports ------------------------------------------------------------
-
import java.util.Arrays;
import java.util.List;
-import java.util.Set;
+
+//~--- JDK imports ------------------------------------------------------------
/**
*
@@ -104,9 +102,7 @@ public final class PluginTree
if ((condition == null) || condition.isSupported())
{
- Set dependencies = plugin.getDependencies();
-
- if ((dependencies == null) || dependencies.isEmpty())
+ if (plugin.getDependencies().isEmpty() && plugin.getOptionalDependencies().isEmpty())
{
rootNodes.add(new PluginNode(smp));
}
@@ -170,6 +166,20 @@ public final class PluginTree
//J+
}
}
+
+ boolean rootNode = smp.getPlugin().getDependencies().isEmpty();
+ for (String dependency : smp.getPlugin().getOptionalDependencies()) {
+ if (appendNode(rootNodes, child, dependency)) {
+ rootNode = false;
+ } else {
+ logger.info("optional dependency {} of {} is not installed", dependency, child.getId());
+ }
+ }
+
+ if (rootNode) {
+ logger.info("could not find optional dependencies of {}, append it as root node", child.getId());
+ rootNodes.add(new PluginNode(smp));
+ }
}
/**
@@ -212,7 +222,18 @@ public final class PluginTree
@Override
public String toString() {
- return "plugin tree: " + rootNodes.toString();
+ StringBuilder buffer = new StringBuilder();
+ for (PluginNode node : rootNodes) {
+ append(buffer, "", node);
+ }
+ return buffer.toString();
+ }
+
+ private void append(StringBuilder buffer, String indent, PluginNode node) {
+ buffer.append(indent).append("+- ").append(node.getId()).append("\n");
+ for (PluginNode child : node.getChildren()) {
+ append(buffer, indent + " ", child);
+ }
}
//~--- fields ---------------------------------------------------------------
diff --git a/scm-webapp/src/test/java/sonia/scm/plugin/ExplodedSmpTest.java b/scm-webapp/src/test/java/sonia/scm/plugin/ExplodedSmpTest.java
index 090d903f49..c4a4c0a0d3 100644
--- a/scm-webapp/src/test/java/sonia/scm/plugin/ExplodedSmpTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/plugin/ExplodedSmpTest.java
@@ -134,7 +134,7 @@ public class ExplodedSmpTest
info.setVersion(version);
InstalledPluginDescriptor plugin = new InstalledPluginDescriptor(2, info, null, null, false,
- Sets.newSet(dependencies));
+ Sets.newSet(dependencies), null);
return new ExplodedSmp(null, plugin);
}
diff --git a/scm-webapp/src/test/java/sonia/scm/plugin/PluginTreeTest.java b/scm-webapp/src/test/java/sonia/scm/plugin/PluginTreeTest.java
index 72c48d4d16..33a139aa5a 100644
--- a/scm-webapp/src/test/java/sonia/scm/plugin/PluginTreeTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/plugin/PluginTreeTest.java
@@ -34,6 +34,7 @@ package sonia.scm.plugin;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Function;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import org.junit.Rule;
@@ -72,7 +73,7 @@ public class PluginTreeTest
PluginCondition condition = new PluginCondition("999",
new ArrayList(), "hit");
InstalledPluginDescriptor plugin = new InstalledPluginDescriptor(2, createInfo("a", "1"), null, condition,
- false, null);
+ false, null, null);
ExplodedSmp smp = createSmp(plugin);
new PluginTree(smp).getRootNodes();
@@ -115,7 +116,7 @@ public class PluginTreeTest
public void testScmVersion() throws IOException
{
InstalledPluginDescriptor plugin = new InstalledPluginDescriptor(1, createInfo("a", "1"), null, null, false,
- null);
+ null, null);
ExplodedSmp smp = createSmp(plugin);
new PluginTree(smp).getRootNodes();
@@ -131,10 +132,10 @@ public class PluginTreeTest
public void testSimpleDependencies() throws IOException
{
//J-
- ExplodedSmp[] smps = new ExplodedSmp[] {
+ ExplodedSmp[] smps = new ExplodedSmp[] {
createSmpWithDependency("a"),
createSmpWithDependency("b", "a"),
- createSmpWithDependency("c", "a", "b")
+ createSmpWithDependency("c", "a", "b")
};
//J+
@@ -152,6 +153,61 @@ public class PluginTreeTest
assertThat(unwrapIds(b.getChildren()), containsInAnyOrder("c"));
}
+ @Test
+ public void testWithOptionalDependency() throws IOException {
+ ExplodedSmp[] smps = new ExplodedSmp[] {
+ createSmpWithDependency("a"),
+ createSmpWithDependency("b", null, ImmutableSet.of("a")),
+ createSmpWithDependency("c", null, ImmutableSet.of("a", "b"))
+ };
+
+ PluginTree tree = new PluginTree(smps);
+ List rootNodes = tree.getRootNodes();
+
+ assertThat(unwrapIds(rootNodes), containsInAnyOrder("a"));
+
+ PluginNode a = rootNodes.get(0);
+ assertThat(unwrapIds(a.getChildren()), containsInAnyOrder("b", "c"));
+
+ PluginNode b = a.getChild("b");
+ assertThat(unwrapIds(b.getChildren()), containsInAnyOrder("c"));
+ }
+
+ @Test
+ public void testWithDeepOptionalDependency() throws IOException {
+ ExplodedSmp[] smps = new ExplodedSmp[] {
+ createSmpWithDependency("a"),
+ createSmpWithDependency("b", "a"),
+ createSmpWithDependency("c", null, ImmutableSet.of("b"))
+ };
+
+ PluginTree tree = new PluginTree(smps);
+
+ System.out.println(tree);
+
+ List rootNodes = tree.getRootNodes();
+
+ assertThat(unwrapIds(rootNodes), containsInAnyOrder("a"));
+
+ PluginNode a = rootNodes.get(0);
+ assertThat(unwrapIds(a.getChildren()), containsInAnyOrder("b"));
+
+ PluginNode b = a.getChild("b");
+ assertThat(unwrapIds(b.getChildren()), containsInAnyOrder("c"));
+ }
+
+ @Test
+ public void testWithNonExistentOptionalDependency() throws IOException {
+ ExplodedSmp[] smps = new ExplodedSmp[] {
+ createSmpWithDependency("a", null, ImmutableSet.of("b"))
+ };
+
+ PluginTree tree = new PluginTree(smps);
+ List rootNodes = tree.getRootNodes();
+
+ assertThat(unwrapIds(rootNodes), containsInAnyOrder("a"));
+ }
+
/**
* Method description
*
@@ -200,7 +256,7 @@ public class PluginTreeTest
private ExplodedSmp createSmp(String name) throws IOException
{
return createSmp(new InstalledPluginDescriptor(2, createInfo(name, "1.0.0"), null, null,
- false, null));
+ false, null, null));
}
/**
@@ -224,10 +280,19 @@ public class PluginTreeTest
{
dependencySet.add(d);
}
+ return createSmpWithDependency(name, dependencySet, null);
+ }
- InstalledPluginDescriptor plugin = new InstalledPluginDescriptor(2, createInfo(name, "1"), null, null,
- false, dependencySet);
-
+ private ExplodedSmp createSmpWithDependency(String name, Set dependencies, Set optionalDependencies) throws IOException {
+ InstalledPluginDescriptor plugin = new InstalledPluginDescriptor(
+ 2,
+ createInfo(name, "1"),
+ null,
+ null,
+ false,
+ dependencies,
+ optionalDependencies
+ );
return createSmp(plugin);
}
diff --git a/yarn.lock b/yarn.lock
index b69a934a48..f75ea838fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7332,9 +7332,9 @@ gitconfiglocal@^1.0.0:
dependencies:
ini "^1.3.2"
-gitdiff-parser@^0.1.2, "gitdiff-parser@https://github.com/scm-manager/gitdiff-parser#6baa7278824ecd17a199d842ca720d0453f68982":
+gitdiff-parser@^0.1.2, "gitdiff-parser@https://github.com/scm-manager/gitdiff-parser#ed3fe7de73dbb0a06c3e6adbbdf22dbae6e66351":
version "0.1.2"
- resolved "https://github.com/scm-manager/gitdiff-parser#6baa7278824ecd17a199d842ca720d0453f68982"
+ resolved "https://github.com/scm-manager/gitdiff-parser#ed3fe7de73dbb0a06c3e6adbbdf22dbae6e66351"
glob-parent@^3.1.0:
version "3.1.0"