Detect and handle non-existing tasks more explicitly.
Return NULL for non-existing tasks on fetch since nulls are already used
in the task tree for INVALID tasks.
Change-Id: I37ca30eec59d27f2a2505bd0a6246cec63142e07
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/TaskConfig.java b/src/main/java/com/googlesource/gerrit/plugins/task/TaskConfig.java
index 0bc8fa5..0fa89d6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/task/TaskConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/task/TaskConfig.java
@@ -136,7 +136,8 @@
}
public Task getTask(String name) {
- return new Task(new SubSection(SECTION_TASK, name), isVisible, isTrusted);
+ SubSection subSection = new SubSection(SECTION_TASK, name);
+ return getNames(subSection).isEmpty() ? null : new Task(subSection, isVisible, isTrusted);
}
public External getExternal(String name) {
diff --git a/src/main/resources/Documentation/task_states.md b/src/main/resources/Documentation/task_states.md
index 5b8ac13..95ae507 100644
--- a/src/main/resources/Documentation/task_states.md
+++ b/src/main/resources/Documentation/task_states.md
@@ -594,8 +594,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
@@ -618,8 +617,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
diff --git a/test/all b/test/all
index 5ce71fc..b3c79a8 100644
--- a/test/all
+++ b/test/all
@@ -408,9 +408,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
@@ -436,9 +434,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
@@ -548,9 +544,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
@@ -576,9 +570,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
diff --git a/test/invalid b/test/invalid
index ba4db4f..27df0ec 100644
--- a/test/invalid
+++ b/test/invalid
@@ -97,9 +97,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
@@ -125,9 +123,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
@@ -225,9 +221,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
@@ -253,9 +247,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
diff --git a/test/invalid-applicable b/test/invalid-applicable
index 51606f3..514fca9 100644
--- a/test/invalid-applicable
+++ b/test/invalid-applicable
@@ -68,8 +68,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
@@ -92,8 +91,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
diff --git a/test/preview b/test/preview
index d48e084..60ba53f 100644
--- a/test/preview
+++ b/test/preview
@@ -53,9 +53,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
@@ -81,9 +79,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
@@ -228,9 +224,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
@@ -256,9 +250,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
diff --git a/test/preview.invalid b/test/preview.invalid
index 718da97..be1bb7f 100644
--- a/test/preview.invalid
+++ b/test/preview.invalid
@@ -53,9 +53,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
@@ -81,9 +79,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
@@ -181,9 +177,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
@@ -209,9 +203,7 @@
"status" : "WAITING",
"subTasks" : [
{
- "applicable" : true,
- "hasPass" : false,
- "name" : "MISSING",
+ "name" : "UNKNOWN",
"status" : "INVALID"
}
]
