Remove dead code when updating project version meta-ref The failure in updating the project's refs/multi-site/version has always thrown an exception, hence the method that returned the ref update was using an Optional<> that was never empty. Replace the Optional<> with the actual type and remove the dead code of checking for emptiness. Change-Id: Id549a9511f742be62862898902d248e96681ffa3
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/ProjectVersionRefUpdateImpl.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/ProjectVersionRefUpdateImpl.java index 4d2515e..cd2e67d 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/ProjectVersionRefUpdateImpl.java +++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/ProjectVersionRefUpdateImpl.java
@@ -99,19 +99,12 @@ Project.NameKey projectNameKey = refUpdatedEvent.getProjectNameKey(); long newVersion = getCurrentGlobalVersionNumber(); - Optional<RefUpdate> newProjectVersionRefUpdate = - updateLocalProjectVersion(projectNameKey, newVersion); + RefUpdate newProjectVersionRefUpdate = updateLocalProjectVersion(projectNameKey, newVersion); - if (newProjectVersionRefUpdate.isPresent()) { - verLogger.log(projectNameKey, newVersion, 0L); + verLogger.log(projectNameKey, newVersion, 0L); - if (updateSharedProjectVersion(projectNameKey, newVersion)) { - gitReferenceUpdated.fire(projectNameKey, newProjectVersionRefUpdate.get(), null); - } - } else { - logger.atWarning().log( - "Ref %s not found on projet %s: skipping project version update", - refUpdatedEvent.getRefName(), projectNameKey); + if (updateSharedProjectVersion(projectNameKey, newVersion)) { + gitReferenceUpdated.fire(projectNameKey, newProjectVersionRefUpdate, null); } } catch (LocalProjectVersionUpdateException | SharedProjectVersionUpdateException e) { logger.atSevere().withCause(e).log( @@ -249,8 +242,7 @@ } @SuppressWarnings("FloggerLogString") - private Optional<RefUpdate> updateLocalProjectVersion( - Project.NameKey projectNameKey, long newVersionNumber) + private RefUpdate updateLocalProjectVersion(Project.NameKey projectNameKey, long newVersionNumber) throws LocalProjectVersionUpdateException { logger.atFine().log( "Updating local version for project %s with version %d", @@ -267,7 +259,7 @@ throw new LocalProjectVersionUpdateException(message); } - return Optional.of(refUpdate); + return refUpdate; } catch (IOException e) { String message = "Cannot create versioning command for " + projectNameKey.get(); logger.atSevere().withCause(e).log(message);