FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Add JSpecify annotations to 10 classes in graphql.language package and improve annotation prompt by Copilot · Pull Request #4216 · graphql-java/graphql-java · GitHub

/ graphql-java Public

Add JSpecify annotations to 10 classes in graphql.language package and improve annotation prompt #4216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dondonz merged 7 commits into from
Mar 22, 2026
Conversation 11 Commits 7 Checks 12 Files changed
Merged

Add JSpecify annotations to 10 classes in graphql.language package and improve annotation prompt #4216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c60fdf6
Initial plan
Copilot Jan 24, 2026
c02fa4e
Add JSpecify annotations to 10 classes in graphql.language package
Copilot Jan 24, 2026
3db2dde
Update JSpecify annotation prompt with effectiveness improvements
Copilot Jan 24, 2026
e7144c6
Allow slashes in dev branch names
dondonz Feb 8, 2026
5aaada6
Merge branch 'master' into copilot/add-jspecify-annotations-to-classes
dondonz Feb 14, 2026
0c7b9c3
Merge branch 'master' into copilot/add-jspecify-annotations-to-classes
dondonz Mar 21, 2026
4665320
Remove already-annotated classes from JSpecify exemption list
dondonz Mar 21, 2026
File filter

Filter by extension

Filter by extension .gradle  (1) .groovy  (1) .java  (10) .md  (1) All 4 file types selected
Deleted files Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
68 changes: 0 additions & 68 deletions .claude/commands/jspecify-annotate.md
Show comments
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def getDevelopmentVersion() {
gitRevParse.waitForProcessOutput(gitRevParseOutput, gitRevParseError)
def branchName = gitRevParseOutput.toString().trim().replaceAll('[/\\\\]', '-')

return makeDevelopmentVersion(["0.0.0", branchName, "SNAPSHOT"])
return makeDevelopmentVersion(["0.0.0", sanitizedBranchName, "SNAPSHOT"])

dondonz Feb 8, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Copliot PRs always have a / in the name, which makes it appear like the jar is in another directory when developing locally. This sanitises the name
}

def reactiveStreamsVersion = '1.0.3'
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/graphql/language/Comment.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
package graphql.language;

import graphql.PublicApi;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

import java.io.Serializable;

