commit 6ccfeea4ce24a138c374f87f0c30d76da1e07efb
author Edwin Kempin <edwin.kempin@sap.com> Wed Apr 15 13:36:02 2015 +0200
committer Edwin Kempin <edwin.kempin@sap.com> Wed Apr 15 13:43:01 2015 +0200
tree 7a8cd0242e9036febcddc399522b6b5607fb8aac
parent 1da850be90283b6215fa3f4d9006d1b115a56d9a

Do not fail to create account if email doesn't match

The email of a user may change over time, so it can happen that there
are old entries with an old email that doesn't match the current
email. Don't fail in this case, but only log a warning.

Change-Id: I010cc93f3a2c379ce4fa95588071d9c6936a632a
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>

src/main/java/com/googlesource/gerrit/plugins/importer/AccountUtil.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/AccountUtil.java b/src/main/java/com/googlesource/gerrit/plugins/importer/AccountUtil.java
index e741092..31fecd4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/AccountUtil.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/AccountUtil.java
@@ -15,6 +15,7 @@
 package com.googlesource.gerrit.plugins.importer;
 
 import com.google.gerrit.common.errors.NoSuchAccountException;
+import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.extensions.common.AccountInfo;
 import com.google.gerrit.extensions.restapi.BadRequestException;
 import com.google.gerrit.reviewdb.client.Account;
@@ -33,6 +34,9 @@
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.util.Collection;
 import java.util.HashSet;
@@ -41,17 +45,22 @@
 
 @Singleton
 class AccountUtil {
+  private static Logger log = LoggerFactory.getLogger(AccountUtil.class);
 
+  private final String pluginName;
   private final AccountCache accountCache;
   private final AccountManager accountManager;
   private final AuthType authType;
   private final Provider<ReviewDb> db;
 
   @Inject
-  public AccountUtil(AccountCache accountCache,
+  public AccountUtil(
+      @PluginName String pluginName,
+      AccountCache accountCache,
       AccountManager accountManager,
       AuthConfig authConfig,
       Provider<ReviewDb> db) {
+    this.pluginName = pluginName;
     this.accountCache = accountCache;
     this.accountManager = accountManager;
     this.authType = authConfig.getAuthType();
@@ -80,9 +89,9 @@
       }
     }
     if (!Objects.equals(a.getAccount().getPreferredEmail(), acc.email)) {
-      throw new NoSuchAccountException(String.format(
-          "User %s not found: Email mismatch, expected %s but found %s",
-          acc.username, acc.email, a.getAccount().getPreferredEmail()));
+      log.warn(String.format(
+          "[%s] Email mismatch for user %s: expected %s but found %s",
+          pluginName, acc.username, acc.email, a.getAccount().getPreferredEmail()));
     }
 
     return a.getAccount().getId();