commit b0454c6a312dcae50df8e6b9774796f89deb2531
author Edwin Kempin <ekempin@google.com> Mon Dec 27 13:02:20 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 27 13:02:20 2021 +0000
tree 6c74bb3c419fb0a508b40d1a1dcb804dd4280e15
parent f86fb7201f2bab52794567f801fcb465599ba6ef
parent f3faf11ccbfc2825b3bc7dadf455c79c674146e5

Merge "Fix FloggerArgumentToString bug pattern flagged by error prone"

java/com/google/gerrit/httpd/auth/oauth/OAuthSession.java

diff --git a/java/com/google/gerrit/httpd/auth/oauth/OAuthSession.java b/java/com/google/gerrit/httpd/auth/oauth/OAuthSession.java
index a3f8fbda..297505a 100644
--- a/java/com/google/gerrit/httpd/auth/oauth/OAuthSession.java
+++ b/java/com/google/gerrit/httpd/auth/oauth/OAuthSession.java
@@ -190,7 +190,7 @@
     } else if (claimedId.isPresent() && !actualId.isPresent()) {
       // Claimed account already exists: link to it.
       //
-      logger.atInfo().log("OAuth2: linking claimed identity to %s", claimedId.get().toString());
+      logger.atInfo().log("OAuth2: linking claimed identity to %s", claimedId.get());
       try {
         accountManager.link(claimedId.get(), req);
       } catch (ConfigInvalidException e) {

java/com/google/gerrit/httpd/restapi/RestApiServlet.java

diff --git a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
index 9677814..b7dd2f4 100644
--- a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
+++ b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
@@ -825,18 +825,13 @@
       if (isRead(request)) {
         logger.atWarning().log(
             "request %s performed a ref update %s although the request is a READ request",
-            getRequestUrl(request), refUpdateFormat);
+            request.getRequestURL(), refUpdateFormat);
       }
       response.addHeader(X_GERRIT_UPDATED_REF, refUpdateFormat);
     }
     globals.webSession.get().resetRefUpdatedEvents();
   }
 
-  @SuppressWarnings("JdkObsolete")
-  private static String getRequestUrl(HttpServletRequest req) {
-    return req.getRequestURL().toString();
-  }
-
   private String getEtagWithRetry(
       HttpServletRequest req,
       TraceContext traceContext,

java/com/google/gerrit/server/notedb/CommitRewriter.java

diff --git a/java/com/google/gerrit/server/notedb/CommitRewriter.java b/java/com/google/gerrit/server/notedb/CommitRewriter.java
index 649094d..74f7e13 100644
--- a/java/com/google/gerrit/server/notedb/CommitRewriter.java
+++ b/java/com/google/gerrit/server/notedb/CommitRewriter.java
@@ -480,7 +480,7 @@
           }
           detailedVerificationStatus.append("Commit author:\n");
           detailedVerificationStatus.append(fixedAuthorIdent.toString());
-          logger.atWarning().log("%s", detailedVerificationStatus.toString());
+          logger.atWarning().log("%s", detailedVerificationStatus);
         }
       }
       boolean needsFix =

java/com/google/gerrit/server/submit/MergeOp.java

diff --git a/java/com/google/gerrit/server/submit/MergeOp.java b/java/com/google/gerrit/server/submit/MergeOp.java
index e661d3c..238e6ea 100644
--- a/java/com/google/gerrit/server/submit/MergeOp.java
+++ b/java/com/google/gerrit/server/submit/MergeOp.java
@@ -485,7 +485,7 @@
           if (!changeData.change().getStatus().equals(Status.NEW)) {
             logger.atFine().log(
                 "Change %s has status %s due to stale index, so it is skipped during submit",
-                changeData.getId().toString(), changeData.change().getStatus().name());
+                changeData.getId(), changeData.change().getStatus().name());
             continue;
           }
           filteredChanges.add(changeData);