Merge pull request #1057 from kobylynskyi/develop

kobylynskyi · web-flow · commit 6e1bde7d3736 · 2023-03-22T20:55:42.000-04:00
5.7.1 Release
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ plugins {
     id "org.sonarqube" version "3.2.0"
 }
 
-def graphqlCodegenVersion = '5.7.0' // This variable used in the automatic release process
+def graphqlCodegenVersion = '5.7.1' // This variable used in the automatic release process
 
 group = "io.github.kobylynskyi"
 version = graphqlCodegenVersion
diff --git a/plugins/gradle/README.md b/plugins/gradle/README.md
@@ -17,7 +17,7 @@
 
 ```groovy
 plugins {
-  id "io.github.kobylynskyi.graphql.codegen" version "5.7.0"
+  id "io.github.kobylynskyi.graphql.codegen" version "5.7.1"
 }
 ```
 
@@ -31,7 +31,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath "io.github.kobylynskyi.graphql.codegen:graphql-codegen-gradle-plugin:5.7.0"
+    classpath "io.github.kobylynskyi.graphql.codegen:graphql-codegen-gradle-plugin:5.7.1"
   }
 }
 
diff --git a/plugins/gradle/example-client-kotlin/build.gradle b/plugins/gradle/example-client-kotlin/build.gradle
@@ -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.7.0"
+    id "io.github.kobylynskyi.graphql.codegen" version "5.7.1"
 }
 
-def graphqlCodegenClientKotlinVersion = '5.7.0' // Variable used in the automatic release process
+def graphqlCodegenClientKotlinVersion = '5.7.1' // Variable used in the automatic release process
 
 group = 'io.github.dreamylost'
 version = graphqlCodegenClientKotlinVersion
