opendev/gerrit
Code Issues Proposed changes

CurrentUser#getUserName: Return Optional<String> instead of nullable String

Browse Source 
This makes it more explicit that callers must handle the case where the
returned username is absent.

Change-Id: I97e33caa8e9cc8092dc398e3b383d7afd5beb96f
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2018-01-19 11:57:01 +01:00
parent d59a61dde5
commit ef120cd66d
21 changed files with 67 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/com/google/gerrit/server/project/RefPatternMatcher.java
View File

@@ -28,6 +28,7 @@ import dk.brics.automaton.Automaton;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
import java.util.stream.Stream;
public abstract class RefPatternMatcher {
public static RefPatternMatcher getMatcher(String pattern) {
@@ -133,16 +134,11 @@ public abstract class RefPatternMatcher {
}
private ImmutableSet<String> getUsernames(CurrentUser user) {
Stream<String> usernames = Streams.stream(user.getUserName());
if (user.isIdentifiedUser()) {
return Streams.concat(
user.asIdentifiedUser().getEmailAddresses().stream(),
ImmutableSet.of(user.getUserName()).stream())
.collect(toImmutableSet());
usernames = Streams.concat(usernames, user.asIdentifiedUser().getEmailAddresses().stream());
}
if (user.getUserName() != null) {
return ImmutableSet.of(user.getUserName());
}
return ImmutableSet.of();
return usernames.collect(toImmutableSet());
}
public boolean matchPrefix(String ref) {