Skip to content

Fix bug in DgsGraphQLSourceBuilder #2214

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

Open
kilink wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix bug in DgsGraphQLSourceBuilder #2214

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
1 change: 0 additions & 1 deletion graphql-dgs-example-shared/src/main/resources/schema/schema.graphqls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ type Stock {
price: Float
}

scalar Upload
Copy link
Copy Markdown
Member Author

@kilink kilink Sep 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This scalar is getting added by the multipart-spring-graphql dependency. With the bug fixed, it caused the schema to fail to parse due to duplicate scalar definitions.

scalar LocalTime

directive @connection on OBJECT
Expand Down
5 changes: 4 additions & 1 deletion ...le-shared/src/test/java/com/netflix/graphql/dgs/example/shared/ExampleSpringBootTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
import com.netflix.graphql.dgs.pagination.DgsPaginationAutoConfiguration;
import com.netflix.graphql.dgs.scalars.UploadScalar;
import com.netflix.graphql.dgs.test.EnableDgsTest;
import name.nkonev.multipart.springboot.graphql.server.SchemaAutoconfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand All @@ -32,7 +34,8 @@

@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@SpringBootTest(classes = {HelloDataFetcher.class, MovieDataFetcher.class, ConcurrentDataFetcher.class, RequestHeadersDataFetcher.class, RatingMutation.class, CurrentTimeDateFetcher.class, DgsExtendedScalarsAutoConfiguration.class, DgsPaginationAutoConfiguration.class, MessageDataLoaderWithDispatchPredicate.class, UploadScalar.class})
@SpringBootTest(classes = {HelloDataFetcher.class, MovieDataFetcher.class, ConcurrentDataFetcher.class, RequestHeadersDataFetcher.class, RatingMutation.class, CurrentTimeDateFetcher.class, MessageDataLoaderWithDispatchPredicate.class, UploadScalar.class})
@EnableDgsTest
@Import({DgsExtendedScalarsAutoConfiguration.class, DgsPaginationAutoConfiguration.class, SchemaAutoconfiguration.class})
public @interface ExampleSpringBootTest {
}
11 changes: 6 additions & 5 deletions .../java/com/netflix/graphql/dgs/example/shared/datafetcher/SubscriptionDataFetcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,33 @@
import com.netflix.graphql.dgs.scalars.UploadScalar;
import com.netflix.graphql.dgs.test.EnableDgsTest;
import graphql.ExecutionResult;
import name.nkonev.multipart.springboot.graphql.server.SchemaAutoconfiguration;
import org.junit.jupiter.api.Test;
import org.reactivestreams.Publisher;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import reactor.test.StepVerifier;
import reactor.test.scheduler.VirtualTimeScheduler;

import java.util.Map;

import static org.assertj.core.api.Assertions.assertThat;

