Skip to content

Commit 0122043

Browse files
sohamdasohamda
committed
Upgrade to java 17 and current releases
1 parent 6a5aab3 commit 0122043

5 files changed

Lines changed: 31 additions & 37 deletions

File tree

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM adoptopenjdk/openjdk11-openj9:alpine-slim
1+
FROM eclipse-temurin:17-jre-alpine
22
ARG JAR_FILE=target/graphql-java*.jar
33
ADD ${JAR_FILE} graphql-java.jar
44
ENTRYPOINT java -Xshareclasses -Xquickstart -XX:+UseSerialGC -XX:MaxRAM=150m -jar /graphql-java.jar

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.4.4</version>
8+
<version>2.7.0</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>soham.spring</groupId>
@@ -15,8 +15,8 @@
1515
<description>Spring Boot project to demonstrate GraphQL with graphql-java</description>
1616

1717
<properties>
18-
<java.version>11</java.version>
19-
<graphql-java-version>16.2</graphql-java-version>
18+
<java.version>17</java.version>
19+
<graphql-java-version>18.1</graphql-java-version>
2020
<graphql-java-spring-boot-starter-webmvc-version>2.0</graphql-java-spring-boot-starter-webmvc-version>
2121
</properties>
2222

‎src/main/java/soham/spring/graphqljava/component/GraphQLProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import graphql.schema.idl.SchemaParser;
88
import graphql.schema.idl.TypeDefinitionRegistry;
99
import lombok.extern.slf4j.Slf4j;
10-
import org.dataloader.DataLoader;
10+
import org.dataloader.DataLoaderFactory;
1111
import org.dataloader.DataLoaderRegistry;
1212
import org.springframework.beans.factory.annotation.Autowired;
1313
import org.springframework.context.annotation.Bean;
@@ -42,7 +42,7 @@ public GraphQL graphQL() {
4242
public DataLoaderRegistry dataLoaderRegistry() {
4343
DataLoaderRegistry dataLoaderRegistry = new DataLoaderRegistry();
4444
dataLoaderRegistry.register("providers",
45-
DataLoader.newDataLoader(providerDataFetcher.providerBatchLoader()));
45+
DataLoaderFactory.newDataLoader(providerDataFetcher.providerBatchLoader()));
4646
return dataLoaderRegistry;
4747
}
4848

‎src/main/java/soham/spring/graphqljava/datafetcher/ProviderDataFetcher.java‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package soham.spring.graphqljava.datafetcher;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
4-
import graphql.execution.DataFetcherResult;
53
import graphql.schema.DataFetcher;
64
import org.dataloader.BatchLoader;
75
import org.springframework.beans.factory.annotation.Autowired;
86
import org.springframework.stereotype.Component;
97
import soham.spring.graphqljava.entity.Provider;
108
import soham.spring.graphqljava.service.ProviderService;
119

12-
import java.util.Map;
10+
import java.util.List;
1311
import java.util.concurrent.CompletableFuture;
1412

1513
@Component
@@ -18,31 +16,27 @@ public class ProviderDataFetcher {
1816
@Autowired
1917
ProviderService providerService;
2018

21-
public DataFetcher getAllProviders() {
22-
return dataFetchingEnvironment -> {
23-
return DataFetcherResult.newResult().data(providerService.findAllProviders()).build();
24-
};
19+
public DataFetcher<List<Provider>> getAllProviders() {
20+
return environment -> providerService.findAllProviders();
2521
}
2622

27-
public DataFetcher getProviderById() {
28-
return dataFetchingEnvironment -> {
29-
String providerId = dataFetchingEnvironment.getArgument("id");
30-
return DataFetcherResult.newResult().data(providerService.findProviderByID(providerId)).build();
23+
public DataFetcher<Provider> getProviderById() {
24+
return environment -> {
25+
String providerId = environment.getArgument("id");
26+
return providerService.findProviderByID(providerId);
3127
};
3228
}
3329

3430
public BatchLoader<Integer, Provider> providerBatchLoader() {
35-
final BatchLoader<Integer, Provider> batchLoader = keys ->
31+
return keys ->
3632
CompletableFuture.supplyAsync(() -> providerService.findByIdIn(keys));
37-
return batchLoader;
3833
}
3934

40-
public DataFetcher addProvider() {
41-
return dataFetchingEnvironment -> {
42-
String name = dataFetchingEnvironment.getArgument("name");
43-
String description = dataFetchingEnvironment.getArgument("description");
44-
45-
return DataFetcherResult.newResult().data(providerService.addProvider(name, description)).build();
35+
public DataFetcher<Provider> addProvider() {
36+
return environment -> {
37+
String name = environment.getArgument("name");
38+
String description = environment.getArgument("description");
39+
return providerService.addProvider(name, description);
4640
};
4741
}
4842
}

‎src/main/java/soham/spring/graphqljava/datafetcher/ServiceDataFetcher.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package soham.spring.graphqljava.datafetcher;
22

3-
import graphql.execution.DataFetcherResult;
43
import graphql.schema.DataFetcher;
54
import org.dataloader.DataLoader;
65
import org.springframework.beans.factory.annotation.Autowired;
@@ -9,27 +8,28 @@
98
import soham.spring.graphqljava.entity.Service;
109
import soham.spring.graphqljava.service.ServicesService;
1110

11+
import java.util.List;
12+
import java.util.concurrent.CompletableFuture;
13+
1214
@Component
1315
public class ServiceDataFetcher {
1416

1517
@Autowired
1618
ServicesService servicesService;
1719

1820

19-
public DataFetcher getAllServices() {
20-
return dataFetchingEnvironment -> {
21-
return DataFetcherResult.newResult().data(servicesService.findAll()).build();
22-
};
21+
public DataFetcher<List<Service>> getAllServices() {
22+
return dataFetchingEnvironment -> servicesService.findAll();
2323
}
2424

25-
public DataFetcher getServiceById() {
25+
public DataFetcher<Service> getServiceById() {
2626
return dataFetchingEnvironment -> {
2727
String serviceId = dataFetchingEnvironment.getArgument("id");
28-
return DataFetcherResult.newResult().data(servicesService.findById(serviceId)).build();
28+
return servicesService.findById(serviceId);
2929
};
3030
}
3131

32-
public DataFetcher getProviderForService() {
32+
public DataFetcher<CompletableFuture<Provider>> getProviderForService() {
3333
return dataFetchingEnvironment -> {
3434
Service service = dataFetchingEnvironment.getSource();
3535

@@ -38,20 +38,20 @@ public DataFetcher getProviderForService() {
3838
};
3939
}
4040

41-
public DataFetcher getServicesForProvider() {
41+
public DataFetcher<List<Service>> getServicesForProvider() {
4242
return dataFetchingEnvironment -> {
4343
Provider provider = dataFetchingEnvironment.getSource();
44-
return DataFetcherResult.newResult().data(servicesService.findAllByProviderId(provider.getId())).build();
44+
return servicesService.findAllByProviderId(provider.getId());
4545
};
4646
}
4747

48-
public DataFetcher addService() {
48+
public DataFetcher<Service> addService() {
4949
return dataFetchingEnvironment -> {
5050
String name = dataFetchingEnvironment.getArgument("name");
5151
String description = dataFetchingEnvironment.getArgument("description");
5252
String providerId = dataFetchingEnvironment.getArgument("providerId");
5353

54-
return DataFetcherResult.newResult().data(servicesService.addService(name, description, providerId)).build();
54+
return servicesService.addService(name, description, providerId);
5555
};
5656
}
5757
}

0 commit comments

Comments
 (0)