From 3602976ff109ba0c4c6cd713be69dc135fc4cfb4 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 16 Jan 2020 10:27:34 +0100
Subject: [PATCH] removed unnecessary plugin node wrapper

Removed PluginNodeHashWrapper and moved equals and hashCode logic into PluginNode
---
 .../java/sonia/scm/plugin/PluginNode.java     | 11 +++++++
 .../java/sonia/scm/plugin/PluginTree.java     | 31 +++----------------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/PluginNode.java b/scm-webapp/src/main/java/sonia/scm/plugin/PluginNode.java
index 94a048770f..08cff50457 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/PluginNode.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/PluginNode.java
@@ -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;
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 1eb2704c90..d7dfafbe02 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/PluginTree.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/PluginTree.java
@@ -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());
-    }
-  }
 }