PathCodeOwnersResult.Builder: Add @CanIgnoreReturnValue annotations For methods that return the builder to allow chaining calls the return value may be ignored. Not marking these methods with the @CanIgnoreReturnValue annotation block us (Google) from importing the recent code changes. Change-Id: Ie2cd800ed7e7861a8aed10418fb7d042f08185ec Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwnersResult.java b/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwnersResult.java index 15be56f..a124e3e 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwnersResult.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwnersResult.java
@@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.flogger.FluentLogger; +import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.nio.file.Path; /** The result of resolving path code owners via {@link PathCodeOwners}. */ @@ -155,12 +156,14 @@ abstract ImmutableSet.Builder<CodeOwnerSet> globalCodeOwnerSetsBuilder(); + @CanIgnoreReturnValue Builder addGlobalCodeOwnerSet(CodeOwnerSet globalCodeOwnerSet) { requireNonNull(globalCodeOwnerSet, "globalCodeOwnerSet"); globalCodeOwnerSetsBuilder().add(globalCodeOwnerSet); return this; } + @CanIgnoreReturnValue Builder addAllGlobalCodeOwnerSets(ImmutableSet<CodeOwnerSet> globalCodeOwnerSets) { requireNonNull(globalCodeOwnerSets, "globalCodeOwnerSets"); globalCodeOwnerSetsBuilder().addAll(globalCodeOwnerSets); @@ -169,6 +172,7 @@ abstract ImmutableSet.Builder<CodeOwnerSet> perFileCodeOwnerSetsBuilder(); + @CanIgnoreReturnValue Builder addPerFileCodeOwnerSet(CodeOwnerSet perFileCodeOwnerSet) { requireNonNull(perFileCodeOwnerSet, "perFileCodeOwnerSet"); perFileCodeOwnerSetsBuilder().add(perFileCodeOwnerSet); @@ -190,6 +194,7 @@ return this; } + @CanIgnoreReturnValue Builder addAllPerFileCodeOwnerSets(ImmutableSet<CodeOwnerSet> perFileCodeOwnerSets) { requireNonNull(perFileCodeOwnerSets, "perFileCodeOwnerSets"); perFileCodeOwnerSets.forEach(this::addPerFileCodeOwnerSet); @@ -200,12 +205,14 @@ abstract ImmutableList.Builder<CodeOwnerConfigImport> resolvedImportsBuilder(); + @CanIgnoreReturnValue Builder addResolvedImport(CodeOwnerConfigImport codeOwnerConfigImport) { requireNonNull(codeOwnerConfigImport, "codeOwnerConfigImport"); resolvedImportsBuilder().add(codeOwnerConfigImport); return this; } + @CanIgnoreReturnValue Builder addAllResolvedImports(ImmutableList<CodeOwnerConfigImport> codeOwnerConfigImports) { requireNonNull(codeOwnerConfigImports, "codeOwnerConfigImports"); resolvedImportsBuilder().addAll(codeOwnerConfigImports); @@ -214,12 +221,14 @@ abstract ImmutableList.Builder<CodeOwnerConfigImport> unresolvedImportsBuilder(); + @CanIgnoreReturnValue Builder addUnresolvedImport(CodeOwnerConfigImport codeOwnerConfigImport) { requireNonNull(codeOwnerConfigImport, "codeOwnerConfigImport"); unresolvedImportsBuilder().add(codeOwnerConfigImport); return this; } + @CanIgnoreReturnValue Builder addAllUnresolvedImports(ImmutableList<CodeOwnerConfigImport> codeOwnerConfigImports) { requireNonNull(codeOwnerConfigImports, "codeOwnerConfigImports"); unresolvedImportsBuilder().addAll(codeOwnerConfigImports); @@ -228,12 +237,14 @@ abstract ImmutableList.Builder<String> messagesBuilder(); + @CanIgnoreReturnValue Builder addMessage(String message) { requireNonNull(message, "message"); messagesBuilder().add(message); return this; } + @CanIgnoreReturnValue Builder addAllMessages(ImmutableList<String> messages) { requireNonNull(messages, "messages"); messagesBuilder().addAll(messages);