Rename submit requirement expressions in project.config
Doing the following renames for a shorter and more compact version:
applicabilityExpression -> applicableIf
submittabilityExpression -> submittableIf
overrideExpression -> overrideIf
Change-Id: I23a6cff2e5187b5cdfbf760d0ab59c481091f4a7
diff --git a/java/com/google/gerrit/server/project/ProjectConfig.java b/java/com/google/gerrit/server/project/ProjectConfig.java
index 6551858..0d710b9 100644
--- a/java/com/google/gerrit/server/project/ProjectConfig.java
+++ b/java/com/google/gerrit/server/project/ProjectConfig.java
@@ -129,9 +129,9 @@
public static final String SUBMIT_REQUIREMENT = "submit-requirement";
public static final String KEY_SR_NAME = "name";
public static final String KEY_SR_DESCRIPTION = "description";
- public static final String KEY_SR_APPLICABILITY_EXPRESSION = "applicabilityExpression";
- public static final String KEY_SR_SUBMITTABILITY_EXPRESSION = "submittabilityExpression";
- public static final String KEY_SR_OVERRIDE_EXPRESSION = "overrideExpression";
+ public static final String KEY_SR_APPLICABILITY_EXPRESSION = "applicableIf";
+ public static final String KEY_SR_SUBMITTABILITY_EXPRESSION = "submittableIf";
+ public static final String KEY_SR_OVERRIDE_EXPRESSION = "overrideIf";
public static final String KEY_SR_OVERRIDE_IN_CHILD_PROJECTS = "canOverrideInChildProjects";
public static final String KEY_MATCH = "match";
diff --git a/javatests/com/google/gerrit/server/project/ProjectConfigTest.java b/javatests/com/google/gerrit/server/project/ProjectConfigTest.java
index 8ca392c..9130d3e 100644
--- a/javatests/com/google/gerrit/server/project/ProjectConfigTest.java
+++ b/javatests/com/google/gerrit/server/project/ProjectConfigTest.java
@@ -211,13 +211,13 @@
"project.config",
"[submit-requirement \"Code-review\"]\n"
+ " description = At least one Code Review +2\n"
- + " applicabilityExpression = branch(refs/heads/master)\n"
- + " submittabilityExpression = label(code-review, +2)\n"
+ + " applicableIf =branch(refs/heads/master)\n"
+ + " submittableIf = label(code-review, +2)\n"
+ "[submit-requirement \"api-review\"]\n"
+ " description = Additional review required for API modifications\n"
- + " applicabilityExpression = commit_filepath_contains(\\\"/api/.*\\\")\n"
- + " submittabilityExpression = label(api-review, +2)\n"
- + " overrideExpression = label(build-cop-override, +1)\n"
+ + " applicableIf =commit_filepath_contains(\\\"/api/.*\\\")\n"
+ + " submittableIf = label(api-review, +2)\n"
+ + " overrideIf = label(build-cop-override, +1)\n"
+ " canOverrideInChildProjects = true\n")
.create();
@@ -258,7 +258,7 @@
.add(
"project.config",
"[submit-requirement \"code-review\"]\n"
- + " submittabilityExpression = label(code-review, +2)\n")
+ + " submittableIf = label(code-review, +2)\n")
.create();
ProjectConfig cfg = read(rev);
@@ -283,10 +283,10 @@
"project.config",
"[submit-requirement \"code-review\"]\n"
+ " description = At least one Code Review +2\n"
- + " submittabilityExpression = label(code-review, +2)\n"
+ + " submittableIf = label(code-review, +2)\n"
+ "[submit-requirement \"Code-Review\"]\n"
+ " description = Another code review label\n"
- + " submittabilityExpression = label(code-review, +2)\n"
+ + " submittableIf = label(code-review, +2)\n"
+ " canOverrideInChildProjects = true\n")
.create();
@@ -318,7 +318,7 @@
.add(
"project.config",
"[submit-requirement \"code-review\"]\n"
- + " applicabilityExpression = label(code-review, +2)\n")
+ + " applicableIf =label(code-review, +2)\n")
.create();
ProjectConfig cfg = read(rev);
@@ -945,8 +945,8 @@
"project.config",
"[submit-requirement \"code-review\"]\n"
+ " description = At least one Code Review +2\n"
- + " applicabilityExpression = branch(refs/heads/master)\n"
- + " submittabilityExpression = label(code-review, +2)\n"
+ + " applicableIf =branch(refs/heads/master)\n"
+ + " submittableIf = label(code-review, +2)\n"
+ "[notify \"name\"]\n"
+ " email = example@example.com\n")
.create();
