Skip to content

Commit 3f69366

Browse files
authored
Move ProxyAuthScheme to SPI package (#7289)
Per team review, this makes more sense in the SPI package where it can be shared by other client implementations.
1 parent e3b7bfe commit 3f69366

10 files changed

Lines changed: 10 additions & 9 deletions

File tree

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/ProxyAuthScheme.java renamed to http-client-spi/src/main/java/software/amazon/awssdk/http/ProxyAuthScheme.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
package software.amazon.awssdk.http.nio.netty;
16+
package software.amazon.awssdk.http;
1717

1818
import software.amazon.awssdk.annotations.SdkPublicApi;
1919

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/ProxyConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.HashSet;
2020
import java.util.Set;
2121
import software.amazon.awssdk.annotations.SdkPublicApi;
22+
import software.amazon.awssdk.http.ProxyAuthScheme;
2223
import software.amazon.awssdk.http.nio.netty.internal.utils.NettyClientLogger;
2324
import software.amazon.awssdk.utils.ProxyConfigProvider;
2425
import software.amazon.awssdk.utils.ProxyEnvironmentSetting;

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import software.amazon.awssdk.annotations.SdkTestInternalApi;
4545
import software.amazon.awssdk.http.Protocol;
4646
import software.amazon.awssdk.http.ProtocolNegotiation;
47-
import software.amazon.awssdk.http.nio.netty.ProxyAuthScheme;
47+
import software.amazon.awssdk.http.ProxyAuthScheme;
4848
import software.amazon.awssdk.http.nio.netty.ProxyConfiguration;
4949
import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup;
5050
import software.amazon.awssdk.http.nio.netty.internal.http2.HttpOrHttp2ChannelPool;

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/BasicProxyAuthGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.Base64;
2121
import java.util.concurrent.CompletableFuture;
2222
import software.amazon.awssdk.annotations.SdkInternalApi;
23-
import software.amazon.awssdk.http.nio.netty.ProxyAuthScheme;
23+
import software.amazon.awssdk.http.ProxyAuthScheme;
2424
import software.amazon.awssdk.utils.Validate;
2525

2626
/**

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NegotiateProxyAuthGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.ietf.jgss.GSSName;
3434
import org.ietf.jgss.Oid;
3535
import software.amazon.awssdk.annotations.SdkInternalApi;
36-
import software.amazon.awssdk.http.nio.netty.ProxyAuthScheme;
36+
import software.amazon.awssdk.http.ProxyAuthScheme;
3737
import software.amazon.awssdk.utils.BinaryUtils;
3838
import software.amazon.awssdk.utils.Validate;
3939

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ProxyAuthGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.net.URI;
1919
import java.util.concurrent.CompletableFuture;
2020
import software.amazon.awssdk.annotations.SdkInternalApi;
21-
import software.amazon.awssdk.http.nio.netty.ProxyAuthScheme;
21+
import software.amazon.awssdk.http.ProxyAuthScheme;
2222

2323
/**
2424
* Generates the auth params for an {@code Authorization} HTTP header.

http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ProxyConfigurationTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.junit.jupiter.api.AfterAll;
2929
import org.junit.jupiter.api.BeforeEach;
3030
import org.junit.jupiter.api.Test;
31+
import software.amazon.awssdk.http.ProxyAuthScheme;
3132
import software.amazon.awssdk.testutils.LogCaptor;
3233

3334
/**

http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMapTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
import software.amazon.awssdk.http.Protocol;
5757
import software.amazon.awssdk.http.ProtocolNegotiation;
5858
import software.amazon.awssdk.http.TlsKeyManagersProvider;
59-
import software.amazon.awssdk.http.nio.netty.ProxyAuthScheme;
59+
import software.amazon.awssdk.http.ProxyAuthScheme;
6060
import software.amazon.awssdk.http.nio.netty.ProxyConfiguration;
6161
import software.amazon.awssdk.http.nio.netty.RecordingNetworkTrafficListener;
6262
import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup;

http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/BasicProxyAuthGeneratorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.junit.jupiter.params.ParameterizedTest;
2727
import org.junit.jupiter.params.provider.Arguments;
2828
import org.junit.jupiter.params.provider.MethodSource;
29-
import software.amazon.awssdk.http.nio.netty.ProxyAuthScheme;
29+
import software.amazon.awssdk.http.ProxyAuthScheme;
3030

3131
public class BasicProxyAuthGeneratorTest {
3232
private static final String USERNAME = "user";

http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ProxyTunnelInitHandlerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import java.net.URI;
4949
import java.util.Base64;
5050
import java.util.concurrent.CompletableFuture;
51-
import java.util.concurrent.ExecutionException;
5251
import java.util.function.Supplier;
5352
import org.junit.AfterClass;
5453
import org.junit.Before;
@@ -57,7 +56,7 @@
5756
import org.mockito.ArgumentCaptor;
5857
import org.mockito.Mock;
5958
import org.mockito.junit.MockitoJUnitRunner;
60-
import software.amazon.awssdk.http.nio.netty.ProxyAuthScheme;
59+
import software.amazon.awssdk.http.ProxyAuthScheme;
6160

6261
/**
6362
* Unit tests for {@link ProxyTunnelInitHandler}.

0 commit comments

Comments
 (0)