Repository navigation
fix(client): require interceptor request payloads #1347
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.
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
ehsavoie
wants to merge
1
commit into
a2aproject:main
Choose a base branch
from
ehsavoie:not_nullable_payload
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
13 changes: 13 additions & 0 deletions
13
...test/java/org/a2aproject/sdk/client/transport/spi/interceptors/PayloadAndHeadersTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package org.a2aproject.sdk.client.transport.spi.interceptors; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class PayloadAndHeadersTest { | ||
|
|
||
| @Test | ||
| void rejectsNullPayload() { | ||
| assertThrows(IllegalArgumentException.class, () -> new PayloadAndHeaders(null, null)); | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
common/src/main/java/org/a2aproject/sdk/util/InterceptorPayloads.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package org.a2aproject.sdk.util; | ||
|
|
||
| import org.jspecify.annotations.Nullable; | ||
|
|
||
| /** Type checks for payloads returned by client interceptors. */ | ||
| public final class InterceptorPayloads { | ||
|
|
||
| private InterceptorPayloads() { | ||
| } | ||
|
|
||
| /** | ||
| * Casts a non-null interceptor payload. | ||
| * | ||
| * @param payload the interceptor payload | ||
| * @param expectedType the expected payload type | ||
| * @param <T> the expected payload type | ||
| * @return the cast payload | ||
| * @throws IllegalArgumentException if the payload has an unexpected type | ||
| */ | ||
| public static <T> T cast(Object payload, Class<T> expectedType) { | ||
| return Assert.checkNotNullParam("payload", castNullable(payload, expectedType)); | ||
| } | ||
|
|
||
| /** Casts a payload while preserving null for transports that allow it. */ | ||
| public static <T> @Nullable T castNullable(@Nullable Object payload, Class<T> expectedType) { | ||
| if (payload != null && !expectedType.isInstance(payload)) { | ||
| throw new IllegalArgumentException("Interceptor payload must be " + expectedType.getName() | ||
| + "; got " + payload.getClass().getName()); | ||
| } | ||
| return expectedType.cast(payload); | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
common/src/test/java/org/a2aproject/sdk/util/InterceptorPayloadsTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package org.a2aproject.sdk.util; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNull; | ||
| import static org.junit.jupiter.api.Assertions.assertSame; | ||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class InterceptorPayloadsTest { | ||
|
|
||
| @Test | ||
| void castsCompatiblePayloadsAndPreservesNull() { | ||
| String payload = "request"; | ||
| assertSame(payload, InterceptorPayloads.cast(payload, CharSequence.class)); | ||
| assertNull(InterceptorPayloads.castNullable(null, CharSequence.class)); | ||
| } | ||
|
|
||
| @Test | ||
| void describesUnexpectedPayloadType() { | ||
| IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, | ||
| () -> InterceptorPayloads.cast(42, CharSequence.class)); | ||
| assertEquals("Interceptor payload must be java.lang.CharSequence; got java.lang.Integer", exception.getMessage()); | ||
| } | ||
| } |
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.