diff options
author | David Ostrovsky <david@ostrovsky.org> | 2023-09-27 11:54:56 +0200 |
---|---|---|
committer | Nasser Grainawi <nasser.grainawi@linaro.org> | 2024-04-03 11:56:48 -0700 |
commit | ffd7f293870760bbe10cefaf06fb39a82e56b212 (patch) | |
tree | cc990efefc56803b133d1c31831c060ef7fca327 | |
parent | 9a54970d2916bfb1849c1d50a345b6e0a5412be3 (diff) |
Fix ReturnMissingNullable bug pattern flagged by error prone
Release-Notes: skip
Change-Id: I732b1799abcb0d6b514a7c1824745cb26342deeb
-rw-r--r-- | java/com/google/gerrit/httpd/RemoteUserUtil.java | 1 | ||||
-rw-r--r-- | java/com/google/gerrit/server/account/AccountProperties.java | 1 |
2 files changed, 2 insertions, 0 deletions
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)); } |