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

Add detection of circular dependencies

Browse Source
This commit is contained in:
Rene Pfeuffer
2020-01-31 12:27:02 +01:00
parent f92ea41ca3
commit 931133353d
5 changed files with 28 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
scm-webapp/src/main/java/sonia/scm/plugin/ExplodedSmp.java
View File

@@ -51,7 +51,7 @@ import java.util.Set;
*
* @author Sebastian Sdorra
*/
public final class ExplodedSmp implements Comparable<ExplodedSmp>
public final class ExplodedSmp
{
private static final Logger logger = LoggerFactory.getLogger(ExplodedSmp.class);
@@ -90,60 +90,6 @@ public final class ExplodedSmp implements Comparable<ExplodedSmp>
return new ExplodedSmp(directory, Plugins.parsePluginDescriptor(desc));
}
/**
* {@inheritDoc}
*/
@Override
public int compareTo(ExplodedSmp o)
{
int result;
Set<String> depends = plugin.getDependenciesInclusiveOptionals();
Set<String> odepends = o.plugin.getDependenciesInclusiveOptionals();
if (depends.isEmpty() && odepends.isEmpty())
{
result = 0;
}
else if (depends.isEmpty() &&!odepends.isEmpty())
{
result = -1;
}
else if (!depends.isEmpty() && odepends.isEmpty())
{
result = 1;
}
else
{
String id = plugin.getInformation().getName(false);
String oid = o.plugin.getInformation().getName(false);
if (depends.contains(oid) && odepends.contains(id))
{
StringBuilder b = new StringBuilder("circular dependency detected: ");
b.append(id).append(" depends on ").append(oid).append(" and ");
b.append(oid).append(" depends on ").append(id);
throw new PluginCircularDependencyException(b.toString());
}
else if (depends.contains(oid))
{
result = 999;
}
else if (odepends.contains(id))
{
result = -999;
}
else
{
result = 0;
}
}
return result;
}
//~--- get methods ----------------------------------------------------------
/**

16
scm-webapp/src/main/java/sonia/scm/plugin/SmpNodeBuilder.java
View File

@@ -29,6 +29,8 @@ class SmpNodeBuilder {
otherNode.addChild(node);
}
});
nodes.forEach(this::checkForCircle);
});
return nodes;
@@ -47,4 +49,18 @@ class SmpNodeBuilder {
}
});
}
private void checkForCircle(PluginNode pluginNode) {
pluginNode.getChildren().forEach(child -> assertDoesNotContainsDependency(pluginNode, child));
}
private void assertDoesNotContainsDependency(PluginNode pluginNode, PluginNode childNode) {
if (childNode == pluginNode) {
throw new PluginCircularDependencyException("circular dependency detected: " +
childNode.getId() + " depends on " + pluginNode.getId() + " and " +
pluginNode.getId() + " depends on " + childNode.getId()
);
}
childNode.getChildren().forEach(child -> assertDoesNotContainsDependency(pluginNode, child));
}
}