Add has:a_depends-on operator
This operator returns changes that have 'Depends-on' change
dependencies defined in their comments. Note that, it does not
return changes with an empty 'Depends-on'.
Change-Id: I3b8084a41a633bf2a4d5479b5b8f531b8e43a260
diff --git a/src/main/java/com/googlesource/gerrit/plugins/depends/on/HasDependsOnOperator.java b/src/main/java/com/googlesource/gerrit/plugins/depends/on/HasDependsOnOperator.java
new file mode 100644
index 0000000..b9d1e15
--- /dev/null
+++ b/src/main/java/com/googlesource/gerrit/plugins/depends/on/HasDependsOnOperator.java
@@ -0,0 +1,55 @@
+// Copyright (C) 2022 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.googlesource.gerrit.plugins.depends.on;
+
+import com.google.gerrit.index.query.PostFilterPredicate;
+import com.google.gerrit.index.query.Predicate;
+import com.google.gerrit.index.query.QueryParseException;
+import com.google.gerrit.server.query.change.ChangeData;
+import com.google.gerrit.server.query.change.ChangeQueryBuilder;
+import com.google.gerrit.server.query.change.ChangeQueryBuilder.ChangeHasOperandFactory;
+import com.google.inject.Inject;
+
+public class HasDependsOnOperator implements ChangeHasOperandFactory {
+ public static final String FIELD = "a";
+
+ public class HasDependsOnPredicate extends PostFilterPredicate<ChangeData> {
+ HasDependsOnPredicate() {
+ super("has", FIELD);
+ }
+
+ @Override
+ public boolean match(ChangeData change) {
+ return !changeMessageStore.load(change.getId()).isEmpty();
+ }
+
+ @Override
+ public int getCost() {
+ return 2;
+ }
+ }
+
+ protected final ChangeMessageStore changeMessageStore;
+
+ @Inject
+ public HasDependsOnOperator(ChangeMessageStore changeMessageStore) {
+ this.changeMessageStore = changeMessageStore;
+ }
+
+ @Override
+ public Predicate<ChangeData> create(ChangeQueryBuilder builder) throws QueryParseException {
+ return new HasDependsOnPredicate();
+ }
+}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/depends/on/Module.java b/src/main/java/com/googlesource/gerrit/plugins/depends/on/Module.java
index 2f425db..0a51e2b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/depends/on/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/depends/on/Module.java
@@ -28,6 +28,7 @@
import com.google.gerrit.server.events.EventListener;
import com.google.gerrit.server.project.InvalidChangeOperationException;
import com.google.gerrit.server.project.NoSuchChangeException;
+import com.google.gerrit.server.query.change.ChangeQueryBuilder.ChangeHasOperandFactory;
import com.google.gerrit.server.query.change.ChangeQueryBuilder.ChangeOperatorFactory;
import com.google.gerrit.server.restapi.change.GetChange;
import com.google.gerrit.server.restapi.change.QueryChanges;
@@ -44,6 +45,9 @@
bind(ChangeOperatorFactory.class)
.annotatedWith(Exports.named(InDependsOnOperator.FIELD))
.to(InDependsOnOperator.class);
+ bind(ChangeHasOperandFactory.class)
+ .annotatedWith(Exports.named(HasDependsOnOperator.FIELD))
+ .to(HasDependsOnOperator.class);
DynamicSet.bind(binder(), EventListener.class).to(CoreListener.class);
bind(ChangePluginDefinedInfoFactory.class)
.annotatedWith(Exports.named("depends-ons"))
@@ -57,7 +61,7 @@
.annotatedWith(Exports.named(DependsOnCommentValidator.class.getSimpleName()))
.to(DependsOnCommentValidator.class);
DynamicSet.bind(binder(), WebUiPlugin.class)
- .toInstance(new JavaScriptPlugin("gr-depends-on-plugin.js"));
+ .toInstance(new JavaScriptPlugin("gr-depends-on-plugin.js"));
}
public static class MyQueryOptions implements DependencyResolver {
diff --git a/src/main/resources/Documentation/change-search-operators.md b/src/main/resources/Documentation/change-search-operators.md
index 2c18f6d..0885ac0 100644
--- a/src/main/resources/Documentation/change-search-operators.md
+++ b/src/main/resources/Documentation/change-search-operators.md
@@ -5,6 +5,10 @@
: Returns "Depends-on" change dependencies specified in the comments of the provided change.
+**has:a_@PLUGIN@**
+
+: Returns changes that have "Depends-on" change dependencies defined in their comments (operator does not return changes with an empty "Depends-on").
+
**Operational Notes**:
To use any operator of @PLUGIN@ plugin, change operator aliasing is needed since query parser
diff --git a/test/test_independson_operator.sh b/test/test_dependson_operators.sh
similarity index 77%
rename from test/test_independson_operator.sh
rename to test/test_dependson_operators.sh
index ac9ce3a..1c861a1 100755
--- a/test/test_independson_operator.sh
+++ b/test/test_dependson_operators.sh
@@ -120,13 +120,29 @@
q git init "$REPO_DIR"
FILE_A="$REPO_DIR"/fileA
-# ------------------------- Depends-on Test ---------------------------
+# ------------------------- independson:<change-num> Tests ---------------------------
DEPENDENT_CHANGE=$(create_change "$SRC_REF_BRANCH" "$FILE_A") || \
die "Failed to create change on project: $PROJECT branch: $SRC_REF_BRANCH"
CHANGE=$(create_change "$SRC_REF_BRANCH" "$FILE_A") || \
die "Failed to create change on project: $PROJECT branch: $SRC_REF_BRANCH"
gssh gerrit review --message \'"Depends-on: $DEPENDENT_CHANGE"\' "$CHANGE",1
-EXPECTED=$DEPENDENT_CHANGE
ACTUAL="$(query "independson:$CHANGE" | jq --raw-output '.number')"
-result_out "independson operator" "$EXPECTED" "$ACTUAL"
+result_out "independson operator" "$DEPENDENT_CHANGE" "$ACTUAL"
+
+# ------------------------- has:a_depends-on Tests ---------------------------
+CHANGE_1=$(create_change "$SRC_REF_BRANCH" "$FILE_A") || \
+ die "Failed to create change on project: $PROJECT branch: $SRC_REF_BRANCH"
+ACTUAL="$(query "change:$CHANGE_1 has:a_depends-on" | jq --raw-output '.number')"
+result_out "has:a_depends-on operator (no Depends-On)" "null" "$ACTUAL"
+
+CHANGE_2=$(create_change "$SRC_REF_BRANCH" "$FILE_A") || \
+ die "Failed to create change on project: $PROJECT branch: $SRC_REF_BRANCH"
+gssh gerrit review --message \'"Depends-on: $CHANGE_1"\' "$CHANGE_2",1
+ACTUAL="$(query "change:$CHANGE_2 has:a_depends-on" | jq --raw-output '.number')"
+result_out "has:a_depends-on operator (non-empty Depends-on)" "$CHANGE_2" "$ACTUAL"
+
+gssh gerrit review --message \'"Depends-on:"\' "$CHANGE_2",1
+ACTUAL="$(query "change:$CHANGE_2 has:a_depends-on" | jq --raw-output '.number')"
+result_out "has:a_depends-on operator (empty Depends-On)" "null" "$ACTUAL"
+
exit $RESULT
diff --git a/test/test_plugin.sh b/test/test_plugin.sh
index 1e51096..f3a0610 100755
--- a/test/test_plugin.sh
+++ b/test/test_plugin.sh
@@ -5,6 +5,6 @@
RESULT=0
"$CUR_DIR"/test_dependson.sh "$@" || RESULT=1
-"$CUR_DIR"/test_independson_operator.sh "$@" || RESULT=1
+"$CUR_DIR"/test_dependson_operators.sh "$@" || RESULT=1
-exit $RESULT
\ No newline at end of file
+exit $RESULT
