opendev/gerrit
Code Issues Proposed changes

Merge changes Iafcc3fbd,I3d5172b4

Browse Source 
* changes:
  ChangeData#asMap: Use Java 8 stream
  ChangeData: Replace FluentIterable with Java 8 stream
This commit is contained in:
David Pursehouse
2016-10-25 10:59:25 +00:00
committed by Gerrit Code Review
parent 1321b245db 765fc273fc
commit 153829da30
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java
View File

@@ -17,11 +17,10 @@ package com.google.gerrit.server.query.change;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;
import static com.google.gerrit.server.ApprovalsUtil.sortApprovals; import static com.google.gerrit.server.ApprovalsUtil.sortApprovals;
import static java.util.stream.Collectors.toList;
import com.google.auto.value.AutoValue; import com.google.auto.value.AutoValue;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableMultimap;
@@ -94,6 +93,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;
public class ChangeData { public class ChangeData {
private static final int BATCH_SIZE = 50; private static final int BATCH_SIZE = 50;
@@ -108,12 +109,8 @@ public class ChangeData {
} }
public static Map<Change.Id, ChangeData> asMap(List<ChangeData> changes) { public static Map<Change.Id, ChangeData> asMap(List<ChangeData> changes) {
Map<Change.Id, ChangeData> result = return changes.stream().collect(
Maps.newHashMapWithExpectedSize(changes.size()); Collectors.toMap(ChangeData::getId, cd -> cd));
for (ChangeData cd : changes) {
result.put(cd.getId(), cd);
}
return result;
} }
public static void ensureChangeLoaded(Iterable<ChangeData> changes) public static void ensureChangeLoaded(Iterable<ChangeData> changes)
@@ -898,14 +895,14 @@ public class ChangeData {
* @throws OrmException an error occurred reading the database. * @throws OrmException an error occurred reading the database.
*/ */
public Collection<PatchSet> visiblePatchSets() throws OrmException { public Collection<PatchSet> visiblePatchSets() throws OrmException {
Predicate<PatchSet> predicate = ps -> { Predicate<? super PatchSet> predicate = ps -> {
try { try {
return changeControl().isPatchVisible(ps, db); return changeControl().isPatchVisible(ps, db);
} catch (OrmException e) { } catch (OrmException e) {
return false; return false;
} }
}; };
return FluentIterable.from(patchSets()).filter(predicate).toList(); return patchSets().stream().filter(predicate).collect(toList());
} }
public void setPatchSets(Collection<PatchSet> patchSets) { public void setPatchSets(Collection<PatchSet> patchSets) {