opendev/gerrit
Code Issues Proposed changes

ChangeData: Use java.util.Optional

Browse Source 
Change-Id: I2cd9978e236d0060657d49a0c3ae402f6aac454c
This commit is contained in:
Dave Borowitz
2016-10-13 16:10:27 -04:00
parent 85ef799a62
commit 5d0798f72d
3 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeField.java
View File

@@ -19,7 +19,6 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.stream.Collectors.toSet;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Optional;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -41,7 +40,6 @@ import com.google.gerrit.server.index.FieldType;
import com.google.gerrit.server.index.SchemaUtil;
import com.google.gerrit.server.notedb.ReviewerStateInternal;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.query.change.ChangeData.ChangedLines;
import com.google.gerrit.server.query.change.ChangeQueryBuilder;
import com.google.gerrit.server.query.change.ChangeStatusPredicate;
import com.google.gwtorm.protobuf.CodecFactory;
@@ -632,10 +630,9 @@ public class ChangeField {
@Override
public Integer get(ChangeData input, FillArgs args)
throws OrmException {
Optional<ChangedLines> changedLines = input.changedLines();
return changedLines.isPresent()
? changedLines.get().insertions + changedLines.get().deletions
: null;
return input.changedLines()
.map(c -> c.insertions + c.deletions)
.orElse(null);
}
};