Skip to content

Upgrade Spring Boot version to 3.5.4 / Graphql Java version 24.1 #526

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

Merged
merged 5 commits into from
Oct 14, 2025
Merged

Upgrade Spring Boot version to 3.5.4 / Graphql Java version 24.1 #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f811265
Upgrade Spring Boot version to 3.5.4 / Graphql Java version 24.1
igdianov Oct 13, 2025
ffa3919
Fix directivesSupport test
igdianov Oct 13, 2025
3b635b9
Fix JavaScalarsRuntimeWiringConfigurer to disable strict mode for bac…
igdianov Oct 13, 2025
63e2118
Update activiti-cloud.version to 8.8.0-alpha.119
igdianov Oct 13, 2025
9be7664
Fix Gatling test
igdianov Oct 14, 2025
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
4 changes: 2 additions & 2 deletions ...res/graphql/jpa/query/autoconfigure/GraphQLJpaQueryGraphQlExecutionAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class GraphQLJpaQueryGraphQlExecutionAutoConfiguration {
BatchLoaderRegistry batchLoaderRegistry(ListableBeanFactory beanFactory) {
var batchLoaderRegistry = new GraphQlAutoConfiguration(beanFactory).batchLoaderRegistry();

DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false);
DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false).build();

batchLoaderRegistry
.forName(GraphQLJpaQueryGraphQlExecutionAutoConfiguration.class.getName())
Expand All @@ -54,7 +54,7 @@ ExecutionGraphQlService executionGraphQlService(
@Bean
InitializingBean batchLoaderRegistryConfigurer(BatchLoaderRegistry batchLoaderRegistry) {
return () -> {
DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false);
DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false).build();

getMappedBatchDataLoaderMap()
.forEach((name, mappedBatchLoader) ->
Expand Down
2 changes: 2 additions & 0 deletions .../introproventures/graphql/jpa/query/autoconfigure/JavaScalarsRuntimeWiringConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ public class JavaScalarsRuntimeWiringConfigurer implements RuntimeWiringConfigur

@Override
public void configure(RuntimeWiring.Builder wiringBuilder) {
wiringBuilder.strictMode(false);

JavaScalars.scalars().forEach(wiringBuilder::scalar);
}
}
2 changes: 1 addition & 1 deletion .../introproventures/graphql/jpa/query/autoconfigure/GraphQLSchemaAutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ public void enableGraphQLJpaQuerySchema() {
public void directivesSupport() {
assertThat(graphQLSchema.getDirectives())
.extracting(GraphQLDirective::getName)
.containsOnly("include", "skip", "specifiedBy", "deprecated", "oneOf");
.contains("include", "skip", "specifiedBy", "deprecated", "oneOf", "defer");
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
</description>

<properties>
<spring-boot.version>3.3.2</spring-boot.version>
<graphql-java.version>22.1</graphql-java.version>
<spring-boot.version>3.5.4</spring-boot.version>
<graphql-java.version>24.1</graphql-java.version>
<evo-inflector.version>1.3</evo-inflector.version>
<joda-time.version>2.12.7</joda-time.version>
<graphql-java-extended-scalars.version>22.0</graphql-java-extended-scalars.version>
Expand Down
5 changes: 5 additions & 0 deletions scalars/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

</dependencies>

</project>
7 changes: 5 additions & 2 deletions .../com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaExecutorContextFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,13 @@ public class GraphQLJpaExecutorContextFactory implements GraphQLExecutorContextF
private Supplier<Instrumentation> instrumentation = () -> new SimpleInstrumentation();
private Supplier<GraphQLContext> graphqlContext = () -> GraphQLContext.newContext().build();

private Supplier<DataLoaderOptions> dataLoaderOptions = () -> DataLoaderOptions.newOptions();
private Supplier<DataLoaderOptions> dataLoaderOptions = () -> DataLoaderOptions.newOptions().build();

private Supplier<DataLoaderRegistry> dataLoaderRegistry = () -> {
DataLoaderOptions options = dataLoaderOptions.get().setCachingEnabled(false);
DataLoaderOptions options = DataLoaderOptions
.newOptions(dataLoaderOptions.get())
.setCachingEnabled(false)
.build();

return BatchLoaderRegistry.newDataLoaderRegistry(options);
};
Expand Down
5 changes: 3 additions & 2 deletions .../java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaToManyDataFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.List;
import java.util.Optional;
import org.dataloader.DataLoader;
import org.dataloader.DataLoaderFactory;
import org.dataloader.DataLoaderOptions;
import org.dataloader.DataLoaderRegistry;
import org.dataloader.MappedBatchLoaderWithContext;
Expand Down Expand Up @@ -84,9 +85,9 @@ protected DataLoader<Object, List<Object>> getDataLoader(
queryFactory
);

DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false);
DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false).build();

DataLoader<Object, List<Object>> dataLoader = DataLoader.newMappedDataLoader(
DataLoader<Object, List<Object>> dataLoader = DataLoaderFactory.newMappedDataLoader(
mappedBatchLoader,
options
);
Expand Down
8 changes: 6 additions & 2 deletions ...n/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaToOneDataFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import jakarta.persistence.metamodel.SingularAttribute;
import java.util.Optional;
import org.dataloader.DataLoader;
import org.dataloader.DataLoaderFactory;
import org.dataloader.DataLoaderOptions;
import org.dataloader.DataLoaderRegistry;
import org.dataloader.MappedBatchLoaderWithContext;
Expand Down Expand Up @@ -81,9 +82,12 @@ protected DataLoader<Object, Object> getDataLoader(DataFetchingEnvironment envir
queryFactory
);

DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false);
DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false).build();