@SpringBootTest(classes = {SubscriptionDataFetcher.class, DgsExtendedScalarsAutoConfiguration.class, DgsPaginationAutoConfiguration.class, UploadScalar.class})
@SpringBootTest(classes = {SubscriptionDataFetcher.class, UploadScalar.class})
@EnableDgsTest
@Import({DgsExtendedScalarsAutoConfiguration.class, SchemaAutoconfiguration.class, DgsPaginationAutoConfiguration.class})
class SubscriptionDataFetcherTest {

@Autowired
DgsQueryExecutor queryExecutor;
private DgsQueryExecutor queryExecutor;

ObjectMapper objectMapper = new ObjectMapper();
private final ObjectMapper objectMapper = new ObjectMapper();

@Test
void stocks() {
ExecutionResult executionResult = queryExecutor.execute("subscription Stocks { stocks { name, price } }");
Publisher<ExecutionResult> publisher = executionResult.getData();

VirtualTimeScheduler virtualTimeScheduler = VirtualTimeScheduler.create();
StepVerifier.withVirtualTime(() -> publisher, 3)
.expectSubscription()
.thenRequest(3)
Expand Down
4 changes: 0 additions & 4 deletions ...flix/graphql/dgs/example/datafetcher/DgsTestSliceWithMockMvcAndHttpGraphQlTesterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@

package com.netflix.graphql.dgs.example.datafetcher;

import com.netflix.graphql.dgs.autoconfig.DgsExtendedScalarsAutoConfiguration;
import com.netflix.graphql.dgs.example.shared.dataLoader.MessageDataLoader;
import com.netflix.graphql.dgs.pagination.DgsPaginationAutoConfiguration;
import com.netflix.graphql.dgs.scalars.UploadScalar;
import com.netflix.graphql.dgs.test.EnableDgsMockMvcTest;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
2 changes: 2 additions & 0 deletions ...-example-java/src/test/java/com/netflix/graphql/dgs/example/datafetcher/GreetingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@
import com.netflix.graphql.dgs.test.EnableDgsTest;
import graphql.ExecutionResult;
import jakarta.servlet.http.Cookie;
import name.nkonev.multipart.springboot.graphql.server.SchemaAutoconfiguration;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.springframework.http.HttpHeaders;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.web.context.request.ServletWebRequest;
Expand Down
3 changes: 2 additions & 1 deletion ...mple-java/src/test/java/com/netflix/graphql/dgs/example/datafetcher/TestAppTestSlice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.netflix.graphql.dgs.example.shared.instrumentation.ExampleInstrumentationDependingOnContextContributor;
import com.netflix.graphql.dgs.pagination.DgsPaginationAutoConfiguration;
import com.netflix.graphql.dgs.scalars.UploadScalar;
import name.nkonev.multipart.springboot.graphql.server.SchemaAutoconfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.context.annotation.Import;

Expand All @@ -42,6 +43,6 @@
ExampleInstrumentationDependingOnContextContributor.class,
MyContextBuilder.class
})
@ImportAutoConfiguration({DgsPaginationAutoConfiguration.class, DgsExtendedScalarsAutoConfiguration.class})
@ImportAutoConfiguration({DgsPaginationAutoConfiguration.class, DgsExtendedScalarsAutoConfiguration.class, SchemaAutoconfiguration.class})
public @interface TestAppTestSlice {
}
18 changes: 9 additions & 9 deletions ...-graphql/src/main/kotlin/com/netflix/graphql/dgs/springgraphql/DgsGraphQLSourceBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class DgsGraphQLSourceBuilder(
private val typeDefinitionConfigurers = mutableListOf<TypeDefinitionConfigurer>()
private val runtimeWiringConfigurers = mutableListOf<RuntimeWiringConfigurer>()

private val schemaResources: Set<Resource> = LinkedHashSet()
private val schemaResources = mutableSetOf<Resource>()

@Nullable
private var typeResolver: TypeResolver? = null
Expand All @@ -64,18 +64,18 @@ class DgsGraphQLSourceBuilder(
return schema.graphQLSchema
}

override fun schemaResources(vararg resources: Resource?): SchemaResourceBuilder {
schemaResources.plus(listOf(*resources))
override fun schemaResources(vararg resources: Resource): SchemaResourceBuilder {
schemaResources += resources
return this
}

override fun configureTypeDefinitions(configurer: TypeDefinitionConfigurer): SchemaResourceBuilder {
this.typeDefinitionConfigurers.add(configurer)
this.typeDefinitionConfigurers += configurer
return this
}

override fun configureRuntimeWiring(configurer: RuntimeWiringConfigurer): SchemaResourceBuilder {
this.runtimeWiringConfigurers.add(configurer)
this.runtimeWiringConfigurers += configurer
return this
}

Expand Down Expand Up @@ -112,14 +112,14 @@ class DgsGraphQLSourceBuilder(

override fun getReturnType(): ResolvableType = ResolvableType.forMethodReturnType(dataFetcher.method)

override fun getArguments(): Map<String, ResolvableType> {
return dataFetcher.method.parameters
override fun getArguments(): Map<String, ResolvableType> =
dataFetcher.method.parameters
.asSequence()
.filter { it.isAnnotationPresent(InputArgument::class.java) }
.associate {
val name = it.getAnnotation(InputArgument::class.java).name.ifEmpty { it.name }
return@associate name to ResolvableType.forClass(it.type)
name to ResolvableType.forClass(it.type)
}
}
}

private fun wrapDataFetchers(dataFetchers: List<DataFetcherReference>): Map<String, Map<String, SelfDescribingDataFetcher<Any>>> {
Expand Down
Loading