fixing the samller issues based on the review

Author: stoty

httpclient5/src/main/java/org/apache/hc/client5/http/auth/KerberosConfig.java

@@ -37,8 +37,6 @@
  *
  * @deprecated Do not use. The old GGS based experimental authentication schemes are no longer
  * supported.
- * Use org.apache.hc.client5.http.impl.auth.gss.SpnegoScheme, or consider using Basic or Bearer
- * authentication with TLS instead.
  * @see org.apache.hc.client5.http.impl.auth.gss.SpnegoScheme
  * @see org.apache.hc.client5.http.auth.gss.GssConfig
  */

httpclient5/src/main/java/org/apache/hc/client5/http/auth/KerberosCredentials.java

@@ -37,8 +37,7 @@
  * @since 4.4
  *
  * The original KerberosCredentials class has been renamed to
- * org.apache.hc.client5.http.auth.gss.GssCredentials for the new Mutual capable SPNEGO Scheme.
- * This is an identical child class with the original name to maintain backwards compatibility.
+ * org.apache.hc.client5.http.auth.gss.GssCredentials.
  *
  * @deprecated Do not use. The old GGS based experimental authentication schemes are no longer
  * supported.

httpclient5/src/main/java/org/apache/hc/client5/http/auth/gss/GssConfig.java

@@ -31,13 +31,13 @@
 import org.apache.hc.core5.annotation.ThreadingBehavior;
 
 /**
- * Immutable class encapsulating Kerberos configuration options for the new mutual auth capable
+ * Immutable class encapsulating GSS configuration options for the new mutual auth capable
  * SpnegoScheme.
  *
  * Unlike the deprecated {@link KerberosConfig}, this class uses explicit defaults, and
  * primitive booleans.
  *
- * Compared to {@link KerberosConfig} stripPort has been changed toAddPort, and the default is now
+ * Compared to {@link KerberosConfig} stripPort has been changed to addPort, and the default is now
  * false (same effect). The default for useCanonicalHostname has been changed to false from true.
  *
  * @since 5.5
@@ -62,12 +62,12 @@ protected GssConfig() {
     }
 
     GssConfig(
-            final boolean stripPort,
+            final boolean addPort,
             final boolean useCanonicalHostname,
             final boolean requestMutualAuth,
             final boolean requestDelegCreds) {
         super();
-        this.addPort = stripPort;
+        this.addPort = addPort;
         this.useCanonicalHostname = useCanonicalHostname;
         this.requestMutualAuth = requestMutualAuth;
         this.requestDelegCreds = requestDelegCreds;

httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/gss/GssSchemeBase.java

@@ -171,7 +171,7 @@ public void processChallenge(
             queuedToken = generateToken(challengeToken, KERBEROS_SCHEME, gssHostname);
             switch (state) {
             case UNINITIATED:
-                if (challenge != NO_TOKEN) {
+                if (challengeToken != null) {
                     if (LOG.isDebugEnabled()) {
                         final HttpClientContext clientContext = HttpClientContext.cast(context);
                         final String exchangeId = clientContext.getExchangeId();

httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/gss/SpnegoScheme.java

@@ -82,7 +82,15 @@
  */
 public class SpnegoScheme extends GssSchemeBase {
 
-    private static final String SPNEGO_OID = "1.3.6.1.5.5.2";
+    private static final String SPNEGO_OID_STRING = "1.3.6.1.5.5.2";
+    private static final Oid SPNEGO_OID;
+    static {
+        try {
+            SPNEGO_OID = new Oid(SPNEGO_OID_STRING);
+        } catch (final GSSException e) {
+            throw new IllegalStateException("Failed to create OID for SPNEGO mechanism", e);
+        }
+    }
 
     /**
      * @since 5.0
@@ -102,7 +110,7 @@ public String getName() {
 
     @Override
     protected byte[] generateToken(final byte[] input, final String gssServiceName, final String gssHostname) throws GSSException {
-        return generateGSSToken(input, new Oid(SPNEGO_OID), gssServiceName, gssHostname);
+        return generateGSSToken(input, SPNEGO_OID, gssServiceName, gssHostname);
     }
 
     @Override