DataLoader<Object, Object> dataLoader = DataLoader.newMappedDataLoader(mappedBatchLoader, options);
DataLoader<Object, Object> dataLoader = DataLoaderFactory.newMappedDataLoader(
mappedBatchLoader,
options
);
dataLoaderRegistry.register(dataLoaderKey, dataLoader);
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/gatling/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<properties>
<java.version>21</java.version>
<activiti-cloud.version>8.7.0</activiti-cloud.version>
<activiti-cloud.version>8.8.0-alpha.120</activiti-cloud.version>
<gatling.version>3.11.5</gatling.version>
<gatling-maven-plugin.version>4.9.6</gatling-maven-plugin.version>
<hibernate.version>6.5.3.Final</hibernate.version>
Expand Down
42 changes: 21 additions & 21 deletions tests/gatling/src/main/resources/data.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,29 +1006,29 @@ insert into TASK (id, assignee, created_date, description, due_date, last_modifi
(999, 'drembrantrq', '2020-01-04T05:06:42Z', 'Organized holistic methodology', '2019-09-01T05:23:48Z', '2019-05-04T17:52:43Z', '2019-04-20T11:34:28Z', '2019-05-04T22:15:09Z', 'Voyatouch', 1, '45665a22-b353-4e6e-a9b8-e92a901473d7', 2, 'CREATED', 'dmcilroyrq', '2019-08-10T17:07:51Z'),
(1000, 'jlambarthrr', '2019-07-23T04:10:06Z', 'Intuitive full-range encoding', '2019-09-06T07:44:38Z', '2019-04-06T05:15:02Z', '2019-10-26T08:08:17Z', '2019-05-08T08:59:28Z', 'Fintone', 67, '13a93fb0-895e-4e5d-9a38-aafded574cd8', 2, 'ASSIGNED', 'lhobdenrr', '2019-04-23T12:34:42Z');

insert into PROCESS_VARIABLE (create_time, execution_id, last_updated_time, name, process_instance_id, type, value) values
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'approverlist', 0, 'json', '{"value":["andrelaksmana"]}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'moduleid', 0, 'string', '{"value":"LBU"}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'nullable', 0, 'string', '{"value":null}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'applicationDate', 0, 'string', '{"value":"2023-10-22T00:00:00.000+0000"}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'applicationId', 0, 'string', '{"value":"232951752337576"}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'isApproved', 0, 'boolean', '{"value":true}');
insert into PROCESS_VARIABLE (create_time, execution_id, last_updated_time, name, process_instance_id, type, value, ephemeral) values
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'approverlist', 0, 'json', '{"value":["andrelaksmana"]}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'moduleid', 0, 'string', '{"value":"LBU"}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'nullable', 0, 'string', '{"value":null}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'applicationDate', 0, 'string', '{"value":"2023-10-22T00:00:00.000+0000"}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'applicationId', 0, 'string', '{"value":"232951752337576"}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'isApproved', 0, 'boolean', '{"value":true}', false);

insert into PROCESS_VARIABLE (create_time, execution_id, last_updated_time, name, process_instance_id, type, value) values
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'approverlist', 1, 'json', '{"value":["andrelaksmana"]}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'moduleid', 1, 'string', '{"value":"LBU"}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'nullable', 1, 'string', '{"value":null}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'applicationDate', 1, 'string', '{"value":"2023-10-22T00:00:00.000+0000"}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'applicationId', 1, 'string', '{"value":"232951752337576"}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'isApproved', 1, 'boolean', '{"value":true}');
insert into PROCESS_VARIABLE (create_time, execution_id, last_updated_time, name, process_instance_id, type, value, ephemeral) values
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'approverlist', 1, 'json', '{"value":["andrelaksmana"]}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'moduleid', 1, 'string', '{"value":"LBU"}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'nullable', 1, 'string', '{"value":null}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'applicationDate', 1, 'string', '{"value":"2023-10-22T00:00:00.000+0000"}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'applicationId', 1, 'string', '{"value":"232951752337576"}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'isApproved', 1, 'boolean', '{"value":true}', false);

insert into PROCESS_VARIABLE (create_time, execution_id, last_updated_time, name, process_instance_id, type, value) values
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'approverlist', 2, 'json', '{"value":["andrelaksmana"]}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'moduleid', 2, 'string', '{"value":"LBU"}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'nullable', 2, 'string', '{"value":null}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'applicationDate', 2, 'string', '{"value":"2023-10-22T00:00:00.000+0000"}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'applicationId', 2, 'string', '{"value":"232951752337576"}'),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'isApproved', 2, 'boolean', '{"value":true}');
insert into PROCESS_VARIABLE (create_time, execution_id, last_updated_time, name, process_instance_id, type, value, ephemeral) values
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'approverlist', 2, 'json', '{"value":["andrelaksmana"]}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'moduleid', 2, 'string', '{"value":"LBU"}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'nullable', 2, 'string', '{"value":null}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'applicationDate', 2, 'string', '{"value":"2023-10-22T00:00:00.000+0000"}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'applicationId', 2, 'string', '{"value":"232951752337576"}', false),
(CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'isApproved', 2, 'boolean', '{"value":true}', false);

insert into TASK_VARIABLE (id, create_time, execution_id, last_updated_time, name, process_instance_id, task_id, type, value) values
(1, CURRENT_TIMESTAMP, 'execution_id', CURRENT_TIMESTAMP, 'accountNumber', 0, '1', 'string', '{"value":"data"}'),
Expand Down