Merge branch 'dev' into feature/DT-55-persist-pattern-names

conveyal · Aug 31, 2023 · d84ffc3 · d84ffc3
2 parents e264342 + c348533
commit d84ffc3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -29,7 +29,7 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    # Install node 14+ for running maven-semantic-release.
+    # Install node 18+ for running maven-semantic-release.
     - name: Use Node.js 18.X
       uses: actions/setup-node@v1
       with:

diff --git a/pom.xml b/pom.xml
@@ -241,7 +241,7 @@
     <dependency>
     	<groupId>com.google.guava</groupId>
     	<artifactId>guava</artifactId>
-    	<version>30.0-jre</version>
+    	<version>32.0.0-jre</version>
     </dependency>
     <dependency>
     	<groupId>org.locationtech.jts</groupId>
@@ -296,7 +296,7 @@
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-s3</artifactId>
-      <version>1.11.18</version>
+      <version>1.12.261</version>
     </dependency>
     <!-- Very efficient collections of primitive data types for Java. -->
     <dependency>
@@ -314,7 +314,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.2.25</version>
+      <version>42.4.3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -331,13 +331,13 @@
     <dependency>
       <groupId>com.graphql-java</groupId>
       <artifactId>graphql-java</artifactId>
-      <version>11.0</version>
+      <version>17.4</version>
     </dependency>
     <!--  Contains special utils for things like converting escaped strings to unescaped strings for logging.  -->
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-text</artifactId>
-      <version>1.6</version>
+      <version>1.10.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java b/src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java
@@ -90,7 +90,12 @@ public class GraphQLGtfsSchema {
             .field(MapFetcher.field("description"))
             .build();
 
-    private static final GraphQLScalarType stringList = new GraphQLScalarType("StringList", "List of Strings", new StringCoercing());
+    private static final GraphQLScalarType stringList = GraphQLScalarType
+        .newScalar()
+        .name("StringList")
+        .description("List of Strings")
+        .coercing(new StringCoercing())
+        .build();
 
     // Represents GTFS Editor service exceptions.
     public static final GraphQLObjectType scheduleExceptionType = newObject().name("scheduleException")

diff --git a/src/main/java/com/conveyal/gtfs/graphql/fetchers/JDBCFetcher.java b/src/main/java/com/conveyal/gtfs/graphql/fetchers/JDBCFetcher.java
@@ -180,7 +180,7 @@ public List<Map<String, Object>> get (DataFetchingEnvironment environment) {
      * Handle fetching functionality for a given namespace, set of join values, and arguments. This is broken out from
      * the standard get function so that it can be reused in other fetchers (i.e., NestedJdbcFetcher)
      */
-    List<Map<String, Object>> getResults (
+    public List<Map<String, Object>> getResults (
         String namespace,
         List<String> parentJoinValues,
         Map<String, Object> graphQLQueryArguments