From 4aa1cf5e26d49ab1273d6affc58a5ac70b870ec4 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 29 Mar 2013 14:55:14 +0000
Subject: [PATCH] Very minor code cleanup to requests and responses package:

---
 opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java |   53 +++++++++++++++++++----------------------------------
 1 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java
index f2b2c72..66b4353 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java
@@ -58,11 +58,6 @@
 public interface GSSAPISASLBindRequest extends SASLBindRequest {
 
     /**
-     * The name of the SASL mechanism based on GSS-API authentication.
-     */
-    public static final String SASL_MECHANISM_NAME = "GSSAPI";
-
-    /**
      * Indicates that the client will accept authentication only. More
      * specifically, the underlying connection will not be protected using
      * integrity protection or encryption, unless previously established using
@@ -73,16 +68,21 @@
 
     /**
      * Indicates that the client will accept authentication with connection
+     * integrity protection and encryption.
+     */
+    public static final String QOP_AUTH_CONF = "auth-conf";
+
+    /**
+     * Indicates that the client will accept authentication with connection
      * integrity protection. More specifically, the underlying connection will
      * not be encrypted, unless previously established using SSL/TLS.
      */
     public static final String QOP_AUTH_INT = "auth-int";
 
     /**
-     * Indicates that the client will accept authentication with connection
-     * integrity protection and encryption.
+     * The name of the SASL mechanism based on GSS-API authentication.
      */
-    public static final String QOP_AUTH_CONF = "auth-conf";
+    public static final String SASL_MECHANISM_NAME = "GSSAPI";
 
     /**
      * Adds the provided additional authentication parameter to the list of
@@ -102,20 +102,6 @@
      */
     GSSAPISASLBindRequest addAdditionalAuthParam(String name, String value);
 
-    /**
-     * Returns a map containing the provided additional authentication
-     * parameters to be passed to the underlying mechanism implementation. This
-     * method is provided in order to allow for future extensions.
-     *
-     * @return A map containing the provided additional authentication
-     *         parameters to be passed to the underlying mechanism
-     *         implementation.
-     */
-    Map<String, String> getAdditionalAuthParams();
-
-    /**
-     * {@inheritDoc}
-     */
     @Override
     GSSAPISASLBindRequest addControl(Control control);
 
@@ -141,13 +127,21 @@
      */
     GSSAPISASLBindRequest addQOP(String... qopValues);
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     BindClient createBindClient(String serverName) throws ErrorResultException;
 
     /**
+     * Returns a map containing the provided additional authentication
+     * parameters to be passed to the underlying mechanism implementation. This
+     * method is provided in order to allow for future extensions.
+     *
+     * @return A map containing the provided additional authentication
+     *         parameters to be passed to the underlying mechanism
+     *         implementation.
+     */
+    Map<String, String> getAdditionalAuthParams();
+
+    /**
      * Returns the authentication ID of the user, which should be the user's
      * Kerberos principal. The authentication ID usually has the form "dn:"
      * immediately followed by the distinguished name of the user, or "u:"
@@ -180,16 +174,10 @@
      */
     String getAuthorizationID();
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     <C extends Control> C getControl(ControlDecoder<C> decoder, DecodeOptions options)
             throws DecodeException;
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     List<Control> getControls();
 
@@ -269,9 +257,6 @@
      */
     String getRealm();
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     String getSASLMechanism();
 

--
Gitblit v1.10.0