Updating function calls to be to graphqlSpecifiedScalar

simeonleatherland · simeonleatherland · commit d3d30d31e1f1 · 2020-01-30T09:44:30.000+11:00
diff --git a/src/main/java/graphql/schema/idl/SchemaGenerator.java b/src/main/java/graphql/schema/idl/SchemaGenerator.java
@@ -398,7 +398,7 @@ private Set<GraphQLType> buildAdditionalTypes(BuildContext buildCtx) {
             }
         });
         typeRegistry.scalars().values().forEach(scalarTypeDefinition -> {
-            if (ScalarInfo.isStandardScalar(scalarTypeDefinition.getName())) {
+            if (ScalarInfo.isGraphqlSpecifiedScalar(scalarTypeDefinition.getName())) {
                 return;
             }
             if (buildCtx.hasInputType(scalarTypeDefinition) == null && buildCtx.hasOutputType(scalarTypeDefinition) == null) {
diff --git a/src/test/groovy/graphql/schema/idl/MockedWiringFactory.groovy b/src/test/groovy/graphql/schema/idl/MockedWiringFactory.groovy
@@ -55,7 +55,7 @@ class MockedWiringFactory implements WiringFactory {
 
     @Override
     boolean providesScalar(ScalarWiringEnvironment environment) {
-        if (ScalarInfo.isStandardScalar(environment.getScalarTypeDefinition().getName())) {
+        if (ScalarInfo.isGraphqlSpecifiedScalar(environment.getScalarTypeDefinition().getName())) {
             return false
         }
         return true

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ private Set<GraphQLType> buildAdditionalTypes(BuildContext buildCtx) {`
`398`	`398`	`}`
`399`	`399`	`});`
`400`	`400`	`typeRegistry.scalars().values().forEach(scalarTypeDefinition -> {`
`401`		`- if (ScalarInfo.isStandardScalar(scalarTypeDefinition.getName())) {`
	`401`	`+ if (ScalarInfo.isGraphqlSpecifiedScalar(scalarTypeDefinition.getName())) {`
`402`	`402`	`return;`
`403`	`403`	`}`
`404`	`404`	`if (buildCtx.hasInputType(scalarTypeDefinition) == null && buildCtx.hasOutputType(scalarTypeDefinition) == null) {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class MockedWiringFactory implements WiringFactory {`
`55`	`55`
`56`	`56`	`@Override`
`57`	`57`	`boolean providesScalar(ScalarWiringEnvironment environment) {`
`58`		`- if (ScalarInfo.isStandardScalar(environment.getScalarTypeDefinition().getName())) {`
	`58`	`+ if (ScalarInfo.isGraphqlSpecifiedScalar(environment.getScalarTypeDefinition().getName())) {`
`59`	`59`	`return false`
`60`	`60`	`}`
`61`	`61`	`return true`