opendev/gerrit
Code Issues Proposed changes

Merge "ConfigNotesMigration: Allow "sequence" option name"

Browse Source
This commit is contained in:
Dave Borowitz
2016-08-04 17:10:34 +00:00
committed by Gerrit Code Review
parent 82f339de88 2e2f6ad6b6
commit 1bc670c199
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/notedb/ConfigNotesMigration.java
View File

@@ -18,6 +18,7 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.gerrit.server.notedb.NoteDbTable.ACCOUNTS; import static com.google.gerrit.server.notedb.NoteDbTable.ACCOUNTS;
import static com.google.gerrit.server.notedb.NoteDbTable.CHANGES; import static com.google.gerrit.server.notedb.NoteDbTable.CHANGES;
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.GerritServerConfig;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.Inject; import com.google.inject.Inject;
@@ -57,12 +58,12 @@ public class ConfigNotesMigration extends NotesMigration {
for (NoteDbTable t : NoteDbTable.values()) { for (NoteDbTable t : NoteDbTable.values()) {
keys.add(t.key()); keys.add(t.key());
} }
Set<String> allowed = ImmutableSet.of(READ, WRITE, SEQUENCE);
for (String t : cfg.getSubsections(NOTE_DB)) { for (String t : cfg.getSubsections(NOTE_DB)) {
checkArgument(keys.contains(t.toLowerCase()), checkArgument(keys.contains(t.toLowerCase()),
"invalid NoteDb table: %s", t); "invalid NoteDb table: %s", t);
for (String key : cfg.getNames(NOTE_DB, t)) { for (String key : cfg.getNames(NOTE_DB, t)) {
String lk = key.toLowerCase(); checkArgument(allowed.contains(key.toLowerCase()),
checkArgument(lk.equals(WRITE) || lk.equals(READ),
"invalid NoteDb key: %s.%s", t, key); "invalid NoteDb key: %s.%s", t, key);
} }
} }