Merge pull request #999 from kobylynskyi/develop

5.5.0 Release

Author: kobylynskyi

.github/workflows/github.yml

@@ -82,6 +82,7 @@ jobs:
 
   sonar:
     needs: build
+    if: github.event_name != 'pull_request'    
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -117,4 +118,5 @@ jobs:
       - name: Generate and publish Sonar report
         run: ./gradlew sonarqube -Dsonar.projectKey=kobylynskyi_graphql-java-codegen -Dsonar.organization=kobylynskyi -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_LOGIN }} --stacktrace
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}           
+          

build.gradle

@@ -9,7 +9,7 @@ plugins {
     id "org.sonarqube" version "3.2.0"
 }
 
-def graphqlCodegenVersion = '5.4.1' // This variable used in the automatic release process
+def graphqlCodegenVersion = '5.5.0' // This variable used in the automatic release process
 
 group = "io.github.kobylynskyi"
 version = graphqlCodegenVersion

docs/codegen-options.md

@@ -17,7 +17,7 @@
 
 ```groovy
 plugins {
-  id "io.github.kobylynskyi.graphql.codegen" version "5.4.1"
+  id "io.github.kobylynskyi.graphql.codegen" version "5.5.0"
 }
 ```
 
@@ -31,7 +31,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath "io.github.kobylynskyi.graphql.codegen:graphql-codegen-gradle-plugin:5.4.1"
+    classpath "io.github.kobylynskyi.graphql.codegen:graphql-codegen-gradle-plugin:5.5.0"
   }
 }
 

plugins/gradle/README.md

@@ -4,10 +4,10 @@ import io.github.kobylynskyi.graphql.codegen.gradle.GraphQLCodegenGradleTask
 plugins {
     id "java"
     id "org.jetbrains.kotlin.jvm" version "1.6.21"
-    id "io.github.kobylynskyi.graphql.codegen" version "5.4.1"
+    id "io.github.kobylynskyi.graphql.codegen" version "5.5.0"
 }
 
-def graphqlCodegenClientKotlinVersion = '5.4.1' // Variable used in the automatic release process
+def graphqlCodegenClientKotlinVersion = '5.5.0' // Variable used in the automatic release process
 
 group = 'io.github.dreamylost'
 version = graphqlCodegenClientKotlinVersion
