Skip to content
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

On the client side, support @Id on collections #1365

Merged
merged 2 commits into from
Apr 22, 2022
Merged

On the client side, support @Id on collections #1365

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
1f0ea89
On the client side, support @Id on collections
jmartisk Apr 21, 2022
8818c47
Merge branch 'main' into main-issue-1359
phillip-kruger Apr 22, 2022
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
6 changes: 5 additions & 1 deletion ...tion/src/main/java/io/smallrye/graphql/client/impl/typesafe/reflection/ParameterInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ public String toString() {

public String graphQlInputTypeName() {
if (parameter.isAnnotationPresent(Id.class)) {
return "ID" + optionalExclamationMark(type);
if (type.isCollection()) {
return "[ID" + optionalExclamationMark(type.getItemType()) + "]" + optionalExclamationMark(type);
} else {
return "ID" + optionalExclamationMark(type);
}
} else if (type.isCollection()) {
return "[" + withExclamationMark(type.getItemType()) + "]" + optionalExclamationMark(type);
} else if (type.isMap()) {
Expand Down
20 changes: 19 additions & 1 deletion client/tck/src/main/java/tck/graphql/typesafe/ScalarBehavior.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package tck.graphql.typesafe;

import static java.time.ZoneOffset.UTC;
import static java.util.Collections.singletonList;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
import static org.assertj.core.api.BDDAssertions.then;

Expand All @@ -15,6 +16,7 @@
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.Date;
import java.util.List;
import java.util.UUID;

import org.eclipse.microprofile.graphql.Id;
Expand Down Expand Up @@ -584,9 +586,14 @@ interface IdApi {
@Id
String idea(
@Id String stringId,
@Id List<String> stringListId,
@Id List<@NonNull String> stringListInnerNonNullId,
@Id @NonNull List<String> stringListOuterNonNullId,
@Id @NonNull List<@NonNull String> stringListBothNonNullId,
@Id long primitiveLongId,
@Id int primitiveIntId,
@Id Long longId,
@Id List<Long> longListId,
@Id Integer intId,
@Id UUID uuidId);
}
Expand Down Expand Up @@ -719,20 +726,31 @@ void shouldCallIdQuery() {
fixture.returnsData("'idea':'out'");
IdApi api = fixture.builder().build(IdApi.class);

String out = api.idea("stringId", 1L, 2, 3L, 4, UUID.randomUUID());
String out = api.idea("stringId", singletonList("x"), singletonList("x"), singletonList("x"), singletonList("x"),
1L, 2, 3L, singletonList(5L), 4, UUID.randomUUID());

then(fixture.query()).isEqualTo("query idea(" +
"$stringId: ID, " +
"$stringListId: [ID], " +
"$stringListInnerNonNullId: [ID!], " +
"$stringListOuterNonNullId: [ID]!, " +
"$stringListBothNonNullId: [ID!]!, " +
"$primitiveLongId: ID!, " +
"$primitiveIntId: ID!, " +
"$longId: ID, " +
"$longListId: [ID], " +
"$intId: ID, " +
"$uuidId: ID) " +
"{ idea(" +
"stringId: $stringId, " +
"stringListId: $stringListId, " +
"stringListInnerNonNullId: $stringListInnerNonNullId, " +
"stringListOuterNonNullId: $stringListOuterNonNullId, " +
"stringListBothNonNullId: $stringListBothNonNullId, " +
"primitiveLongId: $primitiveLongId, " +
"primitiveIntId: $primitiveIntId, " +
"longId: $longId, " +
"longListId: $longListId, " +
"intId: $intId, " +
"uuidId: $uuidId) }");
then(out).isEqualTo("out");
Expand Down