Skip to content

Commit d99f274

Browse files
committed
duplicate and rename mutual SPNEGO related classes
1 parent 1a7f0e0 commit d99f274

File tree

9 files changed

+639
-167
lines changed

9 files changed

+639
-167
lines changed

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/TestMutualSpnegoScheme.java

Lines changed: 5 additions & 5 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.MutualSpnegoScheme;
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;
@@ -80,9 +80,9 @@
8080
/**
8181
* Tests for {@link SPNegoScheme}.
8282
*/
83-
public class TestSPNegoScheme extends AbstractIntegrationTestBase {
83+
public class TestMutualSpnegoScheme extends AbstractIntegrationTestBase {
8484

85-
protected TestSPNegoScheme() {
85+
protected TestMutualSpnegoScheme() {
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 MutualSpnegoScheme {
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 MutualSpnegoScheme {
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/GGSSchemeBase.java

Lines changed: 76 additions & 151 deletions
Large diffs are not rendered by default.

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@
4141
*
4242
* @since 4.2
4343
*
44-
* @deprecated Do not use. Consider using Spengo, Basic or Bearer authentication with TLS instead.
44+
* @deprecated Do not use. The Kerberos authentication scheme was never standardised.
45+
* Use {@link MutualSpnegoScheme} or some other scheme instead.
4546
*
47+
* @see MutualSpnegoScheme
4648
* @see BasicScheme
4749
* @see BearerScheme
4850
*/

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@
4545
*
4646
* @since 4.2
4747
*
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.
48+
* @deprecated Do not use. The Kerberos authentication scheme was never standardised.
49+
* Use {@link MutualSpnegoScheme} or some other scheme instead.
5050
*
51+
* @see MutualSpnegoSchemeFactory
5152
* @see BasicSchemeFactory
5253
* @see BearerSchemeFactory
5354
*/

0 commit comments

Comments
 (0)