Skip to content

Commit 550fc91

Browse files
igdianovigdianov
authored
Upgrade Spring Boot version to 3.5.4 / GraphQl Java version 24.1 (#526)
* Upgrade Spring Boot version to 3.5.4 / Graphql Java version 24.1 * Fix directivesSupport test * Fix JavaScalarsRuntimeWiringConfigurer to disable strict mode for backward compatibility * Update activiti-cloud.version to 8.8.0-alpha.119 * Fix Gatling test
1 parent a519751 commit 550fc91

File tree

10 files changed

+48
-33
lines changed

10 files changed

+48
-33
lines changed

‎autoconfigure/src/main/java/com/introproventures/graphql/jpa/query/autoconfigure/GraphQLJpaQueryGraphQlExecutionAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class GraphQLJpaQueryGraphQlExecutionAutoConfiguration {
2828
BatchLoaderRegistry batchLoaderRegistry(ListableBeanFactory beanFactory) {
2929
var batchLoaderRegistry = new GraphQlAutoConfiguration(beanFactory).batchLoaderRegistry();
3030

31-
DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false);
31+
DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false).build();
3232

3333
batchLoaderRegistry
3434
.forName(GraphQLJpaQueryGraphQlExecutionAutoConfiguration.class.getName())
@@ -54,7 +54,7 @@ ExecutionGraphQlService executionGraphQlService(
5454
@Bean
5555
InitializingBean batchLoaderRegistryConfigurer(BatchLoaderRegistry batchLoaderRegistry) {
5656
return () -> {
57-
DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false);
57+
DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false).build();
5858

5959
getMappedBatchDataLoaderMap()
6060
.forEach((name, mappedBatchLoader) ->

‎autoconfigure/src/main/java/com/introproventures/graphql/jpa/query/autoconfigure/JavaScalarsRuntimeWiringConfigurer.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ public class JavaScalarsRuntimeWiringConfigurer implements RuntimeWiringConfigur
88

99
@Override
1010
public void configure(RuntimeWiring.Builder wiringBuilder) {
11+
wiringBuilder.strictMode(false);
12+
1113
JavaScalars.scalars().forEach(wiringBuilder::scalar);
1214
}
1315
}

‎autoconfigure/src/test/java/com/introproventures/graphql/jpa/query/autoconfigure/GraphQLSchemaAutoConfigurationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ public void enableGraphQLJpaQuerySchema() {
389389
public void directivesSupport() {
390390
assertThat(graphQLSchema.getDirectives())
391391
.extracting(GraphQLDirective::getName)
392-
.containsOnly("include", "skip", "specifiedBy", "deprecated", "oneOf");
392+
.contains("include", "skip", "specifiedBy", "deprecated", "oneOf", "defer");
393393
}
394394

395395
@Test

‎dependencies/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</description>
1515

1616
<properties>
17-
<spring-boot.version>3.3.2</spring-boot.version>
18-
<graphql-java.version>22.1</graphql-java.version>
17+
<spring-boot.version>3.5.4</spring-boot.version>
18+
<graphql-java.version>24.1</graphql-java.version>
1919
<evo-inflector.version>1.3</evo-inflector.version>
2020
<joda-time.version>2.12.7</joda-time.version>
2121
<graphql-java-extended-scalars.version>22.0</graphql-java-extended-scalars.version>

‎scalars/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@
3333
<optional>true</optional>
3434
</dependency>
3535

36+
<dependency>
37+
<groupId>org.slf4j</groupId>
38+
<artifactId>slf4j-api</artifactId>
39+
</dependency>
40+
3641
</dependencies>
3742

3843
</project>

‎schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaExecutorContextFactory.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,13 @@ public class GraphQLJpaExecutorContextFactory implements GraphQLExecutorContextF
4545
private Supplier<Instrumentation> instrumentation = () -> new SimpleInstrumentation();
4646
private Supplier<GraphQLContext> graphqlContext = () -> GraphQLContext.newContext().build();
4747

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

5050
private Supplier<DataLoaderRegistry> dataLoaderRegistry = () -> {
51-
DataLoaderOptions options = dataLoaderOptions.get().setCachingEnabled(false);
51+
DataLoaderOptions options = DataLoaderOptions
52+
.newOptions(dataLoaderOptions.get())
53+
.setCachingEnabled(false)
54+
.build();
5255

5356
return BatchLoaderRegistry.newDataLoaderRegistry(options);
5457
};

‎schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaToManyDataFetcher.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.List;
2727
import java.util.Optional;
2828
import org.dataloader.DataLoader;
29+
import org.dataloader.DataLoaderFactory;
2930
import org.dataloader.DataLoaderOptions;
3031
import org.dataloader.DataLoaderRegistry;
3132
import org.dataloader.MappedBatchLoaderWithContext;
@@ -84,9 +85,9 @@ protected DataLoader<Object, List<Object>> getDataLoader(
8485
queryFactory
8586
);
8687

87-
DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false);
88+
DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false).build();
8889

89-
DataLoader<Object, List<Object>> dataLoader = DataLoader.newMappedDataLoader(
90+
DataLoader<Object, List<Object>> dataLoader = DataLoaderFactory.newMappedDataLoader(
9091
mappedBatchLoader,
9192
options
9293
);

‎schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaToOneDataFetcher.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import jakarta.persistence.metamodel.SingularAttribute;
2727
import java.util.Optional;
2828
import org.dataloader.DataLoader;
29+
import org.dataloader.DataLoaderFactory;
2930
import org.dataloader.DataLoaderOptions;
3031
import org.dataloader.DataLoaderRegistry;
3132
import org.dataloader.MappedBatchLoaderWithContext;
@@ -81,9 +82,12 @@ protected DataLoader<Object, Object> getDataLoader(DataFetchingEnvironment envir
8182
queryFactory
8283
);
8384

84-
DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false);
85+
DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false).build();
8586

86-
DataLoader<Object, Object> dataLoader = DataLoader.newMappedDataLoader(mappedBatchLoader, options);
87+
DataLoader<Object, Object> dataLoader = DataLoaderFactory.newMappedDataLoader(
88+
mappedBatchLoader,
89+
options
90+
);
8791
dataLoaderRegistry.register(dataLoaderKey, dataLoader);
8892
}
8993
}

‎tests/gatling/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<properties>
1414
<java.version>21</java.version>
15-
<activiti-cloud.version>8.7.0</activiti-cloud.version>
15+
<activiti-cloud.version>8.8.0-alpha.120</activiti-cloud.version>
1616
<gatling.version>3.11.5</gatling.version>
1717
<gatling-maven-plugin.version>4.9.6</gatling-maven-plugin.version>
1818
<hibernate.version>6.5.3.Final</hibernate.version>

‎tests/gatling/src/main/resources/data.sql‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,29 +1006,29 @@ insert into TASK (id, assignee, created_date, description, due_date, last_modifi
10061006
(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'),
10071007
(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');
10081008

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

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

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

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

0 commit comments

Comments
 (0)