rename SPNegoScheme to SpnegoScheme

apache · Sep 10, 2024 · 99bb75c · 99bb75c
1 parent 4777477
commit 99bb75c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/...lient5/testing/sync/TestSPNegoScheme.java → ...lient5/testing/sync/TestSpnegoScheme.java b/...lient5/testing/sync/TestSPNegoScheme.java → ...lient5/testing/sync/TestSpnegoScheme.java
@@ -49,7 +49,7 @@
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.impl.DefaultAuthenticationStrategy;
 import org.apache.hc.client5.http.impl.auth.CredentialsProviderBuilder;
-import org.apache.hc.client5.http.impl.auth.SPNegoScheme;
+import org.apache.hc.client5.http.impl.auth.SpnegoScheme;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.client5.http.utils.Base64;
 import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel;
@@ -78,11 +78,11 @@
 import org.mockito.Mockito;
 
 /**
- * Tests for {@link SPNegoScheme}.
+ * Tests for {@link SpnegoScheme}.
  */
-public class TestSPNegoScheme extends AbstractIntegrationTestBase {
+public class TestSpnegoScheme extends AbstractIntegrationTestBase {
 
-    protected TestSPNegoScheme() {
+    protected TestSpnegoScheme() {
         super(URIScheme.HTTP, ClientProtocolLevel.STANDARD);
     }
 
@@ -191,7 +191,7 @@ public void handle(
      * Kerberos configuration.
      *
      */
-    private static class NegotiateSchemeWithMockGssManager extends SPNegoScheme {
+    private static class NegotiateSchemeWithMockGssManager extends SpnegoScheme {
 
         final GSSManager manager = Mockito.mock(GSSManager.class);
         final GSSName name = Mockito.mock(GSSName.class);
@@ -218,7 +218,7 @@ protected GSSManager getManager() {
 
     }
 
-    private static class MutualNegotiateSchemeWithMockGssManager extends SPNegoScheme {
+    private static class MutualNegotiateSchemeWithMockGssManager extends SpnegoScheme {
 
         final GSSManager manager = Mockito.mock(GSSManager.class);
         final GSSName name = Mockito.mock(GSSName.class);

diff --git a/.../client5/http/impl/auth/SPNegoScheme.java → .../client5/http/impl/auth/SpnegoScheme.java b/.../client5/http/impl/auth/SPNegoScheme.java → .../client5/http/impl/auth/SpnegoScheme.java
@@ -43,18 +43,18 @@
  * @since 4.2
  */
 @Experimental
-public class SPNegoScheme extends GSSchemeBase {
+public class SpnegoScheme extends GSSchemeBase {
 
     private static final String SPNEGO_OID = "1.3.6.1.5.5.2";
 
     /**
      * @since 5.0
      */
-    public SPNegoScheme(final org.apache.hc.client5.http.auth.KerberosConfig config, final DnsResolver dnsResolver) {
+    public SpnegoScheme(final org.apache.hc.client5.http.auth.KerberosConfig config, final DnsResolver dnsResolver) {
         super(config, dnsResolver);
     }
 
-    public SPNegoScheme() {
+    public SpnegoScheme() {
         super();
     }
 

diff --git a/...5/http/impl/auth/SPNegoSchemeFactory.java → ...5/http/impl/auth/SpnegoSchemeFactory.java b/...5/http/impl/auth/SPNegoSchemeFactory.java → ...5/http/impl/auth/SpnegoSchemeFactory.java
@@ -37,29 +37,22 @@
 
 /**
  * {@link AuthSchemeFactory} implementation that creates and initializes
- * {@link SPNegoScheme} instances.
+ * {@link SpnegoScheme} instances.
  * <p>
  * Please note this class is considered experimental and may be discontinued or removed
  * in the future.
  * </p>
  *
  * @since 4.2
- *
- * @deprecated Do not use. The GGS based experimental authentication schemes are no longer
- * supported. Consider using Basic or Bearer authentication with TLS instead.
- *
- * @see BasicSchemeFactory
- * @see BearerSchemeFactory
  */
-@Deprecated
 @Contract(threading = ThreadingBehavior.STATELESS)
 @Experimental
-public class SPNegoSchemeFactory implements AuthSchemeFactory {
+public class SpnegoSchemeFactory implements AuthSchemeFactory {
 
     /**
      * Singleton instance for the default configuration.
      */
-    public static final SPNegoSchemeFactory DEFAULT = new SPNegoSchemeFactory(org.apache.hc.client5.http.auth.KerberosConfig.DEFAULT,
+    public static final SpnegoSchemeFactory DEFAULT = new SpnegoSchemeFactory(org.apache.hc.client5.http.auth.KerberosConfig.DEFAULT,
             SystemDefaultDnsResolver.INSTANCE);
 
     private final org.apache.hc.client5.http.auth.KerberosConfig config;
@@ -68,15 +61,15 @@ public class SPNegoSchemeFactory implements AuthSchemeFactory {
     /**
      * @since 5.0
      */
-    public SPNegoSchemeFactory(final org.apache.hc.client5.http.auth.KerberosConfig config, final DnsResolver dnsResolver) {
+    public SpnegoSchemeFactory(final org.apache.hc.client5.http.auth.KerberosConfig config, final DnsResolver dnsResolver) {
         super();
         this.config = config;
         this.dnsResolver = dnsResolver;
     }
 
     @Override
     public AuthScheme create(final HttpContext context) {
-        return new SPNegoScheme(this.config, this.dnsResolver);
+        return new SpnegoScheme(this.config, this.dnsResolver);
     }
 
 }