Improved the message toString() method
git-svn-id: https://svn.apache.org/repos/asf/directory/shared/branches/m1@1072732 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractMessage.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractMessage.java
index e3a6ca0..3139656 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractMessage.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractMessage.java
@@ -264,9 +264,14 @@
*
* @return A LdapMessage String
*/
- public String toString()
+ public String toString( String message )
{
StringBuilder sb = new StringBuilder();
+
+ sb.append( "MessageType : " ).append( type ).append( '\n' );
+ sb.append( "Message ID : " ).append( id ).append( '\n' );
+
+ sb.append( message );
if ( controls != null )
{
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java
index 60c6fee..ed3f6dc 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java
@@ -20,7 +20,11 @@
package org.apache.directory.shared.ldap.model.message;
-import org.apache.directory.shared.ldap.model.entry.*;
+import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
+import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.name.Dn;
@@ -291,6 +295,6 @@
sb.append( entry.toString() );
}
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddResponseImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddResponseImpl.java
index 76cfa52..767afd5 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddResponseImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddResponseImpl.java
@@ -62,6 +62,6 @@
sb.append( " Add Response\n" );
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindRequestImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindRequestImpl.java
index cd7fb22..8fd0478 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindRequestImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindRequestImpl.java
@@ -418,6 +418,7 @@
public String toString()
{
StringBuffer sb = new StringBuffer();
+
sb.append( " BindRequest\n" );
sb.append( " Version : '" ).append( isVersion3 ? "3" : "2" ).append( "'\n" );
@@ -451,8 +452,6 @@
}
// The controls if any
- sb.append( super.toString() );
-
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindResponseImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindResponseImpl.java
index da7591f..acb8a13 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindResponseImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindResponseImpl.java
@@ -187,6 +187,6 @@
.append( "'\n" );
}
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java
index 94352a4..7b51414 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java
@@ -328,6 +328,6 @@
// The controls
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareResponseImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareResponseImpl.java
index 4a8fa28..a1c1193 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareResponseImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareResponseImpl.java
@@ -72,6 +72,6 @@
sb.append( " Compare Response\n" );
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImpl.java
index 6393b08..d389c43 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImpl.java
@@ -201,6 +201,6 @@
sb.append( " Entry : '" ).append( name.toString() ).append( "'\n" );
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteResponseImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteResponseImpl.java
index 78d9c65..983a7b5 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteResponseImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteResponseImpl.java
@@ -64,6 +64,6 @@
sb.append( " Delete Response\n" );
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImpl.java
index 8059ad2..8d2d12f 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImpl.java
@@ -283,6 +283,6 @@
// The controls
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImpl.java
index 49c5332..7972fc5 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImpl.java
@@ -265,6 +265,6 @@
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/IntermediateResponseImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/IntermediateResponseImpl.java
index 00c781a..94aad33 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/IntermediateResponseImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/IntermediateResponseImpl.java
@@ -214,6 +214,6 @@
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImpl.java
index 2eaf131..8ea4e71 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImpl.java
@@ -352,6 +352,6 @@
// The controls
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnResponseImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnResponseImpl.java
index 4477001..3951d53 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnResponseImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnResponseImpl.java
@@ -63,6 +63,6 @@
sb.append( " Modify Dn Response\n" );
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java
index b2a26fe..c46143d 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java
@@ -438,6 +438,6 @@
// The controls
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyResponseImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyResponseImpl.java
index 02daeef..2df2241 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyResponseImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyResponseImpl.java
@@ -62,6 +62,6 @@
sb.append( " Modify Response\n" );
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequestImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequestImpl.java
index 3d0e807..c659bf8 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequestImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequestImpl.java
@@ -21,7 +21,10 @@
import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapProtocolErrorException;
@@ -604,6 +607,6 @@
// The controls
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
\ No newline at end of file
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchResultDoneImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchResultDoneImpl.java
index aa8d805..4057bd6 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchResultDoneImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchResultDoneImpl.java
@@ -105,6 +105,6 @@
sb.append( " Search Result Done\n" );
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImpl.java
index c88ecbb..33efefa 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImpl.java
@@ -185,7 +185,6 @@
}
}
- return sb.toString();
+ return super.toString( sb.toString() );
}
-
}
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchResultReferenceImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchResultReferenceImpl.java
index 5bb29eb..8189a64 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchResultReferenceImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchResultReferenceImpl.java
@@ -168,8 +168,6 @@
}
}
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
-
-
diff --git a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/UnbindRequestImpl.java b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/UnbindRequestImpl.java
index 559f1c5..acfa78f 100644
--- a/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/UnbindRequestImpl.java
+++ b/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/UnbindRequestImpl.java
@@ -70,6 +70,6 @@
// The controls
sb.append( super.toString() );
- return sb.toString();
+ return super.toString( sb.toString() );
}
}
