Skip to content

Commit bf09441

Browse files
jiholee17jiholee17
authored
Merge pull request #913 from Netflix/fix/kotlin-closures-v2
Fix generating Kotlin closure projections for generateClientv2
2 parents 0805dc4 + 915a975 commit bf09441

File tree

11 files changed

+73
-75
lines changed

11 files changed

+73
-75
lines changed

‎graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ class CodeGen(
296296

297297
private fun generateJavaClientApi(definitions: Collection<Definition<*>>): CodeGenResult {
298298
val methodNames = mutableSetOf<String>()
299-
return if (config.generateClientApi || config.generateClientApiv2) {
299+
return if (config.generateClientApi) {
300300
definitions
301301
.asSequence()
302302
.filterIsInstance<ObjectTypeDefinition>()
@@ -311,7 +311,7 @@ class CodeGen(
311311
}
312312

313313
private fun generateJavaClientEntitiesApi(definitions: Collection<Definition<*>>): CodeGenResult =
314-
if (config.generateClientApi || config.generateClientApiv2) {
314+
if (config.generateClientApi) {
315315
val federatedDefinitions =
316316
definitions
317317
.asSequence()
@@ -324,7 +324,7 @@ class CodeGen(
324324
}
325325

326326
private fun generateJavaClientEntitiesRepresentations(definitions: Collection<Definition<*>>): CodeGenResult =
327-
if (config.generateClientApi || config.generateClientApiv2) {
327+
if (config.generateClientApi) {
328328
val generatedRepresentations = mutableMapOf<String, Any>()
329329
definitions
330330
.asSequence()
@@ -554,7 +554,6 @@ class CodeGenConfig(
554554
var generateBoxedTypes: Boolean = false,
555555
var generateIsGetterForPrimitiveBooleanFields: Boolean = false,
556556
var generateClientApi: Boolean = false,
557-
var generateClientApiv2: Boolean = false,
558557
var generateInterfaces: Boolean = false,
559558
var generateKotlinNullableClasses: Boolean = false,
560559
var generateKotlinClosureProjections: Boolean = false,

‎graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/RequiredTypeCollector.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class RequiredTypeCollector(
4646
"Mutation" -> definition.fieldDefinitions.filterTo(fieldDefinitions) { it.name in config.includeMutations }
4747
"Subscription" -> definition.fieldDefinitions.filterTo(fieldDefinitions) { it.name in config.includeSubscriptions }
4848
else -> {
49-
if (config.generateClientApiv2 == true || config.generateClientApi == true) {
49+
if (config.generateClientApi) {
5050
fieldDefinitions.addAll(definition.fieldDefinitions)
5151
}
5252
}

‎graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6979,7 +6979,7 @@ It takes a title and such.
69796979
CodeGen(
69806980
CodeGenConfig(
69816981
schemas = setOf(schema),
6982-
generateClientApiv2 = true,
6982+
generateClientApi = true,
69836983
),
69846984
).generate()
69856985
assertThat(

‎graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/EntitiesClientApiGenTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ class EntitiesClientApiGenTest {
629629
CodeGenConfig(
630630
schemas = setOf(schema),
631631
packageName = BASE_PACKAGE_NAME,
632-
generateClientApiv2 = true,
632+
generateClientApi = true,
633633
language = Language.JAVA,
634634
),
635635
).generate()

‎graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenBuilderTest.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ClientApiGenBuilderTest {
3939
CodeGenConfig(
4040
schemas = setOf(schema),
4141
packageName = BASE_PACKAGE_NAME,
42-
generateClientApiv2 = true,
42+
generateClientApi = true,
4343
),
4444
).generate()
4545

@@ -73,7 +73,7 @@ class ClientApiGenBuilderTest {
7373
CodeGenConfig(
7474
schemas = setOf(schema),
7575
packageName = BASE_PACKAGE_NAME,
76-
generateClientApiv2 = true,
76+
generateClientApi = true,
7777
),
7878
).generate()
7979

@@ -104,7 +104,7 @@ class ClientApiGenBuilderTest {
104104
CodeGenConfig(
105105
schemas = setOf(schema),
106106
packageName = BASE_PACKAGE_NAME,
107-
generateClientApiv2 = true,
107+
generateClientApi = true,
108108
),
109109
).generate()
110110

@@ -133,7 +133,7 @@ class ClientApiGenBuilderTest {
133133
CodeGenConfig(
134134
schemas = setOf(schema),
135135
packageName = BASE_PACKAGE_NAME,
136-
generateClientApiv2 = true,
136+
generateClientApi = true,
137137
),
138138
).generate()
139139

@@ -171,7 +171,7 @@ class ClientApiGenBuilderTest {
171171
CodeGenConfig(
172172
schemas = setOf(schema),
173173
packageName = BASE_PACKAGE_NAME,
174-
generateClientApiv2 = true,
174+
generateClientApi = true,
175175
addDeprecatedAnnotation = true,
176176
),
177177
).generate()
@@ -219,7 +219,7 @@ class ClientApiGenBuilderTest {
219219
CodeGenConfig(
220220
schemas = setOf(schema),
221221
packageName = BASE_PACKAGE_NAME,
222-
generateClientApiv2 = true,
222+
generateClientApi = true,
223223
addDeprecatedAnnotation = true,
224224
),
225225
).generate()
@@ -273,7 +273,7 @@ class ClientApiGenBuilderTest {
273273
CodeGenConfig(
274274
schemas = setOf(schema),
275275
packageName = BASE_PACKAGE_NAME,
276-
generateClientApiv2 = true,
276+
generateClientApi = true,
277277
addDeprecatedAnnotation = true,
278278
),
279279
).generate()
@@ -329,7 +329,7 @@ class ClientApiGenBuilderTest {
329329
CodeGenConfig(
330330
schemas = setOf(schema),
331331
packageName = BASE_PACKAGE_NAME,
332-
generateClientApiv2 = true,
332+
generateClientApi = true,
333333
addDeprecatedAnnotation = true,
334334
),
335335
).generate()
@@ -387,7 +387,7 @@ class ClientApiGenBuilderTest {
387387
CodeGenConfig(
388388
schemas = setOf(schema),
389389
packageName = BASE_PACKAGE_NAME,
390-
generateClientApiv2 = true,
390+
generateClientApi = true,
391391
),
392392
).generate()
393393

‎graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenFragmentTest.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class ClientApiGenFragmentTest {
5656
CodeGenConfig(
5757
schemas = setOf(schema),
5858
packageName = BASE_PACKAGE_NAME,
59-
generateClientApiv2 = true,
59+
generateClientApi = true,
6060
),
6161
).generate()
6262

@@ -116,7 +116,7 @@ class ClientApiGenFragmentTest {
116116
CodeGenConfig(
117117
schemas = setOf(schema),
118118
packageName = BASE_PACKAGE_NAME,
119-
generateClientApiv2 = true,
119+
generateClientApi = true,
120120
),
121121
).generate()
122122

@@ -169,7 +169,7 @@ class ClientApiGenFragmentTest {
169169
CodeGenConfig(
170170
schemas = setOf(schema),
171171
packageName = BASE_PACKAGE_NAME,
172-
generateClientApiv2 = true,
172+
generateClientApi = true,
173173
),
174174
).generate()
175175

@@ -216,7 +216,7 @@ class ClientApiGenFragmentTest {
216216
CodeGenConfig(
217217
schemas = setOf(schema),
218218
packageName = BASE_PACKAGE_NAME,
219-
generateClientApiv2 = true,
219+
generateClientApi = true,
220220
),
221221
).generate()
222222

@@ -269,7 +269,7 @@ class ClientApiGenFragmentTest {
269269
CodeGenConfig(
270270
schemas = setOf(schema),
271271
packageName = BASE_PACKAGE_NAME,
272-
generateClientApiv2 = true,
272+
generateClientApi = true,
273273
),
274274
).generate()
275275

‎graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenMutationTest.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ClientApiGenMutationTest {
4545
CodeGenConfig(
4646
schemas = setOf(schema),
4747
packageName = BASE_PACKAGE_NAME,
48-
generateClientApiv2 = true,
48+
generateClientApi = true,
4949
),
5050
).generate()
5151

@@ -80,7 +80,7 @@ class ClientApiGenMutationTest {
8080
CodeGenConfig(
8181
schemas = setOf(schema),
8282
packageName = BASE_PACKAGE_NAME,
83-
generateClientApiv2 = true,
83+
generateClientApi = true,
8484
),
8585
).generate()
8686

@@ -121,7 +121,7 @@ class ClientApiGenMutationTest {
121121
CodeGenConfig(
122122
schemas = setOf(schema),
123123
packageName = BASE_PACKAGE_NAME,
124-
generateClientApiv2 = true,
124+
generateClientApi = true,
125125
),
126126
).generate()
127127

@@ -167,7 +167,7 @@ class ClientApiGenMutationTest {
167167
CodeGenConfig(
168168
schemas = setOf(schema),
169169
packageName = BASE_PACKAGE_NAME,
170-
generateClientApiv2 = true,
170+
generateClientApi = true,
171171
),
172172
).generate()
173173

@@ -216,7 +216,7 @@ class ClientApiGenMutationTest {
216216
CodeGenConfig(
217217
schemas = setOf(schema),
218218
packageName = BASE_PACKAGE_NAME,
219-
generateClientApiv2 = true,
219+
generateClientApi = true,
220220
),
221221
).generate()
222222

@@ -286,7 +286,7 @@ class ClientApiGenMutationTest {
286286
CodeGenConfig(
287287
schemas = setOf(schema),
288288
packageName = BASE_PACKAGE_NAME,
289-
generateClientApiv2 = true,
289+
generateClientApi = true,
290290
includeMutations = setOf("shows"),
291291
generateDataTypes = false,
292292
writeToFiles = false,
@@ -328,7 +328,7 @@ class ClientApiGenMutationTest {
328328
CodeGenConfig(
329329
schemas = setOf(schema),
330330
packageName = BASE_PACKAGE_NAME,
331-
generateClientApiv2 = true,
331+
generateClientApi = true,
332332
includeMutations = setOf("updateMovieTitle"),
333333
),
334334
).generate()

0 commit comments

Comments
 (0)