From 310df200f78f7d98cc52e4ab97d8a5feb744fa52 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 28 Apr 2016 09:04:35 +0000
Subject: [PATCH] UCDetector and AutoRefactor code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java | 75 +++----------------------------------
1 files changed, 6 insertions(+), 69 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
index 92e6c0d..2d34d8e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
@@ -69,12 +69,9 @@
import static org.opends.server.tools.upgrade.Installation.*;
import static org.opends.server.util.ChangeOperationType.*;
-/**
- * Common utility methods needed by the upgrade.
- */
+/** Common utility methods needed by the upgrade. */
final class UpgradeUtils
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/** The config folder of the current instance. */
@@ -82,7 +79,7 @@
/** The config/schema folder of the current instance. */
static final File configSchemaDirectory = new File(configDirectory, SCHEMA_PATH_RELATIVE);
/** The template folder of the current installation. */
- static final File templateDirectory = new File(getInstallationPath(), TEMPLATE_RELATIVE_PATH);
+ private static final File templateDirectory = new File(getInstallationPath(), TEMPLATE_RELATIVE_PATH);
/** The template/config folder of the current installation. */
static final File templateConfigDirectory = new File(templateDirectory, CONFIG_PATH_RELATIVE);
/** The template/config/schema folder of the current installation. */
@@ -96,7 +93,7 @@
static final File binDirectory = new File(getInstallationPath(), UNIX_BINARIES_PATH_RELATIVE);
/** The bat folder of the current installation. */
static final File batDirectory = new File(getInstallationPath(), WINDOWS_BINARIES_PATH_RELATIVE);
- /** The server configuration file path */
+ /** The server configuration file path. */
static final String CONFIG_FILE_PATH =
Paths.get(configDirectory.getAbsolutePath(), CURRENT_CONFIG_FILE_NAME).toString();
@@ -106,7 +103,7 @@
*
* @return the path of the installation of the directory server.
*/
- static String getInstallPathFromClasspath()
+ private static String getInstallPathFromClasspath()
{
String installPath = DirectoryServer.getServerRoot();
if (installPath != null)
@@ -226,20 +223,6 @@
}
}
- /**
- * Returns the absolute path for the given parentPath and relativePath.
- *
- * @param parentPath
- * the parent path.
- * @param relativePath
- * the relative path.
- * @return the absolute path for the given parentPath and relativePath.
- */
- static String getPath(final String parentPath, final String relativePath)
- {
- return getPath(new File(new File(parentPath), relativePath));
- }
-
static File getFileForPath(String path)
{
final File f = new File(path);
@@ -247,53 +230,6 @@
}
/**
- * Determines whether one file is the parent of another.
- *
- * @param ancestor
- * possible parent of <code>descendant</code>
- * @param descendant
- * possible child 0f <code>ancestor</code>
- * @return return true if ancestor is a parent of descendant
- */
- static boolean isParentOf(final File ancestor, File descendant)
- {
- if (ancestor != null)
- {
- if (ancestor.equals(descendant))
- {
- return false;
- }
- while (descendant != null && !ancestor.equals(descendant))
- {
- descendant = descendant.getParentFile();
- }
- }
- return ancestor != null && descendant != null;
- }
-
- /**
- * Returns <CODE>true</CODE> if the first provided path is under the second
- * path in the file system.
- * @param descendant the descendant candidate path.
- * @param path the path.
- * @return <CODE>true</CODE> if the first provided path is under the second
- * path in the file system; <code>false</code> otherwise or if
- * either of the files are null
- */
- static boolean isDescendant(File descendant, File path) {
- if (descendant != null && path != null) {
- File parent = descendant.getParentFile();
- while (parent != null) {
- if (path.equals(parent)) {
- return true;
- }
- parent = parent.getParentFile();
- }
- }
- return false;
- }
-
- /**
* Returns the instance root directory (the path where the instance is
* installed).
*
@@ -763,7 +699,8 @@
*
* @return A schema which may used in the upgrade context.
*/
- static Schema getUpgradeSchema() {
+ private static Schema getUpgradeSchema()
+ {
final SchemaBuilder sb = new SchemaBuilder(Schema.getCoreSchema())
.setOption(DEFAULT_MATCHING_RULE_OID, getCaseExactMatchingRule().getOID())
.setOption(DEFAULT_SYNTAX_OID, getDirectoryStringSyntax().getOID());
--
Gitblit v1.10.0