Skip to content

[EndpointUri PR 3/4] Update codegen to use the EndpointUrl #7160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alextwoods wants to merge 1 commit into
base: feature/master/endpoint-remove-uri
Choose a base branch
from
Open

[EndpointUri PR 3/4] Update codegen to use the EndpointUrl #7160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointProviderSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import com.squareup.javapoet.TypeSpec;
import com.squareup.javapoet.TypeVariableName;
import com.squareup.javapoet.WildcardTypeName;
import java.net.URI;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand All @@ -42,6 +41,7 @@
import software.amazon.awssdk.codegen.poet.PoetUtils;
import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.endpoints.Endpoint;
import software.amazon.awssdk.endpoints.EndpointUrl;
import software.amazon.awssdk.utils.CompletableFutureUtils;
import software.amazon.awssdk.utils.Logger;
import software.amazon.awssdk.utils.Validate;
Expand Down Expand Up @@ -127,7 +127,7 @@ private MethodSpec valueAsEndpointOrThrowMethodSpec() {
.addStatement("$T endpoint = $N.expectEndpoint()",
endpointRulesSpecUtils.rulesRuntimeClassName("Value.Endpoint"), valueParamName)
.addStatement("$T builder = Endpoint.builder()", Endpoint.Builder.class)
.addStatement("builder.url($T.create(endpoint.getUrl()))", URI.class)
.addStatement("builder.endpointUrl($T.fromString(endpoint.getUrl()))", EndpointUrl.class)
.addStatement("$T headers = endpoint.getHeaders()",
ParameterizedTypeName.get(ClassName.get(Map.class),
TypeName.get(String.class),
Expand Down
9 changes: 2 additions & 7 deletions codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules2/CodeGeneratorVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock;
import java.net.URI;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
Expand All @@ -29,7 +28,7 @@
import software.amazon.awssdk.awscore.endpoints.authscheme.SigV4aAuthScheme;
import software.amazon.awssdk.codegen.model.config.customization.KeyTypePair;
import software.amazon.awssdk.endpoints.Endpoint;
import software.amazon.awssdk.utils.uri.SdkUri;
import software.amazon.awssdk.endpoints.EndpointUrl;

public class CodeGeneratorVisitor extends WalkRuleExpressionVisitor {
private static final Logger log = LoggerFactory.getLogger(CodeGeneratorVisitor.class);
Expand Down Expand Up @@ -333,11 +332,7 @@ private String callParams(String ruleId) {
@Override
public Void visitEndpointExpression(EndpointExpression e) {
builder.add("return $T.endpoint(", typeMirror.rulesResult().type());
if (endpointCaching) {
builder.add("$T.builder().url($T.getInstance().create(", Endpoint.class, SdkUri.class);
} else {
builder.add("$T.builder().url($T.create(", Endpoint.class, URI.class);
}
builder.add("$T.builder().endpointUrl($T.fromString(", Endpoint.class, EndpointUrl.class);
e.url().accept(this);
builder.add("))");
e.headers().accept(this);
Expand Down
604 changes: 302 additions & 302 deletions ...src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-provider-class.java
View file
Open in desktop

Large diffs are not rendered by default.

582 changes: 291 additions & 291 deletions ...software/amazon/awssdk/codegen/poet/rules/endpoint-provider-know-prop-override-class.java
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions ...rc/test/resources/software/amazon/awssdk/codegen/poet/rules2/endpoint-provider-class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package software.amazon.awssdk.services.query.endpoints.internal;

import java.net.URI;
import java.util.Arrays;
import java.util.concurrent.CompletableFuture;
import software.amazon.awssdk.annotations.Generated;
Expand All @@ -10,6 +9,7 @@
import software.amazon.awssdk.awscore.endpoints.authscheme.SigV4aAuthScheme;
import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.endpoints.Endpoint;
import software.amazon.awssdk.endpoints.EndpointUrl;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.query.endpoints.QueryEndpointParams;
import software.amazon.awssdk.services.query.endpoints.QueryEndpointProvider;
Expand Down Expand Up @@ -66,7 +66,7 @@ private static RuleResult endpointRule1(QueryEndpointParams params, String regio
if (parsedArn != null) {
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://" + params.endpointId() + ".query."
.endpointUrl(EndpointUrl.fromString("https://" + params.endpointId() + ".query."
+ partitionResult.dualStackDnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Expand All @@ -87,15 +87,15 @@ private static RuleResult endpointRule2(QueryEndpointParams params, RulePartitio
if (params.useFipsEndpoint() == null && params.useDualStackEndpoint() != null && params.useDualStackEndpoint()) {
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://" + params.endpointId() + ".query." + partitionResult.dualStackDnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://" + params.endpointId() + ".query." + partitionResult.dualStackDnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query")
.signingRegionSet(Arrays.asList("*")).build())).build());
}
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://" + params.endpointId() + ".query." + partitionResult.dnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://" + params.endpointId() + ".query." + partitionResult.dnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query").signingRegionSet(Arrays.asList("*"))
Expand All @@ -109,7 +109,7 @@ private static RuleResult endpointRule6(QueryEndpointParams params, String regio
if (params.useFipsEndpoint() != null && params.useFipsEndpoint() && params.useDualStackEndpoint() == null) {
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://query-fips." + region + "." + partitionResult.dnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://query-fips." + region + "." + partitionResult.dnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query")
Expand All @@ -118,7 +118,7 @@ private static RuleResult endpointRule6(QueryEndpointParams params, String regio
if (params.useDualStackEndpoint() != null && params.useDualStackEndpoint() && params.useFipsEndpoint() == null) {
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://query." + region + "." + partitionResult.dualStackDnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://query." + region + "." + partitionResult.dualStackDnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query")
Expand All @@ -129,14 +129,14 @@ private static RuleResult endpointRule6(QueryEndpointParams params, String regio
&& params.useFipsEndpoint()) {
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://query-fips." + region + "." + partitionResult.dualStackDnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://query-fips." + region + "." + partitionResult.dualStackDnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query")
.signingRegionSet(Arrays.asList("*")).build())).build());
}
return RuleResult.endpoint(Endpoint.builder()
.url(URI.create("https://query." + region + "." + partitionResult.dnsSuffix())).build());
.endpointUrl(EndpointUrl.fromString("https://query." + region + "." + partitionResult.dnsSuffix())).build());
}
return RuleResult.carryOn();
}
Expand Down
16 changes: 8 additions & 8 deletions ...oftware/amazon/awssdk/codegen/poet/rules2/endpoint-provider-know-prop-override-class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package software.amazon.awssdk.services.query.endpoints.internal;

import java.net.URI;
import java.util.Arrays;
import java.util.concurrent.CompletableFuture;
import software.amazon.awssdk.annotations.Generated;
Expand All @@ -10,6 +9,7 @@
import software.amazon.awssdk.awscore.endpoints.authscheme.SigV4aAuthScheme;
import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.endpoints.Endpoint;
import software.amazon.awssdk.endpoints.EndpointUrl;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.query.endpoints.QueryEndpointParams;
import software.amazon.awssdk.services.query.endpoints.QueryEndpointProvider;
Expand Down Expand Up @@ -66,7 +66,7 @@ private static RuleResult endpointRule1(QueryEndpointParams params, String regio
if (parsedArn != null) {
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://" + params.endpointId() + ".query."
.endpointUrl(EndpointUrl.fromString("https://" + params.endpointId() + ".query."
+ partitionResult.dualStackDnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Expand All @@ -87,15 +87,15 @@ private static RuleResult endpointRule2(QueryEndpointParams params, RulePartitio
if (params.useFipsEndpoint() == null && params.useDualStackEndpoint() != null && params.useDualStackEndpoint()) {
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://" + params.endpointId() + ".query." + partitionResult.dualStackDnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://" + params.endpointId() + ".query." + partitionResult.dualStackDnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query")
.signingRegionSet(Arrays.asList("*")).build())).build());
}
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://" + params.endpointId() + ".query." + partitionResult.dnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://" + params.endpointId() + ".query." + partitionResult.dnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query").signingRegionSet(Arrays.asList("*"))
Expand All @@ -109,7 +109,7 @@ private static RuleResult endpointRule6(QueryEndpointParams params, String regio
if (params.useFipsEndpoint() != null && params.useFipsEndpoint() && params.useDualStackEndpoint() == null) {
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://query-fips." + region + "." + partitionResult.dnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://query-fips." + region + "." + partitionResult.dnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query")
Expand All @@ -118,7 +118,7 @@ private static RuleResult endpointRule6(QueryEndpointParams params, String regio
if (params.useDualStackEndpoint() != null && params.useDualStackEndpoint() && params.useFipsEndpoint() == null) {
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://query." + region + "." + partitionResult.dualStackDnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://query." + region + "." + partitionResult.dualStackDnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query")
Expand All @@ -129,14 +129,14 @@ private static RuleResult endpointRule6(QueryEndpointParams params, String regio
&& params.useFipsEndpoint()) {
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://query-fips." + region + "." + partitionResult.dualStackDnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://query-fips." + region + "." + partitionResult.dualStackDnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query")
.signingRegionSet(Arrays.asList("*")).build())).build());
}
return RuleResult.endpoint(Endpoint.builder()
.url(URI.create("https://query." + region + "." + partitionResult.dnsSuffix())).build());
.endpointUrl(EndpointUrl.fromString("https://query." + region + "." + partitionResult.dnsSuffix())).build());
}
return RuleResult.carryOn();
}
Expand Down
14 changes: 7 additions & 7 deletions ...ces/software/amazon/awssdk/codegen/poet/rules2/endpoint-provider-metric-values-class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package software.amazon.awssdk.services.query.endpoints.internal;

import java.net.URI;
import java.util.Arrays;
import java.util.concurrent.CompletableFuture;
import software.amazon.awssdk.annotations.Generated;
Expand All @@ -10,6 +9,7 @@
import software.amazon.awssdk.awscore.endpoints.authscheme.SigV4aAuthScheme;
import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.endpoints.Endpoint;
import software.amazon.awssdk.endpoints.EndpointUrl;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.query.endpoints.QueryEndpointParams;
import software.amazon.awssdk.services.query.endpoints.QueryEndpointProvider;
Expand Down Expand Up @@ -70,15 +70,15 @@ private static RuleResult endpointRule2(QueryEndpointParams params, RulePartitio
if (params.useFipsEndpoint() == null && params.useDualStackEndpoint() != null && params.useDualStackEndpoint()) {
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://" + params.endpointId() + ".query." + partitionResult.dualStackDnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://" + params.endpointId() + ".query." + partitionResult.dualStackDnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query")
.signingRegionSet(Arrays.asList("*")).build())).build());
}
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://" + params.endpointId() + ".query." + partitionResult.dnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://" + params.endpointId() + ".query." + partitionResult.dnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query").signingRegionSet(Arrays.asList("*"))
Expand All @@ -92,7 +92,7 @@ private static RuleResult endpointRule6(QueryEndpointParams params, String regio
if (params.useFipsEndpoint() != null && params.useFipsEndpoint() && params.useDualStackEndpoint() == null) {
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://query-fips." + region + "." + partitionResult.dnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://query-fips." + region + "." + partitionResult.dnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query")
Expand All @@ -101,7 +101,7 @@ private static RuleResult endpointRule6(QueryEndpointParams params, String regio
if (params.useDualStackEndpoint() != null && params.useDualStackEndpoint() && params.useFipsEndpoint() == null) {
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://query." + region + "." + partitionResult.dualStackDnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://query." + region + "." + partitionResult.dualStackDnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query")
Expand All @@ -112,14 +112,14 @@ private static RuleResult endpointRule6(QueryEndpointParams params, String regio
&& params.useFipsEndpoint()) {
return RuleResult.endpoint(Endpoint
.builder()
.url(URI.create("https://query-fips." + region + "." + partitionResult.dualStackDnsSuffix()))
.endpointUrl(EndpointUrl.fromString("https://query-fips." + region + "." + partitionResult.dualStackDnsSuffix()))
.putAttribute(
AwsEndpointAttribute.AUTH_SCHEMES,
Arrays.asList(SigV4aAuthScheme.builder().signingName("query")
.signingRegionSet(Arrays.asList("*")).build())).build());
}
return RuleResult.endpoint(Endpoint.builder()
.url(URI.create("https://query." + region + "." + partitionResult.dnsSuffix())).build());
.endpointUrl(EndpointUrl.fromString("https://query." + region + "." + partitionResult.dnsSuffix())).build());
}
return RuleResult.carryOn();
}
Expand Down
Loading
Loading