opendev/gerrit
Code Issues Proposed changes

Extract a method from ChangeNoteUtil for parsing a NoteDb ident

Browse Source 
Change-Id: Ie422f5d081976d2a003003cde0986c6465972f8c
This commit is contained in:
Dave Borowitz
2017-11-08 13:55:25 -05:00
parent c7837021ea
commit 5f1deb2538
2 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/com/google/gerrit/server/notedb/ChangeNoteUtil.java
View File

@@ -23,7 +23,6 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.CharMatcher; import com.google.common.base.CharMatcher;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ListMultimap; import com.google.common.collect.ListMultimap;
import com.google.common.primitives.Ints;
import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Comment; import com.google.gerrit.reviewdb.client.Comment;
@@ -158,18 +157,14 @@ public class ChangeNoteUtil {
public Account.Id parseIdent(PersonIdent ident, Change.Id changeId) public Account.Id parseIdent(PersonIdent ident, Change.Id changeId)
throws ConfigInvalidException { throws ConfigInvalidException {
String email = ident.getEmailAddress(); return NoteDbUtil.parseIdent(ident, serverId)
int at = email.indexOf('@'); .orElseThrow(
if (at >= 0) { () ->
String host = email.substring(at + 1, email.length()); parseException(
if (host.equals(serverId)) { changeId,
Integer id = Ints.tryParse(email.substring(0, at)); "invalid identity, expected <id>@%s: %s",
if (id != null) { serverId,
return new Account.Id(id); ident.getEmailAddress()));
}
}
}
throw parseException(changeId, "invalid identity, expected <id>@%s: %s", serverId, email);
} }
private static boolean match(byte[] note, MutableInteger p, byte[] expected) { private static boolean match(byte[] note, MutableInteger p, byte[] expected) {

39
java/com/google/gerrit/server/notedb/NoteDbUtil.java Normal file
View File

@@ -0,0 +1,39 @@
// Copyright (C) 2017 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.notedb;
import com.google.common.primitives.Ints;
import com.google.gerrit.reviewdb.client.Account;
import java.util.Optional;
import org.eclipse.jgit.lib.PersonIdent;
public class NoteDbUtil {
public static Optional<Account.Id> parseIdent(PersonIdent ident, String serverId) {
String email = ident.getEmailAddress();
int at = email.indexOf('@');
if (at >= 0) {
String host = email.substring(at + 1, email.length());
if (host.equals(serverId)) {
Integer id = Ints.tryParse(email.substring(0, at));
if (id != null) {
return Optional.of(new Account.Id(id));
}
}
}
return Optional.empty();
}
private NoteDbUtil() {}
}