From d79928cc7cd9a3edf6f6a4dcf213234015cd0590 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 29 Jan 2016 15:01:25 +0000
Subject: [PATCH] DirectoryServer.java: Renamed getAttributeTypeOrDefault(String) to getAttributeType(String)
---
opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
index 6a7355d..e6101f1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
@@ -281,7 +281,7 @@
int numEntries = 1;
AttributeType backupPathType =
- DirectoryServer.getAttributeTypeOrDefault(ATTR_BACKUP_DIRECTORY_PATH);
+ DirectoryServer.getAttributeType(ATTR_BACKUP_DIRECTORY_PATH);
for (File dir : backupDirectories.keySet())
{
@@ -398,7 +398,7 @@
Entry backupDirEntry = getBackupDirectoryEntry(entryDN);
AttributeType t =
- DirectoryServer.getAttributeTypeOrDefault(ATTR_BACKUP_DIRECTORY_PATH);
+ DirectoryServer.getAttributeType(ATTR_BACKUP_DIRECTORY_PATH);
List<Attribute> attrList = backupDirEntry.getAttribute(t);
if (!attrList.isEmpty())
{
@@ -493,7 +493,7 @@
throws DirectoryException
{
// Make sure that the DN specifies a backup directory.
- AttributeType t = DirectoryServer.getAttributeTypeOrDefault(ATTR_BACKUP_DIRECTORY_PATH);
+ AttributeType t = DirectoryServer.getAttributeType(ATTR_BACKUP_DIRECTORY_PATH);
ByteString v = entryDN.rdn().getAttributeValue(t);
if (v == null)
{
@@ -542,7 +542,7 @@
LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(3);
userAttrs.put(t, asList(t, v));
- t = DirectoryServer.getAttributeTypeOrDefault(ATTR_BACKUP_BACKEND_DN);
+ t = DirectoryServer.getAttributeType(ATTR_BACKUP_BACKEND_DN);
userAttrs.put(t, asList(t, ByteString.valueOfUtf8(backupDirectory.getConfigEntryDN().toString())));
Entry e = new Entry(entryDN, ocMap, userAttrs, opAttrs);
@@ -568,7 +568,7 @@
throws DirectoryException
{
// First, get the backup ID from the entry DN.
- AttributeType idType = DirectoryServer.getAttributeTypeOrDefault(ATTR_BACKUP_ID);
+ AttributeType idType = DirectoryServer.getAttributeType(ATTR_BACKUP_ID);
ByteString idValue = entryDN.rdn().getAttributeValue(idType);
if (idValue == null) {
throw newConstraintViolation(ERR_BACKUP_NO_BACKUP_ID_IN_DN.get(entryDN));
@@ -581,7 +581,7 @@
throw newConstraintViolation(ERR_BACKUP_NO_BACKUP_PARENT_DN.get(entryDN));
}
- AttributeType t = DirectoryServer.getAttributeTypeOrDefault(ATTR_BACKUP_DIRECTORY_PATH);
+ AttributeType t = DirectoryServer.getAttributeType(ATTR_BACKUP_DIRECTORY_PATH);
ByteString v = parentDN.rdn().getAttributeValue(t);
if (v == null) {
throw newConstraintViolation(ERR_BACKUP_NO_BACKUP_DIR_IN_DN.get(entryDN));
@@ -630,7 +630,7 @@
Date backupDate = backupInfo.getBackupDate();
if (backupDate != null) {
- t = DirectoryServer.getAttributeTypeOrDefault(ATTR_BACKUP_DATE);
+ t = DirectoryServer.getAttributeType(ATTR_BACKUP_DATE);
userAttrs.put(t,
asList(t, ByteString.valueOfUtf8(GeneralizedTimeSyntax.format(backupDate))));
}
@@ -641,7 +641,7 @@
HashSet<String> dependencies = backupInfo.getDependencies();
if (dependencies != null && !dependencies.isEmpty()) {
- t = DirectoryServer.getAttributeTypeOrDefault(ATTR_BACKUP_DEPENDENCY);
+ t = DirectoryServer.getAttributeType(ATTR_BACKUP_DEPENDENCY);
AttributeBuilder builder = new AttributeBuilder(t);
builder.addAllStrings(dependencies);
userAttrs.put(t, builder.toAttributeList());
@@ -660,7 +660,7 @@
HashMap<String, String> properties = backupInfo.getBackupProperties();
if (properties != null && !properties.isEmpty()) {
for (Map.Entry<String, String> e : properties.entrySet()) {
- t = DirectoryServer.getAttributeTypeOrDefault(toLowerCase(e.getKey()));
+ t = DirectoryServer.getAttributeType(toLowerCase(e.getKey()));
userAttrs.put(t, asList(t, ByteString.valueOfUtf8(e.getValue())));
}
}
@@ -672,13 +672,13 @@
private void putByteString(LinkedHashMap<AttributeType, List<Attribute>> userAttrs, String attrName, byte[] value)
{
- AttributeType t = DirectoryServer.getAttributeTypeOrDefault(attrName);
+ AttributeType t = DirectoryServer.getAttributeType(attrName);
userAttrs.put(t, asList(t, ByteString.wrap(value)));
}
private void putBoolean(LinkedHashMap<AttributeType, List<Attribute>> attrsMap, String attrName, boolean value)
{
- AttributeType t = DirectoryServer.getAttributeTypeOrDefault(attrName);
+ AttributeType t = DirectoryServer.getAttributeType(attrName);
attrsMap.put(t, asList(t, createBooleanValue(value)));
}
@@ -764,7 +764,7 @@
if (scope != SearchScope.BASE_OBJECT && !backupDirectories.isEmpty())
{
AttributeType backupPathType =
- DirectoryServer.getAttributeTypeOrDefault(ATTR_BACKUP_DIRECTORY_PATH);
+ DirectoryServer.getAttributeType(ATTR_BACKUP_DIRECTORY_PATH);
for (File dir : backupDirectories.keySet())
{
// Check to see if the descriptor file exists. If not, then skip this
@@ -818,7 +818,7 @@
if (scope != SearchScope.BASE_OBJECT)
{
AttributeType t =
- DirectoryServer.getAttributeTypeOrDefault(ATTR_BACKUP_DIRECTORY_PATH);
+ DirectoryServer.getAttributeType(ATTR_BACKUP_DIRECTORY_PATH);
List<Attribute> attrList = backupDirEntry.getAttribute(t);
returnEntries(searchOperation, baseDN, filter, attrList);
}
@@ -858,7 +858,7 @@
{
File dir = new File(v.toString());
BackupDirectory backupDirectory = backupDirectories.get(dir).getBackupDirectory();
- AttributeType idType = DirectoryServer.getAttributeTypeOrDefault(ATTR_BACKUP_ID);
+ AttributeType idType = DirectoryServer.getAttributeType(ATTR_BACKUP_ID);
for (String backupID : backupDirectory.getBackups().keySet())
{
--
Gitblit v1.10.0