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

removed unnecessary plugin node wrapper

Browse Source 
Removed PluginNodeHashWrapper and moved equals and hashCode logic into PluginNode
This commit is contained in:
Sebastian Sdorra
2020-01-16 10:27:34 +01:00
parent 2d755aae9a
commit 3602976ff1
2 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scm-webapp/src/main/java/sonia/scm/plugin/PluginNode.java
View File

@@ -175,6 +175,17 @@ public final class PluginNode
this.wrapper = wrapper;
}
@Override
public int hashCode() {
return getId().hashCode();
}
@Override
public boolean equals(Object obj) {
return obj instanceof PluginNode
&& ((PluginNode) obj).getId().equals(this.getId());
}
@Override
public String toString() {
return plugin.getPath().toString() + " -> " + children;

31
scm-webapp/src/main/java/sonia/scm/plugin/PluginTree.java
View File

@@ -138,20 +138,20 @@ public final class PluginTree
*/
public List<PluginNode> getLeafLastNodes()
{
LinkedHashSet<PluginNodeHashWrapper> leafFirst = new LinkedHashSet<>();
LinkedHashSet<PluginNode> leafFirst = new LinkedHashSet<>();
rootNodes.forEach(node -> appendLeafFirst(leafFirst, node));
LinkedList<PluginNode> leafLast = new LinkedList<>();
leafFirst.stream().map(PluginNodeHashWrapper::getPluginNode).forEach(leafLast::addFirst);
leafFirst.forEach(leafLast::addFirst);
return leafLast;
}
private void appendLeafFirst(LinkedHashSet<PluginNodeHashWrapper> leafFirst, PluginNode node) {
private void appendLeafFirst(LinkedHashSet<PluginNode> leafFirst, PluginNode node) {
node.getChildren().forEach(child -> appendLeafFirst(leafFirst, child));
leafFirst.add(new PluginNodeHashWrapper(node));
leafFirst.add(node);
}
@@ -255,27 +255,4 @@ public final class PluginTree
/** Field description */
private final List<PluginNode> rootNodes = Lists.newArrayList();
private static class PluginNodeHashWrapper {
private final PluginNode pluginNode;
private PluginNodeHashWrapper(PluginNode pluginNode) {
this.pluginNode = pluginNode;
}
public PluginNode getPluginNode() {
return pluginNode;
}
@Override
public int hashCode() {
return pluginNode.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
return obj instanceof PluginNodeHashWrapper
&& ((PluginNodeHashWrapper) obj).pluginNode.getId().equals(this.pluginNode.getId());
}
}
}