Adapt to changes of the RetryHelper API Change Iecdfa5b15 added a fluent API for executing action with retrying. Signed-off-by: Edwin Kempin <ekempin@google.com> Change-Id: I3fcedb708d9bb618720a2f8a0923226462811583
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/ExportReviewNotes.java b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/ExportReviewNotes.java index 9e728a7..e8ece83 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/ExportReviewNotes.java +++ b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/ExportReviewNotes.java
@@ -90,26 +90,27 @@ private void export(Project.NameKey project, List<ChangeNotes> notes) throws RestApiException, UpdateException { - retryHelper.execute( - updateFactory -> { - try (Repository git = gitManager.openRepository(project)) { - CreateReviewNotes crn = reviewNotesFactory.create(project, git); - crn.createNotes(notes, monitor); - crn.commitNotes(); - } catch (RepositoryNotFoundException e) { - stderr.println("Unable to open project: " + project.get()); - } - return null; - }, - RetryHelper.options() - .listener( - new RetryListener() { - @Override - public <V> void onRetry(Attempt<V> attempt) { - monitor.update(-notes.size()); - } - }) - .build()); + retryHelper + .changeUpdate( + "exportReviewNotes", + updateFactory -> { + try (Repository git = gitManager.openRepository(project)) { + CreateReviewNotes crn = reviewNotesFactory.create(project, git); + crn.createNotes(notes, monitor); + crn.commitNotes(); + } catch (RepositoryNotFoundException e) { + stderr.println("Unable to open project: " + project.get()); + } + return null; + }) + .listener( + new RetryListener() { + @Override + public <V> void onRetry(Attempt<V> attempt) { + monitor.update(-notes.size()); + } + }) + .call(); } private Map.Entry<Project.NameKey, List<ChangeNotes>> next() {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/RefUpdateListener.java b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/RefUpdateListener.java index c370a5c..311a808 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/RefUpdateListener.java +++ b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/RefUpdateListener.java
@@ -96,20 +96,23 @@ return; } try { - retryHelper.execute( - updateFactory -> { - Project.NameKey projectName = Project.nameKey(e.getProjectName()); - try (Repository git = repoManager.openRepository(projectName)) { - CreateReviewNotes crn = reviewNotesFactory.create(projectName, git); - crn.createNotes( - e.getRefName(), - ObjectId.fromString(e.getOldObjectId()), - ObjectId.fromString(e.getNewObjectId()), - null); - crn.commitNotes(); - } - return null; - }); + retryHelper + .changeUpdate( + "createReviewNotes", + updateFactory -> { + Project.NameKey projectName = Project.nameKey(e.getProjectName()); + try (Repository git = repoManager.openRepository(projectName)) { + CreateReviewNotes crn = reviewNotesFactory.create(projectName, git); + crn.createNotes( + e.getRefName(), + ObjectId.fromString(e.getOldObjectId()), + ObjectId.fromString(e.getNewObjectId()), + null); + crn.commitNotes(); + } + return null; + }) + .call(); } catch (RestApiException | UpdateException x) { logger.atSevere().withCause(x).log(x.getMessage()); }