Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make GraphQLContextContributor a functional interface #1961

Merged
merged 1 commit into from
Jul 17, 2024
Merged

Make GraphQLContextContributor a functional interface #1961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 9 additions & 20 deletions ...-autoconfigure/src/main/kotlin/com/netflix/graphql/dgs/autoconfig/DgsAutoConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import com.netflix.graphql.dgs.internal.method.ArgumentResolver
import com.netflix.graphql.dgs.internal.method.MethodDataFetcherFactory
import com.netflix.graphql.dgs.scalars.UploadScalar
import com.netflix.graphql.mocking.MockProvider
import graphql.GraphQLContext
import graphql.execution.AsyncExecutionStrategy
import graphql.execution.AsyncSerialExecutionStrategy
import graphql.execution.DataFetcherExceptionHandler
Expand All @@ -49,7 +48,6 @@ import graphql.schema.DataFetcherFactory
import graphql.schema.GraphQLCodeRegistry
import graphql.schema.GraphQLSchema
import graphql.schema.idl.TypeDefinitionRegistry
import graphql.schema.visibility.DefaultGraphqlFieldVisibility.DEFAULT_FIELD_VISIBILITY
import graphql.schema.visibility.GraphqlFieldVisibility
import io.micrometer.context.ContextRegistry
import io.micrometer.context.ContextSnapshotFactory
Expand Down Expand Up @@ -78,7 +76,7 @@ import org.springframework.mock.web.MockHttpServletRequest
import org.springframework.web.context.request.NativeWebRequest
import org.springframework.web.context.request.WebRequest
import java.time.Duration
import java.util.*
import java.util.Optional
import java.util.concurrent.Executors
import java.util.concurrent.ScheduledExecutorService

Expand Down Expand Up @@ -282,8 +280,13 @@ open class DgsAutoConfiguration(

@Bean
@ConditionalOnMissingBean
open fun schema(dgsSchemaProvider: DgsSchemaProvider, fieldVisibility: GraphqlFieldVisibility): GraphQLSchema {
return dgsSchemaProvider.schema(null, fieldVisibility).graphQLSchema
open fun schema(dgsSchemaProvider: DgsSchemaProvider, fieldVisibility: GraphqlFieldVisibility?): GraphQLSchema {
val result = if (fieldVisibility == null) {
dgsSchemaProvider.schema(schema = null)
} else {
dgsSchemaProvider.schema(schema = null, fieldVisibility = fieldVisibility)
}
return result.graphQLSchema
}

@Bean
Expand All @@ -309,21 +312,7 @@ open class DgsAutoConfiguration(
matchIfMissing = false
)
open fun disableIntrospectionContextContributor(): GraphQLContextContributor {
return object : GraphQLContextContributor {
override fun contribute(
builder: GraphQLContext.Builder,
extensions: Map<String, Any>?,
requestData: DgsRequestData?
) {
builder.put(Introspection.INTROSPECTION_DISABLED, true)
}
}
}

@Bean
@ConditionalOnMissingBean
open fun defaultFieldVisibility(): GraphqlFieldVisibility {
return DEFAULT_FIELD_VISIBILITY
return GraphQLContextContributor { builder, _, _ -> builder.put(Introspection.INTROSPECTION_DISABLED, true) }
}

@Bean
Expand Down
15 changes: 3 additions & 12 deletions ...lin/com/netflix/graphql/dgs/springgraphql/autoconfig/DgsSpringGraphQLAutoConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import com.netflix.graphql.dgs.springgraphql.SpringGraphQLDgsQueryExecutor
import com.netflix.graphql.dgs.springgraphql.SpringGraphQLDgsReactiveQueryExecutor
import com.netflix.graphql.dgs.springgraphql.webflux.DgsWebFluxGraphQLInterceptor
import com.netflix.graphql.dgs.springgraphql.webmvc.DgsWebMvcGraphQLInterceptor
import graphql.GraphQLContext
import graphql.execution.AsyncExecutionStrategy
import graphql.execution.AsyncSerialExecutionStrategy
import graphql.execution.DataFetcherExceptionHandler
Expand Down Expand Up @@ -71,7 +70,7 @@ import org.springframework.web.reactive.result.method.annotation.CookieValueMeth
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter
import org.springframework.web.servlet.mvc.method.annotation.ServletCookieValueMethodArgumentResolver
import org.springframework.web.servlet.mvc.method.annotation.ServletRequestDataBinderFactory
import java.util.*
import java.util.Optional

/**
* Framework auto configuration based on open source Spring only, without Netflix integrations.
Expand Down Expand Up @@ -105,7 +104,7 @@ open class DgsSpringGraphQLAutoConfiguration {
return DgsTypeDefinitionConfigurerBridge()
}

class DgsTypeDefinitionConfigurerBridge() {
class DgsTypeDefinitionConfigurerBridge {
@DgsTypeDefinitionRegistry
fun typeDefinitionRegistry(typeDefinitionRegistry: TypeDefinitionRegistry): TypeDefinitionRegistry {
val newTypeDefinitionRegistry = TypeDefinitionRegistry()
Expand Down Expand Up @@ -146,15 +145,7 @@ open class DgsSpringGraphQLAutoConfiguration {
matchIfMissing = false
)
open fun disableIntrospectionContextContributor(): GraphQLContextContributor {
return object : GraphQLContextContributor {
override fun contribute(
builder: GraphQLContext.Builder,
extensions: Map<String, Any>?,
requestData: DgsRequestData?
) {
builder.put(Introspection.INTROSPECTION_DISABLED, true)
}
}
return GraphQLContextContributor { builder, _, _ -> builder.put(Introspection.INTROSPECTION_DISABLED, true) }
}

@Bean
Expand Down
2 changes: 1 addition & 1 deletion graphql-dgs/src/main/kotlin/com/netflix/graphql/dgs/context/GraphQLContextContributor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import graphql.GraphQLContext
* For each bean implementing this interface found, the framework will call the [contribute] method for every request.
* The [contribute] method is then able to use the [GraphQLContext.Builder] to provide additional entries to place in the context.
*/
interface GraphQLContextContributor {
fun interface GraphQLContextContributor {
fun contribute(
builder: GraphQLContext.Builder,
extensions: Map<String, Any>?,
Expand Down
Loading