From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java | 166 +++++++++----------------------------------------------
1 files changed, 28 insertions(+), 138 deletions(-)
diff --git a/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java b/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
index f3feaa1..9fc264a 100644
--- a/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
+++ b/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
@@ -25,28 +25,22 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.protocols.ldap;
-import org.opends.messages.Message;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.io.IOException;
-import org.opends.server.protocols.asn1.ASN1Element;
-import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.protocols.asn1.ASN1Sequence;
-import org.opends.server.types.DebugLogLevel;
-import org.opends.server.types.LDAPException;
+import org.opends.server.protocols.asn1.*;
import org.opends.server.types.RawAttribute;
+import org.opends.server.types.ByteString;
import org.opends.server.util.Base64;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
-import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
-import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -68,7 +62,7 @@
private List<RawAttribute> attributes;
// The DN for this add request.
- private ASN1OctetString dn;
+ private ByteString dn;
@@ -78,7 +72,7 @@
*
* @param dn The DN for this add request.
*/
- public AddRequestProtocolOp(ASN1OctetString dn)
+ public AddRequestProtocolOp(ByteString dn)
{
this.dn = dn;
this.attributes = new ArrayList<RawAttribute>();
@@ -93,7 +87,7 @@
* @param dn The DN for this add request.
* @param attributes The set of attributes for this add request.
*/
- public AddRequestProtocolOp(ASN1OctetString dn,
+ public AddRequestProtocolOp(ByteString dn,
ArrayList<RawAttribute> attributes)
{
this.dn = dn;
@@ -115,25 +109,12 @@
*
* @return The DN for this add request.
*/
- public ASN1OctetString getDN()
+ public ByteString getDN()
{
return dn;
}
-
- /**
- * Specifies the DN for this add request.
- *
- * @param dn The DN for this add request.
- */
- public void setDN(ASN1OctetString dn)
- {
- this.dn = dn;
- }
-
-
-
/**
* Retrieves the set of attributes for this add request. The returned list
* may be altered by the caller.
@@ -169,117 +150,26 @@
return "Add Request";
}
-
-
/**
- * Encodes this protocol op to an ASN.1 element suitable for including in an
- * LDAP message.
+ * Writes this protocol op to an ASN.1 output stream.
*
- * @return The ASN.1 element containing the encoded protocol op.
+ * @param stream The ASN.1 output stream to write to.
+ * @throws IOException If a problem occurs while writing to the stream.
*/
- public ASN1Element encode()
+ public void write(ASN1Writer stream) throws IOException
{
- ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(2);
- elements.add(dn);
+ stream.writeStartSequence(OP_TYPE_ADD_REQUEST);
+ stream.writeOctetString(dn);
-
- ArrayList<ASN1Element> attrElements =
- new ArrayList<ASN1Element>(attributes.size());
- for (RawAttribute attr : attributes)
+ // Write the attributes
+ stream.writeStartSequence();
+ for(RawAttribute attr : attributes)
{
- attrElements.add(attr.encode());
+ attr.write(stream);
}
- elements.add(new ASN1Sequence(attrElements));
+ stream.writeEndSequence();
-
- return new ASN1Sequence(OP_TYPE_ADD_REQUEST, elements);
- }
-
-
-
- /**
- * Decodes the provided ASN.1 element as an LDAP add request protocol op.
- *
- * @param element The ASN.1 element to be decoded.
- *
- * @return The decoded add request protocol op.
- *
- * @throws LDAPException If a problem occurs while decoding the provided
- * ASN.1 element as an LDAP add request protocol op.
- */
- public static AddRequestProtocolOp decodeAddRequest(ASN1Element element)
- throws LDAPException
- {
- ArrayList<ASN1Element> elements;
- try
- {
- elements = element.decodeAsSequence().elements();
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- Message message =
- ERR_LDAP_ADD_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
- throw new LDAPException(PROTOCOL_ERROR, message, e);
- }
-
-
- int numElements = elements.size();
- if (numElements != 2)
- {
- Message message =
- ERR_LDAP_ADD_REQUEST_DECODE_INVALID_ELEMENT_COUNT.get(numElements);
- throw new LDAPException(PROTOCOL_ERROR, message);
- }
-
-
- ASN1OctetString dn;
- try
- {
- dn = elements.get(0).decodeAsOctetString();
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- Message message = ERR_LDAP_ADD_REQUEST_DECODE_DN.get(String.valueOf(e));
- throw new LDAPException(PROTOCOL_ERROR, message, e);
- }
-
-
-
- ArrayList<RawAttribute> attributes;
- try
- {
- ArrayList<ASN1Element> attrElements =
- elements.get(1).decodeAsSequence().elements();
- attributes = new ArrayList<RawAttribute>(attrElements.size());
- for (ASN1Element e : attrElements)
- {
- attributes.add(LDAPAttribute.decode(e));
- }
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- Message message =
- ERR_LDAP_ADD_REQUEST_DECODE_ATTRS.get(String.valueOf(e));
- throw new LDAPException(PROTOCOL_ERROR, message, e);
- }
-
-
- return new AddRequestProtocolOp(dn, attributes);
+ stream.writeEndSequence();
}
@@ -293,7 +183,7 @@
public void toString(StringBuilder buffer)
{
buffer.append("AddRequest(dn=");
- dn.toString(buffer);
+ buffer.append(dn.toString());
buffer.append(", attrs={");
if (! attributes.isEmpty())
@@ -335,7 +225,7 @@
buffer.append(indentBuf);
buffer.append(" DN: ");
- dn.toString(buffer);
+ buffer.append(dn.toString());
buffer.append(EOL);
buffer.append(" Attributes:");
@@ -360,16 +250,16 @@
// Add the DN to the buffer.
String dnString;
int colsRemaining;
- if (needsBase64Encoding(dn.value()))
+ if (needsBase64Encoding(dn))
{
- dnString = Base64.encode(dn.value());
+ dnString = Base64.encode(dn);
buffer.append("dn:: ");
colsRemaining = wrapColumn - 5;
}
else
{
- dnString = dn.stringValue();
+ dnString = dn.toString();
buffer.append("dn: ");
colsRemaining = wrapColumn - 4;
@@ -411,12 +301,12 @@
String name = a.getAttributeType();
int nameLength = name.length();
- for (ASN1OctetString v : a.getValues())
+ for (ByteString v : a.getValues())
{
String valueString;
- if (needsBase64Encoding(v.value()))
+ if (needsBase64Encoding(v))
{
- valueString = Base64.encode(v.value());
+ valueString = Base64.encode(v);
buffer.append(name);
buffer.append(":: ");
@@ -424,7 +314,7 @@
}
else
{
- valueString = v.stringValue();
+ valueString = v.toString();
buffer.append(name);
buffer.append(": ");
--
Gitblit v1.10.0