Annotate Anonymizer

dondonz · dondonz · commit 23afaea004c1 · 2025-09-01T14:11:10.000+02:00
diff --git a/src/main/java/graphql/util/Anonymizer.java b/src/main/java/graphql/util/Anonymizer.java
@@ -75,6 +75,7 @@
 import graphql.schema.idl.ScalarInfo;
 import graphql.schema.idl.TypeUtil;
 import graphql.schema.impl.SchemaUtil;
+import org.jspecify.annotations.NullMarked;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -91,6 +92,7 @@
 import java.util.function.Consumer;
 
 import static graphql.Assert.assertNotNull;
+import static graphql.Assert.assertShouldNeverHappen;
 import static graphql.parser.ParserEnvironment.newParserEnvironment;
 import static graphql.schema.GraphQLNonNull.nonNull;
 import static graphql.schema.GraphQLTypeUtil.unwrapNonNull;
@@ -105,6 +107,7 @@
  * into anonymized schemas and queries.
  */
 @PublicApi
+@NullMarked
 public class Anonymizer {
 
     public static class AnonymizeResult {
@@ -393,7 +396,7 @@ private static Value replaceValue(Value valueLiteral, GraphQLInputType argType,
         } else if (valueLiteral instanceof EnumValue) {
             GraphQLEnumType enumType = unwrapNonNullAs(argType);
             GraphQLEnumValueDefinition enumValueDefinition = enumType.getValue(((EnumValue) valueLiteral).getName());
-            String newName = newNameMap.get(enumValueDefinition);
+            String newName = assertNotNull(newNameMap.get(enumValueDefinition), "No new name found for enum value %s", ((EnumValue) valueLiteral).getName());
             return new EnumValue(newName);
         } else if (valueLiteral instanceof ObjectValue) {
             GraphQLInputObjectType inputObjectType = unwrapNonNullAs(argType);
@@ -659,7 +662,7 @@ private static void getSameFieldsImpl(String fieldName,
         alreadyChecked.add(curObjectOrInterface);
 
         // "up": get all Interfaces
-        GraphQLImplementingType type = (GraphQLImplementingType) schema.getType(curObjectOrInterface);
+        GraphQLImplementingType type = assertNotNull((GraphQLImplementingType) schema.getType(curObjectOrInterface), "No type found for %s", curObjectOrInterface);
         List<GraphQLNamedOutputType> interfaces = type.getInterfaces();
         getMatchingFieldDefinitions(fieldName, interfaces, result);
         for (GraphQLNamedOutputType interfaze : interfaces) {
@@ -905,15 +908,13 @@ private static GraphQLType fromTypeToGraphQLType(Type type, GraphQLSchema schema
         if (type instanceof TypeName) {
             String typeName = ((TypeName) type).getName();
             GraphQLType graphQLType = schema.getType(typeName);
-            graphql.Assert.assertNotNull(graphQLType, "Schema must contain type %s", typeName);
-            return graphQLType;
+            return assertNotNull(graphQLType, "Schema must contain type %s", typeName);
         } else if (type instanceof NonNullType) {
             return nonNull(fromTypeToGraphQLType(TypeUtil.unwrapOne(type), schema));
         } else if (type instanceof ListType) {
             return GraphQLList.list(fromTypeToGraphQLType(TypeUtil.unwrapOne(type), schema));
         } else {
-            graphql.Assert.assertShouldNeverHappen();
-            return null;
+            return assertShouldNeverHappen();
         }
     }
 
@@ -926,8 +927,7 @@ private static Type replaceTypeName(Type type, String newName) {
         } else if (type instanceof NonNullType) {
             return NonNullType.newNonNullType(replaceTypeName(((NonNullType) type).getType(), newName)).build();
         } else {
-            graphql.Assert.assertShouldNeverHappen();
-            return null;
+            return assertShouldNeverHappen();
         }
     }
 
diff --git a/src/test/groovy/graphql/archunit/JSpecifyAnnotationsCheck.groovy b/src/test/groovy/graphql/archunit/JSpecifyAnnotationsCheck.groovy
@@ -263,7 +263,6 @@ class JSpecifyAnnotationsCheck extends Specification {
             "graphql.schema.visibility.GraphqlFieldVisibility",
             "graphql.schema.visibility.NoIntrospectionGraphqlFieldVisibility",
             "graphql.schema.visitor.GraphQLSchemaTraversalControl",
-            "graphql.util.Anonymizer",
             "graphql.util.CyclicSchemaAnalyzer",
             "graphql.util.NodeAdapter",
             "graphql.util.NodeLocation",