@@ -29,16 +29,16 @@ repositories {
 
 
 dependencies {
-    implementation "io.github.kobylynskyi:graphql-java-codegen:5.7.0"
+    implementation "io.github.kobylynskyi:graphql-java-codegen:5.7.1"
     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"
     implementation "com.fasterxml.jackson.core:jackson-databind:2.13.3"
     implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.3"
     implementation "com.fasterxml.jackson.core:jackson-annotations:2.13.3"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.0"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.0"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
 }
 
 /**
diff --git a/plugins/gradle/example-client/build.gradle b/plugins/gradle/example-client/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.7.0"
+    id "io.github.kobylynskyi.graphql.codegen" version "5.7.1"
 }
 
 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.7.0"
+    implementation "io.github.kobylynskyi:graphql-java-codegen:5.7.1"
 
     implementation "org.apache.httpcomponents:httpclient:4.5.13"
     implementation "javax.validation:validation-api:2.0.1.Final"
diff --git a/plugins/gradle/example-server/build.gradle b/plugins/gradle/example-server/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.7.0"
+    id "io.github.kobylynskyi.graphql.codegen" version "5.7.1"
 }
 
 mainClassName = "io.github.kobylynskyi.product.Application"
diff --git a/plugins/gradle/graphql-java-codegen-gradle-plugin/build.gradle b/plugins/gradle/graphql-java-codegen-gradle-plugin/build.gradle
@@ -16,7 +16,7 @@ apply plugin: "java"
 apply plugin: "idea"
 apply plugin: "maven-publish"
 
-def graphqlCodegenGradlePluginVersion = '5.7.0' // This variable used in the automatic release process
+def graphqlCodegenGradlePluginVersion = '5.7.1' // This variable used in the automatic release process
 
 group = "io.github.kobylynskyi"
 version = graphqlCodegenGradlePluginVersion
diff --git a/plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java b/plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java
@@ -134,6 +134,8 @@ public void generate() throws Exception {
         mappingConfig.setPackageName(packageName);
         mappingConfig.setCustomTypesMapping(
                 customTypesMapping != null ? customTypesMapping : new HashMap<>());
+        mappingConfig.setCustomAnnotationsMapping(
+                customAnnotationsMapping != null ? customAnnotationsMapping : new HashMap<>());
         mappingConfig.setCustomTemplates(
                 customTemplates != null ? customTemplates : new HashMap<>());
         mappingConfig.setDirectiveAnnotationsMapping(
diff --git a/plugins/maven/README.md b/plugins/maven/README.md
@@ -20,7 +20,7 @@
         <plugin>
             <groupId>io.github.kobylynskyi</groupId>
             <artifactId>graphql-codegen-maven-plugin</artifactId>
-            <version>5.7.0</version>
+            <version>5.7.1</version>
             <executions>
                 <execution>
                     <goals>
diff --git a/plugins/maven/example-client/pom.xml b/plugins/maven/example-client/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>io.github.kobylynskyi</groupId>
     <artifactId>graphql-codegen-maven-plugin-example-client</artifactId>
-    <version>5.7.0</version>
+    <version>5.7.1</version>
     <name>graphql-codegen-maven-plugin-example-client</name>
 
     <build>
diff --git a/plugins/maven/example-server/pom.xml b/plugins/maven/example-server/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>io.github.kobylynskyi</groupId>
     <artifactId>graphql-codegen-maven-plugin-example-server</artifactId>
-    <version>5.7.0</version>
+    <version>5.7.1</version>
     <name>graphql-codegen-maven-plugin-example-server</name>
 
     <build>
diff --git a/plugins/maven/graphql-java-codegen-maven-plugin/pom.xml b/plugins/maven/graphql-java-codegen-maven-plugin/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>io.github.kobylynskyi</groupId>
     <artifactId>graphql-codegen-maven-plugin</artifactId>
-    <version>5.7.0</version>
+    <version>5.7.1</version>
     <packaging>maven-plugin</packaging>
 
     <name>graphql-codegen-maven-plugin</name>
@@ -72,7 +72,7 @@
         <version.maven-gpg-plugin>3.0.1</version.maven-gpg-plugin>
         <version.maven-shared-utils>3.3.4</version.maven-shared-utils>
 
-        <version.graphql-java-codegen>5.7.0</version.graphql-java-codegen>
+        <version.graphql-java-codegen>5.7.1</version.graphql-java-codegen>
     </properties>
 
     <dependencies>
diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/example-client-scala/project/plugins.sbt b/plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/example-client-scala/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("io.github.jxnu-liguobin" % "graphql-codegen-sbt-plugin" % "5.7.0")
+addSbtPlugin("io.github.jxnu-liguobin" % "graphql-codegen-sbt-plugin" % "5.7.1")
diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/example-client-scala/version.sbt b/plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/example-client-scala/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "5.7.0"
+version in ThisBuild := "5.7.1"
diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/example-client/project/plugins.sbt b/plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/example-client/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("io.github.jxnu-liguobin" % "graphql-codegen-sbt-plugin" % "5.7.0")
+addSbtPlugin("io.github.jxnu-liguobin" % "graphql-codegen-sbt-plugin" % "5.7.1")
diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/example-client/version.sbt b/plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/example-client/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "5.7.0"
+version in ThisBuild := "5.7.1"
diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/simple/project/plugins.sbt b/plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/simple/project/plugins.sbt
@@ -1,4 +1,4 @@
-sys.props.get("plugin.version").orElse(Some("5.7.0")) match {
+sys.props.get("plugin.version").orElse(Some("5.7.1")) match {
   case Some(x) => addSbtPlugin("io.github.jxnu-liguobin" % "graphql-codegen-sbt-plugin" % x)
   case _ => sys.error("""|The system property 'plugin.version' is not defined.
                          |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/simple/version.sbt b/plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/simple/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "5.7.0"
+version in ThisBuild := "5.7.1"
diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/version.sbt b/plugins/sbt/graphql-java-codegen-sbt-plugin/version.sbt
@@ -1 +1 @@
-ThisBuild / version := "5.7.0"
+ThisBuild / version := "5.7.1"
diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenAnnotationsTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenAnnotationsTest.java
@@ -76,6 +76,19 @@ void generate_CustomAnnotationMappings_Type() throws Exception {
                 "    private org.joda.time.DateTime createdDateTime;");
     }
 
+    @Test
+    void generate_CustomAnnotationMappings_Input() throws Exception {
+        mappingConfig.setCustomAnnotationsMapping(new HashMap<>(singletonMap("ReproInput.reproField",
+                singletonList("@com.fasterxml.jackson.annotation.JsonProperty(\"reproField\")"))));
+
+        generate("src/test/resources/schemas/input.graphqls");
+
+        File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
+        assertFileContainsElements(files, "ReproInput.java",
+                "    @com.fasterxml.jackson.annotation.JsonProperty(\"reproField\")\n" +
+                        "    private java.util.List<String> reproField;");
+    }
+
     @Test
     void generate_CustomAnnotationMappings_Regexp() throws Exception {
         mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("DateTime", "org.joda.time.DateTime")));
diff --git a/src/test/resources/schemas/input.graphqls b/src/test/resources/schemas/input.graphqls
@@ -0,0 +1,15 @@
+schema {
+    query: Query
+}
+
+type Query {
+    repro(input: ReproInput!): ReproOutput
+}
+
+input ReproInput {
+    reproField: [String!]!
+}
+
+type ReproOutput {
+    id: ID!
+}

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ plugins {`
`9`	`9`	`id "org.sonarqube" version "3.2.0"`
`10`	`10`	`}`
`11`	`11`
`12`		`-def graphqlCodegenVersion = '5.7.0' // This variable used in the automatic release process`
	`12`	`+def graphqlCodegenVersion = '5.7.1' // This variable used in the automatic release process`
`13`	`13`
`14`	`14`	`group = "io.github.kobylynskyi"`
`15`	`15`	`version = graphqlCodegenVersion`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	```groovy
`19`	`19`	`plugins {`
`20`		`- id "io.github.kobylynskyi.graphql.codegen" version "5.7.0"`
	`20`	`+ id "io.github.kobylynskyi.graphql.codegen" version "5.7.1"`
`21`	`21`	`}`
`22`	`22`	```
`23`	`23`
`@@ -31,7 +31,7 @@ buildscript {`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`dependencies {`
`34`		`- classpath "io.github.kobylynskyi.graphql.codegen:graphql-codegen-gradle-plugin:5.7.0"`
	`34`	`+ classpath "io.github.kobylynskyi.graphql.codegen:graphql-codegen-gradle-plugin:5.7.1"`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ plugins {`
`6`	`6`	`//`
`7`	`7`	`// use the latest available version:`
`8`	`8`	`// https://plugins.gradle.org/plugin/io.github.kobylynskyi.graphql.codegen`
`9`		`- id "io.github.kobylynskyi.graphql.codegen" version "5.7.0"`
	`9`	`+ id "io.github.kobylynskyi.graphql.codegen" version "5.7.1"`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`mainClassName = "io.github.kobylynskyi.product.Application"`