commit 03ce0d1d8522751b9a806d5fa8b875e89fa4e321
author Edwin Kempin <ekempin@google.com> Tue Oct 19 12:26:07 2021 +0200
committer Edwin Kempin <ekempin@google.com> Tue Oct 19 12:38:50 2021 +0200
tree 333f1a3ea411364351626f0883a618a0df51f86b
parent 6e38b70a4f51f5d4c18e4efa30ba56e4d23e10bf

Enable error level for the InvalidBlockTag bug pattern in ErrorProne

Fix the current issues so that the build continues to work.

Bug: Issue 15066
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I78adc26df6a06e88856c2b27d063fffcfe6fd547

java/com/google/gerrit/acceptance/TestMetricMaker.java

diff --git a/java/com/google/gerrit/acceptance/TestMetricMaker.java b/java/com/google/gerrit/acceptance/TestMetricMaker.java
index d60ef1a..2620f99 100644
--- a/java/com/google/gerrit/acceptance/TestMetricMaker.java
+++ b/java/com/google/gerrit/acceptance/TestMetricMaker.java
@@ -34,11 +34,11 @@
  *
  * <pre>
  * public class MyTest extends AbstractDaemonTest {
- *   @Inject private TestMetricMaker testMetricMaker;
+ *   {@literal @}Inject private TestMetricMaker testMetricMaker;
  *
  *   ...
  *
- *   @Test
+ *   {@literal @}Test
  *   public void testFoo() throws Exception {
  *     testMetricMaker.reset();
  *     doSomething();

java/com/google/gerrit/lucene/WrappableSearcherManager.java

diff --git a/java/com/google/gerrit/lucene/WrappableSearcherManager.java b/java/com/google/gerrit/lucene/WrappableSearcherManager.java
index 4044b90..c164b29 100644
--- a/java/com/google/gerrit/lucene/WrappableSearcherManager.java
+++ b/java/com/google/gerrit/lucene/WrappableSearcherManager.java
@@ -53,7 +53,6 @@
  * {@link #maybeRefresh}. Finally, be sure to call {@link #close} once you are done.
  *
  * @see SearcherFactory
- * @lucene.experimental
  */
 // This file was copied from:
 // https://github.com/apache/lucene-solr/blob/lucene_solr_5_0/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java

java/com/google/gerrit/server/util/CommitMessageUtil.java

diff --git a/java/com/google/gerrit/server/util/CommitMessageUtil.java b/java/com/google/gerrit/server/util/CommitMessageUtil.java
index 55e3951..dc9c2d9 100644
--- a/java/com/google/gerrit/server/util/CommitMessageUtil.java
+++ b/java/com/google/gerrit/server/util/CommitMessageUtil.java
@@ -51,7 +51,7 @@
    * the commit message.
    *
    * @throws BadRequestException if the commit message is null or empty
-   * @returns the trimmed message with a trailing newline character
+   * @return the trimmed message with a trailing newline character
    */
   public static String checkAndSanitizeCommitMessage(@Nullable String commitMessage)
       throws BadRequestException {

tools/BUILD

diff --git a/tools/BUILD b/tools/BUILD
index f952c63..36507a9 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -240,7 +240,7 @@
         "-Xep:InstanceOfAndCastMatchWrongType:ERROR",
         "-Xep:InstantTemporalUnit:ERROR",
         "-Xep:IntLongMath:ERROR",
-        # "-Xep:InvalidBlockTag:WARN",
+        "-Xep:InvalidBlockTag:ERROR",
         "-Xep:InvalidInlineTag:ERROR",
         "-Xep:InvalidJavaTimeConstant:ERROR",
         "-Xep:InvalidLink:ERROR",