From e39a001d3ba7f04212d7eb9e1e7cf5b57e6e98f7 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 01 Aug 2013 15:26:46 +0000
Subject: [PATCH] Change visibility of various classes and methods in the upgrader so that it can be used for embedded upgrades.
---
opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeContext.java | 91 +++++++++++++++++++++++++++------------------
1 files changed, 54 insertions(+), 37 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeContext.java b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeContext.java
index 679d008..4c76d24 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeContext.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeContext.java
@@ -27,13 +27,9 @@
package org.opends.server.tools.upgrade;
-import static org.opends.messages.ToolMessages.
-ERR_UPGRADE_DISPLAY_NOTIFICATION_ERROR;
-import static org.opends.messages.ToolMessages.
-ERR_UPGRADE_DISPLAY_CONFIRM_ERROR;
-import static org.opends.messages.ToolMessages.INFO_PROMPT_NO_COMPLETE_ANSWER;
-import static org.opends.messages.ToolMessages.INFO_PROMPT_YES_COMPLETE_ANSWER;
-import static org.opends.messages.ToolMessages.INFO_TASKINFO_CMD_CANCEL_CHAR;
+
+
+import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.upgrade.Upgrade.EXIT_CODE_ERROR;
import javax.security.auth.callback.Callback;
@@ -45,6 +41,8 @@
import org.opends.server.tools.ClientException;
import org.opends.server.util.BuildVersion;
+
+
/**
* Context information which is passed to upgrade tasks. This might include
* server configuration, etc.
@@ -65,7 +63,7 @@
/**
* The call-back handler for interacting with the upgrade application.
*/
- private CallbackHandler handler;
+ private final CallbackHandler handler;
/**
* If ignore errors is enabled.
@@ -88,6 +86,7 @@
private boolean isForceUpgradeMode;
+
/**
* Constructor for the upgrade context.
*
@@ -99,44 +98,52 @@
* The call-back handler for interacting with the upgrade
* application.
*/
- UpgradeContext(final BuildVersion fromVersion, final BuildVersion toVersion,
- CallbackHandler handler)
+ public UpgradeContext(final BuildVersion fromVersion,
+ final BuildVersion toVersion, CallbackHandler handler)
{
this.fromVersion = fromVersion;
this.toVersion = toVersion;
this.handler = handler;
}
+
+
/**
* Returns the old version.
*
* @return The old version.
*/
- public BuildVersion getFromVersion()
+ BuildVersion getFromVersion()
{
return fromVersion;
}
+
+
/**
* Returns the new version.
*
* @return The new version.
*/
- public BuildVersion getToVersion()
+ BuildVersion getToVersion()
{
return toVersion;
}
+
+
/**
* Returns the ignore error mode.
*
* @return {code true} if ignore error mode is activated.
*/
- public boolean isIgnoreErrorsMode()
+ boolean isIgnoreErrorsMode()
{
return isIgnoreErrorsMode;
}
+
+
/**
* Sets the ignore errors mode.
*
@@ -148,16 +155,20 @@
this.isIgnoreErrorsMode = isIgnoreErrorsMode;
}
+
+
/**
* Returns the accept license mode.
*
* @return {@code true} if accept license mode is activated.
*/
- public boolean isAcceptLicenseMode()
+ boolean isAcceptLicenseMode()
{
return isAcceptLicenseMode;
}
+
+
/**
* Sets the accept license mode.
*
@@ -169,38 +180,32 @@
this.isAcceptLicenseMode = isAcceptLicenseMode;
}
+
+
/**
* Returns the callback handler.
*
* @return The actual callback handler.
*/
- public CallbackHandler getHandler()
+ CallbackHandler getHandler()
{
return handler;
}
- /**
- * Sets the upgrade callback handler.
- *
- * @param handler
- * The call-back handler for interacting with the upgrade
- * application.
- */
- public void setHandler(CallbackHandler handler)
- {
- this.handler = handler;
- }
+
/**
* Returns the status of the interactive mode.
*
* @return {@code true} if interactive mode is activated.
*/
- public boolean isInteractiveMode()
+ boolean isInteractiveMode()
{
return isInteractiveMode;
}
+
+
/**
* Sets the interactive mode.
*
@@ -212,16 +217,20 @@
this.isInteractiveMode = isInteractiveMode;
}
+
+
/**
* Returns the status of the force upgrade mode.
*
* @return {@code true} if the force upgrade mode is activated.
*/
- public boolean isForceUpgradeMode()
+ boolean isForceUpgradeMode()
{
return isForceUpgradeMode;
}
+
+
/**
* Sets the force upgrade mode.
*
@@ -233,6 +242,8 @@
this.isForceUpgradeMode = isForceUpgradeMode;
}
+
+
/**
* Sends notification message to the application via the call-back handler.
*
@@ -241,7 +252,7 @@
* @throws ClientException
* If an error occurred while reporting the message.
*/
- public void notify(final Message message) throws ClientException
+ void notify(final Message message) throws ClientException
{
try
{
@@ -255,6 +266,8 @@
}
}
+
+
/**
* Sends notification message to the application via the call-back handler
* containing specific sub type message.
@@ -266,8 +279,7 @@
* @throws ClientException
* If an error occurred while reporting the message.
*/
- public void notify(final Message message, final int msgType)
- throws ClientException
+ void notify(final Message message, final int msgType) throws ClientException
{
try
{
@@ -281,6 +293,8 @@
}
}
+
+
/**
* Displays a progress callback.
*
@@ -289,7 +303,7 @@
* @throws ClientException
* If an error occurred while reporting the message.
*/
- public void notifyProgress(final ProgressNotificationCallback callback)
+ void notifyProgress(final ProgressNotificationCallback callback)
throws ClientException
{
try
@@ -303,6 +317,8 @@
}
}
+
+
/**
* Asks a confirmation to the user. Answer is yes or no.
*
@@ -314,13 +330,12 @@
* If an error occurred while reporting the message.
* @return an integer corresponding to the user's answer.
*/
- public int confirmYN(final Message message, final int defaultOption)
+ int confirmYN(final Message message, final int defaultOption)
throws ClientException
{
- final ConfirmationCallback confirmYNCallback =
- new ConfirmationCallback(message.toString(),
- ConfirmationCallback.WARNING, ConfirmationCallback.YES_NO_OPTION,
- defaultOption);
+ final ConfirmationCallback confirmYNCallback = new ConfirmationCallback(
+ message.toString(), ConfirmationCallback.WARNING,
+ ConfirmationCallback.YES_NO_OPTION, defaultOption);
try
{
handler.handle(new Callback[] { confirmYNCallback });
@@ -333,6 +348,8 @@
return confirmYNCallback.getSelectedIndex();
}
+
+
/**
* Returns the default option string.
*
--
Gitblit v1.10.0