From ffd7f293870760bbe10cefaf06fb39a82e56b212 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 27 Sep 2023 11:54:56 +0200 Subject: Fix ReturnMissingNullable bug pattern flagged by error prone Release-Notes: skip Change-Id: I732b1799abcb0d6b514a7c1824745cb26342deeb --- java/com/google/gerrit/httpd/RemoteUserUtil.java | 1 + java/com/google/gerrit/server/account/AccountProperties.java | 1 + 2 files changed, 2 insertions(+) diff --git a/java/com/google/gerrit/httpd/RemoteUserUtil.java b/java/com/google/gerrit/httpd/RemoteUserUtil.java index 6f3e9c45d8..9ec10e2124 100644 --- a/java/com/google/gerrit/httpd/RemoteUserUtil.java +++ b/java/com/google/gerrit/httpd/RemoteUserUtil.java @@ -36,6 +36,7 @@ public class RemoteUserUtil { * @param loginHeader name of header which is used for extracting username. * @return the extracted username or null. */ + @Nullable public static String getRemoteUser(HttpServletRequest req, String loginHeader) { if (AUTHORIZATION.equals(loginHeader)) { String user = emptyToNull(req.getRemoteUser()); diff --git a/java/com/google/gerrit/server/account/AccountProperties.java b/java/com/google/gerrit/server/account/AccountProperties.java index 928d851729..5f56aa3485 100644 --- a/java/com/google/gerrit/server/account/AccountProperties.java +++ b/java/com/google/gerrit/server/account/AccountProperties.java @@ -124,6 +124,7 @@ public class AccountProperties { * @param key the key * @return the value, {@code null} if key was not set or key was set to empty string */ + @Nullable private static String get(Config cfg, String key) { return Strings.emptyToNull(cfg.getString(ACCOUNT, null, key)); } -- cgit v1.2.3