/**
* A single-line comment. These are comments that start with a {@code #} in source documents.
*/
@PublicApi
@NullMarked
public class Comment implements Serializable {
public final String content;
public final SourceLocation sourceLocation;
public final @Nullable SourceLocation sourceLocation;

public Comment(String content, SourceLocation sourceLocation) {
public Comment(String content, @Nullable SourceLocation sourceLocation) {
this.content = content;
this.sourceLocation = sourceLocation;
}
Expand All @@ -21,7 +24,7 @@ public String getContent() {
return content;
}

public SourceLocation getSourceLocation() {
public @Nullable SourceLocation getSourceLocation() {
return sourceLocation;
}
}
2 changes: 2 additions & 0 deletions src/main/java/graphql/language/Definition.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@


import graphql.PublicApi;
import org.jspecify.annotations.NullMarked;

@PublicApi
@NullMarked
public interface Definition<T extends Definition> extends Node<T> {

}
5 changes: 4 additions & 1 deletion src/main/java/graphql/language/IgnoredChar.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package graphql.language;

import graphql.PublicApi;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

import java.io.Serializable;
import java.util.Objects;
Expand All @@ -12,6 +14,7 @@
* This costs more memory but for certain use cases (like editors) this maybe be useful
*/
@PublicApi
@NullMarked
public class IgnoredChar implements Serializable {

public enum IgnoredCharKind {
Expand Down Expand Up @@ -51,7 +54,7 @@ public String toString() {
}

@Override
public boolean equals(Object o) {
public boolean equals(@Nullable Object o) {
if (this == o) {
return true;
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/graphql/language/IgnoredChars.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.common.collect.ImmutableList;
import graphql.PublicApi;
import graphql.collect.ImmutableKit;
import org.jspecify.annotations.NullMarked;

import java.io.Serializable;
import java.util.List;
Expand All @@ -14,6 +15,7 @@
* This costs more memory but for certain use cases (like editors) this maybe be useful
*/
@PublicApi
@NullMarked
public class IgnoredChars implements Serializable {

private final ImmutableList<IgnoredChar> left;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/graphql/language/Node.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import graphql.PublicApi;
import graphql.util.TraversalControl;
import graphql.util.TraverserContext;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

import java.io.Serializable;
Expand All @@ -21,6 +22,7 @@
* Every Node is immutable
*/
@PublicApi
@NullMarked
public interface Node<T extends Node> extends Serializable {

/**
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/graphql/language/NodeChildrenContainer.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package graphql.language;

import graphql.PublicApi;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.NullUnmarked;
import org.jspecify.annotations.Nullable;

import java.util.ArrayList;
import java.util.LinkedHashMap;
Expand All @@ -15,6 +18,7 @@
* Container of children of a {@link Node}.
*/
@PublicApi
@NullMarked
public class NodeChildrenContainer {

private final Map<String, List<Node>> children = new LinkedHashMap<>();
Expand All @@ -27,7 +31,7 @@ public <T extends Node> List<T> getChildren(String key) {
return (List<T>) children.getOrDefault(key, emptyList());
}

public <T extends Node> T getChildOrNull(String key) {
public <T extends Node> @Nullable T getChildOrNull(String key) {
List<? extends Node> result = children.getOrDefault(key, emptyList());
if (result.size() > 1) {
throw new IllegalStateException("children " + key + " is not a single value");
Expand Down Expand Up @@ -61,6 +65,7 @@ public boolean isEmpty() {
return this.children.isEmpty();
}

@NullUnmarked
public static class Builder {
private final Map<String, List<Node>> children = new LinkedHashMap<>();

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/graphql/language/NodeVisitor.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
import graphql.PublicApi;
import graphql.util.TraversalControl;
import graphql.util.TraverserContext;
import org.jspecify.annotations.NullMarked;

/**
* Used by {@link NodeTraverser} to visit {@link Node}.
*/
@PublicApi
@NullMarked
public interface NodeVisitor {
TraversalControl visitArgument(Argument node, TraverserContext<Node> data);

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/graphql/language/NodeVisitorStub.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
import graphql.PublicApi;
import graphql.util.TraversalControl;
import graphql.util.TraverserContext;
import org.jspecify.annotations.NullMarked;

/**
* Convenient implementation of {@link NodeVisitor} for easy subclassing methods handling different types of Nodes in one method.
*/
@PublicApi
@NullMarked
public class NodeVisitorStub implements NodeVisitor {
@Override
public TraversalControl visitArgument(Argument node, TraverserContext<Node> context) {
Expand Down
13 changes: 8 additions & 5 deletions src/main/java/graphql/language/SourceLocation.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,27 @@
import graphql.schema.GraphQLSchemaElement;
import graphql.schema.GraphQLTypeUtil;
import graphql.schema.idl.SchemaGenerator;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

import java.io.Serializable;
import java.util.Objects;

@PublicApi
@NullMarked
public class SourceLocation implements Serializable {

public static final SourceLocation EMPTY = new SourceLocation(-1, -1);

private final int line;
private final int column;
private final String sourceName;
private final @Nullable String sourceName;

public SourceLocation(int line, int column) {
this(line, column, null);
}

public SourceLocation(int line, int column, String sourceName) {
public SourceLocation(int line, int column, @Nullable String sourceName) {
this.line = line;
this.column = column;
this.sourceName = sourceName;
Expand All @@ -38,12 +41,12 @@ public int getColumn() {
return column;
}

public String getSourceName() {
public @Nullable String getSourceName() {
return sourceName;
}

@Override
public boolean equals(Object o) {
public boolean equals(@Nullable Object o) {
if (this == o) {
return true;
}
Expand Down Expand Up @@ -91,7 +94,7 @@ public String toString() {
*
* @return the source location if available or null if it's not.
*/
public static SourceLocation getLocation(GraphQLSchemaElement schemaElement) {
public static @Nullable SourceLocation getLocation(GraphQLSchemaElement schemaElement) {
if (schemaElement instanceof GraphQLModifiedType) {
schemaElement = GraphQLTypeUtil.unwrapAllAs((GraphQLModifiedType) schemaElement);
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/graphql/language/Type.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@


import graphql.PublicApi;
import org.jspecify.annotations.NullMarked;

@PublicApi
@NullMarked
public interface Type<T extends Type> extends Node<T> {

}
10 changes: 0 additions & 10 deletions src/test/groovy/graphql/archunit/JSpecifyAnnotationsCheck.groovy
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ class JSpecifyAnnotationsCheck extends Specification {
"graphql.language.AstSignature",
"graphql.language.AstSorter",
"graphql.language.AstTransformer",
"graphql.language.Comment",
"graphql.language.Definition",
"graphql.language.DescribedNode",
"graphql.language.Description",
"graphql.language.Directive",
Expand All @@ -115,8 +113,6 @@ class JSpecifyAnnotationsCheck extends Specification {
"graphql.language.FieldDefinition",
"graphql.language.FragmentDefinition",
"graphql.language.FragmentSpread",
"graphql.language.IgnoredChar",
"graphql.language.IgnoredChars",
"graphql.language.ImplementingTypeDefinition",
"graphql.language.InlineFragment",
"graphql.language.InputObjectTypeDefinition",
Expand All @@ -125,21 +121,15 @@ class JSpecifyAnnotationsCheck extends Specification {
"graphql.language.InterfaceTypeDefinition",
"graphql.language.InterfaceTypeExtensionDefinition",
"graphql.language.ListType",
"graphql.language.Node",
"graphql.language.NodeChildrenContainer",
"graphql.language.NodeDirectivesBuilder",
"graphql.language.NodeParentTree",
"graphql.language.NodeVisitor",
"graphql.language.NodeVisitorStub",
"graphql.language.ScalarTypeDefinition",
"graphql.language.ScalarTypeExtensionDefinition",
"graphql.language.SchemaDefinition",
"graphql.language.SchemaExtensionDefinition",
"graphql.language.Selection",
"graphql.language.SelectionSet",
"graphql.language.SelectionSetContainer",
"graphql.language.SourceLocation",
"graphql.language.Type",
"graphql.language.TypeKind",
"graphql.language.TypeName",
"graphql.language.UnionTypeDefinition",
Expand Down
Back | FazBrowse Home | New Git URL