Fixes to get the prototype working after rebase from master.

Netflix · Dec 15, 2023 · 0961e04 · 0961e04
1 parent f7d70e6
commit 0961e04
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 37 deletions.
diff --git a/graphql-dgs-example-java/src/test/java/RequestHeaderDataFetcherTest.java b/graphql-dgs-example-java/src/test/java/RequestHeaderDataFetcherTest.java
@@ -44,7 +44,7 @@ void withHeaders() {
  MockHttpServletRequest servletRequest = new MockHttpServletRequest();
  servletRequest.addHeader("demo-header", "demo-header-value");
 
- String message = queryExecutor.executeAndExtractJsonPath("{headers}", "data.headers", new ServletWebRequest(servletRequest));
+ String message = queryExecutor.executeAndExtractJsonPath("{demoHeader}", "data.demoHeader", new ServletWebRequest(servletRequest));
  assertThat(message).isEqualTo("demo-header-value");
  }
 
@@ -53,7 +53,7 @@ void withHeadersAndNoRequest() {
  HttpHeaders headers = new HttpHeaders();
  headers.add("demo-header", "demo-header-value");
 
- String message = queryExecutor.executeAndExtractJsonPath("{headers}", "data.headers", headers);
+ String message = queryExecutor.executeAndExtractJsonPath("{demoHeader}", "data.demoHeader", headers);
  assertThat(message).isEqualTo("demo-header-value");
  }
 }
