opendev/gerrit
Code Issues Proposed changes

Sequences: Push @SuppressWarnings down to call sites

Browse Source 
Change-Id: Ic915ec40af1bffb8aae3661e972ae0c3a0391c4d
This commit is contained in:
Dave Borowitz
2017-06-28 13:19:54 -04:00
parent 028a84811b
commit a431b301f4
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gerrit-server/src/main/java/com/google/gerrit/server/Sequences.java
View File

@@ -32,7 +32,6 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.jgit.lib.Config;
@SuppressWarnings("deprecation")
@Singleton
public class Sequences {
public static final String CHANGES = "changes";
@@ -56,18 +55,15 @@ public class Sequences {
this.migration = migration;
int gap = getChangeSequenceGap(cfg);
changeSeq =
new RepoSequence(
repoManager,
allProjects,
CHANGES,
() -> db.get().nextChangeId() + gap,
cfg.getInt("noteDb", "changes", "sequenceBatchSize", 20));
@SuppressWarnings("deprecation")
RepoSequence.Seed seed = () -> db.get().nextChangeId() + gap;
int batchSize = cfg.getInt("noteDb", "changes", "sequenceBatchSize", 20);
changeSeq = new RepoSequence(repoManager, allProjects, CHANGES, seed, batchSize);
}
public int nextChangeId() throws OrmException {
if (!migration.readChangeSequence()) {
return db.get().nextChangeId();
return nextChangeId(db.get());
}
return changeSeq.next();
}
@@ -84,7 +80,7 @@ public class Sequences {
List<Integer> ids = new ArrayList<>(count);
ReviewDb db = this.db.get();
for (int i = 0; i < count; i++) {
ids.add(db.nextChangeId());
ids.add(nextChangeId(db));
}
return ImmutableList.copyOf(ids);
}
@@ -93,4 +89,9 @@ public class Sequences {
public RepoSequence getChangeIdRepoSequence() {
return changeSeq;
}
@SuppressWarnings("deprecation")
private static int nextChangeId(ReviewDb db) throws OrmException {
return db.nextChangeId();
}
}