Skip to content

Don't generate item paginator for non-containers #746

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

Merged
merged 2 commits into from
Oct 4, 2018
Merged

Don't generate item paginator for non-containers #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11be2b9
Don't generate item paginator for non-containers
dagnir Oct 3, 2018
cb100fe
Merge branch 'master' into non-container-result-key-suppression
dagnir Oct 4, 2018
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
10 changes: 9 additions & 1 deletion .../src/main/java/software/amazon/awssdk/codegen/poet/paginators/AsyncResponseClassSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.squareup.javapoet.WildcardTypeName;
import java.util.Collections;
import java.util.Iterator;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import java.util.function.Function;
Expand Down Expand Up @@ -158,6 +159,7 @@ private Iterable<MethodSpec> getMethodSpecsForResultKeyList() {
if (paginatorDefinition.getResultKey() != null) {
return paginatorDefinition.getResultKey().stream()
.map(this::getMethodsSpecForSingleResultKey)
.filter(Objects::nonNull)
.collect(Collectors.toList());
}
return Collections.emptyList();
Expand All @@ -182,9 +184,15 @@ private Iterable<MethodSpec> getMethodSpecsForResultKeyList() {
* }
*/
private MethodSpec getMethodsSpecForSingleResultKey(String resultKey) {
TypeName resultKeyType = getTypeForResultKey(resultKey);
MemberModel resultKeyModel = memberModelForResponseMember(resultKey);

// TODO: Support other types besides List or Map
if (!(resultKeyModel.isList() || resultKeyModel.isMap())) {
return null;
}

TypeName resultKeyType = getTypeForResultKey(resultKey);

return MethodSpec.methodBuilder(resultKeyModel.getFluentGetterMethodName())
.addModifiers(Modifier.PUBLIC, Modifier.FINAL)
.returns(ParameterizedTypeName.get(ClassName.get(SdkPublisher.class), resultKeyType))
Expand Down
10 changes: 9 additions & 1 deletion ...n/src/main/java/software/amazon/awssdk/codegen/poet/paginators/SyncResponseClassSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.squareup.javapoet.TypeSpec;
import java.util.Collections;
import java.util.Iterator;
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand Down Expand Up @@ -132,6 +133,7 @@ private Iterable<MethodSpec> getMethodSpecsForResultKeyList() {
if (paginatorDefinition.getResultKey() != null) {
return paginatorDefinition.getResultKey().stream()
.map(this::getMethodsSpecForSingleResultKey)
.filter(Objects::nonNull)
.collect(Collectors.toList());
}
return Collections.emptyList();
Expand All @@ -154,9 +156,15 @@ private Iterable<MethodSpec> getMethodSpecsForResultKeyList() {
* }
*/
private MethodSpec getMethodsSpecForSingleResultKey(String resultKey) {
TypeName resultKeyType = getTypeForResultKey(resultKey);
MemberModel resultKeyModel = memberModelForResponseMember(resultKey);

// TODO: Support other types besides List or Map
if (!(resultKeyModel.isList() || resultKeyModel.isMap())) {
return null;
}

TypeName resultKeyType = getTypeForResultKey(resultKey);

return MethodSpec.methodBuilder(resultKeyModel.getFluentGetterMethodName())
.addModifiers(Modifier.PUBLIC, Modifier.FINAL)
.returns(ParameterizedTypeName.get(ClassName.get(SdkIterable.class), resultKeyType))
Expand Down