Update codegen test cases after Skip rules based endpoints for most s…

…ervices
aws · Oct 26, 2022 · 8a92319 · 8a92319
1 parent fb41541
commit 8a92319
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 97 deletions.
diff --git a/...esources/software/amazon/awssdk/codegen/poet/builder/test-async-client-builder-class.java b/...esources/software/amazon/awssdk/codegen/poet/builder/test-async-client-builder-class.java
@@ -4,8 +4,6 @@
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.token.credentials.SdkTokenProvider;
 import software.amazon.awssdk.awscore.client.config.AwsClientOption;
-import software.amazon.awssdk.core.client.config.SdkClientOption;
-import software.amazon.awssdk.services.json.endpoints.JsonEndpointProvider;
 
 /**
  * Internal implementation of {@link JsonAsyncClientBuilder}.
@@ -14,12 +12,6 @@
 @SdkInternalApi
 final class DefaultJsonAsyncClientBuilder extends DefaultJsonBaseClientBuilder<JsonAsyncClientBuilder, JsonAsyncClient> implements
                                                                                                                         JsonAsyncClientBuilder {
-    @Override
-    public DefaultJsonAsyncClientBuilder endpointProvider(JsonEndpointProvider endpointProvider) {
-        clientConfiguration.option(SdkClientOption.ENDPOINT_PROVIDER, endpointProvider);
-        return this;
-    }
-
     @Override
     public DefaultJsonAsyncClientBuilder tokenProvider(SdkTokenProvider tokenProvider) {
         clientConfiguration.option(AwsClientOption.TOKEN_PROVIDER, tokenProvider);

diff --git a/...es/software/amazon/awssdk/codegen/poet/builder/test-bearer-auth-client-builder-class.java b/...es/software/amazon/awssdk/codegen/poet/builder/test-bearer-auth-client-builder-class.java
@@ -15,10 +15,6 @@
 import software.amazon.awssdk.core.interceptor.ClasspathInterceptorChainFactory;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.core.signer.Signer;
-import software.amazon.awssdk.services.json.endpoints.JsonEndpointProvider;
-import software.amazon.awssdk.services.json.endpoints.internal.JsonEndpointAuthSchemeInterceptor;
-import software.amazon.awssdk.services.json.endpoints.internal.JsonRequestSetEndpointInterceptor;
-import software.amazon.awssdk.services.json.endpoints.internal.JsonResolveEndpointInterceptor;
 import software.amazon.awssdk.utils.CollectionUtils;
 
 /**
@@ -39,18 +35,14 @@ protected final String serviceName() {
 
     @Override
     protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfiguration config) {
-        return config.merge(c -> c.option(SdkClientOption.ENDPOINT_PROVIDER, defaultEndpointProvider())
-                                  .option(SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED, false)
+        return config.merge(c -> c.option(SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED, false)
                                   .option(AwsClientOption.TOKEN_PROVIDER, defaultTokenProvider())
                                   .option(SdkAdvancedClientOption.TOKEN_SIGNER, defaultTokenSigner()));
     }
 
     @Override
     protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
         List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
-        endpointInterceptors.add(new JsonResolveEndpointInterceptor());
-        endpointInterceptors.add(new JsonEndpointAuthSchemeInterceptor());
-        endpointInterceptors.add(new JsonRequestSetEndpointInterceptor());
         ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
         List<ExecutionInterceptor> interceptors = interceptorFactory
             .getInterceptors("software/amazon/awssdk/services/json/execution.interceptors");
@@ -66,15 +58,11 @@ protected final String signingName() {
         return "json-service";
     }
 
-    private JsonEndpointProvider defaultEndpointProvider() {
-        return JsonEndpointProvider.defaultProvider();
-    }
-
     private SdkTokenProvider defaultTokenProvider() {
         return DefaultAwsTokenProvider.create();
     }
 
     private Signer defaultTokenSigner() {
         return BearerTokenSigner.create();
     }
-}
+}
diff --git a/...oftware/amazon/awssdk/codegen/poet/builder/test-bearer-auth-client-builder-interface.java b/...oftware/amazon/awssdk/codegen/poet/builder/test-bearer-auth-client-builder-interface.java
@@ -3,20 +3,13 @@
 import software.amazon.awssdk.annotations.Generated;
 import software.amazon.awssdk.auth.token.credentials.SdkTokenProvider;
 import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder;
-import software.amazon.awssdk.services.json.endpoints.JsonEndpointProvider;
 
 /**
  * This includes configuration specific to Json Service that is supported by both {@link JsonClientBuilder} and
  * {@link JsonAsyncClientBuilder}.
  */
 @Generated("software.amazon.awssdk:codegen")
 public interface JsonBaseClientBuilder<B extends JsonBaseClientBuilder<B, C>, C> extends AwsClientBuilder<B, C> {
-    /**
-     * Set the {@link JsonEndpointProvider} implementation that will be used by the client to determine the endpoint for
-     * each request. This is optional; if none is provided a default implementation will be used the SDK.
-     */
-    B endpointProvider(JsonEndpointProvider endpointProvider);
-
     /**
      * Set the token provider to use for bearer token authorization. This is optional, if none is provided, the SDK will
      * use {@link software.amazon.awssdk.auth.token.credentials.aws.DefaultAwsTokenProvider}.
@@ -29,4 +22,4 @@ public interface JsonBaseClientBuilder<B extends JsonBaseClientBuilder<B, C>, C>
      * default it is {@link software.amazon.awssdk.auth.token.signer.aws.BearerTokenSigner}.
      */
     B tokenProvider(SdkTokenProvider tokenProvider);
-}
+}
diff --git a/...test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-class.java b/...test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-class.java
@@ -19,10 +19,6 @@
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.core.signer.Signer;
 import software.amazon.awssdk.services.json.endpoints.JsonClientContextParams;
