Skip to content

Commit 9abd847

Browse files
alextwoodsalextwoods
committed
Replace authprovider builder with overridden defaultProvider method
1 parent 729abbb commit 9abd847

15 files changed

Lines changed: 30 additions & 165 deletions

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/auth/scheme/AuthSchemeProviderSpec.java‎

Lines changed: 12 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,13 @@
1717

1818
import com.squareup.javapoet.ClassName;
1919
import com.squareup.javapoet.CodeBlock;
20-
import com.squareup.javapoet.FieldSpec;
2120
import com.squareup.javapoet.MethodSpec;
2221
import com.squareup.javapoet.ParameterizedTypeName;
2322
import com.squareup.javapoet.TypeName;
2423
import com.squareup.javapoet.TypeSpec;
25-
import java.util.ArrayList;
2624
import java.util.List;
2725
import java.util.function.Consumer;
2826
import javax.lang.model.element.Modifier;
29-
import software.amazon.awssdk.annotations.NotThreadSafe;
3027
import software.amazon.awssdk.annotations.SdkPublicApi;
3128
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
3229
import software.amazon.awssdk.codegen.poet.ClassSpec;
@@ -58,9 +55,7 @@ public TypeSpec poetSpec() {
5855
.addMethod(resolveAuthSchemeMethod())
5956
.addMethod(resolveAuthSchemeConsumerBuilderMethod())
6057
.addMethod(defaultProviderMethod())
61-
.addMethod(staticBuilderMethodSpec())
62-
.addType(builderInterfaceSpec())
63-
.addType(builderClassSpec())
58+
.addMethod(defaultPreferredProviderMethod())
6459
.build();
6560
}
6661

@@ -100,6 +95,17 @@ private MethodSpec defaultProviderMethod() {
10095
.build();
10196
}
10297

