Adapt to changes in Gerrit API
Change-Id: Ic2f428f02c5b5378b8aca1ba801dbca8f5e42461
diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ImportGroup.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ImportGroup.java
index 88df701..6c64783 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ImportGroup.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ImportGroup.java
@@ -177,7 +177,7 @@
}
}
- private AccountGroup getGroupByName(String groupName) {
+ private Optional<InternalGroup> getGroupByName(String groupName) {
return groupCache.get(new AccountGroup.NameKey(groupName));
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayChangesStep.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayChangesStep.java
index 8f495fd..8cc0c83 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayChangesStep.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayChangesStep.java
@@ -173,11 +173,6 @@
throws IOException, OrmException, NoSuchAccountException,
NoSuchChangeException, RestApiException, IllegalArgumentException,
UpdateException, ConfigInvalidException {
- if (c.status == ChangeStatus.DRAFT) {
- // no import of draft changes
- return;
- }
-
Change change = resume ? findChange(c) : null;
boolean resumeChange;
if (change == null) {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayRevisionsStep.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayRevisionsStep.java
index c2d20cf..d98df7d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayRevisionsStep.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayRevisionsStep.java
@@ -88,10 +88,6 @@
try {
PatchSetInfo info = null;
for (RevisionInfo r : revisions) {
- if (r.draft != null && r.draft) {
- // no import of draft patch sets
- continue;
- }
PatchSet ps = new PatchSet(new PatchSet.Id(change.getId(), r._number));
String newRef = ps.getId().toRefName();
ObjectId newId = repo.resolve(newRef);
@@ -121,7 +117,6 @@
ps.setUploader(accountUtil.resolveUser(api, r.uploader));
ps.setCreatedOn(r.created);
ps.setRevision(new RevId(commit.name()));
- ps.setDraft(r.draft != null && r.draft);
info = patchSetInfoFactory.get(rw, commit, ps.getId());
if (info.getRevId().equals(changeInfo.currentRevision)) {
