Merge changes Id068891e,If4cdbc4e
* changes:
Enable error level for the InvalidInlineTag bug pattern in ErrorProne
Enable error level for the ParameterName bug pattern in ErrorProne
diff --git a/java/com/google/gerrit/server/cache/PerThreadCache.java b/java/com/google/gerrit/server/cache/PerThreadCache.java
index b4f79d1..ef00b80 100644
--- a/java/com/google/gerrit/server/cache/PerThreadCache.java
+++ b/java/com/google/gerrit/server/cache/PerThreadCache.java
@@ -68,7 +68,7 @@
/**
* Returns a key based on the value's class and an identifier that uniquely identify the value.
- * The identifier needs to implement {@code equals()} and {@hashCode()}.
+ * The identifier needs to implement {@code equals()} and {@code hashCode()}.
*/
public static <T> Key<T> create(Class<T> clazz, Object identifier) {
return new Key<>(clazz, ImmutableList.of(identifier));
@@ -76,7 +76,7 @@
/**
* Returns a key based on the value's class and a set of identifiers that uniquely identify the
- * value. Identifiers need to implement {@code equals()} and {@hashCode()}.
+ * value. Identifiers need to implement {@code equals()} and {@code hashCode()}.
*/
public static <T> Key<T> create(Class<T> clazz, Object... identifiers) {
return new Key<>(clazz, ImmutableList.copyOf(identifiers));
diff --git a/java/com/google/gerrit/server/events/EventFactory.java b/java/com/google/gerrit/server/events/EventFactory.java
index 951167a..a7fea3c 100644
--- a/java/com/google/gerrit/server/events/EventFactory.java
+++ b/java/com/google/gerrit/server/events/EventFactory.java
@@ -400,7 +400,7 @@
try {
Map<String, FileDiffOutput> modifiedFiles =
diffOperations.listModifiedFilesAgainstParent(
- change.getProject(), patchSet.commitId(), /* parent= */ 0);
+ change.getProject(), patchSet.commitId(), /* parentNum= */ 0);
for (FileDiffOutput diff : modifiedFiles.values()) {
if (patchSetAttribute.files == null) {
@@ -457,7 +457,7 @@
Map<String, FileDiffOutput> modifiedFiles =
diffOperations.listModifiedFilesAgainstParent(
- change.getProject(), patchSet.commitId(), /* parent= */ 0);
+ change.getProject(), patchSet.commitId(), /* parentNum= */ 0);
for (FileDiffOutput fileDiff : modifiedFiles.values()) {
p.sizeDeletions += fileDiff.deletions();
p.sizeInsertions += fileDiff.insertions();
diff --git a/java/com/google/gerrit/server/git/validators/ValidationMessage.java b/java/com/google/gerrit/server/git/validators/ValidationMessage.java
index b5d7eb1..c743bbc 100644
--- a/java/com/google/gerrit/server/git/validators/ValidationMessage.java
+++ b/java/com/google/gerrit/server/git/validators/ValidationMessage.java
@@ -68,7 +68,8 @@
}
/**
- * Returns {@true} if this message is an error. Used to decide if the operation should be aborted.
+ * Returns {@code true} if this message is an error. Used to decide if the operation should be
+ * aborted.
*/
public boolean isError() {
return type == Type.FATAL || type == Type.ERROR;
diff --git a/javatests/com/google/gerrit/acceptance/server/query/ApprovalQueryIT.java b/javatests/com/google/gerrit/acceptance/server/query/ApprovalQueryIT.java
index b4d9558..537c7d8 100644
--- a/javatests/com/google/gerrit/acceptance/server/query/ApprovalQueryIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/query/ApprovalQueryIT.java
@@ -68,8 +68,7 @@
public void changeKindPredicate_noCodeChange() throws Exception {
String change = changeKindCreator.createChange(ChangeKind.NO_CODE_CHANGE, testRepo, admin);
changeKindCreator.updateChange(change, ChangeKind.NO_CODE_CHANGE, testRepo, admin, project);
- PatchSet.Id ps1 =
- PatchSet.id(Change.id(gApi.changes().id(change).get()._number), /* psId= */ 1);
+ PatchSet.Id ps1 = PatchSet.id(Change.id(gApi.changes().id(change).get()._number), /* id= */ 1);
assertTrue(
queryBuilder
.parse("changekind:no-code-change")
@@ -77,8 +76,7 @@
.match(contextForCodeReviewLabel(/* value= */ -2, ps1, admin.id())));
changeKindCreator.updateChange(change, ChangeKind.TRIVIAL_REBASE, testRepo, admin, project);
- PatchSet.Id ps2 =
- PatchSet.id(Change.id(gApi.changes().id(change).get()._number), /* psId= */ 2);
+ PatchSet.Id ps2 = PatchSet.id(Change.id(gApi.changes().id(change).get()._number), /* id= */ 2);
assertFalse(
queryBuilder
.parse("changekind:no-code-change")
@@ -90,8 +88,7 @@
public void changeKindPredicate_trivialRebase() throws Exception {
String change = changeKindCreator.createChange(ChangeKind.TRIVIAL_REBASE, testRepo, admin);
changeKindCreator.updateChange(change, ChangeKind.TRIVIAL_REBASE, testRepo, admin, project);
- PatchSet.Id ps1 =
- PatchSet.id(Change.id(gApi.changes().id(change).get()._number), /* psId= */ 1);
+ PatchSet.Id ps1 = PatchSet.id(Change.id(gApi.changes().id(change).get()._number), /* id= */ 1);
assertTrue(
queryBuilder
.parse("changekind:trivial-rebase")
@@ -99,8 +96,7 @@
.match(contextForCodeReviewLabel(/* value= */ -2, ps1, admin.id())));
changeKindCreator.updateChange(change, ChangeKind.REWORK, testRepo, admin, project);
- PatchSet.Id ps2 =
- PatchSet.id(Change.id(gApi.changes().id(change).get()._number), /* psId= */ 2);
+ PatchSet.Id ps2 = PatchSet.id(Change.id(gApi.changes().id(change).get()._number), /* id= */ 2);
assertFalse(
queryBuilder
.parse("changekind:trivial-rebase")
@@ -112,8 +108,7 @@
public void changeKindPredicate_reworkAndNotRework() throws Exception {
String change = changeKindCreator.createChange(ChangeKind.REWORK, testRepo, admin);
changeKindCreator.updateChange(change, ChangeKind.REWORK, testRepo, admin, project);
- PatchSet.Id ps1 =
- PatchSet.id(Change.id(gApi.changes().id(change).get()._number), /* psId= */ 1);
+ PatchSet.Id ps1 = PatchSet.id(Change.id(gApi.changes().id(change).get()._number), /* id= */ 1);
assertTrue(
queryBuilder
.parse("changekind:rework")
@@ -121,8 +116,7 @@
.match(contextForCodeReviewLabel(/* value= */ -2, ps1, admin.id())));
changeKindCreator.updateChange(change, ChangeKind.REWORK, testRepo, admin, project);
- PatchSet.Id ps2 =
- PatchSet.id(Change.id(gApi.changes().id(change).get()._number), /* psId= */ 2);
+ PatchSet.Id ps2 = PatchSet.id(Change.id(gApi.changes().id(change).get()._number), /* id= */ 2);
assertFalse(
queryBuilder
.parse("-changekind:rework")
@@ -150,7 +144,7 @@
.match(
contextForCodeReviewLabel(
/* value= */ 2,
- PatchSet.id(pushResult.getChange().getId(), /* psId= */ 1),
+ PatchSet.id(pushResult.getChange().getId(), /* id= */ 1),
admin.id())));
// can not copy approval from patchset 2 -> 3
assertFalse(
@@ -160,7 +154,7 @@
.match(
contextForCodeReviewLabel(
/* value= */ 2,
- PatchSet.id(pushResult.getChange().getId(), /* psId= */ 2),
+ PatchSet.id(pushResult.getChange().getId(), /* id= */ 2),
admin.id())));
}
@@ -179,7 +173,7 @@
.match(
contextForCodeReviewLabel(
/* value= */ 2,
- PatchSet.id(pushResult.getChange().getId(), /* psId= */ 1),
+ PatchSet.id(pushResult.getChange().getId(), /* id= */ 1),
admin.id())));
// can not copy approval from patchset 2 -> 3
assertFalse(
@@ -189,7 +183,7 @@
.match(
contextForCodeReviewLabel(
/* value= */ 2,
- PatchSet.id(pushResult.getChange().getId(), /* psId= */ 2),
+ PatchSet.id(pushResult.getChange().getId(), /* id= */ 2),
user.id())));
}
@@ -219,7 +213,7 @@
.asMatchable()
.match(
contextForCodeReviewLabel(
- /* value= */ 2, PatchSet.id(changeId, /* psId= */ 1), admin.id())));
+ /* value= */ 2, PatchSet.id(changeId, /* id= */ 1), admin.id())));
changeOperations.change(changeId).newPatchset().file("file").delete().create();
// can not copy approval from patch-set 2 -> 3
@@ -229,7 +223,7 @@
.asMatchable()
.match(
contextForCodeReviewLabel(
- /* value= */ 2, PatchSet.id(changeId, /* psId= */ 2), admin.id())));
+ /* value= */ 2, PatchSet.id(changeId, /* id= */ 2), admin.id())));
}
@Test
diff --git a/tools/BUILD b/tools/BUILD
index 46671ac..e44ae78 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -241,7 +241,7 @@
"-Xep:InstantTemporalUnit:ERROR",
"-Xep:IntLongMath:ERROR",
# "-Xep:InvalidBlockTag:WARN",
- # "-Xep:InvalidInlineTag:WARN",
+ "-Xep:InvalidInlineTag:WARN",
"-Xep:InvalidJavaTimeConstant:ERROR",
"-Xep:InvalidLink:ERROR",
# "-Xep:InvalidParam:WARN",
@@ -354,7 +354,7 @@
"-Xep:OverridesGuiceInjectableMethod:ERROR",
"-Xep:OverridesJavaxInjectableMethod:ERROR",
"-Xep:PackageInfo:ERROR",
- # "-Xep:ParameterName:WARN",
+ "-Xep:ParameterName:ERROR",
"-Xep:ParametersButNotParameterized:ERROR",
"-Xep:ParcelableCreator:ERROR",
"-Xep:PeriodFrom:ERROR",
