| commit | c481c2f770ecdf700109bae0dfb80187f7fffab2 | [log] [tgz] |
|---|---|---|
| author | Edwin Kempin <ekempin@google.com> | Thu Oct 22 13:16:16 2020 +0200 |
| committer | Edwin Kempin <ekempin@google.com> | Thu Oct 22 15:40:56 2020 +0200 |
| tree | 6a3a35556d47fbc2845ce809fbeda75ff4d20823 | |
| parent | bc3e5958e4fea85ccdb85f58387ea64e1cfc5d8a [diff] |
CodeOwnerResolver: Add null check for email in isEmailDomainAllowed This method shouldn't be called with a null email, but if it is we are now getting a better error message. Signed-off-by: Edwin Kempin <ekempin@google.com> Change-Id: I6b9124e72f78b18df6d061ff369f25b89d03440f
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolver.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolver.java index cf9a16b..3cb377b 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolver.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolver.java
@@ -370,6 +370,8 @@ * {@code false} */ public boolean isEmailDomainAllowed(String email) { + requireNonNull(email, "email"); + ImmutableSet<String> allowedEmailDomains = codeOwnersPluginConfiguration.getAllowedEmailDomains(); if (allowedEmailDomains.isEmpty()) {
diff --git a/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolverTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolverTest.java index 0ac0deb..bd1bad1 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolverTest.java +++ b/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolverTest.java
@@ -322,6 +322,14 @@ } @Test + public void isEmailDomainAllowedRequiresEmailToBeNonNull() throws Exception { + NullPointerException npe = + assertThrows( + NullPointerException.class, () -> codeOwnerResolver.get().isEmailDomainAllowed(null)); + assertThat(npe).hasMessageThat().isEqualTo("email"); + } + + @Test @GerritConfig( name = "plugin.code-owners.allowedEmailDomain", values = {"example.com", "example.net"})