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

Author: jpact

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 @@ void generate_Directives() throws Exception {
                         "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;
 
 }

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;
 
 }

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;
 
 }

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;
 
 }

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;
 
 }

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;
 
 }

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;
 
 }