Skip to content

Changed GeneratedServiceMetadataProvider to lazily load elements. Updated unit tests based to reflect changes. #3686

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

Closed
awmcc90 wants to merge 1 commit into from
+563 −159
Closed

Changed GeneratedServiceMetadataProvider to lazily load elements. Updated unit tests based to reflect changes. #3686

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
50 changes: 36 additions & 14 deletions ...in/java/software/amazon/awssdk/codegen/lite/regions/ServiceMetadataProviderGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@

import com.squareup.javapoet.AnnotationSpec;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock;
import com.squareup.javapoet.FieldSpec;
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeName;
import com.squareup.javapoet.TypeSpec;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
Expand All @@ -38,7 +38,6 @@
import software.amazon.awssdk.codegen.lite.PoetClass;
import software.amazon.awssdk.codegen.lite.Utils;
import software.amazon.awssdk.codegen.lite.regions.model.Partitions;
import software.amazon.awssdk.utils.ImmutableMap;

public class ServiceMetadataProviderGenerator implements PoetClass {

Expand All @@ -47,8 +46,8 @@ public class ServiceMetadataProviderGenerator implements PoetClass {
private final String regionBasePackage;

public ServiceMetadataProviderGenerator(Partitions partitions,
String basePackage,
String regionBasePackage) {
String basePackage,
String regionBasePackage) {
this.partitions = partitions;
this.basePackage = basePackage;
this.regionBasePackage = regionBasePackage;
Expand All @@ -57,8 +56,8 @@ public ServiceMetadataProviderGenerator(Partitions partitions,
@Override
public TypeSpec poetClass() {
TypeName mapOfServiceMetadata = ParameterizedTypeName.get(ClassName.get(Map.class),
ClassName.get(String.class),
ClassName.get(regionBasePackage, "ServiceMetadata"));
ClassName.get(String.class),
ClassName.get(regionBasePackage, "ServiceMetadata"));
return TypeSpec.classBuilder(className())
.addModifiers(PUBLIC)
.addSuperinterface(ClassName.get(regionBasePackage, "ServiceMetadataProvider"))
Expand All @@ -69,8 +68,10 @@ public TypeSpec poetClass() {
.addModifiers(FINAL)
.addField(FieldSpec.builder(mapOfServiceMetadata, "SERVICE_METADATA")
.addModifiers(PRIVATE, FINAL, STATIC)
.initializer(regions(partitions))
.initializer("new $T<>()", HashMap.class)
.build())
.addMethod(createServiceMetadata(partitions))
.addMethod(getServiceMetadata())
.addMethod(getter())
.build();
}
Expand All @@ -80,22 +81,29 @@ public ClassName className() {
return ClassName.get(regionBasePackage, "GeneratedServiceMetadataProvider");
}

private CodeBlock regions(Partitions partitions) {
CodeBlock.Builder builder = CodeBlock.builder().add("$T.<String, ServiceMetadata>builder()", ImmutableMap.class);
private MethodSpec createServiceMetadata(Partitions partitions) {
MethodSpec.Builder builder = MethodSpec.methodBuilder("createServiceMetadata")
.addModifiers(PRIVATE, STATIC)
.addParameter(String.class, "endpointPrefix")
.returns(ClassName.get(regionBasePackage, "ServiceMetadata"))
.beginControlFlow("switch ($L)", "endpointPrefix");

Set<String> seenServices = new HashSet<>();

partitions.getPartitions()
.forEach(p -> p.getServices()
.keySet()
.forEach(s -> {
if (!seenServices.contains(s)) {
builder.add(".put($S, new $T())", s, serviceMetadataClass(s));
builder.addCode("$>case $S:\n", s);
builder.addStatement("$>$>return new $T()", serviceMetadataClass(s));
seenServices.add(s);
}
}));

return builder.add(".build()").build();
return builder.addCode("$>default:\n")
.addStatement("$>$>throw new $T(\"Unexpected value: \" + $L)", IllegalStateException.class,
"endpointPrefix")
.endControlFlow()
.build();
}

private ClassName serviceMetadataClass(String service) {
Expand All @@ -109,12 +117,26 @@ private ClassName serviceMetadataClass(String service) {
.collect(Collectors.joining()) + "ServiceMetadata");
}

private MethodSpec getServiceMetadata() {
return MethodSpec.methodBuilder("getServiceMetadata")
.addModifiers(PRIVATE, STATIC)
.addParameter(String.class, "endpointPrefix")
.returns(ClassName.get(regionBasePackage, "ServiceMetadata"))
.beginControlFlow("if (!$L.containsKey($L))", "SERVICE_METADATA", "endpointPrefix")
.addStatement("$L.put($L, createServiceMetadata($L))", "SERVICE_METADATA", "endpointPrefix",
"endpointPrefix")
.endControlFlow()
.addStatement("return $L.get($L)", "SERVICE_METADATA", "endpointPrefix")
.build();
}

private MethodSpec getter() {
return MethodSpec.methodBuilder("serviceMetadata")
.addAnnotation(Override.class)
.addModifiers(PUBLIC)
.addParameter(String.class, "endpointPrefix")
.returns(ClassName.get(regionBasePackage, "ServiceMetadata"))
.addStatement("return $L.get($L)", "SERVICE_METADATA", "endpointPrefix")
.addStatement("return getServiceMetadata($L)", "endpointPrefix")
.build();
}
}
Loading