Skip to content
Snippets Groups Projects

Upgrade gerrit-plugin-api dependency to 3.2.2

Merged Christopher Guindon requested to merge gerrit-3.2.2 into master
5 files
+ 23
20
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -9,10 +9,23 @@
@@ -9,10 +9,23 @@
*/
*/
package org.eclipse.foundation.gerrit.validation;
package org.eclipse.foundation.gerrit.validation;
 
import java.io.IOException;
 
import java.util.ArrayList;
 
import java.util.HashSet;
 
import java.util.List;
 
import java.util.Optional;
 
import java.util.Set;
 
import java.util.concurrent.CompletableFuture;
 
import java.util.concurrent.CompletionStage;
 
import java.util.concurrent.ExecutionException;
 
import java.util.function.Consumer;
 
import java.util.function.Predicate;
 
import java.util.stream.Collectors;
 
 
import com.google.gerrit.entities.Account;
 
import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.annotations.Listen;
import com.google.gerrit.extensions.annotations.Listen;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.reviewdb.client.Account.Id;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.AccountException;
import com.google.gerrit.server.account.AccountException;
import com.google.gerrit.server.account.AccountManager;
import com.google.gerrit.server.account.AccountManager;
@@ -29,24 +42,14 @@ import com.google.gerrit.server.permissions.PermissionBackendException;
@@ -29,24 +42,14 @@ import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.permissions.RefPermission;
import com.google.gerrit.server.permissions.RefPermission;
import com.google.inject.Inject;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.Singleton;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.ExecutionException;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.revwalk.FooterKey;
import org.eclipse.jgit.revwalk.FooterKey;
import org.eclipse.jgit.revwalk.FooterLine;
import org.eclipse.jgit.revwalk.FooterLine;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevCommit;
import org.slf4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.LoggerFactory;
 
import retrofit2.Response;
import retrofit2.Response;
/**
/**
@@ -418,7 +421,7 @@ public class EclipseCommitValidationListener implements CommitValidationListener
@@ -418,7 +421,7 @@ public class EclipseCommitValidationListener implements CommitValidationListener
*
*
* We look up both using mailto: and gerrit:
* We look up both using mailto: and gerrit:
*/
*/
Optional<Id> id = accountManager.lookup(ExternalId.SCHEME_MAILTO + author.getEmailAddress());
Optional<Account.Id> id = accountManager.lookup(ExternalId.SCHEME_MAILTO + author.getEmailAddress());
if (!id.isPresent())
if (!id.isPresent())
id =
id =
accountManager.lookup(
accountManager.lookup(
Loading