opendev/gerrit
Code Issues Proposed changes

Don't use Guava Optional from Enums.getIfPresent

Browse Source 
In the name of consistency we've cut out all other usages of Guava
Optional; these are all that is left. Using orNull does not hurt
readability too much, as these values don't escape local variables.

Change-Id: I305cd8f997dc0741f9748009c4f6708ecef07fef
This commit is contained in:
Dave Borowitz
2016-10-13 16:12:35 -04:00
parent 5d0798f72d
commit 21782e8443
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-server/src/main/java/com/google/gerrit/server/account/WatchConfig.java
View File

@@ -21,7 +21,6 @@ import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Enums;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.ArrayListMultimap;
@@ -319,9 +318,9 @@ public class WatchConfig extends VersionedMetaData
if (i + 1 < notifyValue.length() - 2) {
for (String nt : Splitter.on(',').trimResults().splitToList(
notifyValue.substring(i + 1, notifyValue.length() - 1))) {
Optional<NotifyType> notifyType =
Enums.getIfPresent(NotifyType.class, nt);
if (!notifyType.isPresent()) {
NotifyType notifyType =
Enums.getIfPresent(NotifyType.class, nt).orNull();
if (notifyType == null) {
validationErrorSink.error(new ValidationError(WATCH_CONFIG,
String.format(
"Invalid notify type %s in project watch "
@@ -329,7 +328,7 @@ public class WatchConfig extends VersionedMetaData
nt, accountId.get(), project, notifyValue)));
continue;
}
notifyTypes.add(notifyType.get());
notifyTypes.add(notifyType);
}
}
return create(filter, notifyTypes);