commit d6c1ecb3964be03810cad6eda4cb7d8cae31edb6
author Martin Fick <mfick@codeaurora.org> Thu Nov 04 16:11:06 2021 -0600
committer Martin Fick <mfick@codeaurora.org> Mon Jan 10 21:24:14 2022 -0700
tree 9f423e3fc44b785f89d134b64d3c2cfe73054c0b
parent 0cfd7d34d54d015fb29a6772d4f9c590b5caa78e

Fixup some minor task naming/organizational issues.

Fix the missnamed tasksfactory variable which was missing an 's' to be
consistent with the normal task naming.

Fix the addChangeTypeTaskDefinitions() method name which had an extra
's' and was not consistent with the addStaticTypeTaskDefinitions()
method.

Reorder some of the code in the Preloader paths to return early for the
simple cases. This makes the outcome of each condition easier to track.

Change-Id: I09b233e249e4a604bef8aa5447ff8f58cddc005d

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/Preloader.java b/src/main/java/com/googlesource/gerrit/plugins/task/Preloader.java
index 8babe1c..c9506da 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/task/Preloader.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/task/Preloader.java
@@ -89,28 +89,30 @@
   }
 
   protected static <T> List<T> preloadListFrom(List<T> list, List<T> preList) {
-    List<T> extended = list;
-    if (!preList.isEmpty()) {
-      extended = preList;
-      if (!list.isEmpty()) {
-        extended = new ArrayList<>(list.size() + preList.size());
-        extended.addAll(preList);
-        extended.addAll(list);
-      }
+    if (preList.isEmpty()) {
+      return list;
     }
+    if (list.isEmpty()) {
+      return preList;
+    }
+
+    List<T> extended = new ArrayList<>(list.size() + preList.size());
+    extended.addAll(preList);
+    extended.addAll(list);
     return extended;
   }
 
   protected static <K, V> Map<K, V> preloadMapFrom(Map<K, V> map, Map<K, V> preMap) {
-    Map<K, V> extended = map;
-    if (!preMap.isEmpty()) {
-      extended = preMap;
-      if (!map.isEmpty()) {
-        extended = new HashMap<>(map.size() + preMap.size());
-        extended.putAll(preMap);
-        extended.putAll(map);
-      }
+    if (preMap.isEmpty()) {
+      return map;
     }
+    if (map.isEmpty()) {
+      return preMap;
+    }
+
+    Map<K, V> extended = new HashMap<>(map.size() + preMap.size());
+    extended.putAll(preMap);
+    extended.putAll(map);
     return extended;
   }
 }

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 c785e2d..73c153e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java
@@ -215,8 +215,8 @@
     }
 
     protected void addSubTasksFactoryDefinitions() throws OrmException {
-      for (String taskFactoryName : task.subTasksFactories) {
-        TasksFactory tasksFactory = task.config.getTasksFactory(taskFactoryName);
+      for (String tasksFactoryName : task.subTasksFactories) {
+        TasksFactory tasksFactory = task.config.getTasksFactory(tasksFactoryName);
         if (tasksFactory != null) {
           NamesFactory namesFactory = task.config.getNamesFactory(tasksFactory.namesFactory);
           if (namesFactory != null && namesFactory.type != null) {
@@ -226,7 +226,7 @@
                 addStaticTypeTaskDefinitions(tasksFactory, namesFactory);
                 continue;
               case CHANGE:
-                addChangesTypeTaskDefinitions(tasksFactory, namesFactory);
+                addChangeTypeTaskDefinitions(tasksFactory, namesFactory);
                 continue;
             }
           }
@@ -242,7 +242,7 @@
       }
     }
 
-    protected void addChangesTypeTaskDefinitions(
+    protected void addChangeTypeTaskDefinitions(
         TasksFactory tasksFactory, NamesFactory namesFactory) {
       try {
         if (namesFactory.changes != null) {