Skip to content

Commit 99bb75c

Browse files
committed
rename SPNegoScheme to SpnegoScheme
1 parent 4777477 commit 99bb75c

3 files changed

Lines changed: 14 additions & 21 deletions

File tree

httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSPNegoScheme.java renamed to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSpnegoScheme.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import org.apache.hc.client5.http.classic.methods.HttpGet;
5050
import org.apache.hc.client5.http.impl.DefaultAuthenticationStrategy;
5151
import org.apache.hc.client5.http.impl.auth.CredentialsProviderBuilder;
52-
import org.apache.hc.client5.http.impl.auth.SPNegoScheme;
52+
import org.apache.hc.client5.http.impl.auth.SpnegoScheme;
5353
import org.apache.hc.client5.http.protocol.HttpClientContext;
5454
import org.apache.hc.client5.http.utils.Base64;
5555
import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel;
@@ -78,11 +78,11 @@
7878
import org.mockito.Mockito;
7979

8080
/**
81-
* Tests for {@link SPNegoScheme}.
81+
* Tests for {@link SpnegoScheme}.
8282
*/
83-
public class TestSPNegoScheme extends AbstractIntegrationTestBase {
83+
public class TestSpnegoScheme extends AbstractIntegrationTestBase {
8484

85-
protected TestSPNegoScheme() {
85+
protected TestSpnegoScheme() {
8686
super(URIScheme.HTTP, ClientProtocolLevel.STANDARD);
8787
}
8888

@@ -191,7 +191,7 @@ public void handle(
191191
* Kerberos configuration.
192192
*
193193
*/
194-
private static class NegotiateSchemeWithMockGssManager extends SPNegoScheme {
194+
private static class NegotiateSchemeWithMockGssManager extends SpnegoScheme {
195195

196196
final GSSManager manager = Mockito.mock(GSSManager.class);
197197
final GSSName name = Mockito.mock(GSSName.class);
@@ -218,7 +218,7 @@ protected GSSManager getManager() {
218218

219219
}
220220

221-
private static class MutualNegotiateSchemeWithMockGssManager extends SPNegoScheme {
221+
private static class MutualNegotiateSchemeWithMockGssManager extends SpnegoScheme {
222222

223223
final GSSManager manager = Mockito.mock(GSSManager.class);
224224
final GSSName name = Mockito.mock(GSSName.class);

httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java renamed to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SpnegoScheme.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@
4343
* @since 4.2
4444
*/
4545
@Experimental
46-
public class SPNegoScheme extends GSSchemeBase {
46+
public class SpnegoScheme extends GSSchemeBase {
4747

4848
private static final String SPNEGO_OID = "1.3.6.1.5.5.2";
4949

5050
/**
5151
* @since 5.0
5252
*/
53-
public SPNegoScheme(final org.apache.hc.client5.http.auth.KerberosConfig config, final DnsResolver dnsResolver) {
53+
public SpnegoScheme(final org.apache.hc.client5.http.auth.KerberosConfig config, final DnsResolver dnsResolver) {
5454
super(config, dnsResolver);
5555
}
5656

57-
public SPNegoScheme() {
57+
public SpnegoScheme() {
5858
super();
5959
}
6060

httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoSchemeFactory.java renamed to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SpnegoSchemeFactory.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,22 @@
3737

3838
/**
3939
* {@link AuthSchemeFactory} implementation that creates and initializes
40-
* {@link SPNegoScheme} instances.
40+
* {@link SpnegoScheme} instances.
4141
* <p>
4242
* Please note this class is considered experimental and may be discontinued or removed
4343
* in the future.
4444
* </p>
4545
*
4646
* @since 4.2
47-
*
48-
* @deprecated Do not use. The GGS based experimental authentication schemes are no longer
49-
* supported. Consider using Basic or Bearer authentication with TLS instead.
50-
*
51-
* @see BasicSchemeFactory
52-
* @see BearerSchemeFactory
5347
*/
54-
@Deprecated
5548
@Contract(threading = ThreadingBehavior.STATELESS)
5649
@Experimental
57-
public class SPNegoSchemeFactory implements AuthSchemeFactory {
50+
public class SpnegoSchemeFactory implements AuthSchemeFactory {
5851

5952
/**
6053
* Singleton instance for the default configuration.
6154
*/
62-
public static final SPNegoSchemeFactory DEFAULT = new SPNegoSchemeFactory(org.apache.hc.client5.http.auth.KerberosConfig.DEFAULT,
55+
public static final SpnegoSchemeFactory DEFAULT = new SpnegoSchemeFactory(org.apache.hc.client5.http.auth.KerberosConfig.DEFAULT,
6356
SystemDefaultDnsResolver.INSTANCE);
6457

6558
private final org.apache.hc.client5.http.auth.KerberosConfig config;
@@ -68,15 +61,15 @@ public class SPNegoSchemeFactory implements AuthSchemeFactory {
6861
/**
6962
* @since 5.0
7063
*/
71-
public SPNegoSchemeFactory(final org.apache.hc.client5.http.auth.KerberosConfig config, final DnsResolver dnsResolver) {
64+
public SpnegoSchemeFactory(final org.apache.hc.client5.http.auth.KerberosConfig config, final DnsResolver dnsResolver) {
7265
super();
7366
this.config = config;
7467
this.dnsResolver = dnsResolver;
7568
}
7669

7770
@Override
7871
public AuthScheme create(final HttpContext context) {
79-
return new SPNegoScheme(this.config, this.dnsResolver);
72+
return new SpnegoScheme(this.config, this.dnsResolver);
8073
}
8174

8275
}

0 commit comments

Comments
 (0)