Skip to content

Commit cd32413

Browse files
authored
fix: fixed federation link imports (#1643)
This was fixed in #1593 and broken again in #1618.
1 parent ba98efb commit cd32413

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

generator/graphql-kotlin-federation/src/main/kotlin/com/expediagroup/graphql/generator/federation/FederatedSchemaGeneratorHooks.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ open class FederatedSchemaGeneratorHooks(private val resolvers: List<FederatedTy
141141
builder.additionalDirective(it)
142142
}
143143
if (optInFederationV2) {
144-
val fed2Imports = federatedDirectiveV2List.map { it.name }
145-
.minus(LINK_DIRECTIVE_NAME)
144+
val fed2Imports = federatedDirectiveV2List.map { "@${it.name}" }
145+
.minus("@$LINK_DIRECTIVE_NAME")
146146
.plus(FIELD_SET_SCALAR_NAME)
147147

148148
builder.withSchemaDirective(LINK_DIRECTIVE_TYPE)

generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/FederatedSchemaV2GeneratorTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class FederatedSchemaV2GeneratorTest {
3030
fun `verify can generate federated schema`() {
3131
val expectedSchema =
3232
"""
33-
schema @link(import : ["extends", "external", "inaccessible", "key", "override", "provides", "requires", "shareable", "tag", "FieldSet"], url : "https://specs.apollo.dev/federation/v2.0"){
33+
schema @link(import : ["@extends", "@external", "@inaccessible", "@key", "@override", "@provides", "@requires", "@shareable", "@tag", "FieldSet"], url : "https://specs.apollo.dev/federation/v2.0"){
3434
query: Query
3535
}
3636

generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/execution/ServiceQueryResolverTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ type SelfReferenceObject {
9999

100100
const val FEDERATED_SERVICE_SDL_V2 =
101101
"""
102-
schema @link(import : ["extends", "external", "inaccessible", "key", "override", "provides", "requires", "shareable", "tag", "FieldSet"], url : "https://specs.apollo.dev/federation/v2.0"){
102+
schema @link(import : ["@extends", "@external", "@inaccessible", "@key", "@override", "@provides", "@requires", "@shareable", "@tag", "FieldSet"], url : "https://specs.apollo.dev/federation/v2.0"){
103103
query: Query
104104
}
105105

0 commit comments

Comments
 (0)