Format with GJF 1.24.0 Change-Id: If5e8d401ae78ddb7d80c621bdabd8aa1ddb36c17
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java index 53b83f1..c727344 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/DeleteCommand.java
@@ -61,9 +61,10 @@ throw new UnloggedFailure( String.format( "Really delete '%s'?\n" - + "This is an operation which permanently deletes data. This cannot be undone!\n" - + "If you are sure you wish to delete this project, re-run with the " - + "--yes-really-delete flag.\n", + + "This is an operation which permanently deletes data. This cannot be" + + " undone!\n" + + "If you are sure you wish to delete this project, re-run with the" + + " --yes-really-delete flag.\n", rsrc.getName())); }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/database/DatabaseDeleteHandler.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/database/DatabaseDeleteHandler.java index 5732cec..99dc164 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/database/DatabaseDeleteHandler.java +++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/database/DatabaseDeleteHandler.java
@@ -74,15 +74,12 @@ private List<Change.Id> getChangesListFromNoteDb(Project project) throws IOException { Project.NameKey projectKey = project.getNameKey(); - try(Repository repo = repoManager.openRepository(projectKey)) { + try (Repository repo = repoManager.openRepository(projectKey)) { List<Change.Id> changeIds = - schemaFactoryNoteDb - .scan(repo, projectKey) - .map(ChangeNotesResult::id) - .collect(toList()); + schemaFactoryNoteDb.scan(repo, projectKey).map(ChangeNotesResult::id).collect(toList()); log.atFine().log( - "Number of changes in noteDb related to project %s are %d", - projectKey.get(), changeIds.size()); + "Number of changes in noteDb related to project %s are %d", + projectKey.get(), changeIds.size()); return changeIds; } }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/RepositoryDelete.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/RepositoryDelete.java index a871817..c59f3fc 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/RepositoryDelete.java +++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/RepositoryDelete.java
@@ -118,7 +118,11 @@ } private static void archiveGitRepository( - String projectName, Path repoPath, Optional<Path> archivedFolder, DynamicSet<ProjectDeletedListener> deletedListeners) throws IOException { + String projectName, + Path repoPath, + Optional<Path> archivedFolder, + DynamicSet<ProjectDeletedListener> deletedListeners) + throws IOException { Path basePath = getBasePath(repoPath, projectName); if (archivedFolder.isEmpty()) { throw new IllegalArgumentException(
diff --git a/src/test/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProjectIT.java b/src/test/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProjectIT.java index b2b6bb4..9c684ef 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProjectIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProjectIT.java
@@ -121,7 +121,8 @@ String.format( "Really delete '%s'?\n" + "This is an operation which permanently deletes data. This cannot be undone!\n" - + "If you are sure you wish to delete this project, re-run with the --yes-really-delete flag.\n\n", + + "If you are sure you wish to delete this project, re-run with the" + + " --yes-really-delete flag.\n\n", project.get()); adminSshSession.exec(cmd); @@ -136,7 +137,8 @@ String cmd = createDeleteCommand(project.get()); String expected = String.format( - "Project '%s' has open changes. - To really delete '%s', re-run with the --force flag.%n", + "Project '%s' has open changes. - To really delete '%s', re-run with the --force" + + " flag.%n", project.get(), project.get()); adminSshSession.exec(cmd);