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();
   }
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);