Align to Gerrit 2.13 master
Change-Id: I98b86c88c3f199570ec894111874614ffe3c089f
diff --git a/github-plugin/src/main/java/com/google/gerrit/server/account/AccountImporter.java b/github-plugin/src/main/java/com/google/gerrit/server/account/AccountImporter.java
index 0f1b596..5b2876c 100644
--- a/github-plugin/src/main/java/com/google/gerrit/server/account/AccountImporter.java
+++ b/github-plugin/src/main/java/com/google/gerrit/server/account/AccountImporter.java
@@ -30,6 +30,7 @@
import com.google.inject.Provider;
import org.apache.http.HttpStatus;
+import org.eclipse.jgit.errors.ConfigInvalidException;
import java.io.IOException;
import java.util.Arrays;
@@ -47,7 +48,7 @@
public Account.Id importAccount(String login, String name, String email)
throws IOException, BadRequestException, ResourceConflictException,
- UnprocessableEntityException, OrmException {
+ UnprocessableEntityException, OrmException, ConfigInvalidException {
try (ReviewDb db = schema.get()) {
CreateAccount createAccount = createAccountFactory.create(login);
CreateAccount.Input accountInput = new CreateAccount.Input();
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java
index a07adf3..ecce058 100644
--- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java
+++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java
@@ -44,6 +44,7 @@
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.InvalidRemoteException;
import org.eclipse.jgit.api.errors.TransportException;
+import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.lib.Repository;
@@ -191,7 +192,7 @@
private com.google.gerrit.reviewdb.client.Account.Id getOrRegisterAccount(
ReviewDb db, GitHubUser author) throws BadRequestException,
ResourceConflictException, UnprocessableEntityException, OrmException,
- IOException {
+ IOException, ConfigInvalidException {
return getOrRegisterAccount(db, author.getLogin(), author.getName(),
author.getEmail());
}
@@ -199,7 +200,7 @@
private com.google.gerrit.reviewdb.client.Account.Id getOrRegisterAccount(
ReviewDb db, String login, String name, String email)
throws OrmException, BadRequestException, ResourceConflictException,
- UnprocessableEntityException, IOException {
+ UnprocessableEntityException, IOException, ConfigInvalidException {
AccountExternalId.Key userExtKey =
new AccountExternalId.Key(AccountExternalId.SCHEME_USERNAME, login);
AccountExternalIdAccess gerritExtIds = db.accountExternalIds();
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/RemoteSiteUser.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/RemoteSiteUser.java
index 5c3fdc1..42f6857 100644
--- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/RemoteSiteUser.java
+++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/RemoteSiteUser.java
@@ -14,18 +14,12 @@
package com.googlesource.gerrit.plugins.github.replication;
-import com.google.gerrit.reviewdb.client.AccountProjectWatch;
-import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.account.CapabilityControl;
import com.google.gerrit.server.account.GroupMembership;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
-
public class RemoteSiteUser extends CurrentUser {
public interface Factory {
RemoteSiteUser create(@Assisted GroupMembership authGroups);
@@ -44,14 +38,4 @@
public GroupMembership getEffectiveGroups() {
return effectiveGroups;
}
-
- @Override
- public Set<Change.Id> getStarredChanges() {
- return Collections.emptySet();
- }
-
- @Override
- public Collection<AccountProjectWatch> getNotificationFilters() {
- return Collections.emptySet();
- }
}
