Generate annotations for mutation and query parameters #602 (#603)

src/main/resources/templates/java-lang/javaClassGraphqlOperations.ftl

@@ -35,7 +35,7 @@ public interface ${className}<#if implements?has_content> extends <#list impleme
 <#list operation.annotations as annotation>
     @${annotation}
 </#list>
-    ${operation.type} ${operation.name}(<#list operation.parameters as param>${param.type} ${param.name}<#if param_has_next>, </#if></#list>)<#if operation.throwsException> throws Exception</#if>;
+    ${operation.type} ${operation.name}(<#list operation.parameters as param><#list param.annotations as paramAnnotation>@${paramAnnotation}<#if param.annotations?has_content> </#if></#list>${param.type} ${param.name}<#if param_has_next>, </#if></#list>)<#if operation.throwsException> throws Exception</#if>;
 
 </#list>
 }

src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenAnnotationsTest.java

@@ -208,6 +208,7 @@ class GraphQLCodegenAnnotationsTest {
                         "float={{float?toArrayOfStrings}}, " +
                         "int={{int}}, " +
                         "n={{n?toString}})"));
+        directiveAnnotationsMapping.put("valid", singletonList("@javax.validation.Valid"));
         mappingConfig.setDirectiveAnnotationsMapping(directiveAnnotationsMapping);
 
         new JavaGraphQLCodegen(singletonList("src/test/resources/schemas/test.graphqls"),

src/test/resources/expected-classes/CommitResolver.java.txt

@@ -14,12 +14,12 @@ public interface CommitResolver {
 
     @javax.validation.constraints.NotNull
     @com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = com.example.json.DateTimeScalarDeserializer.class)
-    Blame blame(Commit commit, String path, graphql.schema.DataFetchingEnvironment env) throws Exception;
+    Blame blame(Commit commit, @javax.validation.constraints.NotNull String path, graphql.schema.DataFetchingEnvironment env) throws Exception;
 
     @javax.validation.constraints.NotNull
     CommitCommentConnection comments(Commit commit, String after, String before, Integer first, Integer last, graphql.schema.DataFetchingEnvironment env) throws Exception;
 
-    DeploymentConnection deployments(Commit commit, String after, String before, java.util.List<String> environments, Integer first, Integer last, DeploymentOrder orderBy, graphql.schema.DataFetchingEnvironment env) throws Exception;
+    DeploymentConnection deployments(Commit commit, String after, String before, @javax.validation.constraints.NotNull java.util.List<String> environments, Integer first, Integer last, DeploymentOrder orderBy, graphql.schema.DataFetchingEnvironment env) throws Exception;
 
     @javax.validation.constraints.NotNull
     CommitHistoryConnection history(Commit commit, String after, CommitAuthor author, String before, Integer first, Integer last, String path, String since, String until, graphql.schema.DataFetchingEnvironment env) throws Exception;

src/test/resources/expected-classes/CreateEventMutationResolver.java.txt

@@ -14,6 +14,6 @@ public interface CreateEventMutationResolver {
      * Create a new event.
      */
     @javax.validation.constraints.NotNull
-    Event createEvent(String categoryId, String createdBy) throws Exception;
+    Event createEvent(@javax.validation.constraints.NotNull String categoryId, String createdBy) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/EventByIdQueryResolver.java.txt

@@ -14,6 +14,6 @@ public interface EventByIdQueryResolver {
      * Single event by ID.
      */
     @javax.validation.constraints.NotNull
-    Event eventById(String id) throws Exception;
+    Event eventById(@javax.validation.constraints.NotNull String id) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/EventsByCategoryAndStatusQueryResolver.java.txt

@@ -14,6 +14,6 @@ public interface EventsByCategoryAndStatusQueryResolver {
      * List of events of a specified category.
      */
     @javax.validation.constraints.NotNull
-    java.util.List<Event> eventsByCategoryAndStatus(String categoryId, EventStatus status) throws Exception;
+    java.util.List<Event> eventsByCategoryAndStatus(@javax.validation.constraints.NotNull String categoryId, EventStatus status) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/EventsByIdsQueryResolver.java.txt

@@ -14,6 +14,6 @@ public interface EventsByIdsQueryResolver {
      * Events by IDs.
      */
     @javax.validation.constraints.NotNull
-    java.util.List<Event> eventsByIds(java.util.List<String> ids) throws Exception;
+    java.util.List<Event> eventsByIds(@javax.validation.constraints.NotNull java.util.List<String> ids) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/MutationResolver.java.txt

@@ -11,6 +11,6 @@ public interface MutationResolver {
      * Create a new event.
      */
     @javax.validation.constraints.NotNull
-    Event createEvent(String categoryId, String createdBy) throws Exception;
+    Event createEvent(@javax.validation.constraints.NotNull String categoryId, String createdBy) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/ProductsByCategoryIdAndStatusQueryResolver.java.txt

@@ -7,6 +7,6 @@ package com.kobylynskyi.graphql.test1;
 )
 public interface ProductsByCategoryIdAndStatusQueryResolver {
 
-    java.util.List<Product> products(String categoryId, String status) throws Exception;
+    java.util.List<Product> products(@javax.validation.constraints.NotNull String categoryId, @javax.validation.constraints.NotNull String status) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/ProductsByIdsQueryResolver.java.txt

@@ -7,6 +7,6 @@ package com.kobylynskyi.graphql.test1;
 )
 public interface ProductsByIdsQueryResolver {
 
-    java.util.List<Product> products(java.util.List<String> ids) throws Exception;
+    java.util.List<Product> products(@javax.validation.constraints.NotNull java.util.List<String> ids) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/QueryResolver.java.txt

@@ -17,18 +17,18 @@ public interface QueryResolver {
      * List of events of a specified category.
      */
     @javax.validation.constraints.NotNull
-    java.util.List<Event> eventsByCategoryAndStatus(String categoryId, EventStatus status) throws Exception;
+    java.util.List<Event> eventsByCategoryAndStatus(@javax.validation.constraints.NotNull String categoryId, EventStatus status) throws Exception;
 
     /**
      * Single event by ID.
      */
     @javax.validation.constraints.NotNull
-    Event eventById(String id) throws Exception;
+    Event eventById(@javax.validation.constraints.NotNull String id) throws Exception;
 
     /**
      * Events by IDs.
      */
     @javax.validation.constraints.NotNull
-    java.util.List<Event> eventsByIds(java.util.List<String> ids) throws Exception;
+    java.util.List<Event> eventsByIds(@javax.validation.constraints.NotNull java.util.List<String> ids) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/annotation/CreateEventMutationResolver.java.txt

@@ -15,6 +15,6 @@ public interface CreateEventMutationResolver {
      */
     @javax.validation.constraints.NotNull
     @com.example.CustomAnnotation(roles={"admin", "moderator"}, boo={true, false, true}, float={"12.0", "null"}, int=42, n="null")
-    Event createEvent(String categoryId, String createdBy) throws Exception;
+    Event createEvent(@javax.validation.constraints.NotNull @javax.validation.Valid String categoryId, String createdBy) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/annotation/MutationResolver.java.txt

@@ -12,6 +12,6 @@ public interface MutationResolver {
      */
     @javax.validation.constraints.NotNull
     @com.example.CustomAnnotation(roles={"admin", "moderator"}, boo={true, false, true}, float={"12.0", "null"}, int=42, n="null")
-    Event createEvent(String categoryId, String createdBy) throws Exception;
+    Event createEvent(@javax.validation.constraints.NotNull @javax.validation.Valid String categoryId, String createdBy) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/apis/CodeOfConductQueryResolver_withoutThrowsException.java.txt

@@ -5,6 +5,6 @@
 )
 public interface CodeOfConductQueryResolver {
 
-    CodeOfConduct codeOfConduct(String key);
+    CodeOfConduct codeOfConduct(@javax.validation.constraints.NotNull String key);
 
 }
\ No newline at end of file

src/test/resources/expected-classes/apis/MutationResolver_withoutThrowsException.java.txt

@@ -5,138 +5,138 @@
 )
 public interface MutationResolver {
 
-    AcceptTopicSuggestionPayload acceptTopicSuggestion(AcceptTopicSuggestionInput input);
+    AcceptTopicSuggestionPayload acceptTopicSuggestion(@javax.validation.constraints.NotNull AcceptTopicSuggestionInput input);
 
-    AddAssigneesToAssignablePayload addAssigneesToAssignable(AddAssigneesToAssignableInput input);
+    AddAssigneesToAssignablePayload addAssigneesToAssignable(@javax.validation.constraints.NotNull AddAssigneesToAssignableInput input);
 
-    AddCommentPayload addComment(AddCommentInput input);
+    AddCommentPayload addComment(@javax.validation.constraints.NotNull AddCommentInput input);
 
-    AddLabelsToLabelablePayload addLabelsToLabelable(AddLabelsToLabelableInput input);
+    AddLabelsToLabelablePayload addLabelsToLabelable(@javax.validation.constraints.NotNull AddLabelsToLabelableInput input);
 
-    AddProjectCardPayload addProjectCard(AddProjectCardInput input);
+    AddProjectCardPayload addProjectCard(@javax.validation.constraints.NotNull AddProjectCardInput input);
 
-    AddProjectColumnPayload addProjectColumn(AddProjectColumnInput input);
+    AddProjectColumnPayload addProjectColumn(@javax.validation.constraints.NotNull AddProjectColumnInput input);
 
-    AddPullRequestReviewPayload addPullRequestReview(AddPullRequestReviewInput input);
+    AddPullRequestReviewPayload addPullRequestReview(@javax.validation.constraints.NotNull AddPullRequestReviewInput input);
 
-    AddPullRequestReviewCommentPayload addPullRequestReviewComment(AddPullRequestReviewCommentInput input);
+    AddPullRequestReviewCommentPayload addPullRequestReviewComment(@javax.validation.constraints.NotNull AddPullRequestReviewCommentInput input);
 
-    AddReactionPayload addReaction(AddReactionInput input);
+    AddReactionPayload addReaction(@javax.validation.constraints.NotNull AddReactionInput input);
 
-    AddStarPayload addStar(AddStarInput input);
+    AddStarPayload addStar(@javax.validation.constraints.NotNull AddStarInput input);
 
-    ChangeUserStatusPayload changeUserStatus(ChangeUserStatusInput input);
+    ChangeUserStatusPayload changeUserStatus(@javax.validation.constraints.NotNull ChangeUserStatusInput input);
 
-    ClearLabelsFromLabelablePayload clearLabelsFromLabelable(ClearLabelsFromLabelableInput input);
+    ClearLabelsFromLabelablePayload clearLabelsFromLabelable(@javax.validation.constraints.NotNull ClearLabelsFromLabelableInput input);
 
-    CloneProjectPayload cloneProject(CloneProjectInput input);
+    CloneProjectPayload cloneProject(@javax.validation.constraints.NotNull CloneProjectInput input);
 
-    CloneTemplateRepositoryPayload cloneTemplateRepository(CloneTemplateRepositoryInput input);
+    CloneTemplateRepositoryPayload cloneTemplateRepository(@javax.validation.constraints.NotNull CloneTemplateRepositoryInput input);
 
-    CloseIssuePayload closeIssue(CloseIssueInput input);
+    CloseIssuePayload closeIssue(@javax.validation.constraints.NotNull CloseIssueInput input);
 
-    ClosePullRequestPayload closePullRequest(ClosePullRequestInput input);
+    ClosePullRequestPayload closePullRequest(@javax.validation.constraints.NotNull ClosePullRequestInput input);
 
-    ConvertProjectCardNoteToIssuePayload convertProjectCardNoteToIssue(ConvertProjectCardNoteToIssueInput input);
+    ConvertProjectCardNoteToIssuePayload convertProjectCardNoteToIssue(@javax.validation.constraints.NotNull ConvertProjectCardNoteToIssueInput input);
 
-    CreateBranchProtectionRulePayload createBranchProtectionRule(CreateBranchProtectionRuleInput input);
+    CreateBranchProtectionRulePayload createBranchProtectionRule(@javax.validation.constraints.NotNull CreateBranchProtectionRuleInput input);
 
-    CreateIssuePayload createIssue(CreateIssueInput input);
+    CreateIssuePayload createIssue(@javax.validation.constraints.NotNull CreateIssueInput input);
 
-    CreateProjectPayload createProject(CreateProjectInput input);
+    CreateProjectPayload createProject(@javax.validation.constraints.NotNull CreateProjectInput input);
 
-    CreatePullRequestPayload createPullRequest(CreatePullRequestInput input);
+    CreatePullRequestPayload createPullRequest(@javax.validation.constraints.NotNull CreatePullRequestInput input);
 
-    CreateRefPayload createRef(CreateRefInput input);
+    CreateRefPayload createRef(@javax.validation.constraints.NotNull CreateRefInput input);
 
-    CreateRepositoryPayload createRepository(CreateRepositoryInput input);
+    CreateRepositoryPayload createRepository(@javax.validation.constraints.NotNull CreateRepositoryInput input);
 
-    DeclineTopicSuggestionPayload declineTopicSuggestion(DeclineTopicSuggestionInput input);
+    DeclineTopicSuggestionPayload declineTopicSuggestion(@javax.validation.constraints.NotNull DeclineTopicSuggestionInput input);
 
-    DeleteBranchProtectionRulePayload deleteBranchProtectionRule(DeleteBranchProtectionRuleInput input);
+    DeleteBranchProtectionRulePayload deleteBranchProtectionRule(@javax.validation.constraints.NotNull DeleteBranchProtectionRuleInput input);
 
-    DeleteIssuePayload deleteIssue(DeleteIssueInput input);
+    DeleteIssuePayload deleteIssue(@javax.validation.constraints.NotNull DeleteIssueInput input);
 
-    DeleteIssueCommentPayload deleteIssueComment(DeleteIssueCommentInput input);
+    DeleteIssueCommentPayload deleteIssueComment(@javax.validation.constraints.NotNull DeleteIssueCommentInput input);
 
-    DeleteProjectPayload deleteProject(DeleteProjectInput input);
+    DeleteProjectPayload deleteProject(@javax.validation.constraints.NotNull DeleteProjectInput input);
 
-    DeleteProjectCardPayload deleteProjectCard(DeleteProjectCardInput input);
+    DeleteProjectCardPayload deleteProjectCard(@javax.validation.constraints.NotNull DeleteProjectCardInput input);
 
-    DeleteProjectColumnPayload deleteProjectColumn(DeleteProjectColumnInput input);
+    DeleteProjectColumnPayload deleteProjectColumn(@javax.validation.constraints.NotNull DeleteProjectColumnInput input);
 
-    DeletePullRequestReviewPayload deletePullRequestReview(DeletePullRequestReviewInput input);
+    DeletePullRequestReviewPayload deletePullRequestReview(@javax.validation.constraints.NotNull DeletePullRequestReviewInput input);
 
-    DeletePullRequestReviewCommentPayload deletePullRequestReviewComment(DeletePullRequestReviewCommentInput input);
+    DeletePullRequestReviewCommentPayload deletePullRequestReviewComment(@javax.validation.constraints.NotNull DeletePullRequestReviewCommentInput input);
 
-    DeleteRefPayload deleteRef(DeleteRefInput input);
+    DeleteRefPayload deleteRef(@javax.validation.constraints.NotNull DeleteRefInput input);
 
-    DismissPullRequestReviewPayload dismissPullRequestReview(DismissPullRequestReviewInput input);
+    DismissPullRequestReviewPayload dismissPullRequestReview(@javax.validation.constraints.NotNull DismissPullRequestReviewInput input);
 
-    LinkRepositoryToProjectPayload linkRepositoryToProject(LinkRepositoryToProjectInput input);
+    LinkRepositoryToProjectPayload linkRepositoryToProject(@javax.validation.constraints.NotNull LinkRepositoryToProjectInput input);
 
-    LockLockablePayload lockLockable(LockLockableInput input);
+    LockLockablePayload lockLockable(@javax.validation.constraints.NotNull LockLockableInput input);
 
-    MergeBranchPayload mergeBranch(MergeBranchInput input);
+    MergeBranchPayload mergeBranch(@javax.validation.constraints.NotNull MergeBranchInput input);
 
-    MergePullRequestPayload mergePullRequest(MergePullRequestInput input);
+    MergePullRequestPayload mergePullRequest(@javax.validation.constraints.NotNull MergePullRequestInput input);
 
-    MoveProjectCardPayload moveProjectCard(MoveProjectCardInput input);
+    MoveProjectCardPayload moveProjectCard(@javax.validation.constraints.NotNull MoveProjectCardInput input);
 
-    MoveProjectColumnPayload moveProjectColumn(MoveProjectColumnInput input);
+    MoveProjectColumnPayload moveProjectColumn(@javax.validation.constraints.NotNull MoveProjectColumnInput input);
 
-    RemoveAssigneesFromAssignablePayload removeAssigneesFromAssignable(RemoveAssigneesFromAssignableInput input);
+    RemoveAssigneesFromAssignablePayload removeAssigneesFromAssignable(@javax.validation.constraints.NotNull RemoveAssigneesFromAssignableInput input);
 
-    RemoveLabelsFromLabelablePayload removeLabelsFromLabelable(RemoveLabelsFromLabelableInput input);
+    RemoveLabelsFromLabelablePayload removeLabelsFromLabelable(@javax.validation.constraints.NotNull RemoveLabelsFromLabelableInput input);
 
-    RemoveOutsideCollaboratorPayload removeOutsideCollaborator(RemoveOutsideCollaboratorInput input);
+    RemoveOutsideCollaboratorPayload removeOutsideCollaborator(@javax.validation.constraints.NotNull RemoveOutsideCollaboratorInput input);
 
-    RemoveReactionPayload removeReaction(RemoveReactionInput input);
+    RemoveReactionPayload removeReaction(@javax.validation.constraints.NotNull RemoveReactionInput input);
 
-    RemoveStarPayload removeStar(RemoveStarInput input);
+    RemoveStarPayload removeStar(@javax.validation.constraints.NotNull RemoveStarInput input);
 
-    ReopenIssuePayload reopenIssue(ReopenIssueInput input);
+    ReopenIssuePayload reopenIssue(@javax.validation.constraints.NotNull ReopenIssueInput input);
 
-    ReopenPullRequestPayload reopenPullRequest(ReopenPullRequestInput input);
+    ReopenPullRequestPayload reopenPullRequest(@javax.validation.constraints.NotNull ReopenPullRequestInput input);
 
-    RequestReviewsPayload requestReviews(RequestReviewsInput input);
+    RequestReviewsPayload requestReviews(@javax.validation.constraints.NotNull RequestReviewsInput input);
 
-    ResolveReviewThreadPayload resolveReviewThread(ResolveReviewThreadInput input);
+    ResolveReviewThreadPayload resolveReviewThread(@javax.validation.constraints.NotNull ResolveReviewThreadInput input);
 
-    SubmitPullRequestReviewPayload submitPullRequestReview(SubmitPullRequestReviewInput input);
+    SubmitPullRequestReviewPayload submitPullRequestReview(@javax.validation.constraints.NotNull SubmitPullRequestReviewInput input);
 
-    UnlinkRepositoryFromProjectPayload unlinkRepositoryFromProject(UnlinkRepositoryFromProjectInput input);
+    UnlinkRepositoryFromProjectPayload unlinkRepositoryFromProject(@javax.validation.constraints.NotNull UnlinkRepositoryFromProjectInput input);
 
-    UnlockLockablePayload unlockLockable(UnlockLockableInput input);
+    UnlockLockablePayload unlockLockable(@javax.validation.constraints.NotNull UnlockLockableInput input);
 
-    UnmarkIssueAsDuplicatePayload unmarkIssueAsDuplicate(UnmarkIssueAsDuplicateInput input);
+    UnmarkIssueAsDuplicatePayload unmarkIssueAsDuplicate(@javax.validation.constraints.NotNull UnmarkIssueAsDuplicateInput input);
 
-    UnresolveReviewThreadPayload unresolveReviewThread(UnresolveReviewThreadInput input);
+    UnresolveReviewThreadPayload unresolveReviewThread(@javax.validation.constraints.NotNull UnresolveReviewThreadInput input);
 
-    UpdateBranchProtectionRulePayload updateBranchProtectionRule(UpdateBranchProtectionRuleInput input);
+    UpdateBranchProtectionRulePayload updateBranchProtectionRule(@javax.validation.constraints.NotNull UpdateBranchProtectionRuleInput input);
 
-    UpdateIssuePayload updateIssue(UpdateIssueInput input);
+    UpdateIssuePayload updateIssue(@javax.validation.constraints.NotNull UpdateIssueInput input);
 
-    UpdateIssueCommentPayload updateIssueComment(UpdateIssueCommentInput input);
+    UpdateIssueCommentPayload updateIssueComment(@javax.validation.constraints.NotNull UpdateIssueCommentInput input);
 
-    UpdateProjectPayload updateProject(UpdateProjectInput input);
+    UpdateProjectPayload updateProject(@javax.validation.constraints.NotNull UpdateProjectInput input);
 
-    UpdateProjectCardPayload updateProjectCard(UpdateProjectCardInput input);
+    UpdateProjectCardPayload updateProjectCard(@javax.validation.constraints.NotNull UpdateProjectCardInput input);
 
-    UpdateProjectColumnPayload updateProjectColumn(UpdateProjectColumnInput input);
+    UpdateProjectColumnPayload updateProjectColumn(@javax.validation.constraints.NotNull UpdateProjectColumnInput input);
 
-    UpdatePullRequestPayload updatePullRequest(UpdatePullRequestInput input);
+    UpdatePullRequestPayload updatePullRequest(@javax.validation.constraints.NotNull UpdatePullRequestInput input);
 
-    UpdatePullRequestReviewPayload updatePullRequestReview(UpdatePullRequestReviewInput input);
+    UpdatePullRequestReviewPayload updatePullRequestReview(@javax.validation.constraints.NotNull UpdatePullRequestReviewInput input);
 
-    UpdatePullRequestReviewCommentPayload updatePullRequestReviewComment(UpdatePullRequestReviewCommentInput input);
+    UpdatePullRequestReviewCommentPayload updatePullRequestReviewComment(@javax.validation.constraints.NotNull UpdatePullRequestReviewCommentInput input);
 
-    UpdateRefPayload updateRef(UpdateRefInput input);
+    UpdateRefPayload updateRef(@javax.validation.constraints.NotNull UpdateRefInput input);
 
-    UpdateRepositoryPayload updateRepository(UpdateRepositoryInput input);
+    UpdateRepositoryPayload updateRepository(@javax.validation.constraints.NotNull UpdateRepositoryInput input);
 
-    UpdateSubscriptionPayload updateSubscription(UpdateSubscriptionInput input);
+    UpdateSubscriptionPayload updateSubscription(@javax.validation.constraints.NotNull UpdateSubscriptionInput input);
 
-    UpdateTopicsPayload updateTopics(UpdateTopicsInput input);
+    UpdateTopicsPayload updateTopics(@javax.validation.constraints.NotNull UpdateTopicsInput input);
 
 }
\ No newline at end of file

src/test/resources/expected-classes/deprecated/CreateEventMutationResolver.java.txt

@@ -9,6 +9,6 @@ public interface CreateEventMutationResolver {
 
     @Deprecated
     @javax.validation.constraints.NotNull
-    Event createEvent(EventInput input) throws Exception;
+    Event createEvent(@javax.validation.constraints.NotNull EventInput input) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/deprecated/MutationResolver.java.txt

@@ -9,6 +9,6 @@ public interface MutationResolver {
 
     @Deprecated
     @javax.validation.constraints.NotNull
-    Event createEvent(EventInput input) throws Exception;
+    Event createEvent(@javax.validation.constraints.NotNull EventInput input) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/extend-with-resolvers/CreateAssetMutationResolver.java.txt

@@ -5,6 +5,6 @@
 public interface CreateAssetMutationResolver {
 
     @javax.validation.constraints.NotNull
-    Asset createAsset(AssetInput input) throws Exception;
+    Asset createAsset(@javax.validation.constraints.NotNull AssetInput input) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/extend-with-resolvers/CreateEventMutationResolver.java.txt

@@ -5,6 +5,6 @@
 public interface CreateEventMutationResolver {
 
     @javax.validation.constraints.NotNull
-    Event createEvent(EventInput input) throws Exception;
+    Event createEvent(@javax.validation.constraints.NotNull EventInput input) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/extend-with-resolvers/MutationResolver.java.txt

@@ -5,9 +5,9 @@
 public interface MutationResolver {
 
     @javax.validation.constraints.NotNull
-    Event createEvent(EventInput input) throws Exception;
+    Event createEvent(@javax.validation.constraints.NotNull EventInput input) throws Exception;
 
     @javax.validation.constraints.NotNull
-    Asset createAsset(AssetInput input) throws Exception;
+    Asset createAsset(@javax.validation.constraints.NotNull AssetInput input) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/extend/CreateAssetMutationResolver.java.txt

@@ -5,6 +5,6 @@
 public interface CreateAssetMutationResolver {
 
     @javax.validation.constraints.NotNull
-    Asset createAsset(AssetInput input) throws Exception;
+    Asset createAsset(@javax.validation.constraints.NotNull AssetInput input) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/extend/CreateEventMutationResolver.java.txt

@@ -5,6 +5,6 @@
 public interface CreateEventMutationResolver {
 
     @javax.validation.constraints.NotNull
-    Event createEvent(EventInput input) throws Exception;
+    Event createEvent(@javax.validation.constraints.NotNull EventInput input) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/extend/MutationResolver.java.txt

@@ -5,9 +5,9 @@
 public interface MutationResolver {
 
     @javax.validation.constraints.NotNull
-    Event createEvent(EventInput input) throws Exception;
+    Event createEvent(@javax.validation.constraints.NotNull EventInput input) throws Exception;
 
     @javax.validation.constraints.NotNull
-    Asset createAsset(AssetInput input) throws Exception;
+    Asset createAsset(@javax.validation.constraints.NotNull AssetInput input) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/from-introspection-result/CreateMutationResolver.java.txt

@@ -7,6 +7,6 @@ package com.kobylynskyi.graphql.test1;
 )
 public interface CreateMutationResolver {
 
-    Product create(ProductInput productInput) throws Exception;
+    Product create(@javax.validation.constraints.NotNull ProductInput productInput) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/from-introspection-result/MutationResolver.java.txt

@@ -7,6 +7,6 @@ package com.kobylynskyi.graphql.test1;
 )
 public interface MutationResolver {
 
-    Product create(ProductInput productInput) throws Exception;
+    Product create(@javax.validation.constraints.NotNull ProductInput productInput) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/from-introspection-result/ProductByIdQueryResolver.java.txt

@@ -7,6 +7,6 @@ package com.kobylynskyi.graphql.test1;
 )
 public interface ProductByIdQueryResolver {
 
-    Product productById(String id) throws Exception;
+    Product productById(@javax.validation.constraints.NotNull String id) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/from-introspection-result/ProductsByIdsQueryResolver.java.txt

@@ -7,6 +7,6 @@ package com.kobylynskyi.graphql.test1;
 )
 public interface ProductsByIdsQueryResolver {
 
-    java.util.List<Product> productsByIds(java.util.List<String> ids) throws Exception;
+    java.util.List<Product> productsByIds(@javax.validation.constraints.NotNull java.util.List<String> ids) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/from-introspection-result/QueryResolver.java.txt

@@ -9,8 +9,8 @@ public interface QueryResolver {
 
     java.util.List<Product> products() throws Exception;
 
-    Product productById(String id) throws Exception;
+    Product productById(@javax.validation.constraints.NotNull String id) throws Exception;
 
-    java.util.List<Product> productsByIds(java.util.List<String> ids) throws Exception;
+    java.util.List<Product> productsByIds(@javax.validation.constraints.NotNull java.util.List<String> ids) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/optional/NodeQueryResolver.java.txt

@@ -5,6 +5,6 @@
 )
 public interface NodeQueryResolver {
 
-    java.util.Optional<Node> node(String id) throws Exception;
+    java.util.Optional<Node> node(@javax.validation.constraints.NotNull String id) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/optional/NodeQueryResolver_mono.java.txt

@@ -5,6 +5,6 @@
 )
 public interface NodeQueryResolver {
 
-    reactor.core.publisher.Mono<java.util.Optional<Node>> node(String id) throws Exception;
+    reactor.core.publisher.Mono<java.util.Optional<Node>> node(@javax.validation.constraints.NotNull String id) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/optional/NodesQueryResolver.java.txt

@@ -6,6 +6,6 @@
 public interface NodesQueryResolver {
 
     @javax.validation.constraints.NotNull
-    java.util.List<Node> nodes(java.util.List<String> ids) throws Exception;
+    java.util.List<Node> nodes(@javax.validation.constraints.NotNull java.util.List<String> ids) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/optional/QueryResolver.java.txt

@@ -4,21 +4,21 @@
 )
 public interface QueryResolver {
 
-    java.util.Optional<CodeOfConduct> codeOfConduct(String key) throws Exception;
+    java.util.Optional<CodeOfConduct> codeOfConduct(@javax.validation.constraints.NotNull String key) throws Exception;
 
     java.util.List<CodeOfConduct> codesOfConduct() throws Exception;
 
-    java.util.Optional<License> license(String key) throws Exception;
+    java.util.Optional<License> license(@javax.validation.constraints.NotNull String key) throws Exception;
 
     @javax.validation.constraints.NotNull
     java.util.List<License> licenses() throws Exception;
 
     @javax.validation.constraints.NotNull
-    java.util.List<MarketplaceCategory> marketplaceCategories(Boolean excludeEmpty, Boolean excludeSubcategories, java.util.List<String> includeCategories) throws Exception;
+    java.util.List<MarketplaceCategory> marketplaceCategories(Boolean excludeEmpty, Boolean excludeSubcategories, @javax.validation.constraints.NotNull java.util.List<String> includeCategories) throws Exception;
 
-    java.util.Optional<MarketplaceCategory> marketplaceCategory(String slug, Boolean useTopicAliases) throws Exception;
+    java.util.Optional<MarketplaceCategory> marketplaceCategory(@javax.validation.constraints.NotNull String slug, Boolean useTopicAliases) throws Exception;
 
-    java.util.Optional<MarketplaceListing> marketplaceListing(String slug) throws Exception;
+    java.util.Optional<MarketplaceListing> marketplaceListing(@javax.validation.constraints.NotNull String slug) throws Exception;
 
     @javax.validation.constraints.NotNull
     MarketplaceListingConnection marketplaceListings(String adminId, String after, Boolean allStates, String before, String categorySlug, Integer first, Integer last, String organizationId, Boolean primaryCategoryOnly, java.util.List<String> slugs, Boolean useTopicAliases, Boolean viewerCanAdmin, Boolean withFreeTrialsOnly) throws Exception;
@@ -26,40 +26,40 @@ public interface QueryResolver {
     @javax.validation.constraints.NotNull
     GitHubMetadata meta() throws Exception;
 
-    java.util.Optional<Node> node(String id) throws Exception;
+    java.util.Optional<Node> node(@javax.validation.constraints.NotNull String id) throws Exception;
 
     @javax.validation.constraints.NotNull
-    java.util.List<Node> nodes(java.util.List<String> ids) throws Exception;
+    java.util.List<Node> nodes(@javax.validation.constraints.NotNull java.util.List<String> ids) throws Exception;
 
-    java.util.Optional<Organization> organization(String login) throws Exception;
+    java.util.Optional<Organization> organization(@javax.validation.constraints.NotNull String login) throws Exception;
 
     java.util.Optional<RateLimit> rateLimit(Boolean dryRun) throws Exception;
 
     @javax.validation.constraints.NotNull
     Query relay() throws Exception;
 
-    java.util.Optional<Repository> repository(String name, String owner) throws Exception;
+    java.util.Optional<Repository> repository(@javax.validation.constraints.NotNull String name, @javax.validation.constraints.NotNull String owner) throws Exception;
 
-    java.util.Optional<RepositoryOwner> repositoryOwner(String login) throws Exception;
+    java.util.Optional<RepositoryOwner> repositoryOwner(@javax.validation.constraints.NotNull String login) throws Exception;
 
-    java.util.Optional<UniformResourceLocatable> resource(String url) throws Exception;
+    java.util.Optional<UniformResourceLocatable> resource(@javax.validation.constraints.NotNull String url) throws Exception;
 
     @javax.validation.constraints.NotNull
-    SearchResultItemConnection search(String after, String before, Integer first, Integer last, String query, SearchType type) throws Exception;
+    SearchResultItemConnection search(String after, String before, Integer first, Integer last, @javax.validation.constraints.NotNull String query, @javax.validation.constraints.NotNull SearchType type) throws Exception;
 
     @javax.validation.constraints.NotNull
     SecurityAdvisoryConnection securityAdvisories(String after, String before, Integer first, SecurityAdvisoryIdentifierFilter identifier, Integer last, SecurityAdvisoryOrder orderBy, String publishedSince, String updatedSince) throws Exception;
 
-    java.util.Optional<SecurityAdvisory> securityAdvisory(String ghsaId) throws Exception;
+    java.util.Optional<SecurityAdvisory> securityAdvisory(@javax.validation.constraints.NotNull String ghsaId) throws Exception;
 
     @javax.validation.constraints.NotNull
-    SecurityVulnerabilityConnection securityVulnerabilities(String after, String before, SecurityAdvisoryEcosystem ecosystem, Integer first, Integer last, SecurityVulnerabilityOrder orderBy, String Package, java.util.List<SecurityAdvisorySeverity> severities) throws Exception;
+    SecurityVulnerabilityConnection securityVulnerabilities(String after, String before, SecurityAdvisoryEcosystem ecosystem, Integer first, Integer last, SecurityVulnerabilityOrder orderBy, String Package, @javax.validation.constraints.NotNull java.util.List<SecurityAdvisorySeverity> severities) throws Exception;
 
-    java.util.Optional<SponsorsListing> sponsorsListing(String slug) throws Exception;
+    java.util.Optional<SponsorsListing> sponsorsListing(@javax.validation.constraints.NotNull String slug) throws Exception;
 
-    java.util.Optional<Topic> topic(String name) throws Exception;
+    java.util.Optional<Topic> topic(@javax.validation.constraints.NotNull String name) throws Exception;
 
-    java.util.Optional<User> user(String login) throws Exception;
+    java.util.Optional<User> user(@javax.validation.constraints.NotNull String login) throws Exception;
 
     @javax.validation.constraints.NotNull
     User viewer() throws Exception;

src/test/resources/expected-classes/parent-interfaces/CreateEventMutationResolver.java.txt

@@ -14,6 +14,6 @@ public interface CreateEventMutationResolver extends graphql.kickstart.tools.Gra
      * Create a new event.
      */
     @javax.validation.constraints.NotNull
-    EventTO createEvent(String categoryId, String createdBy) throws Exception;
+    EventTO createEvent(@javax.validation.constraints.NotNull String categoryId, String createdBy) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/parent-interfaces/MutationResolver.java.txt

@@ -11,6 +11,6 @@ public interface MutationResolver extends graphql.kickstart.tools.GraphQLMutatio
      * Create a new event.
      */
     @javax.validation.constraints.NotNull
-    EventTO createEvent(String categoryId, String createdBy) throws Exception;
+    EventTO createEvent(@javax.validation.constraints.NotNull String categoryId, String createdBy) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/expected-classes/parent-interfaces/QueryResolver.java.txt

@@ -17,18 +17,18 @@ public interface QueryResolver extends graphql.kickstart.tools.GraphQLQueryResol
      * List of events of a specified category.
      */
     @javax.validation.constraints.NotNull
-    java.util.List<EventTO> eventsByCategoryAndStatus(String categoryId, EventStatusTO status) throws Exception;
+    java.util.List<EventTO> eventsByCategoryAndStatus(@javax.validation.constraints.NotNull String categoryId, EventStatusTO status) throws Exception;
 
     /**
      * Single event by ID.
      */
     @javax.validation.constraints.NotNull
-    EventTO eventById(String id) throws Exception;
+    EventTO eventById(@javax.validation.constraints.NotNull String id) throws Exception;
 
     /**
      * Events by IDs.
      */
     @javax.validation.constraints.NotNull
-    java.util.List<EventTO> eventsByIds(java.util.List<String> ids) throws Exception;
+    java.util.List<EventTO> eventsByIds(@javax.validation.constraints.NotNull java.util.List<String> ids) throws Exception;
 
 }
\ No newline at end of file

src/test/resources/schemas/test.graphqls

@@ -28,7 +28,7 @@ type Query {
 
 type Mutation {
     # Create a new event.
-    createEvent(categoryId: String!, createdBy: String!): Event!
+    createEvent(categoryId: String! @valid, createdBy: String): Event!
     @auth(
         roles: ["admin", "moderator"],
         boo: [true, false, true],
@@ -105,3 +105,4 @@ directive @auth (
 
 directive @customResolver on FIELD_DEFINITION | OBJECT
 directive @noResolver on FIELD_DEFINITION | OBJECT
+directive @valid on ARGUMENT_DEFINITION