diff --git a/...in/java/com/netflix/graphql/dgs/example/shared/datafetcher/RequestHeadersDataFetcher.java b/...in/java/com/netflix/graphql/dgs/example/shared/datafetcher/RequestHeadersDataFetcher.java
@@ -28,7 +28,14 @@
 
 @DgsComponent
 public class RequestHeadersDataFetcher {
+
  @DgsData(parentType = "Query", field = "headers")
+ public String headers(DgsDataFetchingEnvironment dfe) {
+ HttpHeaders headers = dfe.getDgsContext().getRequestData().getHeaders();
+ return headers.toString();
+ }
+
+ @DgsData(parentType = "Query", field = "demoHeader")
  public String headers(DgsDataFetchingEnvironment dfe, @RequestHeader("demo-header") String demoHeader) {
  return demoHeader;
  }

diff --git a/graphql-dgs-example-shared/src/main/resources/schema/schema.graphqls b/graphql-dgs-example-shared/src/main/resources/schema/schema.graphqls
@@ -25,6 +25,7 @@ type Query {
 
  headers: String
  referer: String
+ demoHeader: String
 
  ### To show how to handle HttpHeaders
  helloWithHeaders(name: String): String
@@ -97,7 +98,3 @@ scalar LocalTime
 
 directive @connection on OBJECT
 
-
-
->>>>>>> bcff65a3 (Initial integration with spring-graphql with an example app.)
-
diff --git a/graphql-dgs-spring-graphql-example-java/dependencies.lock b/graphql-dgs-spring-graphql-example-java/dependencies.lock
diff --git a/graphql-dgs-spring-graphql-starter/dependencies.lock b/graphql-dgs-spring-graphql-starter/dependencies.lock
diff --git a/graphql-dgs-spring-graphql/build.gradle.kts b/graphql-dgs-spring-graphql/build.gradle.kts
@@ -24,6 +24,8 @@ dependencies {
  implementation("org.springframework:spring-webmvc")
  implementation("org.springframework.boot:spring-boot-starter-graphql:3.1.0")
  //implementation("org.springframework.graphql:spring-graphql:1.2.0")
+ implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+ implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
 
 
  compileOnly("org.springframework:spring-test")

diff --git a/graphql-dgs-spring-graphql/dependencies.lock b/graphql-dgs-spring-graphql/dependencies.lock
diff --git a/...l/src/main/kotlin/com/netflix/graphql/dgs/autoconfig/DgsSpringGraphQLAutoConfiguration.kt b/...l/src/main/kotlin/com/netflix/graphql/dgs/autoconfig/DgsSpringGraphQLAutoConfiguration.kt
@@ -15,11 +15,11 @@
  */
 
 package com.netflix.graphql.dgs.autoconfig
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.netflix.graphql.dgs.DgsQueryExecutor
-import com.netflix.graphql.dgs.internal.DefaultDgsGraphQLContextBuilder
-import com.netflix.graphql.dgs.internal.DefaultDgsQueryExecutor
-import com.netflix.graphql.dgs.internal.DgsDataLoaderProvider
-import com.netflix.graphql.dgs.internal.DgsSchemaProvider
+import com.netflix.graphql.dgs.internal.*
 import com.netflix.graphql.dgs.internal.method.ArgumentResolver
 import com.netflix.graphql.dgs.mvc.internal.method.HandlerMethodArgumentResolverAdapter
 import graphql.GraphQL
@@ -37,6 +37,7 @@ import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.beans.factory.config.ConfigurableBeanFactory
 import org.springframework.boot.autoconfigure.AutoConfiguration
 import org.springframework.boot.autoconfigure.AutoConfigureBefore
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication
 import org.springframework.boot.autoconfigure.graphql.GraphQlSourceBuilderCustomizer
 import org.springframework.context.annotation.Bean
@@ -129,8 +130,15 @@ open class DgsSpringGraphQLAutoConfiguration {
  }
 
  @Bean
- open fun springGraphQLDgsQueryExecutor(executionService: DefaultExecutionGraphQlService, dgsContextBuilder: DefaultDgsGraphQLContextBuilder, dgsDataLoaderProvider: DgsDataLoaderProvider): DgsQueryExecutor {
- return SpringGraphQLDgsQueryExecutor(executionService, dgsContextBuilder, dgsDataLoaderProvider)
+ open fun springGraphQLDgsQueryExecutor(executionService: DefaultExecutionGraphQlService, dgsContextBuilder: DefaultDgsGraphQLContextBuilder, dgsDataLoaderProvider: DgsDataLoaderProvider, requestCustomizer: ObjectProvider<DgsQueryExecutorRequestCustomizer>): DgsQueryExecutor {
+ return SpringGraphQLDgsQueryExecutor(executionService, dgsContextBuilder, dgsDataLoaderProvider, requestCustomizer = requestCustomizer.getIfAvailable(DgsQueryExecutorRequestCustomizer::DEFAULT_REQUEST_CUSTOMIZER))
+ }
+
+ @Bean
+ @Qualifier("dgsObjectMapper")
+ @ConditionalOnMissingBean(name = ["dgsObjectMapper"])
+ open fun dgsObjectMapper(): ObjectMapper {
+ return jacksonObjectMapper().registerModule(JavaTimeModule())
  }
 
  @Configuration(proxyBeanMethods = false)

diff --git a/...aphql/src/main/kotlin/com/netflix/graphql/dgs/autoconfig/SpringGraphQLDgsQueryExecutor.kt b/...aphql/src/main/kotlin/com/netflix/graphql/dgs/autoconfig/SpringGraphQLDgsQueryExecutor.kt
@@ -23,21 +23,19 @@ import com.jayway.jsonpath.spi.mapper.MappingException
 import com.netflix.graphql.dgs.DgsQueryExecutor
 import com.netflix.graphql.dgs.exceptions.DgsQueryExecutionDataExtractionException
 import com.netflix.graphql.dgs.exceptions.QueryException
-import com.netflix.graphql.dgs.internal.BaseDgsQueryExecutor
-import com.netflix.graphql.dgs.internal.DefaultDgsGraphQLContextBuilder
-import com.netflix.graphql.dgs.internal.DgsDataLoaderProvider
-import com.netflix.graphql.dgs.internal.DgsWebMvcRequestData
+import com.netflix.graphql.dgs.internal.*
 import graphql.ExecutionResult
 import graphql.GraphQLContext
 import graphql.GraphQLError
 import org.springframework.graphql.execution.DefaultExecutionGraphQlService
 import org.springframework.graphql.support.DefaultExecutionGraphQlRequest
 import org.springframework.http.HttpHeaders
+import org.springframework.web.context.request.RequestContextHolder
 import org.springframework.web.context.request.ServletWebRequest
 import org.springframework.web.context.request.WebRequest
 import java.util.concurrent.CompletableFuture
 
-class SpringGraphQLDgsQueryExecutor(val executionService: DefaultExecutionGraphQlService, private val dgsContextBuilder: DefaultDgsGraphQLContextBuilder, private val dgsDataLoaderProvider: DgsDataLoaderProvider) : DgsQueryExecutor {
+class SpringGraphQLDgsQueryExecutor(val executionService: DefaultExecutionGraphQlService, private val dgsContextBuilder: DefaultDgsGraphQLContextBuilder, private val dgsDataLoaderProvider: DgsDataLoaderProvider, private val requestCustomizer: DgsQueryExecutorRequestCustomizer = DgsQueryExecutorRequestCustomizer.DEFAULT_REQUEST_CUSTOMIZER) : DgsQueryExecutor {
 
  override fun execute(
  query: String,
@@ -56,7 +54,8 @@ class SpringGraphQLDgsQueryExecutor(val executionService: DefaultExecutionGraphQ
  null
  )
 
- val dgsContext = dgsContextBuilder.build(DgsWebMvcRequestData(request.extensions, headers, webRequest))
+ val httpRequest = requestCustomizer.apply(webRequest ?: RequestContextHolder.getRequestAttributes() as? WebRequest, headers)
+ val dgsContext = dgsContextBuilder.build(DgsWebMvcRequestData(request.extensions, headers, httpRequest))
  val graphQLContextFuture = CompletableFuture<GraphQLContext>()
  val dataLoaderRegistry = dgsDataLoaderProvider.buildRegistryWithContextSupplier { graphQLContextFuture.get() }
 

diff --git a/graphql-dgs/src/main/kotlin/com/netflix/graphql/dgs/internal/DgsSchemaProvider.kt b/graphql-dgs/src/main/kotlin/com/netflix/graphql/dgs/internal/DgsSchemaProvider.kt
@@ -71,7 +71,9 @@ import org.springframework.core.io.Resource
 import org.springframework.core.io.support.ResourcePatternUtils
 import org.springframework.util.ReflectionUtils
 import java.io.IOException
+import java.io.InputStreamReader
 import java.lang.reflect.Method
+import java.nio.charset.StandardCharsets
 import java.util.Optional
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CompletionStage
@@ -105,6 +107,7 @@ class DgsSchemaProvider(
  private val dataFetcherMetricsInstrumentationEnabled = mutableMapOf<String, Boolean>()
 
  private val dataFetchers = mutableListOf<DataFetcherReference>()
+ private val scalars = mutableMapOf<String, GraphQLScalarType>()
 
  /**
  * Returns an immutable list of [DataFetcherReference]s that were identified after the schema was loaded.
@@ -211,7 +214,7 @@ class DgsSchemaProvider(
 
  val runtimeWiring = runtimeWiringBuilder.build()
 
- findEntityFetchers(dgsComponents, mergedRegistry, runtimeWiring)
+ findEntityFetchers(dgsComponents, mergedRegistry, scalars)
 
  val federationResolverInstance =
  federationResolver.orElseGet {
@@ -245,8 +248,9 @@ class DgsSchemaProvider(
  // runtime wiring
  fun buildRuntimeWiring(schema: String? = null, runtimeWiringBuilder: RuntimeWiring.Builder): RuntimeWiring.Builder {
  val startTime = System.currentTimeMillis()
- val dgsComponents =
- applicationContext.getBeansWithAnnotation(DgsComponent::class.java).values.filter(componentFilter)
+ val dgsComponents = applicationContext.getBeansWithAnnotation<DgsComponent>().values.let { beans ->
+ if (componentFilter != null) beans.filter(componentFilter) else beans
+ }
  val hasDynamicTypeRegistry =
  dgsComponents.any { it.javaClass.methods.any { m -> m.isAnnotationPresent(DgsTypeDefinitionRegistry::class.java) } }
 
@@ -291,7 +295,7 @@ class DgsSchemaProvider(
  findDirectives(applicationContext, runtimeWiringBuilder)
  findDataFetchers(dgsComponents, codeRegistryBuilder, mergedRegistry)
  findTypeResolvers(dgsComponents, runtimeWiringBuilder, mergedRegistry)
- findEntityFetchers(dgsComponents)
+ findEntityFetchers(dgsComponents, mergedRegistry, scalars)
 
  dgsComponents.forEach { dgsComponent ->
  invokeDgsCodeRegistry(
@@ -585,7 +589,7 @@ class DgsSchemaProvider(
  }
  }
 
- private fun findEntityFetchers(dgsComponents: Collection<Any>, registry: TypeDefinitionRegistry, runtimeWiring: RuntimeWiring) {
+ private fun findEntityFetchers(dgsComponents: Collection<Any>, registry: TypeDefinitionRegistry, scalars: Map<String, GraphQLScalarType>) {
  dgsComponents.forEach { dgsComponent ->
  val javaClass = AopUtils.getTargetClass(dgsComponent)
 
@@ -625,7 +629,7 @@ class DgsSchemaProvider(
  .map {
  Pair(
  it,
- traverseType(it.iterator(), typeDefinition, registry, runtimeWiring)
+ traverseType(it.iterator(), typeDefinition, registry, scalars)
  )
  }
  .filter { it.second != null }
@@ -638,7 +642,7 @@ class DgsSchemaProvider(
  }
  }
 
- private fun traverseType(path: Iterator<String>, type: ImplementingTypeDefinition<*>?, registry: TypeDefinitionRegistry, runtimeWiring: RuntimeWiring): Coercing<*, *>? {
+ private fun traverseType(path: Iterator<String>, type: ImplementingTypeDefinition<*>?, registry: TypeDefinitionRegistry, scalars: Map<String, GraphQLScalarType>): Coercing<*, *>? {
  if (type == null || !path.hasNext()) {
  return null
  }
@@ -652,8 +656,8 @@ class DgsSchemaProvider(
 
  if (fieldType.isPresent) {
  return when (val unwrappedFieldType = fieldType.get()) {
- is ObjectTypeDefinition -> traverseType(path, unwrappedFieldType, registry, runtimeWiring)
- is ScalarTypeDefinition -> runtimeWiring.scalars.get(unwrappedFieldType.name)?.coercing
+ is ObjectTypeDefinition -> traverseType(path, unwrappedFieldType, registry, scalars)
+ is ScalarTypeDefinition -> scalars.get(unwrappedFieldType.name)?.coercing
  else -> null
  }
  }
@@ -775,9 +779,11 @@ class DgsSchemaProvider(
  applicationContext.getBeansWithAnnotation<DgsScalar>().values.forEach { scalarComponent ->
  val annotation = scalarComponent::class.java.getAnnotation(DgsScalar::class.java)
  when (scalarComponent) {
- is Coercing<*, *> -> runtimeWiringBuilder.scalar(
- GraphQLScalarType.newScalar().name(annotation.name).coercing(scalarComponent).build()
- )
+ is Coercing<*, *> -> {
+ val newScalar = GraphQLScalarType.newScalar().name(annotation.name).coercing(scalarComponent).build()
+ runtimeWiringBuilder.scalar(newScalar)
+ scalars[annotation.name] = newScalar
+ }
  else -> throw RuntimeException("Invalid @DgsScalar type: the class must implement graphql.schema.Coercing")
  }
  }

diff --git a/graphql-dgs/src/test/kotlin/com/netflix/graphql/dgs/DgsSchemaProviderTest.kt b/graphql-dgs/src/test/kotlin/com/netflix/graphql/dgs/DgsSchemaProviderTest.kt
@@ -16,11 +16,7 @@
 
 package com.netflix.graphql.dgs
 
-<<<<<<< HEAD
 import com.netflix.graphql.dgs.exceptions.DataFetcherSchemaMismatchException
-import com.netflix.graphql.dgs.exceptions.InvalidDgsConfigurationException
-=======
->>>>>>> bcff65a3 (Initial integration with spring-graphql with an example app.)
 import com.netflix.graphql.dgs.exceptions.InvalidTypeResolverException
 import com.netflix.graphql.dgs.exceptions.NoSchemaFoundException
 import com.netflix.graphql.dgs.internal.DefaultInputObjectMapper