Add logic to handle number acceptors #5813
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RanVaknin
changed the title
RanVaknin
force-pushed
the
rvaknin/number-support-for-waiters
branch
from
4fb548f to
cd55716
Compare
RanVaknin
commented
Jan 29, 2025
...es-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersSyncFunctionalTest.java
Outdated
Show resolved
Hide resolved
dagnir
reviewed
Feb 6, 2025
...gen/src/main/java/software/amazon/awssdk/codegen/poet/waiters/JmesPathAcceptorGenerator.java
Outdated
Show resolved
Hide resolved
codegen/src/main/java/software/amazon/awssdk/codegen/jmespath/component/Literal.java
Outdated
Show resolved
Hide resolved
.changes/next-release/feature-AWSSDKforJavav2waiters-0c835d2.json
Outdated
Show resolved
Hide resolved
codegen/src/main/java/software/amazon/awssdk/codegen/internal/Jackson.java
Show resolved
Hide resolved
codegen/src/main/java/software/amazon/awssdk/codegen/poet/waiters/BaseWaiterClassSpec.java
Outdated
Show resolved
Hide resolved
...gen/src/main/resources/software/amazon/awssdk/codegen/jmespath/JmesPathRuntime.java.resource
Show resolved
Hide resolved
test/codegen-generated-classes-test/src/main/resources/codegen-resources/waiters/service-2.json
Outdated
Show resolved
Hide resolved
...st/src/test/java/software/amazon/awssdk/services/retry/RetryStrategySetupUsingRetryMode.java
Outdated
Show resolved
Hide resolved
dagnir
reviewed
Feb 14, 2025
Comment on lines
608
to
632
| CodeBlock.Builder builder = CodeBlock.builder() | ||
| .add("response -> {") | ||
| .add("$1T input = new $1T(response);", poetExtensions.jmesPathRuntimeClass().nestedClass("Value")) | ||
| .add("$T<$T> resultValues = ", List.class, Object.class) | ||
| .add(jmesPathAcceptorGenerator.interpret(acceptor.getArgument(), "input")) | ||
| .add(".values();") | ||
| .add("return !resultValues.isEmpty() &&" | ||
| + " resultValues.stream().anyMatch(v " + "-> $T.equals" | ||
| + "(v, ", Objects.class); | ||
|
|
||
| if (isNumber) { | ||
| builder.add("new $T($S)", BigDecimal.class, expected); | ||
| } else if (isString) { | ||
| builder.add("$S", expected); | ||
| } else { | ||
| builder.add("$L", expected); | ||
| } | ||
|
|
||
| builder.add("));") | ||
| .add("}"); | ||
|
|
||
| return builder.build(); |
There was a problem hiding this comment.
Can we make the same change as in pathAcceptorBody to make it more readable?
Comment on lines
282
to
287
| <dependency> | ||
| <groupId>backport-util-concurrent</groupId> | ||
| <artifactId>backport-util-concurrent</artifactId> | ||
| <version>3.1</version> | ||
| <scope>test</scope> | ||
| </dependency> |
There was a problem hiding this comment.
What's this dependency for?
|
Can we merge in master and run integ tests again? |
RanVaknin
force-pushed
the
rvaknin/number-support-for-waiters
branch
from
02d1597 to
f0e7e22
Compare
dagnir
approved these changes
Feb 21, 2025
RanVaknin
force-pushed
the
rvaknin/number-support-for-waiters
branch
from
f0e7e22 to
6d859e2
Compare
|
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
Currently the Java SDK waiter matcher acceptor only support Integers. According to the cross SDK spec waiter matcher acceptor must support all number types.
Modifications
Testing