From d366a5db9c1477c823758862268dd493dbbcc936 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Jun 2016 13:49:03 +0000
Subject: [PATCH] OPENDJ-3037 inlined DirectoryServer.getTopObjectClass() and getObjectClassAttributeType()
---
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AddMsg.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AddMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AddMsg.java
index baac982..b0bc3df 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AddMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/AddMsg.java
@@ -16,6 +16,9 @@
*/
package org.opends.server.replication.protocol;
+import static org.forgerock.opendj.ldap.schema.CoreSchema.*;
+import static org.opends.server.replication.protocol.OperationContext.*;
+
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -27,20 +30,20 @@
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.DecodeException;
+import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.core.AddOperation;
import org.opends.server.core.AddOperationBasis;
-import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.plugin.EntryHistorical;
-import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
-import org.opends.server.types.*;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
+import org.opends.server.types.LDAPException;
+import org.opends.server.types.RawAttribute;
import org.opends.server.types.operation.PostOperationAddOperation;
-import static org.opends.server.replication.protocol.OperationContext.*;
-
/**
* This class is used to exchange Add operation between LDAP servers
* and replication servers.
@@ -223,8 +226,7 @@
try
{
// Encode the object classes (SET OF LDAPString).
- AttributeBuilder builder = new AttributeBuilder(
- DirectoryServer.getObjectClassAttributeType());
+ AttributeBuilder builder = new AttributeBuilder(getObjectClassAttributeType());
builder.addAllStrings(objectClasses.values());
new LDAPAttribute(builder.toAttribute()).write(writer);
--
Gitblit v1.10.0