Merge pull request #4087 from graphql-java/builders-nullity

dondonz · web-flow · commit c842ed40a46b · 2025-08-20T06:58:43.000+10:00
Add `@NullUnmarked` to builders
diff --git a/src/main/java/graphql/analysis/QueryComplexityInfo.java b/src/main/java/graphql/analysis/QueryComplexityInfo.java
@@ -3,6 +3,7 @@
 import graphql.PublicApi;
 import graphql.execution.instrumentation.parameters.InstrumentationExecuteOperationParameters;
 import graphql.execution.instrumentation.parameters.InstrumentationValidationParameters;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * The query complexity info.
@@ -62,6 +63,7 @@ public static Builder newQueryComplexityInfo() {
     }
 
     @PublicApi
+    @NullUnmarked
     public static class Builder {
 
         private int complexity;
diff --git a/src/main/java/graphql/analysis/QueryDepthInfo.java b/src/main/java/graphql/analysis/QueryDepthInfo.java
@@ -1,6 +1,7 @@
 package graphql.analysis;
 
 import graphql.PublicApi;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * The query depth info.
@@ -38,6 +39,7 @@ public static Builder newQueryDepthInfo() {
     }
 
     @PublicApi
+    @NullUnmarked
     public static class Builder {
 
         private int depth;
diff --git a/src/main/java/graphql/analysis/QueryTransformer.java b/src/main/java/graphql/analysis/QueryTransformer.java
@@ -13,6 +13,7 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import org.jspecify.annotations.NullUnmarked;
 
 import static graphql.Assert.assertNotNull;
 import static graphql.language.AstNodeAdapter.AST_NODE_ADAPTER;
@@ -98,6 +99,7 @@ public static Builder newQueryTransformer() {
     }
 
     @PublicApi
+    @NullUnmarked
     public static class Builder {
         private GraphQLSchema schema;
         private Map<String, Object> variables;
diff --git a/src/main/java/graphql/analysis/QueryTraverser.java b/src/main/java/graphql/analysis/QueryTraverser.java
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import org.jspecify.annotations.NullUnmarked;
 
 import static graphql.Assert.assertNotNull;
 import static graphql.Assert.assertShouldNeverHappen;
@@ -215,6 +216,7 @@ public static Builder newQueryTraverser() {
     }
 
     @PublicApi
+    @NullUnmarked
     public static class Builder {
         private GraphQLSchema schema;
         private Document document;
diff --git a/src/main/java/graphql/language/NodeDirectivesBuilder.java b/src/main/java/graphql/language/NodeDirectivesBuilder.java
@@ -10,6 +10,4 @@ public interface NodeDirectivesBuilder extends NodeBuilder {
     NodeDirectivesBuilder directives(List<Directive> directives);
 
     NodeDirectivesBuilder directive(Directive directive);
-
-
 }
diff --git a/src/main/java/graphql/schema/GraphQLEnumValueDefinition.java b/src/main/java/graphql/schema/GraphQLEnumValueDefinition.java
@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
+import org.jspecify.annotations.NullUnmarked;
 
 import static graphql.Assert.assertNotNull;
 import static graphql.Assert.assertValidName;
@@ -193,6 +194,7 @@ public static Builder newEnumValueDefinition(GraphQLEnumValueDefinition existing
     }
 
     @PublicApi
+    @NullUnmarked
     public static class Builder extends GraphqlDirectivesContainerTypeBuilder<Builder, Builder> {
         private Object value;
         private String deprecationReason;
diff --git a/src/main/java/graphql/schema/GraphQLFieldDefinition.java b/src/main/java/graphql/schema/GraphQLFieldDefinition.java
@@ -15,6 +15,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
+import org.jspecify.annotations.NullUnmarked;
 import java.util.function.UnaryOperator;
 
 import static graphql.Assert.assertNotNull;
@@ -256,6 +257,7 @@ public static Builder newFieldDefinition() {
     }
 
     @PublicApi
+    @NullUnmarked
     public static class Builder extends GraphqlDirectivesContainerTypeBuilder<Builder,Builder> {
 
         private GraphQLOutputType type;
diff --git a/src/main/java/graphql/schema/GraphQLInputObjectField.java b/src/main/java/graphql/schema/GraphQLInputObjectField.java
@@ -15,6 +15,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.function.Consumer;
+import org.jspecify.annotations.NullUnmarked;
 
 import static graphql.Assert.assertNotNull;
 import static graphql.Assert.assertValidName;
@@ -266,6 +267,7 @@ public static Builder newInputObjectField() {
     }
 
     @PublicApi
+    @NullUnmarked
     public static class Builder extends GraphqlDirectivesContainerTypeBuilder<Builder,Builder> {
         private InputValueWithState defaultValue = InputValueWithState.NOT_SET;
         private GraphQLInputType type;
diff --git a/src/main/java/graphql/schema/GraphQLInputObjectType.java b/src/main/java/graphql/schema/GraphQLInputObjectType.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
+import org.jspecify.annotations.NullUnmarked;
 import java.util.function.UnaryOperator;
 
 import static graphql.Assert.assertNotNull;
@@ -253,6 +254,7 @@ public static Builder newInputObject() {
     }
 
     @PublicApi
+    @NullUnmarked
     public static class Builder extends GraphqlDirectivesContainerTypeBuilder<Builder, Builder> {
         private InputObjectTypeDefinition definition;
         private List<InputObjectTypeExtensionDefinition> extensionDefinitions = emptyList();
diff --git a/src/main/java/graphql/schema/GraphQLInterfaceType.java b/src/main/java/graphql/schema/GraphQLInterfaceType.java
@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
+import org.jspecify.annotations.NullUnmarked;
 import java.util.function.UnaryOperator;
 
 import static graphql.Assert.assertNotNull;
@@ -258,6 +259,7 @@ public static Builder newInterface(GraphQLInterfaceType existing) {
 
 
     @PublicApi
+    @NullUnmarked
     public static class Builder extends GraphqlDirectivesContainerTypeBuilder<Builder, Builder> {
         private TypeResolver typeResolver;
         private InterfaceTypeDefinition definition;
diff --git a/src/main/java/graphql/schema/GraphQLObjectType.java b/src/main/java/graphql/schema/GraphQLObjectType.java
@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
+import org.jspecify.annotations.NullUnmarked;
 import java.util.function.UnaryOperator;
 
 import static graphql.Assert.assertNotNull;
@@ -247,6 +248,7 @@ public static Builder newObject(GraphQLObjectType existing) {
     }
 
     @PublicApi
+    @NullUnmarked
     public static class Builder extends GraphqlDirectivesContainerTypeBuilder<Builder, Builder> {
         private ObjectTypeDefinition definition;
         private List<ObjectTypeExtensionDefinition> extensionDefinitions = emptyList();
diff --git a/src/main/java/graphql/schema/GraphQLScalarType.java b/src/main/java/graphql/schema/GraphQLScalarType.java
@@ -14,6 +14,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
+import org.jspecify.annotations.NullUnmarked;
 
 import static graphql.Assert.assertNotNull;
 import static graphql.Assert.assertValidName;
@@ -214,6 +215,7 @@ public static Builder newScalar(GraphQLScalarType existing) {
 
 
     @PublicApi
+    @NullUnmarked
     public static class Builder extends GraphqlDirectivesContainerTypeBuilder<Builder, Builder> {
         private Coercing<?, ?> coercing;
         private ScalarTypeDefinition definition;
diff --git a/src/main/java/graphql/schema/GraphQLUnionType.java b/src/main/java/graphql/schema/GraphQLUnionType.java
@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
+import org.jspecify.annotations.NullUnmarked;
 
 import static graphql.Assert.assertNotEmpty;
 import static graphql.Assert.assertNotNull;
@@ -249,6 +250,7 @@ public static Builder newUnionType(GraphQLUnionType existing) {
     }
 
     @PublicApi
+    @NullUnmarked
     public static class Builder extends GraphqlDirectivesContainerTypeBuilder<Builder, Builder> {
         private TypeResolver typeResolver;
         private UnionTypeDefinition definition;
diff --git a/src/main/java/graphql/schema/idl/RuntimeWiring.java b/src/main/java/graphql/schema/idl/RuntimeWiring.java
@@ -16,6 +16,7 @@
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
+import org.jspecify.annotations.NullUnmarked;
 
 import static graphql.Assert.assertNotNull;
 import static graphql.schema.visibility.DefaultGraphqlFieldVisibility.DEFAULT_FIELD_VISIBILITY;
@@ -175,6 +176,7 @@ public GraphqlTypeComparatorRegistry getComparatorRegistry() {
     }
 
     @PublicApi
+    @NullUnmarked
     public static class Builder {
         private final Map<String, Map<String, DataFetcher>> dataFetchers = new LinkedHashMap<>();
         private final Map<String, DataFetcher> defaultDataFetchers = new LinkedHashMap<>();
diff --git a/src/test/groovy/graphql/archunit/JSpecifyAnnotationsCheck.groovy b/src/test/groovy/graphql/archunit/JSpecifyAnnotationsCheck.groovy
@@ -35,15 +35,11 @@ class JSpecifyAnnotationsCheck extends Specification {
             "graphql.analysis.MaxQueryDepthInstrumentation",
             "graphql.analysis.QueryComplexityCalculator",
             "graphql.analysis.QueryComplexityInfo",
-            "graphql.analysis.QueryComplexityInfo\$Builder",
             "graphql.analysis.QueryDepthInfo",
-            "graphql.analysis.QueryDepthInfo\$Builder",
             "graphql.analysis.QueryReducer",
             "graphql.analysis.QueryTransformer",
-            "graphql.analysis.QueryTransformer\$Builder",
             "graphql.analysis.QueryTraversalOptions",
             "graphql.analysis.QueryTraverser",
-            "graphql.analysis.QueryTraverser\$Builder",
             "graphql.analysis.QueryVisitor",
             "graphql.analysis.QueryVisitorFieldArgumentEnvironment",
             "graphql.analysis.QueryVisitorFieldArgumentInputValue",
@@ -240,21 +236,16 @@ class JSpecifyAnnotationsCheck extends Specification {
             "graphql.schema.GraphQLDirectiveContainer",
             "graphql.schema.GraphQLEnumType",
             "graphql.schema.GraphQLEnumValueDefinition",
-            "graphql.schema.GraphQLEnumValueDefinition\$Builder",
             "graphql.schema.GraphQLFieldDefinition",
-            "graphql.schema.GraphQLFieldDefinition\$Builder",
             "graphql.schema.GraphQLFieldsContainer",
             "graphql.schema.GraphQLImplementingType",
             "graphql.schema.GraphQLInputFieldsContainer",
             "graphql.schema.GraphQLInputObjectField",
-            "graphql.schema.GraphQLInputObjectField\$Builder",
             "graphql.schema.GraphQLInputObjectType",
-            "graphql.schema.GraphQLInputObjectType\$Builder",
             "graphql.schema.GraphQLInputSchemaElement",
             "graphql.schema.GraphQLInputType",
             "graphql.schema.GraphQLInputValueDefinition",
             "graphql.schema.GraphQLInterfaceType",
-            "graphql.schema.GraphQLInterfaceType\$Builder",
             "graphql.schema.GraphQLList",
             "graphql.schema.GraphQLModifiedType",
             "graphql.schema.GraphQLNamedInputType",
@@ -264,10 +255,8 @@ class JSpecifyAnnotationsCheck extends Specification {
             "graphql.schema.GraphQLNonNull",
             "graphql.schema.GraphQLNullableType",
             "graphql.schema.GraphQLObjectType",
-            "graphql.schema.GraphQLObjectType\$Builder",
             "graphql.schema.GraphQLOutputType",
             "graphql.schema.GraphQLScalarType",
-            "graphql.schema.GraphQLScalarType\$Builder",
             "graphql.schema.GraphQLSchema",
             "graphql.schema.GraphQLSchemaElement",
             "graphql.schema.GraphQLType",
@@ -276,7 +265,6 @@ class JSpecifyAnnotationsCheck extends Specification {
             "graphql.schema.GraphQLTypeVisitor",
             "graphql.schema.GraphQLTypeVisitorStub",
             "graphql.schema.GraphQLUnionType",
-            "graphql.schema.GraphQLUnionType\$Builder",
             "graphql.schema.GraphQLUnmodifiedType",
             "graphql.schema.GraphqlElementParentTree",
             "graphql.schema.GraphqlTypeComparatorEnvironment",
@@ -302,7 +290,6 @@ class JSpecifyAnnotationsCheck extends Specification {
             "graphql.schema.idl.MapEnumValuesProvider",
             "graphql.schema.idl.NaturalEnumValuesProvider",
             "graphql.schema.idl.RuntimeWiring",
-            "graphql.schema.idl.RuntimeWiring\$Builder",
             "graphql.schema.idl.SchemaDirectiveWiring",
             "graphql.schema.idl.SchemaDirectiveWiringEnvironment",
             "graphql.schema.idl.SchemaGenerator",

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,4 @@ public interface NodeDirectivesBuilder extends NodeBuilder {`
`10`	`10`	`NodeDirectivesBuilder directives(List<Directive> directives);`
`11`	`11`
`12`	`12`	`NodeDirectivesBuilder directive(Directive directive);`
`13`		`-`
`14`		`-`
`15`	`13`	`}`