diff --git a/generator/graphql-kotlin-federation/src/main/kotlin/com/expediagroup/graphql/generator/federation/directives/LinkDirective.kt b/generator/graphql-kotlin-federation/src/main/kotlin/com/expediagroup/graphql/generator/federation/directives/LinkDirective.kt index 88ebd221a0..18285ca2a0 100644 --- a/generator/graphql-kotlin-federation/src/main/kotlin/com/expediagroup/graphql/generator/federation/directives/LinkDirective.kt +++ b/generator/graphql-kotlin-federation/src/main/kotlin/com/expediagroup/graphql/generator/federation/directives/LinkDirective.kt @@ -32,7 +32,7 @@ const val LINK_SPEC_URL_PREFIX = "$APOLLO_SPEC_URL/$LINK_SPEC" const val LINK_SPEC_LATEST_URL = "$LINK_SPEC_URL_PREFIX/v$LINK_SPEC_LATEST_VERSION" const val FEDERATION_SPEC = "federation" -const val FEDERATION_SPEC_LATEST_VERSION = "2.14" +const val FEDERATION_SPEC_LATEST_VERSION = "2.13" const val FEDERATION_SPEC_URL_PREFIX = "$APOLLO_SPEC_URL/$FEDERATION_SPEC" const val FEDERATION_SPEC_LATEST_URL = "$FEDERATION_SPEC_URL_PREFIX/v$FEDERATION_SPEC_LATEST_VERSION" diff --git a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/FederatedSchemaGeneratorTest.kt b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/FederatedSchemaGeneratorTest.kt index 7334149412..13984a79ff 100644 --- a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/FederatedSchemaGeneratorTest.kt +++ b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/FederatedSchemaGeneratorTest.kt @@ -36,7 +36,7 @@ class FederatedSchemaGeneratorTest { fun `verify can generate federated schema`() { val expectedSchema = """ - schema @link(import : ["@external", "@key", "@provides", "@requires", "FieldSet"], url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(import : ["@external", "@key", "@provides", "@requires", "FieldSet"], url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } @@ -164,7 +164,7 @@ class FederatedSchemaGeneratorTest { fun `verify generator does not add federation queries for non-federated schemas`() { val expectedSchema = """ - schema @link(url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } @@ -226,7 +226,7 @@ class FederatedSchemaGeneratorTest { fun `verify a schema with self nested query still works`() { val expectedSchema = """ - schema @link(url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } diff --git a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/cachetag/CacheTagDirectiveTest.kt b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/cachetag/CacheTagDirectiveTest.kt index 61cb8ed75c..2c11cf5b17 100644 --- a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/cachetag/CacheTagDirectiveTest.kt +++ b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/cachetag/CacheTagDirectiveTest.kt @@ -37,7 +37,7 @@ class CacheTagDirectiveTest { val expectedSchema = // language=GraphQL """ - schema @link(import : ["@cacheTag"], url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(import : ["@cacheTag"], url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } @@ -95,7 +95,7 @@ class CacheTagDirectiveTest { this.linkSpecs[FEDERATION_SPEC] = FederatedSchemaGeneratorHooks.LinkSpec( namespace = FEDERATION_SPEC, imports = mapOf("cacheTag" to "cacheTag"), - url = "$FEDERATION_SPEC_URL_PREFIX/v2.14" + url = "$FEDERATION_SPEC_URL_PREFIX/v2.13" ) } ) diff --git a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/compose/ComposeDirectiveTest.kt b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/compose/ComposeDirectiveTest.kt index 9815b602e1..33de9f9b75 100644 --- a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/compose/ComposeDirectiveTest.kt +++ b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/compose/ComposeDirectiveTest.kt @@ -45,7 +45,7 @@ class ComposeDirectiveTest { fun `verify we can generate valid schema with @composeDirective`() { val expectedSchema = """ - schema @composeDirective(name : "custom") @link(as : "myspec", import : ["@custom"], url : "https://www.myspecs.dev/myspec/v1.0") @link(import : ["@composeDirective", "@key", "FieldSet"], url : "https://specs.apollo.dev/federation/v2.14"){ + schema @composeDirective(name : "custom") @link(as : "myspec", import : ["@custom"], url : "https://www.myspecs.dev/myspec/v1.0") @link(import : ["@composeDirective", "@key", "FieldSet"], url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } diff --git a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/contact/ContactDirectiveTest.kt b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/contact/ContactDirectiveTest.kt index 0a1e35af9c..bd62023555 100644 --- a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/contact/ContactDirectiveTest.kt +++ b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/contact/ContactDirectiveTest.kt @@ -30,7 +30,7 @@ class ContactDirectiveTest { fun `verify we can import federation spec using custom @link`() { val expectedSchema = """ - schema @contact(description : "Send emails to foo@myteamname.com", name : "My Team Name", url : "https://myteam.slack.com/room") @link(url : "https://specs.apollo.dev/federation/v2.14"){ + schema @contact(description : "Send emails to foo@myteamname.com", name : "My Team Name", url : "https://myteam.slack.com/room") @link(url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } diff --git a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/context/ContextDirectiveTest.kt b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/context/ContextDirectiveTest.kt index 15fa35c27f..d5572b1cbc 100644 --- a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/context/ContextDirectiveTest.kt +++ b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/context/ContextDirectiveTest.kt @@ -39,7 +39,7 @@ class ContextDirectiveTest { val expectedSchema = // language=GraphQL """ - schema @link(import : ["@key", "@context"], url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(import : ["@key", "@context"], url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } @@ -114,7 +114,7 @@ class ContextDirectiveTest { this.linkSpecs[FEDERATION_SPEC] = FederatedSchemaGeneratorHooks.LinkSpec( namespace = FEDERATION_SPEC, imports = mapOf("key" to "key", "context" to "context"), - url = "$FEDERATION_SPEC_URL_PREFIX/v2.14" + url = "$FEDERATION_SPEC_URL_PREFIX/v2.13" ) } ) diff --git a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/cost/CostDirectiveTest.kt b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/cost/CostDirectiveTest.kt index 6279c95148..406c7de356 100644 --- a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/cost/CostDirectiveTest.kt +++ b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/cost/CostDirectiveTest.kt @@ -37,7 +37,7 @@ class CostDirectiveTest { val expectedSchema = // language=GraphQL """ - schema @link(import : ["@cost"], url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(import : ["@cost"], url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } @@ -95,7 +95,7 @@ class CostDirectiveTest { this.linkSpecs[FEDERATION_SPEC] = FederatedSchemaGeneratorHooks.LinkSpec( namespace = FEDERATION_SPEC, imports = mapOf("cost" to "cost"), - url = "$FEDERATION_SPEC_URL_PREFIX/v2.14" + url = "$FEDERATION_SPEC_URL_PREFIX/v2.13" ) } ) diff --git a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/fromcontext/FromContextDirectiveTest.kt b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/fromcontext/FromContextDirectiveTest.kt index 6d7a35db39..9ab38e0902 100644 --- a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/fromcontext/FromContextDirectiveTest.kt +++ b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/fromcontext/FromContextDirectiveTest.kt @@ -39,7 +39,7 @@ class FromContextDirectiveTest { // language=GraphQL val expectedSchema = $$""" - schema @link(import : ["@key", "@context", "@fromContext", "ContextFieldValue"], url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(import : ["@key", "@context", "@fromContext", "ContextFieldValue"], url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } @@ -126,7 +126,7 @@ class FromContextDirectiveTest { "fromContext" to "fromContext", "ContextFieldValue" to "ContextFieldValue" ), - url = "$FEDERATION_SPEC_URL_PREFIX/v2.14" + url = "$FEDERATION_SPEC_URL_PREFIX/v2.13" ) } ) diff --git a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/link/LinkDirectiveTest.kt b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/link/LinkDirectiveTest.kt index e271abdc76..3ecf55cfc8 100644 --- a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/link/LinkDirectiveTest.kt +++ b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/link/LinkDirectiveTest.kt @@ -45,7 +45,7 @@ class LinkDirectiveTest { fun `verify we can import federation spec using custom @link`() { val expectedSchema = """ - schema @link(as : "fed", import : [{name : "@key", as : "@myKey"}], url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(as : "fed", import : [{name : "@key", as : "@myKey"}], url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } diff --git a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/listsize/ListSizeDirectiveTest.kt b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/listsize/ListSizeDirectiveTest.kt index 3059da95c9..69e26b0c56 100644 --- a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/listsize/ListSizeDirectiveTest.kt +++ b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/listsize/ListSizeDirectiveTest.kt @@ -37,7 +37,7 @@ class ListSizeDirectiveTest { val expectedSchema = // language=GraphQL """ - schema @link(import : ["@listSize"], url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(import : ["@listSize"], url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } @@ -96,7 +96,7 @@ class ListSizeDirectiveTest { this.linkSpecs[FEDERATION_SPEC] = FederatedSchemaGeneratorHooks.LinkSpec( namespace = FEDERATION_SPEC, imports = mapOf("listSize" to "listSize"), - url = "$FEDERATION_SPEC_URL_PREFIX/v2.14" + url = "$FEDERATION_SPEC_URL_PREFIX/v2.13" ) } ) @@ -141,7 +141,7 @@ class ListSizeDirectiveTest { this.linkSpecs[FEDERATION_SPEC] = FederatedSchemaGeneratorHooks.LinkSpec( namespace = FEDERATION_SPEC, imports = mapOf("listSize" to "listSize"), - url = "$FEDERATION_SPEC_URL_PREFIX/v2.14" + url = "$FEDERATION_SPEC_URL_PREFIX/v2.13" ) } ) diff --git a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/override/OverrideDirectiveTest.kt b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/override/OverrideDirectiveTest.kt index b9bb3784f8..3406632596 100644 --- a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/override/OverrideDirectiveTest.kt +++ b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/override/OverrideDirectiveTest.kt @@ -32,10 +32,10 @@ import kotlin.test.assertNotNull class OverrideDirectiveTest { @Test - fun `verify override directive definition for fed 2_15`() { + fun `verify override directive definition for fed 2_13`() { val expectedSchema = """ - schema @link(import : ["@override"], url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(import : ["@override"], url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } diff --git a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/policy/PolicyDirectiveTest.kt b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/policy/PolicyDirectiveTest.kt index 5ed6d3d89d..2442a86f69 100644 --- a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/policy/PolicyDirectiveTest.kt +++ b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/policy/PolicyDirectiveTest.kt @@ -37,7 +37,7 @@ class PolicyDirectiveTest { fun `verify we can import federation spec using custom @link`() { val expectedSchema = """ - schema @link(url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } diff --git a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/requiresscope/RequiresScopesDirectiveTest.kt b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/requiresscope/RequiresScopesDirectiveTest.kt index 407b6cefa2..a48e30b1f1 100644 --- a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/requiresscope/RequiresScopesDirectiveTest.kt +++ b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/directives/requiresscope/RequiresScopesDirectiveTest.kt @@ -37,7 +37,7 @@ class RequiresScopesDirectiveTest { fun `verify we can import federation spec using custom @link`() { val expectedSchema = """ - schema @link(url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } diff --git a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/execution/ServiceQueryResolverTest.kt b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/execution/ServiceQueryResolverTest.kt index 52cbca46ac..08b312281b 100644 --- a/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/execution/ServiceQueryResolverTest.kt +++ b/generator/graphql-kotlin-federation/src/test/kotlin/com/expediagroup/graphql/generator/federation/execution/ServiceQueryResolverTest.kt @@ -42,7 +42,7 @@ import kotlin.test.assertNotNull const val BASE_SERVICE_SDL = """ -schema @link(url : "https://specs.apollo.dev/federation/v2.14"){ +schema @link(url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } @@ -70,7 +70,7 @@ scalar link__Import const val FEDERATED_SERVICE_SDL_V2 = """ -schema @link(import : ["@external", "@key", "@provides", "@requires", "FieldSet"], url : "https://specs.apollo.dev/federation/v2.14"){ +schema @link(import : ["@external", "@key", "@provides", "@requires", "FieldSet"], url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } diff --git a/integration/gradle-plugin-integration-tests/src/integration/resources/sdl/custom.graphql b/integration/gradle-plugin-integration-tests/src/integration/resources/sdl/custom.graphql index d22e47bff9..c3cca35210 100644 --- a/integration/gradle-plugin-integration-tests/src/integration/resources/sdl/custom.graphql +++ b/integration/gradle-plugin-integration-tests/src/integration/resources/sdl/custom.graphql @@ -1,4 +1,4 @@ -schema @link(url : "https://specs.apollo.dev/federation/v2.14"){ +schema @link(url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } diff --git a/integration/gradle-plugin-integration-tests/src/integration/resources/sdl/federated.graphql b/integration/gradle-plugin-integration-tests/src/integration/resources/sdl/federated.graphql index 622442f023..fe98ab2677 100644 --- a/integration/gradle-plugin-integration-tests/src/integration/resources/sdl/federated.graphql +++ b/integration/gradle-plugin-integration-tests/src/integration/resources/sdl/federated.graphql @@ -1,4 +1,4 @@ -schema @link(url : "https://specs.apollo.dev/federation/v2.14"){ +schema @link(url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } diff --git a/integration/maven-plugin-integration-tests/integration/generate-sdl-federated/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt b/integration/maven-plugin-integration-tests/integration/generate-sdl-federated/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt index 666d0366c0..cd0451cf5f 100755 --- a/integration/maven-plugin-integration-tests/integration/generate-sdl-federated/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt +++ b/integration/maven-plugin-integration-tests/integration/generate-sdl-federated/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt @@ -36,7 +36,7 @@ class GenerateSDLMojoTest { assertTrue(schemaFile.exists(), "schema file was generated") val expectedSchema = """ - schema @link(url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } diff --git a/integration/maven-plugin-integration-tests/integration/generate-sdl-hooks/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt b/integration/maven-plugin-integration-tests/integration/generate-sdl-hooks/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt index 53c74cdf55..2b0c82cab9 100755 --- a/integration/maven-plugin-integration-tests/integration/generate-sdl-hooks/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt +++ b/integration/maven-plugin-integration-tests/integration/generate-sdl-hooks/src/test/kotlin/com/expediagroup/graphql/plugin/maven/GenerateSDLMojoTest.kt @@ -36,7 +36,7 @@ class GenerateSDLMojoTest { assertTrue(schemaFile.exists(), "schema file was generated") val expectedSchema = """ - schema @link(url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } diff --git a/plugins/schema/graphql-kotlin-sdl-generator/src/integrationTest/kotlin/com/expediagroup/graphql/plugin/schema/GenerateCustomSDLTest.kt b/plugins/schema/graphql-kotlin-sdl-generator/src/integrationTest/kotlin/com/expediagroup/graphql/plugin/schema/GenerateCustomSDLTest.kt index b31a6c32bb..4b126a9b17 100644 --- a/plugins/schema/graphql-kotlin-sdl-generator/src/integrationTest/kotlin/com/expediagroup/graphql/plugin/schema/GenerateCustomSDLTest.kt +++ b/plugins/schema/graphql-kotlin-sdl-generator/src/integrationTest/kotlin/com/expediagroup/graphql/plugin/schema/GenerateCustomSDLTest.kt @@ -23,7 +23,7 @@ class GenerateCustomSDLTest { @Test fun `verify we can generate SDL using custom hooks provider`() { val expectedSchema = """ - schema @link(url : "https://specs.apollo.dev/federation/v2.14"){ + schema @link(url : "https://specs.apollo.dev/federation/v2.13"){ query: Query } diff --git a/website/docs/schema-generator/federation/apollo-federation.mdx b/website/docs/schema-generator/federation/apollo-federation.mdx index 639ab17acf..f78537424c 100644 --- a/website/docs/schema-generator/federation/apollo-federation.mdx +++ b/website/docs/schema-generator/federation/apollo-federation.mdx @@ -91,7 +91,7 @@ toFederatedSchema( will generate ```graphql -schema @link(import : ["@key", "FieldSet"], url : "https://specs.apollo.dev/federation/v2.14"){ +schema @link(import : ["@key", "FieldSet"], url : "https://specs.apollo.dev/federation/v2.13"){ query: Query }