commit 9f27f47f11bdcd05321525c839d70b32aa4beaec
author Edwin Kempin <ekempin@google.com> Mon Apr 01 10:07:46 2019 +0200
committer Edwin Kempin <ekempin@google.com> Mon Apr 01 10:29:15 2019 +0200
tree f7f97cc13391463d8cdaf39694e93accd3efc617
parent d8e7e227a3125dd6a43047baa980d894f20facee

CheckerInput: Rename field 'blockingConditions' to 'blocking'

This makes the naming consistent with the fields for blocking conditions
in CheckerInfo and CheckInfo.

The documentation of CheckerInput doesn't need to be adapted since it
was already using 'blocking' as field name.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I29bc8ee1487cd1a90bfcdef3037c28e58af557b7

java/com/google/gerrit/plugins/checks/api/CheckerInput.java

diff --git a/java/com/google/gerrit/plugins/checks/api/CheckerInput.java b/java/com/google/gerrit/plugins/checks/api/CheckerInput.java
index 9d609c6..1f4b498 100644
--- a/java/com/google/gerrit/plugins/checks/api/CheckerInput.java
+++ b/java/com/google/gerrit/plugins/checks/api/CheckerInput.java
@@ -23,6 +23,6 @@
   public String url;
   public String repository;
   public CheckerStatus status;
-  public Set<BlockingCondition> blockingConditions;
+  public Set<BlockingCondition> blocking;
   public String query;
 }

java/com/google/gerrit/plugins/checks/api/CreateChecker.java

diff --git a/java/com/google/gerrit/plugins/checks/api/CreateChecker.java b/java/com/google/gerrit/plugins/checks/api/CreateChecker.java
index b5743bd..8bea2f3 100644
--- a/java/com/google/gerrit/plugins/checks/api/CreateChecker.java
+++ b/java/com/google/gerrit/plugins/checks/api/CreateChecker.java
@@ -104,9 +104,8 @@
     if (input.status != null) {
       checkerUpdateBuilder.setStatus(input.status);
     }
-    if (input.blockingConditions != null) {
-      checkerUpdateBuilder.setBlockingConditions(
-          ImmutableSortedSet.copyOf(input.blockingConditions));
+    if (input.blocking != null) {
+      checkerUpdateBuilder.setBlockingConditions(ImmutableSortedSet.copyOf(input.blocking));
     }
     if (input.query != null) {
       checkerUpdateBuilder.setQuery(CheckerQuery.clean(input.query));

java/com/google/gerrit/plugins/checks/api/UpdateChecker.java

diff --git a/java/com/google/gerrit/plugins/checks/api/UpdateChecker.java b/java/com/google/gerrit/plugins/checks/api/UpdateChecker.java
index b20117b..362fde8 100644
--- a/java/com/google/gerrit/plugins/checks/api/UpdateChecker.java
+++ b/java/com/google/gerrit/plugins/checks/api/UpdateChecker.java
@@ -103,9 +103,8 @@
       checkerUpdateBuilder.setStatus(input.status);
     }
 
-    if (input.blockingConditions != null) {
-      checkerUpdateBuilder.setBlockingConditions(
-          ImmutableSortedSet.copyOf(input.blockingConditions));
+    if (input.blocking != null) {
+      checkerUpdateBuilder.setBlockingConditions(ImmutableSortedSet.copyOf(input.blocking));
     }
 
     if (input.query != null) {

javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckerIT.java

diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckerIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckerIT.java
index 4a72f1e..98a04b8 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckerIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckerIT.java
@@ -326,7 +326,7 @@
     CheckerInput input = new CheckerInput();
     input.uuid = "test:my-checker";
     input.repository = allProjects.get();
-    input.blockingConditions = ImmutableSet.of(BlockingCondition.STATE_NOT_PASSING);
+    input.blocking = ImmutableSet.of(BlockingCondition.STATE_NOT_PASSING);
 
     CheckerInfo info = checkersApi.create(input).get();
     assertThat(info.blocking).containsExactly(BlockingCondition.STATE_NOT_PASSING);

javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java

diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java
index f6598a4..da9025a 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java
@@ -440,7 +440,7 @@
     CheckerUuid checkerUuid = checkerOperations.newChecker().create();
 
     CheckerInput input = new CheckerInput();
-    input.blockingConditions = ImmutableSet.of(BlockingCondition.STATE_NOT_PASSING);
+    input.blocking = ImmutableSet.of(BlockingCondition.STATE_NOT_PASSING);
     CheckerInfo info = checkersApi.id(checkerUuid).update(input);
     assertThat(info.blocking).containsExactly(BlockingCondition.STATE_NOT_PASSING);
   }