diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 16e39476e..e04f2c0f8 100644 --- 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 index fa11a3762..a2b50bf6c 100644 --- a/pom.xml +++ b/pom.xml @@ -241,7 +241,7 @@ com.google.guava guava - 30.0-jre + 32.0.0-jre org.locationtech.jts @@ -296,7 +296,7 @@ com.amazonaws aws-java-sdk-s3 - 1.11.18 + 1.12.261 @@ -314,7 +314,7 @@ org.postgresql postgresql - 42.2.25 + 42.4.3 org.apache.commons @@ -331,13 +331,13 @@ com.graphql-java graphql-java - 11.0 + 17.4 org.apache.commons commons-text - 1.6 + 1.10.0 diff --git a/src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java b/src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java index fe5d901ce..6c4032dc2 100644 --- 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 index 3e7389ff9..8c2107bac 100644 --- 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> 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> getResults ( + public List> getResults ( String namespace, List parentJoinValues, Map graphQLQueryArguments