From d673231a7ed9c83b4966ab9a148d089b5ab4a54e Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 10:14:44 +0000
Subject: [PATCH] InternalClientConnection.processAdd(AddChangeRecordEntry), simplified code
---
opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
index 953cdf2..efd0728 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
@@ -801,11 +801,7 @@
*/
public AddOperation processAdd(AddChangeRecordEntry addRecord)
{
- LinkedHashMap<ObjectClass,String> objectClasses = new LinkedHashMap<>();
- LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>();
- LinkedHashMap<AttributeType,List<Attribute>> opAttrs = new LinkedHashMap<>();
-
- Entry e = new Entry(addRecord.getDN(), objectClasses, userAttrs, opAttrs);
+ Entry e = newEntry(addRecord.getDN());
ArrayList<ByteString> duplicateValues = new ArrayList<>();
for (Attribute a : addRecord.getAttributes())
@@ -815,7 +811,7 @@
for (ByteString v : a)
{
String ocName = v.toString();
- objectClasses.put(DirectoryServer.getSchema().getObjectClass(ocName), ocName);
+ e.getObjectClasses().put(DirectoryServer.getSchema().getObjectClass(ocName), ocName);
}
}
else
@@ -824,9 +820,15 @@
}
}
- // TODO JNR can we directly pass e instead of addEntry()?
- Entry addEntry = new Entry(addRecord.getDN(), objectClasses, userAttrs, opAttrs);
- return processAdd(addEntry, null);
+ return processAdd(e, null);
+ }
+
+ private Entry newEntry(DN dn)
+ {
+ return new Entry(dn,
+ new LinkedHashMap<ObjectClass, String>(),
+ new LinkedHashMap<AttributeType, List<Attribute>>(),
+ new LinkedHashMap<AttributeType, List<Attribute>>());
}
--
Gitblit v1.10.0