Merge pull request #170 from mxab/wip/unify-objectmapper

Introduce PerFieldObjectMapperProvider

Author: oliemansm

src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt

@@ -38,9 +38,7 @@ internal class MethodFieldResolver(field: FieldDefinition, search: FieldResolver
     override fun createDataFetcher(): DataFetcher<*> {
         val batched = isBatched(method, search)
         val args = mutableListOf<ArgumentPlaceholder>()
-        val mapper = ObjectMapper().apply {
-            options.objectMapperConfigurer.configure(this, ObjectMapperConfigurerContext(field))
-        }.registerModule(Jdk8Module()).registerKotlinModule()
+        val mapper = options.objectMapperProvider.provide(field)
 
         // Add source argument if this is a resolver (but not a root resolver)
         if(this.search.requiredFirstParameterType != null) {

src/main/kotlin/com/coxautodev/graphql/tools/PerFieldConfiguringObjectMapperProvider.kt

@@ -0,0 +1,16 @@
+package com.coxautodev.graphql.tools
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module
+import com.fasterxml.jackson.module.kotlin.registerKotlinModule
+import graphql.language.FieldDefinition
+
+class PerFieldConfiguringObjectMapperProvider(
+		private val objectMapperConfigurer: ObjectMapperConfigurer = ObjectMapperConfigurer { _, _ -> }) : PerFieldObjectMapperProvider {
+
+	override fun provide(fieldDefinition: FieldDefinition): ObjectMapper {
+		return ObjectMapper().apply {
+			objectMapperConfigurer.configure(this, ObjectMapperConfigurerContext(fieldDefinition))
+		}.registerModule(Jdk8Module()).registerKotlinModule()
+	}
+}

src/main/kotlin/com/coxautodev/graphql/tools/PerFieldObjectMapperProvider.java

@@ -0,0 +1,9 @@
+package com.coxautodev.graphql.tools;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import graphql.language.FieldDefinition;
+
+
+public interface PerFieldObjectMapperProvider {
+	ObjectMapper provide(FieldDefinition fieldDefinition);
+}

src/main/kotlin/com/coxautodev/graphql/tools/SchemaParserBuilder.kt

@@ -225,7 +225,7 @@ class SchemaParserDictionary {
     }
 }
 
-data class SchemaParserOptions internal constructor(val contextClass: Class<*>?, val genericWrappers: List<GenericWrapper>, val allowUnimplementedResolvers: Boolean, val objectMapperConfigurer: ObjectMapperConfigurer, val proxyHandlers: List<ProxyHandler>) {
+data class SchemaParserOptions internal constructor(val contextClass: Class<*>?, val genericWrappers: List<GenericWrapper>, val allowUnimplementedResolvers: Boolean, val objectMapperProvider: PerFieldObjectMapperProvider, val proxyHandlers: List<ProxyHandler>) {
     companion object {
         @JvmStatic fun newOptions() = Builder()
         @JvmStatic fun defaultOptions() = Builder().build()
@@ -236,7 +236,7 @@ data class SchemaParserOptions internal constructor(val contextClass: Class<*>?,
         private val genericWrappers: MutableList<GenericWrapper> = mutableListOf()
         private var useDefaultGenericWrappers = true
         private var allowUnimplementedResolvers = false
-        private var objectMapperConfigurer: ObjectMapperConfigurer = ObjectMapperConfigurer { _, _ ->  }
+        private var objectMapperProvider: PerFieldObjectMapperProvider = PerFieldConfiguringObjectMapperProvider()
         private val proxyHandlers: MutableList<ProxyHandler> = mutableListOf(Spring4AopProxyHandler(), GuiceAopProxyHandler(), JavassistProxyHandler())
 
         fun contextClass(contextClass: Class<*>) = this.apply {
@@ -264,7 +264,10 @@ data class SchemaParserOptions internal constructor(val contextClass: Class<*>?,
         }
 
         fun objectMapperConfigurer(objectMapperConfigurer: ObjectMapperConfigurer) = this.apply {
-            this.objectMapperConfigurer = objectMapperConfigurer
+            this.objectMapperProvider = PerFieldConfiguringObjectMapperProvider(objectMapperConfigurer)
+        }
+        fun objectMapperProvider(objectMapperProvider: PerFieldObjectMapperProvider) = this.apply {
+            this.objectMapperProvider = objectMapperProvider
         }
 
         fun objectMapperConfigurer(objectMapperConfigurer: (ObjectMapper, ObjectMapperConfigurerContext) -> Unit) = this.apply {
@@ -287,7 +290,7 @@ data class SchemaParserOptions internal constructor(val contextClass: Class<*>?,
                 genericWrappers
             }
 
-            return SchemaParserOptions(contextClass, wrappers, allowUnimplementedResolvers, objectMapperConfigurer, proxyHandlers)
+            return SchemaParserOptions(contextClass, wrappers, allowUnimplementedResolvers, objectMapperProvider, proxyHandlers)
         }
     }