Skip to content

Commit 91b23a9

Browse files
dagnirdagnir
authored
Merge pull request #2211 from aws/dongie/e2-testing
Various fixes
2 parents f3a8ff9 + 7416cba commit 91b23a9

File tree

21 files changed

+469
-71
lines changed

21 files changed

+469
-71
lines changed

‎core/endpoints-spi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.247-SNAPSHOT</version>
23+
<version>2.17.294</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎test/codegen-generated-classes-test/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@
8080
<artifactId>metrics-spi</artifactId>
8181
<version>${awsjavasdk.version}</version>
8282
</dependency>
83+
<dependency>
84+
<groupId>software.amazon.awssdk</groupId>
85+
<artifactId>endpoints-spi</artifactId>
86+
<version>${awsjavasdk.version}</version>
87+
</dependency>
8388
<dependency>
8489
<groupId>software.amazon.awssdk</groupId>
8590
<artifactId>sdk-core</artifactId>

‎test/codegen-generated-classes-test/src/main/resources/codegen-resources/bearerauth/customization.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"skipEndpointTestGeneration": true
3+
}

‎test/codegen-generated-classes-test/src/main/resources/codegen-resources/bearerauth/endpoint-rule-set.json

Lines changed: 375 additions & 0 deletions
Large diffs are not rendered by default.

‎test/codegen-generated-classes-test/src/main/resources/codegen-resources/bearerauth/endpoint-tests.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"testCases": [
3+
],
4+
"version": "1.0"
5+
}

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/endpointproviders/AuthSchemeUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
3232
import software.amazon.awssdk.regions.Region;
3333
import software.amazon.awssdk.regions.RegionScope;
34-
import software.amazon.awssdk.services.restjsonendpointproviders.rules.internal.AuthSchemeUtils;
34+
import software.amazon.awssdk.services.restjsonendpointproviders.endpoints.internal.AuthSchemeUtils;
3535

