From 5cd7bdbbda0fa9f1aa6e12d9171c3811b73feb07 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 09 Jul 2015 14:01:31 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 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 47d92fb..85a51d1 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
@@ -222,9 +222,7 @@
for (int i=0; i < numAVAs; i++)
{
AttributeType attrType = rdn.getAttributeType(i);
- ArrayList<Attribute> attrList = new ArrayList<>(1);
- attrList.add(Attributes.create(attrType, rdn.getAttributeValue(i)));
- userAttrs.put(attrType, attrList);
+ userAttrs.put(attrType, Attributes.createAsList(attrType, rdn.getAttributeValue(i)));
}
backupBaseEntry = new Entry(backupBaseDN, objectClasses, userAttrs, opAttrs);
@@ -649,9 +647,7 @@
for (String s : dependencies) {
builder.add(s);
}
- ArrayList<Attribute> attrList = new ArrayList<>(1);
- attrList.add(builder.toAttribute());
- userAttrs.put(t, attrList);
+ userAttrs.put(t, builder.toAttributeList());
}
byte[] signedHash = backupInfo.getSignedHash();
@@ -679,8 +675,7 @@
private void putByteString(LinkedHashMap<AttributeType, List<Attribute>> userAttrs, String attrName, byte[] value)
{
- AttributeType t;
- t = DirectoryServer.getAttributeType(attrName, true);
+ AttributeType t = DirectoryServer.getAttributeType(attrName, true);
userAttrs.put(t, asList(t, ByteString.wrap(value)));
}
@@ -690,11 +685,9 @@
attrsMap.put(t, asList(t, createBooleanValue(value)));
}
- private ArrayList<Attribute> asList(AttributeType attrType, ByteString value)
+ private List<Attribute> asList(AttributeType attrType, ByteString value)
{
- final ArrayList<Attribute> attrList = new ArrayList<>(1);
- attrList.add(Attributes.create(attrType, value));
- return attrList;
+ return Attributes.createAsList(attrType, value);
}
private DirectoryException newConstraintViolation(LocalizableMessage message)
--
Gitblit v1.10.0