@@ -29,7 +29,7 @@ repositories {
 
 
 dependencies {
-    implementation "io.github.kobylynskyi:graphql-java-codegen:5.4.1"
+    implementation "io.github.kobylynskyi:graphql-java-codegen:5.5.0"
     implementation "javax.validation:validation-api:2.0.1.Final"
     implementation "com.squareup.okhttp3:okhttp:4.2.2"
     implementation "com.fasterxml.jackson.core:jackson-core:2.13.3"

plugins/gradle/example-client-kotlin/build.gradle

@@ -7,7 +7,7 @@ plugins {
 
     // use the latest available version:
     // https://plugins.gradle.org/plugin/io.github.kobylynskyi.graphql.codegen
-    id "io.github.kobylynskyi.graphql.codegen" version "5.4.1"
+    id "io.github.kobylynskyi.graphql.codegen" version "5.5.0"
 }
 
 mainClassName = "io.github.kobylynskyi.order.Application"
@@ -22,7 +22,7 @@ dependencies {
 
     // use the latest available version:
     // https://search.maven.org/artifact/io.github.kobylynskyi/graphql-java-codegen
-    implementation "io.github.kobylynskyi:graphql-java-codegen:5.4.1"
+    implementation "io.github.kobylynskyi:graphql-java-codegen:5.5.0"
 
     implementation "org.apache.httpcomponents:httpclient:4.5.13"
     implementation "javax.validation:validation-api:2.0.1.Final"

plugins/gradle/example-client/build.gradle

@@ -6,7 +6,7 @@ plugins {
     //
     // use the latest available version:
     // https://plugins.gradle.org/plugin/io.github.kobylynskyi.graphql.codegen
-    id "io.github.kobylynskyi.graphql.codegen" version "5.4.1"
+    id "io.github.kobylynskyi.graphql.codegen" version "5.5.0"
 }
 
 mainClassName = "io.github.kobylynskyi.product.Application"

plugins/gradle/example-server/build.gradle

@@ -16,7 +16,7 @@ apply plugin: "java"
 apply plugin: "idea"
 apply plugin: "maven-publish"
 
-def graphqlCodegenGradlePluginVersion = '5.4.1' // This variable used in the automatic release process
+def graphqlCodegenGradlePluginVersion = '5.5.0' // This variable used in the automatic release process
 
 group = "io.github.kobylynskyi"
 version = graphqlCodegenGradlePluginVersion

plugins/gradle/graphql-java-codegen-gradle-plugin/build.gradle

@@ -87,6 +87,8 @@ public class GraphQLCodegenGradleTask extends DefaultTask implements GraphQLCode
     private Set<String> fieldsWithResolvers = new HashSet<>();
     private Set<String> fieldsWithoutResolvers = new HashSet<>();
     private Set<String> typesAsInterfaces = new HashSet<>();
+    private Set<String> resolverArgumentAnnotations = new HashSet<>();
+    private Set<String> parametrizedResolverAnnotations = new HashSet<>();
     private final RelayConfig relayConfig = new RelayConfig();
 
 
@@ -109,6 +111,8 @@ public class GraphQLCodegenGradleTask extends DefaultTask implements GraphQLCode
     private Boolean supportUnknownFields = MappingConfigConstants.DEFAULT_SUPPORT_UNKNOWN_FIELDS;
     private String unknownFieldsPropertyName = MappingConfigConstants.DEFAULT_UNKNOWN_FIELDS_PROPERTY_NAME;
 
+    private Boolean skip = false;
+
     public GraphQLCodegenGradleTask() {
         setGroup("codegen");
         setDescription("Generates Java POJOs and interfaces based on GraphQL schemas");
@@ -164,6 +168,10 @@ public void generate() throws Exception {
                 fieldsWithoutResolvers != null ? fieldsWithoutResolvers : new HashSet<>());
         mappingConfig.setTypesAsInterfaces(
                 typesAsInterfaces != null ? typesAsInterfaces : new HashSet<>());
+        mappingConfig.setResolverArgumentAnnotations(
+                resolverArgumentAnnotations != null ? resolverArgumentAnnotations : new HashSet<>());
+        mappingConfig.setParametrizedResolverAnnotations(
+                parametrizedResolverAnnotations != null ? parametrizedResolverAnnotations : new HashSet<>());
         mappingConfig.setRelayConfig(relayConfig);
 
         mappingConfig.setGenerateClient(generateClient);
@@ -188,6 +196,11 @@ public void generate() throws Exception {
         mappingConfig.setSupportUnknownFields(isSupportUnknownFields());
         mappingConfig.setUnknownFieldsPropertyName(getUnknownFieldsPropertyName());
 
+        if (Boolean.TRUE.equals(skip)) {
+            getLogger().info("Skipping code generation");
+            return;
+        }
+
         instantiateCodegen(mappingConfig).generate();
     }
 
@@ -689,6 +702,28 @@ public void setTypesAsInterfaces(Set<String> typesAsInterfaces) {
         this.typesAsInterfaces = typesAsInterfaces;
     }
 
+    @Input
+    @Optional
+    @Override
+    public Set<String> getResolverArgumentAnnotations() {
+        return resolverArgumentAnnotations;
+    }
+
+    public void setResolverArgumentAnnotations(Set<String> resolverArgumentAnnotations) {
+        this.resolverArgumentAnnotations = resolverArgumentAnnotations;
+    }
+
+    @Input
+    @Optional
+    @Override
+    public Set<String> getParametrizedResolverAnnotations() {
+        return parametrizedResolverAnnotations;
+    }
+
+    public void setParametrizedResolverAnnotations(Set<String> parametrizedResolverAnnotations) {
+        this.parametrizedResolverAnnotations = parametrizedResolverAnnotations;
+    }
+
     @Nested
     @Optional
     @Override
@@ -897,6 +932,15 @@ public String getUnknownFieldsPropertyName() {
     public void setUnknownFieldsPropertyName(String unknownFieldsPropertyName) {
         this.unknownFieldsPropertyName = unknownFieldsPropertyName;
     }
-    
+
+    @Input
+    @Optional
+    public Boolean isSkip() {
+        return skip;
+    }
+
+    public void setSkip(Boolean skip) {
+        this.skip = skip;
+    }
 
 }

plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java

@@ -20,7 +20,7 @@
         <plugin>
             <groupId>io.github.kobylynskyi</groupId>
             <artifactId>graphql-codegen-maven-plugin</artifactId>
-            <version>5.4.1</version>
+            <version>5.5.0</version>
             <executions>
                 <execution>
                     <goals>