3636
public class AuthSchemeUtilsTest {
3737
@Test

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/endpointproviders/AwsEndpointProviderUtilsTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
3535
import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
3636
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
37-
import software.amazon.awssdk.core.rules.model.Endpoint;
37+
import software.amazon.awssdk.endpoints.Endpoint;
3838
import software.amazon.awssdk.http.SdkHttpMethod;
3939
import software.amazon.awssdk.http.SdkHttpRequest;
4040
import software.amazon.awssdk.regions.Region;
4141
import software.amazon.awssdk.services.protocolquery.model.AllTypesRequest;
42-
import software.amazon.awssdk.services.restjsonendpointproviders.rules.internal.AwsEndpointProviderUtils;
43-
import software.amazon.awssdk.services.restjsonendpointproviders.rules.internal.Identifier;
44-
import software.amazon.awssdk.services.restjsonendpointproviders.rules.internal.Value;
42+
import software.amazon.awssdk.services.restjsonendpointproviders.endpoints.internal.AwsEndpointProviderUtils;
43+
import software.amazon.awssdk.services.restjsonendpointproviders.endpoints.internal.Identifier;
44+
import software.amazon.awssdk.services.restjsonendpointproviders.endpoints.internal.Value;
4545
import software.amazon.awssdk.utils.MapUtils;
4646

4747
public class AwsEndpointProviderUtilsTest {

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/endpointproviders/ClientBuilderTests.java

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@
2323
import static org.mockito.Mockito.when;
2424

2525
import java.net.URI;
26+
import java.util.concurrent.CompletableFuture;
2627
import org.junit.Test;
2728
import org.mockito.ArgumentCaptor;
2829
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
2930
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
3031
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
3132
import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
3233
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
33-
import software.amazon.awssdk.core.rules.model.Endpoint;
34+
import software.amazon.awssdk.endpoints.Endpoint;
3435
import software.amazon.awssdk.http.HttpExecuteRequest;
3536
import software.amazon.awssdk.http.SdkHttpClient;
3637
import software.amazon.awssdk.http.async.AsyncExecuteRequest;
@@ -40,8 +41,9 @@
4041
import software.amazon.awssdk.services.restjsonendpointproviders.RestJsonEndpointProvidersAsyncClientBuilder;
4142
import software.amazon.awssdk.services.restjsonendpointproviders.RestJsonEndpointProvidersClient;
4243
import software.amazon.awssdk.services.restjsonendpointproviders.RestJsonEndpointProvidersClientBuilder;
43-
import software.amazon.awssdk.services.restjsonendpointproviders.rules.RestJsonEndpointProvidersClientContextParams;
44-
import software.amazon.awssdk.services.restjsonendpointproviders.rules.RestJsonEndpointProvidersEndpointProvider;
44+
import software.amazon.awssdk.services.restjsonendpointproviders.endpoints.RestJsonEndpointProvidersClientContextParams;
45+
import software.amazon.awssdk.services.restjsonendpointproviders.endpoints.RestJsonEndpointProvidersEndpointParams;
46+
import software.amazon.awssdk.services.restjsonendpointproviders.endpoints.RestJsonEndpointProvidersEndpointProvider;
4547
import software.amazon.awssdk.utils.AttributeMap;
4648
import software.amazon.awssdk.utils.CompletableFutureUtils;
4749

@@ -54,9 +56,10 @@ public void syncBuilder_setCustomProvider_interceptorUsesProvider() {
5456

5557
when(mockClient.prepareRequest(any())).thenThrow(new RuntimeException("boom"));
5658

57-
when(mockProvider.resolveEndpoint(any())).thenReturn(Endpoint.builder()
58-
.url(URI.create("https://my-service.com"))
59-
.build());
59+
when(mockProvider.resolveEndpoint(any(RestJsonEndpointProvidersEndpointParams.class)))
60+
.thenReturn(CompletableFuture.completedFuture(Endpoint.builder()
61+
.url(URI.create("https://my-service.com"))
62+
.build()));
6063

6164
RestJsonEndpointProvidersClient client =
6265
RestJsonEndpointProvidersClient.builder()
@@ -70,7 +73,7 @@ public void syncBuilder_setCustomProvider_interceptorUsesProvider() {
7073
assertThatThrownBy(() -> client.operationWithNoInputOrOutput(r -> {
7174
})).hasMessageContaining("boom");
7275

73-
verify(mockProvider).resolveEndpoint(any());
76+
verify(mockProvider).resolveEndpoint(any(RestJsonEndpointProvidersEndpointParams.class));
7477

7578
ArgumentCaptor<HttpExecuteRequest> httpRequestCaptor = ArgumentCaptor.forClass(HttpExecuteRequest.class);
7679
verify(mockClient).prepareRequest(httpRequestCaptor.capture());
@@ -93,9 +96,10 @@ public void asyncBuilder_setCustomProvider_interceptorUsesProvider() {
9396
return CompletableFutureUtils.failedFuture(new RuntimeException());
9497
});
9598

96-
when(mockProvider.resolveEndpoint(any())).thenReturn(Endpoint.builder()
97-
.url(URI.create("https://my-service.com"))
98-
.build());
99+
when(mockProvider.resolveEndpoint(any(RestJsonEndpointProvidersEndpointParams.class)))
100+
.thenReturn(CompletableFuture.completedFuture(Endpoint.builder()
101+
.url(URI.create("https://my-service.com"))
102+
.build()));
99103

100104
RestJsonEndpointProvidersAsyncClient client =
101105
RestJsonEndpointProvidersAsyncClient.builder()
@@ -112,7 +116,7 @@ public void asyncBuilder_setCustomProvider_interceptorUsesProvider() {
112116
.hasRootCauseMessage("boom");
113117

114118

115-
verify(mockProvider).resolveEndpoint(any());
119+
verify(mockProvider).resolveEndpoint(any(RestJsonEndpointProvidersEndpointParams.class));
116120

117121
ArgumentCaptor<AsyncExecuteRequest> httpRequestCaptor = ArgumentCaptor.forClass(AsyncExecuteRequest.class);
118122
verify(mockClient).execute(httpRequestCaptor.capture());

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/endpointproviders/EndpointAuthSchemeInterceptorTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
import software.amazon.awssdk.core.interceptor.InterceptorContext;
3333
import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
3434
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
35-
import software.amazon.awssdk.core.rules.model.Endpoint;
3635
import software.amazon.awssdk.core.signer.Signer;
36+
import software.amazon.awssdk.endpoints.Endpoint;
3737
import software.amazon.awssdk.services.protocolquery.model.AllTypesRequest;
38-
import software.amazon.awssdk.services.protocolquery.rules.internal.ProtocolQueryEndpointAuthSchemeInterceptor;
38+
import software.amazon.awssdk.services.protocolquery.endpoints.internal.ProtocolQueryEndpointAuthSchemeInterceptor;
3939

4040
public class EndpointAuthSchemeInterceptorTest {
4141
private static final ExecutionInterceptor INTERCEPTOR = new ProtocolQueryEndpointAuthSchemeInterceptor();
@@ -47,8 +47,8 @@ public void modifyRequest_sigV4Scheme_overridesCorrectSigner() {
4747
SdkRequest request = AllTypesRequest.builder().build();
4848

4949
Endpoint endpoint = Endpoint.builder()
50-
.putAttribute(AwsEndpointAttribute.AUTH_SCHEMES, Arrays.asList(scheme))
51-
.build();
50+
.putAttribute(AwsEndpointAttribute.AUTH_SCHEMES, Arrays.asList(scheme))
51+
.build();
5252

5353
ExecutionAttributes attrs = new ExecutionAttributes();
5454
attrs.putAttribute(SdkInternalExecutionAttribute.RESOLVED_ENDPOINT, endpoint);

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/endpointproviders/EndpointInterceptorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
2626
import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
2727
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
28-
import software.amazon.awssdk.core.rules.model.Endpoint;
28+
import software.amazon.awssdk.endpoints.Endpoint;
2929
import software.amazon.awssdk.http.SdkHttpRequest;
3030
import software.amazon.awssdk.regions.Region;
3131
import software.amazon.awssdk.services.restjsonendpointproviders.RestJsonEndpointProvidersAsyncClient;

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/endpointproviders/ParametersTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
3131
import software.amazon.awssdk.regions.Region;
3232
import software.amazon.awssdk.services.restjsonendpointproviders.RestJsonEndpointProvidersClient;
33-
import software.amazon.awssdk.services.restjsonendpointproviders.rules.RestJsonEndpointProvidersEndpointParams;
34-
import software.amazon.awssdk.services.restjsonendpointproviders.rules.RestJsonEndpointProvidersEndpointProvider;
33+
import software.amazon.awssdk.services.restjsonendpointproviders.endpoints.RestJsonEndpointProvidersEndpointParams;
34+
import software.amazon.awssdk.services.restjsonendpointproviders.endpoints.RestJsonEndpointProvidersEndpointProvider;
3535

3636
public class ParametersTest {
3737
private static final AwsCredentialsProvider CREDENTIALS = StaticCredentialsProvider.create(
@@ -44,7 +44,8 @@ public class ParametersTest {
4444
@Before
4545
public void setup() {
4646
mockEndpointProvider = mock(RestJsonEndpointProvidersEndpointProvider.class);
47-
when(mockEndpointProvider.resolveEndpoint(any())).thenThrow(new RuntimeException("boom"));
47+
when(mockEndpointProvider.resolveEndpoint(any(RestJsonEndpointProvidersEndpointParams.class)))
48+
.thenThrow(new RuntimeException("boom"));
4849
}
4950

5051
@Test

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/rules/DefaultVisitor.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
package software.amazon.awssdk.services.rules;
22

33
import java.util.List;
4-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.BooleanEqualsFn;
5-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.EndpointResult;
6-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Expr;
7-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.ExprVisitor;
8-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Fn;
9-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.FnVisitor;
10-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.GetAttr;
11-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.IsSet;
12-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.IsValidHostLabel;
13-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.IsVirtualHostableS3Bucket;
14-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Literal;
15-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Not;
16-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.ParseArn;
17-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.ParseUrl;
18-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.PartitionFn;
19-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Ref;
20-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Rule;
21-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.RuleValueVisitor;
22-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.StringEqualsFn;
23-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Substring;
24-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.UriEncodeFn;
4+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.BooleanEqualsFn;
5+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.EndpointResult;
6+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Expr;
7+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.ExprVisitor;
8+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Fn;
9+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.FnVisitor;
10+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.GetAttr;
11+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.IsSet;
12+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.IsValidHostLabel;
13+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.IsVirtualHostableS3Bucket;
14+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Literal;
15+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Not;
16+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.ParseArn;
17+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.ParseUrl;
18+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.PartitionFn;
19+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Ref;
20+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Rule;
21+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.RuleValueVisitor;
22+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.StringEqualsFn;
23+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Substring;
24+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.UriEncodeFn;
2525

2626
public abstract class DefaultVisitor<R> implements RuleValueVisitor<R>, ExprVisitor<R>, FnVisitor<R> {
2727
public abstract R getDefault();

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/rules/EndpointTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import java.util.NoSuchElementException;
77
import java.util.Optional;
88
import software.amazon.awssdk.protocols.jsoncore.JsonNode;
9-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.EndpointRuleset;
10-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Identifier;
11-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Parameter;
12-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.ParameterType;
13-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.RuleEngine;
14-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.RuleError;
15-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Value;
9+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.EndpointRuleset;
10+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Identifier;
11+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Parameter;
12+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.ParameterType;
13+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.RuleEngine;
14+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.RuleError;
15+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Value;
1616
import software.amazon.awssdk.utils.Pair;
1717

1818
public class EndpointTest {

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/rules/EndpointTestSuite.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.List;
55
import java.util.Map;
66
import software.amazon.awssdk.protocols.jsoncore.JsonNode;
7-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.EndpointRuleset;
7+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.EndpointRuleset;
88

99
public class EndpointTestSuite {
1010
public static final String SERVICE = "service";

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/rules/IntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.junit.jupiter.params.ParameterizedTest;
2929
import org.junit.jupiter.params.provider.MethodSource;
3030
import software.amazon.awssdk.protocols.jsoncore.JsonNode;
31-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.EndpointRuleset;
31+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.EndpointRuleset;
3232
import software.amazon.awssdk.services.rules.testutil.TestDiscovery;
3333

3434
@TestInstance(TestInstance.Lifecycle.PER_CLASS)

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/rules/RuleEngineTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import org.junit.jupiter.api.Test;
2323
import software.amazon.awssdk.protocols.jsoncore.JsonNode;
2424
import software.amazon.awssdk.protocols.jsoncore.JsonNodeParser;
25-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.EndpointRuleset;
26-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Identifier;
27-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.RuleEngine;
28-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Value;
25+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.EndpointRuleset;
26+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Identifier;
27+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.RuleEngine;
28+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Value;
2929
import software.amazon.awssdk.utils.MapUtils;
3030

3131
public class RuleEngineTest {

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/rules/TraversingVisitor.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import java.util.List;
44
import java.util.stream.Stream;
5-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Condition;
6-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.EndpointResult;
7-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.EndpointRuleset;
8-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Expr;
9-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Fn;
10-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Rule;
5+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Condition;
6+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.EndpointResult;
7+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.EndpointRuleset;
8+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Expr;
9+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Fn;
10+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Rule;
1111

1212
public abstract class TraversingVisitor<R> extends DefaultVisitor<Stream<R>> {
1313
public Stream<R> visitRuleset(EndpointRuleset ruleset) {

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/rules/ValidateUriScheme.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import java.util.List;
44
import java.util.Map;
55
import java.util.stream.Stream;
6-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.EndpointResult;
7-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Identifier;
8-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Literal;
9-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.Template;
6+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.EndpointResult;
7+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Identifier;
8+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Literal;
9+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.Template;
1010

1111
/**
1212
* Validate that URIs start with a scheme

‎test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/rules/testutil/TestDiscovery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.util.stream.Collectors;
1414
import java.util.stream.Stream;
1515
import software.amazon.awssdk.protocols.jsoncore.JsonNode;
16-
import software.amazon.awssdk.services.protocolrestjson.rules.internal.EndpointRuleset;
16+
import software.amazon.awssdk.services.protocolrestjson.endpoints.internal.EndpointRuleset;
1717
import software.amazon.awssdk.services.rules.EndpointTest;
1818
import software.amazon.awssdk.services.rules.EndpointTestSuite;
1919

0 commit comments

Comments
 (0)