98+
private MethodSpec defaultPreferredProviderMethod() {
99+
return MethodSpec.methodBuilder("defaultProvider")
100+
.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
101+
.addParameter(ParameterizedTypeName.get(List.class, String.class), "authSchemePreference")
102+
.returns(className())
103+
.addJavadoc("Get the default auth scheme provider the preferred auth schemes in order of preference.")
104+
.addStatement("return new $T(defaultProvider(), authSchemePreference)",
105+
authSchemeSpecUtils.preferredAuthSchemeProviderName())
106+
.build();
107+
}
108+
103109
private CodeBlock interfaceJavadoc() {
104110
CodeBlock.Builder b = CodeBlock.builder();
105111

@@ -111,75 +117,5 @@ private CodeBlock interfaceJavadoc() {
111117

112118
return b.build();
113119
}
114-
115-
private MethodSpec staticBuilderMethodSpec() {
116-
return MethodSpec.methodBuilder("builder")
117-
.addJavadoc("Create a builder for the auth scheme provider.")
118-
.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
119-
.returns(className().nestedClass("Builder"))
120-
.addStatement("return new $T()", ClassName.get(className().packageName(),
121-
className().simpleName(),
122-
className().simpleName() + "Builder")
123-
)
124-
.build();
125-
}
126-
127-
128-
private TypeSpec builderInterfaceSpec() {
129-
return TypeSpec.interfaceBuilder("Builder")
130-
.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
131-
.addAnnotation(NotThreadSafe.class)
132-
.addJavadoc("A builder for creating {@link $T} instances.\n", className())
133-
.addMethod(MethodSpec.methodBuilder("build")
134-
.addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
135-
.addJavadoc("Returns a {@link $T} object that is created from the "
136-
+ "properties that have been set on the builder.",
137-
className())
138-
.returns(className())
139-
.build())
140-
141-
.addMethod(MethodSpec.methodBuilder("preferredAuthSchemes")
142-
.addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
143-
.addJavadoc("Set the preferred auth schemes in order of preference.")
144-
.returns(className().nestedClass("Builder"))
145-
.addParameter(
146-
ParameterizedTypeName.get(List.class, String.class),
147-
"authSchemePreference"
148-
)
149-
.build())
150-
.build();
151-
}
152-
153-
private TypeSpec builderClassSpec() {
154-
return TypeSpec.classBuilder(authSchemeSpecUtils.authSchemeProviderBuilderName())
155-
.addModifiers(Modifier.PUBLIC, Modifier.FINAL, Modifier.STATIC)
156-
.addSuperinterface(className().nestedClass("Builder"))
157-
.addField(
158-
FieldSpec
159-
.builder(ParameterizedTypeName.get(List.class, String.class), "authSchemePreference")
160-
.addModifiers(Modifier.PRIVATE)
161-
.build())
162-
.addMethod(
163-
MethodSpec
164-
.methodBuilder("preferredAuthSchemes").addAnnotation(Override.class)
165-
.addModifiers(Modifier.PUBLIC)
166-
.addParameter(
167-
ParameterizedTypeName.get(List.class, String.class),
168-
"authSchemePreference"
169-
)
170-
.returns(className().nestedClass("Builder"))
171-
.addStatement("this.authSchemePreference = new $T<>(authSchemePreference)", ArrayList.class)
172-
.addStatement("return this")
173-
.build())
174-
.addMethod(
175-
MethodSpec
176-
.methodBuilder("build").addAnnotation(Override.class)
177-
.addModifiers(Modifier.PUBLIC)
178-
.returns(className())
179-
.addStatement("return new $T(defaultProvider(), authSchemePreference)",
180-
authSchemeSpecUtils.preferredAuthSchemeProviderName())
181-
.build())
182-
.build();
183-
}
184120
}
185121

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ private MethodSpec defaultAuthSchemeProviderMethod() {
840840
.addStatement(".build()")
841841
.addStatement("List<String> preferences = authSchemePreferenceProvider.resolveAuthSchemePreference()")
842842
.beginControlFlow("if(!preferences.isEmpty())")
843-
.addStatement("return $T.builder().preferredAuthSchemes(preferences).build()",
843+
.addStatement("return $T.defaultProvider(preferences)",
844844
authSchemeSpecUtils.providerInterfaceName())
845845
.endControlFlow()
846846
.addStatement("return $T.defaultProvider()", authSchemeSpecUtils.providerInterfaceName())

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/query-auth-scheme-provider.java‎

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package software.amazon.awssdk.services.query.auth.scheme;
22

3-
import java.util.ArrayList;
43
import java.util.List;
54
import java.util.function.Consumer;
65
import software.amazon.awssdk.annotations.Generated;
7-
import software.amazon.awssdk.annotations.NotThreadSafe;
86
import software.amazon.awssdk.annotations.SdkPublicApi;
97
import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption;
108
import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeProvider;
@@ -40,41 +38,9 @@ static QueryAuthSchemeProvider defaultProvider() {
4038
}
4139

4240
/**
43-
* Create a builder for the auth scheme provider.
41+
* Get the default auth scheme provider the preferred auth schemes in order of preference.
4442
*/
45-
static Builder builder() {
46-
return new QueryAuthSchemeProviderBuilder();
47-
}
48-
49-
/**
50-
* A builder for creating {@link QueryAuthSchemeProvider} instances.
51-
*/
52-
@NotThreadSafe
53-
interface Builder {
54-
/**
55-
* Returns a {@link QueryAuthSchemeProvider} object that is created from the properties that have been set on
56-
* the builder.
57-
*/
58-
QueryAuthSchemeProvider build();
59-
60-
/**
61-
* Set the preferred auth schemes in order of preference.
62-
*/
63-
Builder preferredAuthSchemes(List<String> authSchemePreference);
64-
}
65-
66-
final class QueryAuthSchemeProviderBuilder implements Builder {
67-
private List<String> authSchemePreference;
68-
69-
@Override
70-
public Builder preferredAuthSchemes(List<String> authSchemePreference) {
71-
this.authSchemePreference = new ArrayList<>(authSchemePreference);
72-
return this;
73-
}
74-
75-
@Override
76-
public QueryAuthSchemeProvider build() {
77-
return new PreferredQueryAuthSchemeProvider(defaultProvider(), authSchemePreference);
78-
}
43+
static QueryAuthSchemeProvider defaultProvider(List<String> authSchemePreference) {
44+
return new PreferredQueryAuthSchemeProvider(defaultProvider(), authSchemePreference);
7945
}
8046
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/query-endpoint-auth-params-auth-scheme-provider.java‎

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package software.amazon.awssdk.services.query.auth.scheme;
22

3-
import java.util.ArrayList;
43
import java.util.List;
54
import java.util.function.Consumer;
65
import software.amazon.awssdk.annotations.Generated;
7-
import software.amazon.awssdk.annotations.NotThreadSafe;
86
import software.amazon.awssdk.annotations.SdkPublicApi;
97
import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption;
108
import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeProvider;
@@ -40,41 +38,9 @@ static QueryAuthSchemeProvider defaultProvider() {
4038
}
4139

4240
/**
43-
* Create a builder for the auth scheme provider.
41+
* Get the default auth scheme provider the preferred auth schemes in order of preference.
4442
*/
45-
static Builder builder() {
46-
return new QueryAuthSchemeProviderBuilder();
47-
}
48-
49-
/**
50-
* A builder for creating {@link QueryAuthSchemeProvider} instances.
51-
*/
52-
@NotThreadSafe
53-
interface Builder {
54-
/**
55-
* Returns a {@link QueryAuthSchemeProvider} object that is created from the properties that have been set on
56-
* the builder.
57-
*/
58-
QueryAuthSchemeProvider build();
59-
60-
/**
61-
* Set the preferred auth schemes in order of preference.
62-
*/
63-
Builder preferredAuthSchemes(List<String> authSchemePreference);
64-
}
65-
66-
final class QueryAuthSchemeProviderBuilder implements Builder {
67-
private List<String> authSchemePreference;
68-
69-
@Override
70-
public Builder preferredAuthSchemes(List<String> authSchemePreference) {
71-
this.authSchemePreference = new ArrayList<>(authSchemePreference);
72-
return this;
73-
}
74-
75-
@Override
76-
public QueryAuthSchemeProvider build() {
77-
return new PreferredQueryAuthSchemeProvider(defaultProvider(), authSchemePreference);
78-
}
43+
static QueryAuthSchemeProvider defaultProvider(List<String> authSchemePreference) {
44+
return new PreferredQueryAuthSchemeProvider(defaultProvider(), authSchemePreference);
7945
}
8046
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-bearer-auth-client-builder-class.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ private JsonAuthSchemeProvider defaultAuthSchemeProvider(SdkClientConfiguration
133133
.profileName(config.option(SdkClientOption.PROFILE_NAME)).build();
134134
List<String> preferences = authSchemePreferenceProvider.resolveAuthSchemePreference();
135135
if (!preferences.isEmpty()) {
136-
return JsonAuthSchemeProvider.builder().preferredAuthSchemes(preferences).build();
136+
return JsonAuthSchemeProvider.defaultProvider(preferences);
137137
}
138138
return JsonAuthSchemeProvider.defaultProvider();
139139
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-client-builder-class.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ private JsonAuthSchemeProvider defaultAuthSchemeProvider(SdkClientConfiguration
232232
.profileName(config.option(SdkClientOption.PROFILE_NAME)).build();
233233
List<String> preferences = authSchemePreferenceProvider.resolveAuthSchemePreference();
234234
if (!preferences.isEmpty()) {
235-
return JsonAuthSchemeProvider.builder().preferredAuthSchemes(preferences).build();
235+
return JsonAuthSchemeProvider.defaultProvider(preferences);
236236
}
237237
return JsonAuthSchemeProvider.defaultProvider();
238238
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-client-builder-endpoints-auth-params.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ private QueryAuthSchemeProvider defaultAuthSchemeProvider(SdkClientConfiguration
150150
.profileName(config.option(SdkClientOption.PROFILE_NAME)).build();
151151
List<String> preferences = authSchemePreferenceProvider.resolveAuthSchemePreference();
152152
if (!preferences.isEmpty()) {
153-
return QueryAuthSchemeProvider.builder().preferredAuthSchemes(preferences).build();
153+
return QueryAuthSchemeProvider.defaultProvider(preferences);
154154
}
155155
return QueryAuthSchemeProvider.defaultProvider();
156156
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-client-builder-internal-defaults-class.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ private JsonAuthSchemeProvider defaultAuthSchemeProvider(SdkClientConfiguration
133133
.profileName(config.option(SdkClientOption.PROFILE_NAME)).build();
134134
List<String> preferences = authSchemePreferenceProvider.resolveAuthSchemePreference();
135135
if (!preferences.isEmpty()) {
136-
return JsonAuthSchemeProvider.builder().preferredAuthSchemes(preferences).build();
136+
return JsonAuthSchemeProvider.defaultProvider(preferences);
137137
}
138138
return JsonAuthSchemeProvider.defaultProvider();
139139
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-composed-sync-default-client-builder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private JsonAuthSchemeProvider defaultAuthSchemeProvider(SdkClientConfiguration
155155
.profileName(config.option(SdkClientOption.PROFILE_NAME)).build();
156156
List<String> preferences = authSchemePreferenceProvider.resolveAuthSchemePreference();
157157
if (!preferences.isEmpty()) {
158-
return JsonAuthSchemeProvider.builder().preferredAuthSchemes(preferences).build();
158+
return JsonAuthSchemeProvider.defaultProvider(preferences);
159159
}
160160
return JsonAuthSchemeProvider.defaultProvider();
161161
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-multi-auth-sigv4a-client-builder-class.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private DatabaseAuthSchemeProvider defaultAuthSchemeProvider(SdkClientConfigurat
128128
.profileName(config.option(SdkClientOption.PROFILE_NAME)).build();
129129
List<String> preferences = authSchemePreferenceProvider.resolveAuthSchemePreference();
130130
if (!preferences.isEmpty()) {
131-
return DatabaseAuthSchemeProvider.builder().preferredAuthSchemes(preferences).build();
131+
return DatabaseAuthSchemeProvider.defaultProvider(preferences);
132132
}
133133
return DatabaseAuthSchemeProvider.defaultProvider();
134134
}

0 commit comments

Comments
 (0)