Add a null-check to java enum safeValueOf

libraries/apollo-annotations/api/apollo-annotations.api

@@ -27,9 +27,6 @@ public final class com/apollographql/apollo3/annotations/ApolloDeprecatedSince$V
 	public static fun values ()[Lcom/apollographql/apollo3/annotations/ApolloDeprecatedSince$Version;
 }
 
-public abstract interface annotation class com/apollographql/apollo3/annotations/ApolloEnumConstructor : java/lang/annotation/Annotation {
-}
-
 public abstract interface annotation class com/apollographql/apollo3/annotations/ApolloExperimental : java/lang/annotation/Annotation {
 }
 
@@ -39,6 +36,9 @@ public abstract interface annotation class com/apollographql/apollo3/annotations
 public abstract interface annotation class com/apollographql/apollo3/annotations/ApolloRequiresOptIn : java/lang/annotation/Annotation {
 }
 
+public abstract interface annotation class com/apollographql/apollo3/annotations/ApolloUnknownEnum : java/lang/annotation/Annotation {
+}
+
 public abstract interface annotation class com/apollographql/apollo3/annotations/GraphQLAdapter : java/lang/annotation/Annotation {
 	public abstract fun forScalar ()Ljava/lang/String;
 }

libraries/apollo-annotations/api/apollo-annotations.klib.api

@@ -37,9 +37,6 @@ open annotation class com.apollographql.apollo3.annotations/ApolloDeprecatedSinc
     final val version // com.apollographql.apollo3.annotations/ApolloDeprecatedSince.version|{}version[0]
         final fun <get-version>(): com.apollographql.apollo3.annotations/ApolloDeprecatedSince.Version // com.apollographql.apollo3.annotations/ApolloDeprecatedSince.version.<get-version>|<get-version>(){}[0]
 }
-open annotation class com.apollographql.apollo3.annotations/ApolloEnumConstructor : kotlin/Annotation { // com.apollographql.apollo3.annotations/ApolloEnumConstructor|null[0]
-    constructor <init>() // com.apollographql.apollo3.annotations/ApolloEnumConstructor.<init>|<init>(){}[0]
-}
 open annotation class com.apollographql.apollo3.annotations/ApolloExperimental : kotlin/Annotation { // com.apollographql.apollo3.annotations/ApolloExperimental|null[0]
     constructor <init>() // com.apollographql.apollo3.annotations/ApolloExperimental.<init>|<init>(){}[0]
 }
@@ -49,6 +46,9 @@ open annotation class com.apollographql.apollo3.annotations/ApolloInternal : kot
 open annotation class com.apollographql.apollo3.annotations/ApolloRequiresOptIn : kotlin/Annotation { // com.apollographql.apollo3.annotations/ApolloRequiresOptIn|null[0]
     constructor <init>() // com.apollographql.apollo3.annotations/ApolloRequiresOptIn.<init>|<init>(){}[0]
 }
+open annotation class com.apollographql.apollo3.annotations/ApolloUnknownEnum : kotlin/Annotation { // com.apollographql.apollo3.annotations/ApolloUnknownEnum|null[0]
+    constructor <init>() // com.apollographql.apollo3.annotations/ApolloUnknownEnum.<init>|<init>(){}[0]
+}
 open annotation class com.apollographql.apollo3.annotations/GraphQLAdapter : kotlin/Annotation { // com.apollographql.apollo3.annotations/GraphQLAdapter|null[0]
     constructor <init>(kotlin/String) // com.apollographql.apollo3.annotations/GraphQLAdapter.<init>|<init>(kotlin.String){}[0]
     final val forScalar // com.apollographql.apollo3.annotations/GraphQLAdapter.forScalar|{}forScalar[0]

libraries/apollo-annotations/src/commonMain/kotlin/com/apollographql/apollo3/annotations/ApolloEnumConstructor.kt → libraries/apollo-annotations/src/commonMain/kotlin/com/apollographql/apollo3/annotations/ApolloUnknownEnum.kt

@@ -2,8 +2,8 @@ package com.apollographql.apollo3.annotations
 
 @RequiresOptIn(
     level = RequiresOptIn.Level.WARNING,
-    message = "The `UNKNOWN__` class represents GraphQL enums that are not present in the schema and whose `rawValue` cannot be checked at build time. You may want to update your schema instead of calling this constructor directly."
+    message = "The `UNKNOWN__` class represents GraphQL enums that are not present in the schema and whose `rawValue` cannot be checked at build time. You may want to update your schema instead of calling this directly."
 )
 @Retention(AnnotationRetention.BINARY)
-@Target(AnnotationTarget.CONSTRUCTOR)
-annotation class ApolloEnumConstructor
+@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CONSTRUCTOR)
+annotation class ApolloUnknownEnum

