From 49c8560679d3e0217f34ed017d2382ec43e4f300 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 05 Jul 2016 12:57:45 +0000
Subject: [PATCH] Inlined useless methods from InstallerHelper
---
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index ac4acf9..71bffc5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -32,6 +32,7 @@
import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.quicksetup.util.Utils.*;
+import static org.opends.server.backends.task.TaskState.*;
import static org.opends.server.tools.dsreplication.ReplicationCliArgumentParser.*;
import static org.opends.server.tools.dsreplication.ReplicationCliReturnCode.*;
import static org.opends.server.util.StaticUtils.*;
@@ -131,6 +132,7 @@
import org.opends.quicksetup.installer.InstallerHelper;
import org.opends.quicksetup.installer.PeerNotFoundException;
import org.opends.quicksetup.util.PlainTextProgressMessageFormatter;
+import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.JDKLogging;
import org.opends.server.tasks.PurgeConflictsHistoricalTask;
@@ -1440,18 +1442,18 @@
logger.info(LocalizableMessage.raw(logMsg));
lastLogMsg = logMsg;
}
- InstallerHelper helper = new InstallerHelper();
- String state = getFirstValue(sr, "ds-task-state");
- if (helper.isDone(state) || helper.isStoppedByError(state))
+ String state = getFirstValue(sr, "ds-task-state");
+ TaskState taskState = TaskState.fromString(state);
+ if (TaskState.isDone(taskState) || taskState == STOPPED_BY_ERROR)
{
LocalizableMessage errorMsg = ERR_UNEXPECTED_DURING_TASK_WITH_LOG.get(lastLogMsg, state, conn.getHostPort());
- if (helper.isCompletedWithErrors(state))
+ if (taskState == COMPLETED_WITH_ERRORS)
{
logger.warn(LocalizableMessage.raw("Completed with error: " + errorMsg));
errPrintln(errorMsg);
}
- else if (!helper.isSuccessful(state) || helper.isStoppedByError(state))
+ else if (!TaskState.isSuccessful(taskState) || taskState == STOPPED_BY_ERROR)
{
logger.warn(LocalizableMessage.raw("Error: " + errorMsg));
throw new ReplicationCliException(errorMsg, ERROR_LAUNCHING_RESET_CHANGE_NUMBER, null);
@@ -1589,21 +1591,20 @@
logger.info(LocalizableMessage.raw(logMsg));
lastLogMsg = logMsg;
}
- InstallerHelper helper = new InstallerHelper();
- String state = getFirstValue(sr, "ds-task-state");
- if (helper.isDone(state) || helper.isStoppedByError(state))
+ String state = getFirstValue(sr, "ds-task-state");
+ TaskState taskState = TaskState.fromString(state);
+ if (TaskState.isDone(taskState) || taskState == STOPPED_BY_ERROR)
{
isOver = true;
LocalizableMessage errorMsg = getPurgeErrorMsg(lastLogMsg, state, conn);
- if (helper.isCompletedWithErrors(state))
+ if (taskState == COMPLETED_WITH_ERRORS)
{
logger.warn(LocalizableMessage.raw("Completed with error: "+errorMsg));
errPrintln(errorMsg);
}
- else if (!helper.isSuccessful(state) ||
- helper.isStoppedByError(state))
+ else if (!TaskState.isSuccessful(taskState) || taskState == STOPPED_BY_ERROR)
{
logger.warn(LocalizableMessage.raw("Error: "+errorMsg));
ReplicationCliReturnCode code = ERROR_LAUNCHING_PURGE_HISTORICAL;
@@ -7156,21 +7157,20 @@
logger.info(LocalizableMessage.raw(logMsg));
lastLogMsg = logMsg;
}
- InstallerHelper helper = new InstallerHelper();
String state = getFirstValue(sr, "ds-task-state");
+ TaskState taskState = TaskState.fromString(state);
- if (helper.isDone(state) || helper.isStoppedByError(state))
+ if (TaskState.isDone(taskState) || taskState == STOPPED_BY_ERROR)
{
isOver = true;
LocalizableMessage errorMsg = getPrePostErrorMsg(lastLogMsg, state, conn);
- if (helper.isCompletedWithErrors(state))
+ if (TaskState.COMPLETED_WITH_ERRORS == taskState)
{
logger.warn(LocalizableMessage.raw("Completed with error: "+errorMsg));
errPrintln(errorMsg);
}
- else if (!helper.isSuccessful(state) ||
- helper.isStoppedByError(state))
+ else if (!TaskState.isSuccessful(taskState) || taskState == STOPPED_BY_ERROR)
{
logger.warn(LocalizableMessage.raw("Error: "+errorMsg));
ReplicationCliReturnCode code = isPre?
@@ -7305,8 +7305,9 @@
}
InstallerHelper helper = new InstallerHelper();
String state = getFirstValue(sr, "ds-task-state");
+ TaskState taskState = TaskState.fromString(state);
- if (helper.isDone(state) || helper.isStoppedByError(state))
+ if (TaskState.isDone(taskState) || taskState == STOPPED_BY_ERROR)
{
isOver = true;
logger.info(LocalizableMessage.raw("Last task entry: "+sr));
@@ -7318,7 +7319,7 @@
}
LocalizableMessage errorMsg = getInitializeAllErrorMsg(hostPort, lastLogMsg, state);
- if (helper.isCompletedWithErrors(state))
+ if (TaskState.COMPLETED_WITH_ERRORS == taskState)
{
logger.warn(LocalizableMessage.raw("Processed errorMsg: "+errorMsg));
if (displayProgress)
@@ -7326,8 +7327,7 @@
errPrintln(errorMsg);
}
}
- else if (!helper.isSuccessful(state) ||
- helper.isStoppedByError(state))
+ else if (!TaskState.isSuccessful(taskState) || taskState == STOPPED_BY_ERROR)
{
logger.warn(LocalizableMessage.raw("Processed errorMsg: "+errorMsg));
ClientException ce = new ClientException(
--
Gitblit v1.10.0