Move spring-server to com.expediagroup.graphql.server.spring (#999)

* Move spring-server to com.expediagroup.graphql.server.spring

* Ktlint

* Update SimpleMutations.kt

* Update SimpleQueries.kt

Co-authored-by: Shane Myrick <[email protected]>

Author: smyrick

README.md

@@ -15,17 +15,17 @@ Visit our [documentation site](https://expediagroup.github.io/graphql-kotlin) fo
 * [examples](/examples) - Example apps that use graphql-kotlin libraries to test and demonstrate usages
 * [graphql-kotlin-federation](/graphql-kotlin-federation) - Schema generator extension to build Apollo Federation GraphQL schemas
 * [graphql-kotlin-schema-generator](/graphql-kotlin-schema-generator) - Code only GraphQL schema generation for Kotlin
-* [graphql-kotlin-spring-server](/graphql-kotlin-spring-server) - Spring Boot auto-configuration library to create a GraphQL server
 * [graphql-kotlin-types](/graphql-kotlin-types) - Core types used by both client and server
 * [plugins](/plugins) - Gradle and Maven plugins
+* [servers](/servers) - Common and library specific modules for running a GraphQL server
 
 ## ⌨️ Usage
 
 While all the individual modules of `graphql-kotlin` are published as stand-alone libraries, the most common use cases are running a server, and genereating a type-safe client.
 
 ### Server Example
 
-A basic example of how you can use [graphql-kotlin-spring-server](/graphql-kotlin-spring-server) to run a GraphQL server can be found on our [server documentation section](https://expediagroup.github.io/graphql-kotlin/docs/spring-server/spring-overview).
+A basic example of how you can use [graphql-kotlin-spring-server](/servers/graphql-kotlin-spring-server) to run a GraphQL server can be found on our [server documentation section](https://expediagroup.github.io/graphql-kotlin/docs/spring-server/spring-overview).
 
 ### Client Example
 

examples/server/spring-server/src/main/kotlin/com/expediagroup/graphql/examples/Application.kt

@@ -23,7 +23,7 @@ import com.expediagroup.graphql.examples.execution.CustomDataFetcherFactoryProvi
 import com.expediagroup.graphql.examples.execution.MySubscriptionHooks
 import com.expediagroup.graphql.examples.execution.SpringDataFetcherFactory
 import com.expediagroup.graphql.examples.hooks.CustomSchemaGeneratorHooks
-import com.expediagroup.graphql.spring.execution.ApolloSubscriptionHooks
+import com.expediagroup.graphql.server.spring.subscriptions.ApolloSubscriptionHooks
 import com.fasterxml.jackson.databind.ObjectMapper
 import graphql.execution.DataFetcherExceptionHandler
 import org.springframework.boot.autoconfigure.SpringBootApplication

examples/server/spring-server/src/main/kotlin/com/expediagroup/graphql/examples/context/MyGraphQLContextFactory.kt

@@ -1,8 +1,8 @@
 package com.expediagroup.graphql.examples.context
 
 import com.expediagroup.graphql.server.execution.GraphQLContextFactory
-import com.expediagroup.graphql.spring.execution.SpringGraphQLContextFactory
-import com.expediagroup.graphql.spring.execution.SpringSubscriptionGraphQLContextFactory
+import com.expediagroup.graphql.server.spring.execution.SpringGraphQLContextFactory
+import com.expediagroup.graphql.server.spring.subscriptions.SpringSubscriptionGraphQLContextFactory
 import org.springframework.stereotype.Component
 import org.springframework.web.reactive.function.server.ServerRequest
 import org.springframework.web.reactive.socket.WebSocketSession

examples/server/spring-server/src/main/kotlin/com/expediagroup/graphql/examples/execution/CustomFunctionDataFetcher.kt

@@ -16,7 +16,7 @@
 
 package com.expediagroup.graphql.examples.execution
 
-import com.expediagroup.graphql.spring.execution.SpringDataFetcher
+import com.expediagroup.graphql.server.spring.execution.SpringDataFetcher
 import com.fasterxml.jackson.databind.ObjectMapper
 import graphql.schema.DataFetchingEnvironment
 import org.springframework.context.ApplicationContext

examples/server/spring-server/src/main/kotlin/com/expediagroup/graphql/examples/execution/MySubscriptionHooks.kt

@@ -2,7 +2,7 @@ package com.expediagroup.graphql.examples.execution
 
 import com.expediagroup.graphql.examples.context.MySubscriptionGraphQLContext
 import com.expediagroup.graphql.execution.GraphQLContext
-import com.expediagroup.graphql.spring.execution.ApolloSubscriptionHooks
+import com.expediagroup.graphql.server.spring.subscriptions.ApolloSubscriptionHooks
 import kotlinx.coroutines.reactor.mono
 import org.springframework.web.reactive.socket.WebSocketSession
 import reactor.core.publisher.Mono

examples/server/spring-server/src/test/kotlin/com/expediagroup/graphql/examples/subscriptions/SimpleSubscriptionIT.kt

@@ -17,10 +17,10 @@
 package com.expediagroup.graphql.examples.subscriptions
 
 import com.expediagroup.graphql.examples.SUBSCRIPTION_ENDPOINT
-import com.expediagroup.graphql.spring.model.SubscriptionOperationMessage
-import com.expediagroup.graphql.spring.model.SubscriptionOperationMessage.ClientMessages.GQL_CONNECTION_INIT
-import com.expediagroup.graphql.spring.model.SubscriptionOperationMessage.ClientMessages.GQL_START
-import com.expediagroup.graphql.spring.model.SubscriptionOperationMessage.ServerMessages
+import com.expediagroup.graphql.server.spring.subscriptions.SubscriptionOperationMessage
+import com.expediagroup.graphql.server.spring.subscriptions.SubscriptionOperationMessage.ClientMessages.GQL_CONNECTION_INIT
+import com.expediagroup.graphql.server.spring.subscriptions.SubscriptionOperationMessage.ClientMessages.GQL_START
+import com.expediagroup.graphql.server.spring.subscriptions.SubscriptionOperationMessage.ServerMessages
 import com.expediagroup.graphql.types.GraphQLRequest
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue

…ring/FederatedSchemaAutoConfiguration.kt …ring/FederatedSchemaAutoConfiguration.ktservers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/FederatedSchemaAutoConfiguration.kt renamed to servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/FederatedSchemaAutoConfiguration.kt servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/FederatedSchemaAutoConfiguration.kt renamed to servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/FederatedSchemaAutoConfiguration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Expedia, Inc
+ * Copyright 2021 Expedia, Inc
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.expediagroup.graphql.spring
+package com.expediagroup.graphql.server.spring
 
 import com.expediagroup.graphql.TopLevelNames
 import com.expediagroup.graphql.execution.KotlinDataFetcherFactoryProvider
@@ -26,7 +26,7 @@ import com.expediagroup.graphql.federation.toFederatedSchema
 import com.expediagroup.graphql.server.operations.Mutation
 import com.expediagroup.graphql.server.operations.Query
 import com.expediagroup.graphql.server.operations.Subscription
-import com.expediagroup.graphql.spring.extensions.toTopLevelObjects
+import com.expediagroup.graphql.server.spring.extensions.toTopLevelObjects
 import graphql.schema.GraphQLSchema
 import org.slf4j.LoggerFactory
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean

…aphql/spring/GraphQLAutoConfiguration.kt …erver/spring/GraphQLAutoConfiguration.ktservers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/GraphQLAutoConfiguration.kt renamed to servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/GraphQLAutoConfiguration.kt servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/GraphQLAutoConfiguration.kt renamed to servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/GraphQLAutoConfiguration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Expedia, Inc
+ * Copyright 2021 Expedia, Inc
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.expediagroup.graphql.spring
+package com.expediagroup.graphql.server.spring
 
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import

…spring/GraphQLConfigurationProperties.kt …spring/GraphQLConfigurationProperties.ktservers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/GraphQLConfigurationProperties.kt renamed to servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/GraphQLConfigurationProperties.kt servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/GraphQLConfigurationProperties.kt renamed to servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/GraphQLConfigurationProperties.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Expedia, Inc
+ * Copyright 2021 Expedia, Inc
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.expediagroup.graphql.spring
+package com.expediagroup.graphql.server.spring
 
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.boot.context.properties.ConstructorBinding

…/spring/GraphQLExecutionConfiguration.kt …/spring/GraphQLExecutionConfiguration.ktservers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/GraphQLExecutionConfiguration.kt renamed to servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/GraphQLExecutionConfiguration.kt servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/GraphQLExecutionConfiguration.kt renamed to servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/GraphQLExecutionConfiguration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Expedia, Inc
+ * Copyright 2021 Expedia, Inc
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.expediagroup.graphql.spring
+package com.expediagroup.graphql.server.spring
 
 import com.expediagroup.graphql.execution.KotlinDataFetcherFactoryProvider
 import com.expediagroup.graphql.server.execution.DataLoaderRegistryFactory
-import com.expediagroup.graphql.spring.exception.KotlinDataFetcherExceptionHandler
-import com.expediagroup.graphql.spring.execution.EmptyDataLoaderRegistryFactory
-import com.expediagroup.graphql.spring.execution.SpringKotlinDataFetcherFactoryProvider
+import com.expediagroup.graphql.server.spring.exception.KotlinDataFetcherExceptionHandler
+import com.expediagroup.graphql.server.spring.execution.EmptyDataLoaderRegistryFactory
+import com.expediagroup.graphql.server.spring.execution.SpringKotlinDataFetcherFactoryProvider
 import com.fasterxml.jackson.databind.ObjectMapper
 import graphql.execution.DataFetcherExceptionHandler
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean