From 2e86eba101ac08b44de0b4b95dd6a1a302b66763 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 12 Feb 2016 21:47:19 +0000
Subject: [PATCH] Removed Utilities.getRDNString()
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java | 12 ++----
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java | 12 ++----
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java | 3 -
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java | 15 ++-----
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java | 8 ++--
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java | 6 +--
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java | 20 ---------
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java | 24 ++---------
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewGroupPanel.java | 5 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java | 15 ++-----
10 files changed, 32 insertions(+), 88 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
index ff500c3..463303f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -413,17 +413,6 @@
}
/**
- * Returns the DN in the configuration for a given backend.
- * @param backend the backend.
- * @return the backend configuration entry DN.
- */
- private String getDN(BackendDescriptor backend)
- {
- return Utilities.getRDNString("ds-cfg-backend-id",
- backend.getBackendID())+",cn=Backends,cn=config";
- }
-
- /**
* Deletes a set of base DNs. The code assumes that the server is not running
* and that the configuration file can be edited.
* @param baseDNs the list of base DNs.
@@ -448,10 +437,8 @@
newBaseDNs.removeAll(dnsToRemove);
String backendName = backend.getBackendID();
- String dn = Utilities.getRDNString("ds-cfg-backend-id", backendName)+
- ",cn=Backends,cn=config";
- ConfigEntry configEntry =
- DirectoryServer.getConfigHandler().getConfigEntry(DN.valueOf(dn));
+ DN dn = DN.valueOf("ds-cfg-backend-id" + "=" + backendName + ",cn=Backends,cn=config");
+ ConfigEntry configEntry = DirectoryServer.getConfigHandler().getConfigEntry(dn);
DNConfigAttribute baseDNAttr =
new DNConfigAttribute(
@@ -498,9 +485,8 @@
*/
private void deleteBackend(BackendDescriptor backend) throws OpenDsException, ConfigException
{
- String dn = getDN(backend);
- Utilities.deleteConfigSubtree(
- DirectoryServer.getConfigHandler(), DN.valueOf(dn));
+ DN dn = DN.valueOf("ds-cfg-backend-id" + "=" + backend.getBackendID() + ",cn=Backends,cn=config");
+ Utilities.deleteConfigSubtree(DirectoryServer.getConfigHandler(), dn);
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
index e6545d2..874efed 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -263,15 +263,15 @@
*/
private void deleteIndex(AbstractIndexDescriptor index) throws OpenDsException
{
- final String backendId = Utilities.getRDNString("ds-cfg-backend-id", index.getBackend().getBackendID());
+ final String backendId = "ds-cfg-backend-id" + "=" + index.getBackend().getBackendID();
String dn;
if (isVLVIndex(index))
{
- dn = getRDNString("ds-cfg-name", index.getName()) + ",cn=VLV Index," + backendId + ",cn=Backends,cn=config";
+ dn = "ds-cfg-name" + "=" + index.getName() + ",cn=VLV Index," + backendId + ",cn=Backends,cn=config";
}
else
{
- dn = getRDNString("ds-cfg-attribute", index.getName()) + ",cn=Index," + backendId + ",cn=Backends,cn=config";
+ dn = "ds-cfg-attribute" + "=" + index.getName() + ",cn=Index," + backendId + ",cn=Backends,cn=config";
}
DirectoryServer.getConfigHandler().deleteEntry(DN.valueOf(dn), null);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
index 4fb459c..dbaafee 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
@@ -537,8 +537,7 @@
// If it takes time to read the entry, the rdnAttribute might not be initialized yet. Don't try to use it then.
if (value.length() > 0 && rdnAttribute != null)
{
- String rdn = Utilities.getRDNString(rdnAttribute, value);
- dn.setText(rdn+","+parentDN.getText().trim());
+ dn.setText(rdnAttribute + "=" + value + "," + parentDN.getText().trim());
}
else
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
index e923fd3..02f3ad3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -33,13 +33,9 @@
import javax.swing.JLabel;
import javax.swing.JTextField;
-import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
-/**
- * The panel to create a domain.
- *
- */
+/** The panel to create a domain. */
public class NewDomainPanel extends NewOrganizationPanel
{
private static final long serialVersionUID = -595396547491445219L;
@@ -76,14 +72,13 @@
}
}
- /** {@inheritDoc} */
+ @Override
protected void updateDNValue()
{
String value = name.getText().trim();
if (value.length() > 0)
{
- String rdn = Utilities.getRDNString("dc", value);
- dn.setText(rdn+","+parentNode.getDN());
+ dn.setText("dc" + "=" + value + "," + parentNode.getDN());
}
else
{
@@ -91,7 +86,7 @@
}
}
- /** {@inheritDoc} */
+ @Override
protected String getLDIF()
{
StringBuilder sb = new StringBuilder();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewGroupPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
index 5725b5b..615924d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.guitools.controlpanel.ui;
@@ -613,8 +613,7 @@
String value = name.getText().trim();
if (value.length() > 0)
{
- String rdn = Utilities.getRDNString("cn", value);
- dn.setText(rdn+","+parentNode.getDN());
+ dn.setText("cn" + "=" + value + "," + parentNode.getDN());
}
else
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
index ec9b09c..3035e78 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
/*
@@ -69,10 +69,7 @@
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
-/**
- * The panel used to create a new organization.
- *
- */
+/** The panel used to create a new organization. */
public class NewOrganizationPanel extends AbstractNewEntryPanel
{
private static final long serialVersionUID = 6560126551083160773L;
@@ -275,8 +272,7 @@
String value = name.getText().trim();
if (value.length() > 0)
{
- String rdn = Utilities.getRDNString("o", value);
- dn.setText(rdn+","+parentNode.getDN());
+ dn.setText("o" + "=" + value + "," + parentNode.getDN());
}
else
{
@@ -284,10 +280,7 @@
}
}
- /**
- * Returns the LDIF representing the new entry.
- * @return the LDIF representing the new entry.
- */
+ @Override
protected String getLDIF()
{
StringBuilder sb = new StringBuilder();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java
index 5ad8cf7..20fb230 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -43,10 +43,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.OpenDsException;
-/**
- * The panel used to create a new organizational unit.
- *
- */
+/** The panel used to create a new organizational unit. */
public class NewOrganizationalUnitPanel extends AbstractNewEntryPanel
{
private static final long serialVersionUID = -7145648120019856161L;
@@ -245,8 +242,7 @@
String value = name.getText().trim();
if (value.length() > 0)
{
- String rdn = Utilities.getRDNString("ou", value);
- dn.setText(rdn+","+parentNode.getDN());
+ dn.setText("ou" + "=" + value + "," + parentNode.getDN());
}
else
{
@@ -254,7 +250,7 @@
}
}
- /** {@inheritDoc} */
+ @Override
protected String getLDIF()
{
StringBuilder sb = new StringBuilder();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java
index d791ba9..519ab4c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -50,10 +50,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.OpenDsException;
-/**
- * The panel used to create a new user.
- *
- */
+/** The panel used to create a new user. */
public class NewUserPanel extends AbstractNewEntryPanel
{
private static final long serialVersionUID = -2450090053404111892L;
@@ -332,14 +329,13 @@
if (attr.equalsIgnoreCase(NAMING_ATTRIBUTES[i]))
{
String value = NAMING_ATTRIBUTE_TEXTFIELDS[i].getText().trim();
- String rdn = Utilities.getRDNString(attr, value);
- dn.setText(rdn+","+parentNode.getDN());
+ dn.setText(attr + "=" + value + "," + parentNode.getDN());
break;
}
}
}
- /** {@inheritDoc} */
+ @Override
protected String getLDIF()
{
StringBuilder sb = new StringBuilder();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
index 9d1350c..0362761 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
@@ -99,7 +99,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.ConfigurationFramework;
import org.forgerock.opendj.config.server.ConfigException;
-import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.opends.guitools.controlpanel.ControlPanel;
@@ -124,14 +124,11 @@
import org.opends.server.admin.ClassLoaderProvider;
import org.opends.server.api.ConfigHandler;
import org.opends.server.config.ConfigEntry;
-import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.schema.SchemaConstants;
import org.opends.server.schema.SomeSchemaElement;
-import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.types.DN;
import org.opends.server.types.OpenDsException;
-import org.opends.server.types.RDN;
import org.opends.server.types.Schema;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
@@ -1479,26 +1476,11 @@
}
}
-
- /**
- * Gets the RDN string for a given attribute name and value.
- * @param attrName the attribute name.
- * @param attrValue the attribute value.
- * @return the RDN string for the attribute name and value.
- */
- public static String getRDNString(String attrName, String attrValue)
- {
- AttributeType attrType = DirectoryServer.getAttributeType(attrName);
- RDN rdn = new RDN(attrType, attrName, ByteString.valueOfUtf8(attrValue));
- return rdn.toString();
- }
-
/**
* Returns the attribute name with no options (or subtypes).
* @param attrName the complete attribute name.
* @return the attribute name with no options (or subtypes).
*/
-
public static String getAttributeNameWithoutOptions(String attrName)
{
int index = attrName.indexOf(";");
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
index 52b422d..f6a74c5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java
@@ -352,10 +352,8 @@
try
{
// Read the configuration file.
- String dn = Utilities.getRDNString("ds-cfg-backend-id",
- backendName)+",cn=Backends,cn=config";
- Utilities.deleteConfigSubtree(
- DirectoryServer.getConfigHandler(), DN.valueOf(dn));
+ DN dn = DN.valueOf("ds-cfg-backend-id" + "=" + backendName + ",cn=Backends,cn=config");
+ Utilities.deleteConfigSubtree(DirectoryServer.getConfigHandler(), dn);
}
catch (OpenDsException | ConfigException ode)
{
--
Gitblit v1.10.0