Merge pull request #595 from entur/spring-graphql

Replace graphql kickstart project with spring graphql
entur · Dec 19, 2024 · 253a633 · 253a633
2 parents fe4a1d1 + abde0de
commit 253a633
Show file tree

Hide file tree

Showing 30 changed files with 642 additions and 553 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,6 @@
 
         <java.version>21</java.version>
 
-        <graphql-starter.version>15.1.0</graphql-starter.version>
         <entur.ror.helpers.version>1.101</entur.ror.helpers.version>
         <redisson.version>3.40.2</redisson.version>
         <embedded-redis.version>0.9.1</embedded-redis.version>
@@ -127,9 +126,8 @@
             <version>${jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.graphql-java-kickstart</groupId>
-            <artifactId>graphql-spring-boot-starter</artifactId>
-            <version>${graphql-starter.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-graphql</artifactId>
         </dependency>
         <dependency>
             <groupId>net.logstash.logback</groupId>
@@ -154,6 +152,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.graphql</groupId>
+            <artifactId>spring-graphql-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.signal</groupId>
             <artifactId>embedded-redis</artifactId>
@@ -172,12 +175,6 @@
             <version>${okhttp.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.graphql-java-kickstart</groupId>
-            <artifactId>graphql-spring-boot-starter-test</artifactId>
-            <version>${graphql-starter.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.wiremock</groupId>
             <artifactId>wiremock</artifactId>

diff --git a/src/main/java/org/entur/lamassu/controller/GraphQLQueryController.java b/src/main/java/org/entur/lamassu/controller/GraphQLQueryController.java