commit 1b4108feaa803dfb6221d5ae8caada88c7abdc2d
author Martin Fick <mfick@codeaurora.org> Fri Oct 15 11:01:15 2021 -0600
committer Martin Fick <mfick@codeaurora.org> Mon Jan 10 21:21:46 2022 -0700
tree 5f48b254e1f22b818cb1d007927771110fbef9fb
parent 1b13ceb90b709733b79a5e8fdc78f8e7ec848aef

Remove the TaskTree.Root class

Since there is very little custom code left in the TaskTree.Root class,
eliminate it by pushing its functionality into NodeList and thus making
it share more code with the Node class.

Change-Id: I739935ee599870aca810098b033a8cb72eee5f8a

src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java b/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java
index 8445796..5a8bc5f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java
@@ -65,7 +65,7 @@
   protected final AllUsersNameProvider allUsers;
   protected final CurrentUser user;
   protected final TaskConfigFactory taskFactory;
-  protected final Root root = new Root();
+  protected final NodeList root = new NodeList();
   protected final Provider<ChangeQueryBuilder> changeQueryBuilderProvider;
   protected final Provider<ChangeQueryProcessor> changeQueryProcessorProvider;
 
@@ -98,14 +98,15 @@
     return root.getSubNodes();
   }
 
-  protected abstract class NodeList {
+  protected class NodeList {
     protected NodeList parent = null;
     protected LinkedList<String> path = new LinkedList<>();
     protected List<Node> nodes;
     protected Set<String> names = new HashSet<>();
 
-    protected abstract void addSubDefinitions()
-        throws ConfigInvalidException, IOException, OrmException;
+    protected void addSubDefinitions() throws ConfigInvalidException, IOException, OrmException {
+      addSubDefinitions(taskFactory.getRootConfig().getRootTasks());
+    }
 
     protected void addSubDefinitions(List<Task> defs) {
       for (Task def : defs) {
@@ -148,13 +149,6 @@
     }
   }
 
-  protected class Root extends NodeList {
-    @Override
-    protected void addSubDefinitions() throws ConfigInvalidException, IOException {
-      addSubDefinitions(getRootDefinitions());
-    }
-  }
-
   public class Node extends NodeList {
     public final Task task;
     protected final Properties.Task properties;