Remove spring-graphql-core module

Move its contents into the spring-graphql module.

graphql-spring-boot-starter/build.gradle

@@ -24,7 +24,6 @@ dependencyManagement {
 }
 
 dependencies {
-	api project(':spring-graphql-core')
 	api project(':spring-graphql')
 	api 'com.graphql-java:graphql-java:16.2'
 	api 'io.projectreactor:reactor-core'

graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQLAutoConfiguration.java

@@ -37,7 +37,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.graphql.core.ReactorDataFetcherAdapter;
+import org.springframework.graphql.data.ReactorDataFetcherAdapter;
 
 @Configuration
 @ConditionalOnClass(GraphQL.class)

settings.gradle

@@ -15,8 +15,7 @@ pluginManagement {
 }
 
 rootProject.name = 'spring-graphql'
-include 'spring-graphql-core',
-	'spring-graphql',
+include 'spring-graphql',
 	'spring-graphql-test',
 	'graphql-spring-boot-starter',
 	'samples:webmvc-http',

spring-graphql-core/build.gradle

@@ -1,48 +0,0 @@
-
-plugins {
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id 'java-library'
-	id 'maven'
-}
-
-description = "Basic Support and Utilities for Spring GraphQL Applications"
-
-java {
-	sourceCompatibility = JavaVersion.VERSION_1_8
-	targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-dependencyManagement {
-	imports {
-		mavenBom "io.projectreactor:reactor-bom:2020.0.6"
-		mavenBom "org.springframework:spring-framework-bom:5.3.6"
-	}
-	generatedPomCustomization {
-		enabled = false
-	}
-}
-
-dependencies {
-	api 'com.graphql-java:graphql-java:16.2'
-	api 'io.projectreactor:reactor-core'
-	api 'org.springframework:spring-context'
-
-	compileOnly "javax.annotation:javax.annotation-api:1.3.2"
-
-	testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
-	testImplementation 'org.assertj:assertj-core:3.19.0'
-	testImplementation 'org.mockito:mockito-core:3.8.0'
-	testImplementation 'io.projectreactor:reactor-test'
-
-	testRuntime 'org.apache.logging.log4j:log4j-core:2.14.1'
-	testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1'
-}
-
-test {
-	useJUnitPlatform()
-	testLogging {
-		events "passed", "skipped", "failed"
-	}
-}
-
-apply from: "${rootDir}/gradle/publishing.gradle"

spring-graphql/build.gradle

@@ -24,7 +24,6 @@ dependencyManagement {
 }
 
 dependencies {
-	api project(':spring-graphql-core')
 	api 'com.graphql-java:graphql-java:16.2'
 	api 'io.projectreactor:reactor-core'
 	api 'org.springframework:spring-context'
@@ -37,13 +36,11 @@ dependencies {
 
 	testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
 	testImplementation 'org.assertj:assertj-core:3.19.0'
-	testImplementation 'com.jayway.jsonpath:json-path:2.5.0'
-	testImplementation 'org.skyscreamer:jsonassert:1.5.0'
+	testImplementation 'io.projectreactor:reactor-test'
 	testImplementation 'org.springframework:spring-webflux'
 	testImplementation 'org.springframework:spring-webmvc'
 	testImplementation 'org.springframework:spring-websocket'
 	testImplementation 'org.springframework:spring-test'
-	testImplementation 'io.projectreactor:reactor-test'
 	testImplementation 'javax.servlet:javax.servlet-api:4.0.1'
 	testImplementation 'com.fasterxml.jackson.core:jackson-databind'
 }

spring-graphql/src/main/java/org/springframework/graphql/data/ReactorDataFetcherAdapter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.graphql.core;
+package org.springframework.graphql.data;
 
 import java.lang.reflect.Method;
 

spring-graphql/src/main/java/org/springframework/graphql/data/package-info.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2020-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+@NonNullFields
+package org.springframework.graphql.data;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;

spring-graphql/src/main/java/org/springframework/graphql/web/AbstractWebGraphQLService.java

@@ -23,7 +23,7 @@ import graphql.ExecutionInput;
 import graphql.ExecutionResult;
 import reactor.core.publisher.Mono;
 
-import org.springframework.graphql.core.ReactorDataFetcherAdapter;
+import org.springframework.graphql.data.ReactorDataFetcherAdapter;
 
 /**
  * Base class for {@link WebGraphQLService} implementations, providing support

spring-graphql/src/test/java/org/springframework/graphql/data/ReactorDataFetcherAdapterTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.graphql.core;
+package org.springframework.graphql.data;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;