Merge pull request #5335 from entur/map_graphql_unknown_operation_error

Map GraphQL UnknowOperationException as bad request
opentripplanner · Aug 31, 2023 · 09a16e2 · 09a16e2
2 parents 388a94e + 1d762a6
commit 09a16e2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/ext/java/org/opentripplanner/ext/transmodelapi/TransmodelGraph.java b/src/ext/java/org/opentripplanner/ext/transmodelapi/TransmodelGraph.java
@@ -5,6 +5,7 @@
 import graphql.GraphQL;
 import graphql.analysis.MaxQueryComplexityInstrumentation;
 import graphql.execution.ExecutionStrategy;
+import graphql.execution.UnknownOperationException;
 import graphql.execution.instrumentation.ChainedInstrumentation;
 import graphql.execution.instrumentation.Instrumentation;
 import graphql.schema.CoercingParseValueException;
@@ -69,8 +70,8 @@ Response executeGraphQL(
       return ExecutionResultMapper.okResponse(result);
     } catch (OTPRequestTimeoutException te) {
       return ExecutionResultMapper.timeoutResponse();
-    } catch (CoercingParseValueException cpve) {
-      return ExecutionResultMapper.badRequestResponse(cpve.getMessage());
+    } catch (CoercingParseValueException | UnknownOperationException e) {
+      return ExecutionResultMapper.badRequestResponse(e.getMessage());
     } catch (Exception systemError) {
       LOG.error(systemError.getMessage(), systemError);
       return ExecutionResultMapper.systemErrorResponse(systemError.getMessage());