Skip to content

Commit 219866e

Browse files
authored
upgrade to 7.x.x codegen library (#207)
* upgrade to 7.x.x codegen library * upgrade to java 17
1 parent ece8b99 commit 219866e

File tree

4 files changed

+19
-21
lines changed

4 files changed

+19
-21
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@v4
19-
- name: Set up JDK 11
19+
- name: Set up JDK 17
2020
uses: actions/setup-java@v4
2121
with:
22-
java-version: '11'
22+
java-version: '17'
2323
distribution: 'temurin'
2424
cache: maven
2525
- name: Build/Test with Maven

.github/workflows/publish.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v4
1717

18-
- name: Set up JDK 11
18+
- name: Set up JDK 17
1919
uses: actions/setup-java@v4
2020
with:
21-
java-version: 11
21+
java-version: 17
2222
distribution: 'temurin'
2323
cache: maven
2424
- name: Build with Maven
@@ -27,7 +27,7 @@ jobs:
2727
- name: Set up Apache Maven Central
2828
uses: actions/setup-java@v4
2929
with: # running setup-java again overwrites the settings.xml
30-
java-version: 11
30+
java-version: 17
3131
distribution: 'temurin'
3232
server-id: ossrh
3333
server-username: OSSRH_USERNAME

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>io.github.deweyjose</groupId>
88
<artifactId>graphqlcodegen-maven-plugin</artifactId>
99
<packaging>maven-plugin</packaging>
10-
<version>1.61.6</version>
10+
<version>2.0.0</version>
1111

1212
<name>GraphQL Code Generator</name>
1313
<description>Maven port of the Netflix DGS GraphQL Codegen gradle build plugin</description>
@@ -36,8 +36,8 @@
3636

3737
<properties>
3838
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
39-
<graphql-dgs-codegen-core.version>6.3.0</graphql-dgs-codegen-core.version>
40-
<java.version>1.8</java.version>
39+
<graphql-dgs-codegen-core.version>7.0.3</graphql-dgs-codegen-core.version>
40+
<java.version>17</java.version>
4141
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
4242
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
4343
<maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>

src/main/java/io/github/deweyjose/graphqlcodegen/Codegen.java

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,8 @@ public class Codegen extends AbstractMojo {
3838
@Parameter(defaultValue = "${project}")
3939
private MavenProject project;
4040

41-
@Parameter(
42-
property = "schemaPaths",
43-
defaultValue = "${project.basedir}/src/main/resources/schema")
44-
private File[] schemaPaths;
41+
@Parameter(property = "schemas", defaultValue = "${project.basedir}/src/main/resources/schema")
42+
private File[] schemas;
4543

4644
@Parameter(alias = "schemaJarFilesFromDependencies", property = "schemaJarFilesFromDependencies")
4745
private String[] schemaJarFilesFromDependencies;
@@ -81,8 +79,8 @@ public class Codegen extends AbstractMojo {
8179
@Parameter(property = "generateClientApi", defaultValue = "false")
8280
private boolean generateClientApi;
8381

84-
@Parameter(property = "generateClientApiV2", defaultValue = "false")
85-
private boolean generateClientApiV2;
82+
@Parameter(property = "generateClientApiv2", defaultValue = "false")
83+
private boolean generateClientApiv2;
8684

8785
@Parameter(property = "generateDataTypes", defaultValue = "true")
8886
private boolean generateDataTypes;
@@ -100,9 +98,9 @@ public class Codegen extends AbstractMojo {
10098
private File outputDir;
10199

102100
@Parameter(
103-
property = "exampleOutputDir",
101+
property = "examplesOutputDir",
104102
defaultValue = "${project.build.directory}/generated-examples")
105-
private File exampleOutputDir;
103+
private File examplesOutputDir;
106104

107105
@Parameter(
108106
property = "schemaManifestOutputDir",
@@ -194,7 +192,7 @@ public class Codegen extends AbstractMojo {
194192
*/
195193
private Set<File> expandSchemaPaths() {
196194
if (onlyGenerateChanged) {
197-
Set<File> configuredSchemaPaths = stream(schemaPaths).collect(toSet());
195+
Set<File> configuredSchemaPaths = stream(schemas).collect(toSet());
198196
Set<File> expandedSchemaPaths = new HashSet<>();
199197

200198
// expand any directories into graphql file paths
@@ -209,7 +207,7 @@ private Set<File> expandSchemaPaths() {
209207
getLog().info(String.format("expanded schema paths: %s", expandedSchemaPaths));
210208
return expandedSchemaPaths;
211209
} else {
212-
return stream(schemaPaths).collect(toSet());
210+
return stream(schemas).collect(toSet());
213211
}
214212
}
215213

@@ -264,7 +262,7 @@ public void execute() {
264262
fullSchemaPaths,
265263
DependencySchemaExtractor.extract(project, schemaJarFilesFromDependencies),
266264
outputDir.toPath(),
267-
exampleOutputDir.toPath(),
265+
examplesOutputDir.toPath(),
268266
writeToFiles,
269267
packageName,
270268
subPackageNameClient,
@@ -275,7 +273,7 @@ public void execute() {
275273
generateBoxedTypes,
276274
generateIsGetterForPrimitiveBooleanFields,
277275
generateClientApi,
278-
generateClientApiV2,
276+
generateClientApiv2,
279277
generateInterfaces,
280278
generateKotlinNullableClasses,
281279
generateKotlinClosureProjections,
@@ -362,7 +360,7 @@ public void verifySchemaFiles(Set<File> fullSchemaPaths) {
362360
getLog()
363361
.error(
364362
"No schema files found and no schemaJarFilesFromDependencies specified. "
365-
+ "Refer to documentation for schemaPaths and schemaJarFilesFromDependencies. ");
363+
+ "Refer to documentation for schemas and schemaJarFilesFromDependencies. ");
366364
throw new IllegalArgumentException("No schema files found. Please check your configuration.");
367365
}
368366
}

0 commit comments

Comments
 (0)