From 6735cb32819c25d9bda77244c6bf3173f67918fd Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 29 Feb 2016 12:57:48 +0000
Subject: [PATCH] Code cleanup: - Use try-with-resources - Reversed if conditions
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
index 9fc83f0..7bfdb7e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -694,9 +694,7 @@
context.notifyProgress(pnc);
// Sets the arguments like the rebuild index command line.
- args.addAll(Arrays.asList(
- "-f",
- new File(configDirectory, CURRENT_CONFIG_FILE_NAME).getAbsolutePath()));
+ args.addAll(Arrays.asList("-f", getConfigLdifFile().getAbsolutePath()));
/*
* Index(es) could be contained in several backends or none, If none,
@@ -1164,10 +1162,10 @@
}
}
- private static void displayTaskLogInformation(final String summary,
+ private static void displayTaskLogInformation(final LocalizableMessage summary,
final String filter, final String... ldif)
{
- logger.debug(LocalizableMessage.raw(summary));
+ logger.debug(summary);
if (filter != null)
{
logger.debug(LocalizableMessage.raw(filter));
@@ -1211,19 +1209,17 @@
}
private static void performConfigFileUpdate(final LocalizableMessage summary, final String filter,
- final ChangeOperationType changeOperationType,
- final UpgradeContext context, final String... ldif)
+ final ChangeOperationType changeOperationType, final UpgradeContext context, final String... ldif)
throws ClientException
{
- displayTaskLogInformation(summary.toString(), filter, ldif);
+ displayTaskLogInformation(summary, filter, ldif);
final ProgressNotificationCallback pnc = new ProgressNotificationCallback(INFORMATION, summary, 20);
context.notifyProgress(pnc);
try
{
- final File configFile =
- new File(configDirectory, Installation.CURRENT_CONFIG_FILE_NAME);
+ final File configFile = getConfigLdifFile();
final Filter filterVal = filter != null ? Filter.valueOf(filter) : null;
final int changeCount = updateConfigFile(
@@ -1239,6 +1235,11 @@
}
}
+ private static File getConfigLdifFile()
+ {
+ return new File(configDirectory, CURRENT_CONFIG_FILE_NAME);
+ }
+
static UpgradeTask clearReplicationDbDirectory()
{
return new AbstractUpgradeTask()
--
Gitblit v1.10.0