From 4e4b322332130bf466e3bdbd9cd7c4ca832d1049 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 17 Jul 2015 13:29:00 +0000
Subject: [PATCH] OPENDJ-2027 (CR-7617) Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java | 88 +++++++++++++------------------------------
1 files changed, 27 insertions(+), 61 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
index 8a49a74..5672c2f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
@@ -45,7 +45,6 @@
import java.util.List;
import java.util.TimeZone;
-import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.util.Utils;
@@ -271,9 +270,7 @@
}
catch (ArgumentException ae)
{
- LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
-
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()));
return 1;
}
@@ -295,17 +292,14 @@
}
catch (ArgumentException ae)
{
- LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
-
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
err.println(argParser.getUsage());
return 1;
}
catch (ClientException ce)
{
- // No need to display the usage since the problem comes with a provided
- // value.
- err.println(wrapText(ce.getMessageObject(), MAX_LINE_WIDTH));
+ // No need to display the usage since the problem comes with a provided value.
+ printWrappedText(err, ce.getMessageObject());
return 1;
}
@@ -323,20 +317,16 @@
{
if (backendID.isPresent())
{
- LocalizableMessage message = ERR_BACKUPDB_CANNOT_MIX_BACKUP_ALL_AND_BACKEND_ID.get(
- backUpAll.getLongIdentifier(),
- backendID.getLongIdentifier());
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_BACKUPDB_CANNOT_MIX_BACKUP_ALL_AND_BACKEND_ID.get(
+ backUpAll.getLongIdentifier(), backendID.getLongIdentifier()));
err.println(argParser.getUsage());
return 1;
}
}
else if (! backendID.isPresent())
{
- LocalizableMessage message = ERR_BACKUPDB_NEED_BACKUP_ALL_OR_BACKEND_ID.get(
- backUpAll.getLongIdentifier(),
- backendID.getLongIdentifier());
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_BACKUPDB_NEED_BACKUP_ALL_OR_BACKEND_ID.get(
+ backUpAll.getLongIdentifier(), backendID.getLongIdentifier()));
err.println(argParser.getUsage());
return 1;
}
@@ -355,9 +345,7 @@
}
if (!repeatedBackendIds.isEmpty())
{
- String repeatedBackends = Utils.joinAsString(", ", repeatedBackendIds);
- LocalizableMessage message = ERR_BACKUPDB_REPEATED_BACKEND_ID.get(repeatedBackends);
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_BACKUPDB_REPEATED_BACKEND_ID.get(Utils.joinAsString(", ", repeatedBackendIds)));
err.println(argParser.getUsage());
return 1;
}
@@ -367,11 +355,8 @@
// incremental backup.
if (incrementalBaseID.isPresent() && ! incremental.isPresent())
{
- LocalizableMessage message =
- ERR_BACKUPDB_INCREMENTAL_BASE_REQUIRES_INCREMENTAL.get(
- incrementalBaseID.getLongIdentifier(),
- incremental.getLongIdentifier());
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_BACKUPDB_INCREMENTAL_BASE_REQUIRES_INCREMENTAL.get(
+ incrementalBaseID.getLongIdentifier(), incremental.getLongIdentifier()));
err.println(argParser.getUsage());
return 1;
}
@@ -381,11 +366,8 @@
// are present, infer an offline backup.
if ((encrypt.isPresent() || signHash.isPresent())
&& ! argParser.connectionArgumentsPresent()) {
- LocalizableMessage message =
- ERR_BACKUPDB_ENCRYPT_OR_SIGN_REQUIRES_ONLINE.get(
- encrypt.getLongIdentifier(),
- signHash.getLongIdentifier());
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_BACKUPDB_ENCRYPT_OR_SIGN_REQUIRES_ONLINE.get(
+ encrypt.getLongIdentifier(), signHash.getLongIdentifier()));
err.println(argParser.getUsage());
return 1;
}
@@ -394,10 +376,8 @@
// was given.
if (signHash.isPresent() && !hash.isPresent())
{
- LocalizableMessage message = ERR_BACKUPDB_SIGN_REQUIRES_HASH.get(
- signHash.getLongIdentifier(),
- hash.getLongIdentifier());
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(
+ err, ERR_BACKUPDB_SIGN_REQUIRES_HASH.get(signHash.getLongIdentifier(), hash.getLongIdentifier()));
err.println(argParser.getUsage());
return 1;
}
@@ -410,7 +390,7 @@
}
catch (InitializationException e)
{
- err.println(wrapText(e.getMessage(), MAX_LINE_WIDTH));
+ printWrappedText(err, e.getMessage());
return 1;
}
@@ -481,10 +461,8 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_BACKUPDB_CANNOT_CREATE_BACKUP_DIR.get(
- backupDirectory.getValue(),
- getExceptionMessage(e));
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(
+ err, ERR_BACKUPDB_CANNOT_CREATE_BACKUP_DIR.get(backupDirectory.getValue(), getExceptionMessage(e)));
return 1;
}
}
@@ -526,9 +504,7 @@
}
catch (Exception e)
{
- LocalizableMessage message = ERR_SERVER_BOOTSTRAP_ERROR.get(
- getExceptionMessage(e));
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_SERVER_BOOTSTRAP_ERROR.get(getExceptionMessage(e)));
return 1;
}
@@ -539,14 +515,12 @@
}
catch (InitializationException ie)
{
- LocalizableMessage message = ERR_CANNOT_LOAD_CONFIG.get(ie.getMessage());
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_CANNOT_LOAD_CONFIG.get(ie.getMessage()));
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_CANNOT_LOAD_CONFIG.get(getExceptionMessage(e));
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_CANNOT_LOAD_CONFIG.get(getExceptionMessage(e)));
return 1;
}
@@ -559,14 +533,12 @@
}
catch (ConfigException | InitializationException e)
{
- LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(e.getMessage());
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_CANNOT_LOAD_SCHEMA.get(e.getMessage()));
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(getExceptionMessage(e));
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_CANNOT_LOAD_SCHEMA.get(getExceptionMessage(e)));
return 1;
}
@@ -579,16 +551,12 @@
}
catch (ConfigException | InitializationException e)
{
- LocalizableMessage message =
- ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(e.getMessage());
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(e.getMessage()));
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(
- getExceptionMessage(e));
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(getExceptionMessage(e)));
return 1;
}
@@ -600,14 +568,12 @@
}
catch (ConfigException | InitializationException e)
{
- LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(e.getMessage());
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(e.getMessage()));
return 1;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(getExceptionMessage(e));
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ printWrappedText(err, ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(getExceptionMessage(e)));
return 1;
}
--
Gitblit v1.10.0