libraries/apollo-api-java/src/main/java/com/apollographql/apollo3/api/java/Assertions.java

@@ -1,11 +1,12 @@
 package com.apollographql.apollo3.api.java;
 
 public class Assertions {
+  // A version of Objects.requireNonNull that allows a customized message
   public static <T> T checkNotNull(T value, String errorMessage) {
     if (value == null) {
       throw new NullPointerException(errorMessage);
     }
 
     return value;
   }
-}
+}

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/JavaClassNames.kt

@@ -111,6 +111,7 @@ internal object JavaClassNames {
   val Map: ClassName = ClassName.get("java.util", "Map")
   val MapOfStringToObject = ParameterizedTypeName.get(Map, String, Object)
   val JavaOptional = ClassName.get("java.util", "Optional")
+  val Objects = ClassName.get("java.util", "Objects")
 
   val ObjectBuilderKt = ClassName.get(apolloApiPackageName, "ObjectBuilderKt")
   val ObjectMap = ClassName.get(apolloApiPackageName, "ObjectMap")

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/helpers/DataClass.kt

@@ -1,12 +1,13 @@
 package com.apollographql.apollo3.compiler.codegen.java.helpers
 
 import com.apollographql.apollo3.compiler.GeneratedMethod
-import com.apollographql.apollo3.compiler.GeneratedMethod.*
-import com.apollographql.apollo3.compiler.internal.applyIf
+import com.apollographql.apollo3.compiler.GeneratedMethod.EQUALS_HASH_CODE
+import com.apollographql.apollo3.compiler.GeneratedMethod.TO_STRING
 import com.apollographql.apollo3.compiler.codegen.Identifier.__h
 import com.apollographql.apollo3.compiler.codegen.java.JavaClassNames
 import com.apollographql.apollo3.compiler.codegen.java.L
 import com.apollographql.apollo3.compiler.codegen.java.joinToCode
+import com.apollographql.apollo3.compiler.internal.applyIf
 import com.squareup.javapoet.ClassName
 import com.squareup.javapoet.CodeBlock
 import com.squareup.javapoet.FieldSpec
@@ -30,7 +31,7 @@ internal fun TypeSpec.Builder.makeClassFromParameters(
     generateMethods: List<GeneratedMethod>,
     parameters: List<ParameterSpec>,
     className: ClassName
-    ): TypeSpec.Builder {
+): TypeSpec.Builder {
   addMethod(
       MethodSpec.constructorBuilder()
           .addModifiers(Modifier.PUBLIC)
@@ -69,7 +70,7 @@ internal fun TypeSpec.Builder.makeClassFromProperties(
     generateMethods: List<GeneratedMethod>,
     fields: List<FieldSpec>,
     className: ClassName
-    ): TypeSpec.Builder {
+): TypeSpec.Builder {
   addMethod(
       MethodSpec.constructorBuilder()
           .addModifiers(Modifier.PUBLIC)
@@ -94,36 +95,36 @@ internal fun TypeSpec.Builder.makeClassFromProperties(
 
 internal fun TypeSpec.Builder.withToStringImplementation(className: ClassName): TypeSpec.Builder {
   fun printFieldCode(fieldIndex: Int, fieldName: String) =
-      CodeBlock.builder()
-          .let { if (fieldIndex > 0) it.add(" + \", \"\n") else it.add("\n") }
-          .indent()
-          .add("+ \$S + \$L", "$fieldName=", fieldName)
-          .unindent()
-          .build()
+    CodeBlock.builder()
+        .let { if (fieldIndex > 0) it.add(" + \", \"\n") else it.add("\n") }
+        .indent()
+        .add("+ \$S + \$L", "$fieldName=", fieldName)
+        .unindent()
+        .build()
 
   fun methodCode() =
-      CodeBlock.builder()
-          .beginControlFlow("if (\$L == null)", MEMOIZED_TO_STRING_VAR)
-          .add("\$L = \$S", "\$toString", "${className.simpleName()}{")
-          .add(fieldSpecs
-              .filter { !it.hasModifier(Modifier.STATIC) }
-              .filter { !it.hasModifier(Modifier.TRANSIENT) }
-              .map { it.name }
-              .mapIndexed(::printFieldCode)
-              .fold(CodeBlock.builder(), CodeBlock.Builder::add)
-              .build())
-          .add(CodeBlock.builder()
-              .indent()
-              .add("\n+ \$S;\n", "}")
-              .unindent()
-              .build())
-          .endControlFlow()
-          .addStatement("return \$L", MEMOIZED_TO_STRING_VAR)
-          .build()
+    CodeBlock.builder()
+        .beginControlFlow("if (\$L == null)", MEMOIZED_TO_STRING_VAR)
+        .add("\$L = \$S", "\$toString", "${className.simpleName()}{")
+        .add(fieldSpecs
+            .filter { !it.hasModifier(Modifier.STATIC) }
+            .filter { !it.hasModifier(Modifier.TRANSIENT) }
+            .map { it.name }
+            .mapIndexed(::printFieldCode)
+            .fold(CodeBlock.builder(), CodeBlock.Builder::add)
+            .build())
+        .add(CodeBlock.builder()
+            .indent()
+            .add("\n+ \$S;\n", "}")
+            .unindent()
+            .build())
+        .endControlFlow()
+        .addStatement("return \$L", MEMOIZED_TO_STRING_VAR)
+        .build()
 
   return addField(FieldSpec.builder(JavaClassNames.String, MEMOIZED_TO_STRING_VAR, Modifier.PRIVATE, Modifier.VOLATILE,
-          Modifier.TRANSIENT)
-          .build())
+      Modifier.TRANSIENT)
+      .build())
       .addMethod(MethodSpec.methodBuilder("toString")
           .addAnnotation(JavaClassNames.Override)
           .addModifiers(Modifier.PUBLIC)
@@ -138,84 +139,84 @@ private fun List<FieldSpec>.equalsCode(): CodeBlock = filter { !it.hasModifier(M
     .joinToCode("\n &&")
 
 private fun FieldSpec.equalsCode() =
-    CodeBlock.builder()
-        .let {
-          if (type.isPrimitive) {
-            if (type == TypeName.DOUBLE) {
-              it.add("Double.doubleToLongBits(this.\$L) == Double.doubleToLongBits(that.\$L)",
-                  name, name)
-            } else {
-              it.add("this.\$L == that.\$L", name, name)
-            }
+  CodeBlock.builder()
+      .let {
+        if (type.isPrimitive) {
+          if (type == TypeName.DOUBLE) {
+            it.add("Double.doubleToLongBits(this.\$L) == Double.doubleToLongBits(that.\$L)",
+                name, name)
           } else {
-            it.add("((this.\$L == null) ? (that.\$L == null) : this.\$L.equals(that.\$L))", name, name, name, name)
+            it.add("this.\$L == that.\$L", name, name)
           }
+        } else {
+          it.add("((this.\$L == null) ? (that.\$L == null) : this.\$L.equals(that.\$L))", name, name, name, name)
         }
-        .build()
+      }
+      .build()
 
 internal fun TypeSpec.Builder.withEqualsImplementation(className: ClassName): TypeSpec.Builder {
   fun methodCode(typeJavaClass: ClassName) =
-      CodeBlock.builder()
-          .beginControlFlow("if (o == this)")
-          .addStatement("return true")
-          .endControlFlow()
-          .beginControlFlow("if (o instanceof \$T)", typeJavaClass)
-          .apply {
-            if (fieldSpecs.isEmpty()) {
-              add("return true;\n")
-            } else {
-              addStatement("\$T that = (\$T) o", typeJavaClass, typeJavaClass)
-              add("return $L;\n", if (fieldSpecs.isEmpty()) "true" else fieldSpecs.equalsCode())
-            }
+    CodeBlock.builder()
+        .beginControlFlow("if (o == this)")
+        .addStatement("return true")
+        .endControlFlow()
+        .beginControlFlow("if (o instanceof \$T)", typeJavaClass)
+        .apply {
+          if (fieldSpecs.isEmpty()) {
+            add("return true;\n")
+          } else {
+            addStatement("\$T that = (\$T) o", typeJavaClass, typeJavaClass)
+            add("return $L;\n", if (fieldSpecs.isEmpty()) "true" else fieldSpecs.equalsCode())
           }
-          .endControlFlow()
-          .addStatement("return false")
-          .build()
+        }
+        .endControlFlow()
+        .addStatement("return false")
+        .build()
 
   return addMethod(MethodSpec.methodBuilder("equals")
-          .addAnnotation(JavaClassNames.Override)
-          .addModifiers(Modifier.PUBLIC)
-          .returns(TypeName.BOOLEAN)
-          .addParameter(ParameterSpec.builder(TypeName.OBJECT, "o").build())
-          .addCode(methodCode(className))
-          .build())
+      .addAnnotation(JavaClassNames.Override)
+      .addModifiers(Modifier.PUBLIC)
+      .returns(TypeName.BOOLEAN)
+      .addParameter(ParameterSpec.builder(TypeName.OBJECT, "o").build())
+      .addCode(methodCode(className))
+      .build())
 }
 
 internal fun TypeSpec.Builder.withHashCodeImplementation(): TypeSpec.Builder {
   fun hashFieldCode(field: FieldSpec) =
-      CodeBlock.builder()
-          .addStatement("$__h *= 1000003")
-          .let {
-            if (field.type.isPrimitive) {
-              when (field.type.withoutAnnotations()) {
-                TypeName.DOUBLE -> it.addStatement("$__h ^= Double.valueOf(\$L).hashCode()", field.name)
-                TypeName.BOOLEAN -> it.addStatement("$__h ^= Boolean.valueOf(\$L).hashCode()", field.name)
-                else -> it.addStatement("$__h ^= \$L", field.name)
-              }
-            } else {
-              it.addStatement("$__h ^= (\$L == null) ? 0 : \$L.hashCode()", field.name, field.name)
+    CodeBlock.builder()
+        .addStatement("$__h *= 1000003")
+        .let {
+          if (field.type.isPrimitive) {
+            when (field.type.withoutAnnotations()) {
+              TypeName.DOUBLE -> it.addStatement("$__h ^= Double.valueOf(\$L).hashCode()", field.name)
+              TypeName.BOOLEAN -> it.addStatement("$__h ^= Boolean.valueOf(\$L).hashCode()", field.name)
+              else -> it.addStatement("$__h ^= \$L", field.name)
             }
+          } else {
+            it.addStatement("$__h ^= (\$L == null) ? 0 : \$L.hashCode()", field.name, field.name)
           }
-          .build()
+        }
+        .build()
 
   fun methodCode() =
-      CodeBlock.builder()
-          .beginControlFlow("if (!\$L)", MEMOIZED_HASH_CODE_FLAG_VAR)
-          .addStatement("int $__h = 1")
-          .add(fieldSpecs
-              .filter { !it.hasModifier(Modifier.STATIC) }
-              .filter { !it.hasModifier(Modifier.TRANSIENT) }
-              .map(::hashFieldCode)
-              .fold(CodeBlock.builder(), CodeBlock.Builder::add)
-              .build())
-          .addStatement("\$L = $__h", MEMOIZED_HASH_CODE_VAR)
-          .addStatement("\$L = true", MEMOIZED_HASH_CODE_FLAG_VAR)
-          .endControlFlow()
-          .addStatement("return \$L", MEMOIZED_HASH_CODE_VAR)
-          .build()
+    CodeBlock.builder()
+        .beginControlFlow("if (!\$L)", MEMOIZED_HASH_CODE_FLAG_VAR)
+        .addStatement("int $__h = 1")
+        .add(fieldSpecs
+            .filter { !it.hasModifier(Modifier.STATIC) }
+            .filter { !it.hasModifier(Modifier.TRANSIENT) }
+            .map(::hashFieldCode)
+            .fold(CodeBlock.builder(), CodeBlock.Builder::add)
+            .build())
+        .addStatement("\$L = $__h", MEMOIZED_HASH_CODE_VAR)
+        .addStatement("\$L = true", MEMOIZED_HASH_CODE_FLAG_VAR)
+        .endControlFlow()
+        .addStatement("return \$L", MEMOIZED_HASH_CODE_VAR)
+        .build()
 
   return addField(FieldSpec.builder(TypeName.INT, MEMOIZED_HASH_CODE_VAR, Modifier.PRIVATE, Modifier.VOLATILE,
-          Modifier.TRANSIENT).build())
+      Modifier.TRANSIENT).build())
       .addField(FieldSpec.builder(TypeName.BOOLEAN, MEMOIZED_HASH_CODE_FLAG_VAR, Modifier.PRIVATE,
           Modifier.VOLATILE, Modifier.TRANSIENT).build())
       .addMethod(MethodSpec.methodBuilder("hashCode")