Fix default of deleteTrashFoldersMaxAllowedTime The plugin data directory was passed as the default value for deleteTrashFoldersMaxAllowedTime, so when the option was not set, a warning about an invalid time unit value was logged on every startup before falling back to the actual default of 10 minutes. Read the option without a default, so that the default is used silently when the option is not set. Change-Id: I940be34246c7f39434d1cf67148e5f4f6a1abd7a
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/Configuration.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/Configuration.java index b64337a..5a78a0c 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/Configuration.java +++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/Configuration.java
@@ -78,7 +78,7 @@ this.archiveDeletedRepos = cfg.getBoolean("archiveDeletedRepos", false); this.deleteTrashFoldersMaxAllowedTime = getTrashFoldersMaxAllowedTimeFromConfig( - cfg.getString("deleteTrashFoldersMaxAllowedTime", pluginData.toString())); + cfg.getString("deleteTrashFoldersMaxAllowedTime")); this.archiveFolder = getArchiveFolderFromConfig(cfg.getString("archiveFolder", pluginData.toString())); this.deleteArchivedReposAfter =
diff --git a/src/test/java/com/googlesource/gerrit/plugins/deleteproject/ConfigurationTest.java b/src/test/java/com/googlesource/gerrit/plugins/deleteproject/ConfigurationTest.java index 289dc98..7d3336c 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/deleteproject/ConfigurationTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/deleteproject/ConfigurationTest.java
@@ -68,6 +68,10 @@ assertThat(deleteConfig.shouldArchiveDeletedRepos()).isFalse(); assertThat(deleteConfig.getArchiveDuration()).isEqualTo(DEFAULT_ARCHIVE_DURATION_MS); assertThat(deleteConfig.getArchiveFolder().toString()).isEqualTo(pluginDataDir.toString()); + assertThat(deleteConfig.getDeleteTrashFoldersMaxAllowedTime()) + .isEqualTo( + TimeUnit.MINUTES.toSeconds( + Configuration.DEFAULT_TRASH_FOLDER_MAX_ALLOWED_TIME_MINUTES)); } @Test