-import software.amazon.awssdk.services.json.endpoints.JsonEndpointProvider;
-import software.amazon.awssdk.services.json.endpoints.internal.JsonEndpointAuthSchemeInterceptor;
-import software.amazon.awssdk.services.json.endpoints.internal.JsonRequestSetEndpointInterceptor;
-import software.amazon.awssdk.services.json.endpoints.internal.JsonResolveEndpointInterceptor;
 import software.amazon.awssdk.utils.AttributeMap;
 import software.amazon.awssdk.utils.CollectionUtils;
 import software.amazon.awssdk.utils.Validate;
@@ -45,8 +41,7 @@ protected final String serviceName() {
 
     @Override
     protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfiguration config) {
-        return config.merge(c -> c.option(SdkClientOption.ENDPOINT_PROVIDER, defaultEndpointProvider())
-                                  .option(SdkAdvancedClientOption.SIGNER, defaultSigner())
+        return config.merge(c -> c.option(SdkAdvancedClientOption.SIGNER, defaultSigner())
                                   .option(SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED, false)
                                   .option(SdkClientOption.SERVICE_CONFIGURATION, ServiceConfiguration.builder().build())
                                   .option(AwsClientOption.TOKEN_PROVIDER, defaultTokenProvider())
@@ -56,9 +51,6 @@ protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfigurati
     @Override
     protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
         List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
-        endpointInterceptors.add(new JsonResolveEndpointInterceptor());
-        endpointInterceptors.add(new JsonEndpointAuthSchemeInterceptor());
-        endpointInterceptors.add(new JsonRequestSetEndpointInterceptor());
         ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
         List<ExecutionInterceptor> interceptors = interceptorFactory
             .getInterceptors("software/amazon/awssdk/services/json/execution.interceptors");
@@ -137,10 +129,6 @@ protected final String signingName() {
         return "json-service";
     }
 
-    private JsonEndpointProvider defaultEndpointProvider() {
-        return JsonEndpointProvider.defaultProvider();
-    }
-
     public B serviceConfiguration(ServiceConfiguration serviceConfiguration) {
         clientConfiguration.option(SdkClientOption.SERVICE_CONFIGURATION, serviceConfiguration);
         return thisBuilder();

diff --git a/.../resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-interface.java b/.../resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-interface.java
@@ -4,7 +4,6 @@
 import software.amazon.awssdk.annotations.Generated;
 import software.amazon.awssdk.auth.token.credentials.SdkTokenProvider;
 import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder;
-import software.amazon.awssdk.services.json.endpoints.JsonEndpointProvider;
 
 /**
  * This includes configuration specific to Json Service that is supported by both {@link JsonClientBuilder} and
@@ -18,12 +17,6 @@ default B serviceConfiguration(Consumer<ServiceConfiguration.Builder> serviceCon
         return serviceConfiguration(ServiceConfiguration.builder().applyMutation(serviceConfiguration).build());
     }
 
-    /**
-     * Set the {@link JsonEndpointProvider} implementation that will be used by the client to determine the endpoint for
-     * each request. This is optional; if none is provided a default implementation will be used the SDK.
-     */
-    B endpointProvider(JsonEndpointProvider endpointProvider);
-
     /**
      * Set the token provider to use for bearer token authorization. This is optional, if none is provided, the SDK will
      * use {@link software.amazon.awssdk.auth.token.credentials.aws.DefaultAwsTokenProvider}.

diff --git a/...tware/amazon/awssdk/codegen/poet/builder/test-client-builder-internal-defaults-class.java b/...tware/amazon/awssdk/codegen/poet/builder/test-client-builder-internal-defaults-class.java
@@ -13,10 +13,6 @@
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.core.signer.Signer;
-import software.amazon.awssdk.services.json.endpoints.JsonEndpointProvider;
-import software.amazon.awssdk.services.json.endpoints.internal.JsonEndpointAuthSchemeInterceptor;
-import software.amazon.awssdk.services.json.endpoints.internal.JsonRequestSetEndpointInterceptor;
-import software.amazon.awssdk.services.json.endpoints.internal.JsonResolveEndpointInterceptor;
 import software.amazon.awssdk.utils.CollectionUtils;
 
 /**
@@ -37,9 +33,8 @@ protected final String serviceName() {
 
     @Override
     protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfiguration config) {
-        return config.merge(c -> c.option(SdkClientOption.ENDPOINT_PROVIDER, defaultEndpointProvider())
-                                  .option(SdkAdvancedClientOption.SIGNER, defaultSigner())
-                                  .option(SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED, false));
+        return config.merge(c -> c.option(SdkAdvancedClientOption.SIGNER, defaultSigner()).option(
+            SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED, false));
     }
 
     @Override
@@ -53,9 +48,6 @@ protected final SdkClientConfiguration mergeInternalDefaults(SdkClientConfigurat
     @Override
     protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
         List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
-        endpointInterceptors.add(new JsonResolveEndpointInterceptor());
-        endpointInterceptors.add(new JsonEndpointAuthSchemeInterceptor());
-        endpointInterceptors.add(new JsonRequestSetEndpointInterceptor());
         ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
         List<ExecutionInterceptor> interceptors = interceptorFactory
             .getInterceptors("software/amazon/awssdk/services/json/execution.interceptors");
@@ -74,8 +66,4 @@ private Signer defaultSigner() {
     protected final String signingName() {
         return "json-service";
     }
-
-    private JsonEndpointProvider defaultEndpointProvider() {
-        return JsonEndpointProvider.defaultProvider();
-    }
 }
diff --git a/...esources/software/amazon/awssdk/codegen/poet/builder/test-query-client-builder-class.java b/...esources/software/amazon/awssdk/codegen/poet/builder/test-query-client-builder-class.java
@@ -17,11 +17,6 @@
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.core.signer.Signer;
 import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
-import software.amazon.awssdk.services.query.endpoints.QueryClientContextParams;
-import software.amazon.awssdk.services.query.endpoints.QueryEndpointProvider;
-import software.amazon.awssdk.services.query.endpoints.internal.QueryEndpointAuthSchemeInterceptor;
-import software.amazon.awssdk.services.query.endpoints.internal.QueryRequestSetEndpointInterceptor;
-import software.amazon.awssdk.services.query.endpoints.internal.QueryResolveEndpointInterceptor;
 import software.amazon.awssdk.utils.CollectionUtils;
 
 /**
@@ -42,8 +37,7 @@ protected final String serviceName() {
 
     @Override
     protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfiguration config) {
-        return config.merge(c -> c.option(SdkClientOption.ENDPOINT_PROVIDER, defaultEndpointProvider())
-                                  .option(SdkAdvancedClientOption.SIGNER, defaultSigner())
+        return config.merge(c -> c.option(SdkAdvancedClientOption.SIGNER, defaultSigner())
                                   .option(SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED, false)
                                   .option(AwsClientOption.TOKEN_PROVIDER, defaultTokenProvider())
                                   .option(SdkAdvancedClientOption.TOKEN_SIGNER, defaultTokenSigner()));
@@ -52,9 +46,6 @@ protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfigurati
     @Override
     protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
         List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
-        endpointInterceptors.add(new QueryResolveEndpointInterceptor());
-        endpointInterceptors.add(new QueryEndpointAuthSchemeInterceptor());
-        endpointInterceptors.add(new QueryRequestSetEndpointInterceptor());
         ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
         List<ExecutionInterceptor> interceptors = interceptorFactory
             .getInterceptors("software/amazon/awssdk/services/query/execution.interceptors");
@@ -76,25 +67,11 @@ protected final String signingName() {
         return "query-service";
     }
 
-    private QueryEndpointProvider defaultEndpointProvider() {
-        return QueryEndpointProvider.defaultProvider();
-    }
-
-    public B booleanContextParam(Boolean booleanContextParam) {
-        clientContextParams.put(QueryClientContextParams.BOOLEAN_CONTEXT_PARAM, booleanContextParam);
-        return thisBuilder();
-    }
-
-    public B stringContextParam(String stringContextParam) {
-        clientContextParams.put(QueryClientContextParams.STRING_CONTEXT_PARAM, stringContextParam);
-        return thisBuilder();
-    }
-
     private SdkTokenProvider defaultTokenProvider() {
         return DefaultAwsTokenProvider.create();
     }
 
     private Signer defaultTokenSigner() {
         return BearerTokenSigner.create();
     }
-}
+}
diff --git a/...resources/software/amazon/awssdk/codegen/poet/builder/test-sync-client-builder-class.java b/...resources/software/amazon/awssdk/codegen/poet/builder/test-sync-client-builder-class.java
@@ -4,8 +4,6 @@
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.token.credentials.SdkTokenProvider;
 import software.amazon.awssdk.awscore.client.config.AwsClientOption;
-import software.amazon.awssdk.core.client.config.SdkClientOption;
-import software.amazon.awssdk.services.json.endpoints.JsonEndpointProvider;
 
 /**
  * Internal implementation of {@link JsonClientBuilder}.
@@ -14,12 +12,6 @@
 @SdkInternalApi
 final class DefaultJsonClientBuilder extends DefaultJsonBaseClientBuilder<JsonClientBuilder, JsonClient> implements
                                                                                                          JsonClientBuilder {
-    @Override
-    public DefaultJsonClientBuilder endpointProvider(JsonEndpointProvider endpointProvider) {
-        clientConfiguration.option(SdkClientOption.ENDPOINT_PROVIDER, endpointProvider);
-        return this;
-    }
-
     @Override
     public DefaultJsonClientBuilder tokenProvider(SdkTokenProvider tokenProvider) {
         clientConfiguration.option(AwsClientOption.TOKEN_PROVIDER, tokenProvider);