tidy

James Bellenger · James Bellenger · commit 118df760b793 · 2022-04-07T17:05:33.000-07:00
diff --git a/src/main/java/graphql/validation/ValidationUtil.java b/src/main/java/graphql/validation/ValidationUtil.java
@@ -90,20 +90,14 @@ public boolean isValidLiteralValue(Value<?> value, GraphQLType type, GraphQLSche
         }
 
         if (type instanceof GraphQLScalarType) {
-            return true;
-            /*
             Optional<GraphQLError> invalid = parseLiteral(value, ((GraphQLScalarType) type).getCoercing());
             invalid.ifPresent(graphQLError -> handleScalarError(value, (GraphQLScalarType) type, graphQLError));
             return !invalid.isPresent();
-             */
         }
         if (type instanceof GraphQLEnumType) {
-            return true;
-            /*
             Optional<GraphQLError> invalid = parseLiteralEnum(value, (GraphQLEnumType) type);
             invalid.ifPresent(graphQLError -> handleEnumError(value, (GraphQLEnumType) type, graphQLError));
             return !invalid.isPresent();
-             */
         }
 
         if (isList(type)) {
diff --git a/src/test/java/benchmark/ValidatorBenchmark.java b/src/test/java/benchmark/ValidatorBenchmark.java
@@ -49,19 +49,15 @@ public static class MyState {
         @Setup
         public void setup() {
             try {
-                String schemaString = readFromClasspath("twitter.graphqls");
-                String query = readFromClasspath("birdwatchnotes-query.graphql");
+                String schemaString = readFromClasspath("large-schema-4.graphqls");
+                String query = readFromClasspath("large-schema-4-query.graphql");
                 schema = SchemaGenerator.createdMockedSchema(schemaString);
                 document = Parser.parse(query);
 
-                // JMB TODO: this fails execution because the query requires variables
-
                 // make sure this is a valid query overall
-                /*
                 GraphQL graphQL = GraphQL.newGraphQL(schema).build();
                 ExecutionResult executionResult = graphQL.execute(query);
                 assertTrue(executionResult.getErrors().size() == 0);
-                 */
             } catch (Exception e) {
                 System.out.println(e);
                 throw new RuntimeException(e);

Original file line number	Diff line number	Diff line change
`@@ -90,20 +90,14 @@ public boolean isValidLiteralValue(Value<?> value, GraphQLType type, GraphQLSche`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`if (type instanceof GraphQLScalarType) {`
`93`		`- return true;`
`94`		`- /*`
`95`	`93`	`Optional<GraphQLError> invalid = parseLiteral(value, ((GraphQLScalarType) type).getCoercing());`
`96`	`94`	`invalid.ifPresent(graphQLError -> handleScalarError(value, (GraphQLScalarType) type, graphQLError));`
`97`	`95`	`return !invalid.isPresent();`
`98`		`- */`
`99`	`96`	`}`
`100`	`97`	`if (type instanceof GraphQLEnumType) {`
`101`		`- return true;`
`102`		`- /*`
`103`	`98`	`Optional<GraphQLError> invalid = parseLiteralEnum(value, (GraphQLEnumType) type);`
`104`	`99`	`invalid.ifPresent(graphQLError -> handleEnumError(value, (GraphQLEnumType) type, graphQLError));`
`105`	`100`	`return !invalid.isPresent();`
`106`		`- */`
`107`	`101`	`}`
`108`	`102`
`109`	`103`	`if (isList(type)) {`