commit 0b16708d3b97490e71a2fcfafae37f8fdff9ec4c
author Ben Rohlfs <brohlfs@google.com> Mon Jul 29 09:46:03 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 29 09:46:03 2024 +0000
tree f4455d644764368185db74ec826cc4a99247a791
parent c0ee16db36385cb77fc891ec9418a5674030ece0
parent c385ae8fc71850e5716602eba03789b0287b70c7

Merge "Add `declare` to some interfaces to prevent renaming"

java/com/google/gerrit/server/comment/CommentContextKey.java

diff --git a/java/com/google/gerrit/server/comment/CommentContextKey.java b/java/com/google/gerrit/server/comment/CommentContextKey.java
index ce9aa78..2ba74cc 100644
--- a/java/com/google/gerrit/server/comment/CommentContextKey.java
+++ b/java/com/google/gerrit/server/comment/CommentContextKey.java
@@ -64,7 +64,7 @@
 
     public abstract Builder patchset(Integer patchset);
 
-    public abstract Builder contextPadding(Integer numLines);
+    public abstract Builder contextPadding(int numLines);
 
     public abstract CommentContextKey build();
   }

java/com/google/gerrit/server/patch/gitfilediff/GitFileDiffCacheKey.java

diff --git a/java/com/google/gerrit/server/patch/gitfilediff/GitFileDiffCacheKey.java b/java/com/google/gerrit/server/patch/gitfilediff/GitFileDiffCacheKey.java
index 2e18e93..d127817 100644
--- a/java/com/google/gerrit/server/patch/gitfilediff/GitFileDiffCacheKey.java
+++ b/java/com/google/gerrit/server/patch/gitfilediff/GitFileDiffCacheKey.java
@@ -87,7 +87,7 @@
 
     public abstract Builder newFilePath(String value);
 
-    public abstract Builder renameScore(Integer value);
+    public abstract Builder renameScore(int value);
 
     public Builder disableRenameDetection() {
       renameScore(-1);