Account importer uses new REST API account id Gerrit 2.11/master REST API returns account id as Integer instead of Account.Id object: we do need to adapt our in-memory call. Change-Id: I4e2c0ecf4d5c12e9dab7fb80d81dadf1df8c2865
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 44322e5..88ced25 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
@@ -19,6 +19,7 @@ import org.apache.http.HttpStatus; import com.google.common.base.Objects; +import com.google.gerrit.extensions.common.AccountInfo; import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.Response; @@ -57,7 +58,7 @@ (Response<AccountInfo>) createAccount.apply(TopLevelResource.INSTANCE, accountInput); if (accountResponse.statusCode() == HttpStatus.SC_CREATED) { - Id accountId = accountResponse.value()._id; + Id accountId = new Account.Id(accountResponse.value()._accountId); db.accountExternalIds().insert( Arrays .asList(new AccountExternalId(accountId,