dataconnect: EnumValue and EnumValueSerializer added

firebase-dataconnect/CHANGELOG.md

@@ -3,6 +3,10 @@
 - [changed] Ignore unknown fields in response data instead of throwing a
   `DataConnectOperationException` with message "decoding data from the server's response failed: An
   unknown field for index -3" ([#7314](https://github.com/firebase/firebase-android-sdk/pull/7314))
+- [changed] Added classes `EnumValue` and `EnumValueSerializer`. These classes are identical to
+  those produced by the Data Connect code generator; however, a future version of the code generator
+  will start using these classes from the SDK rather than generating them.
+  ([#7153](https://github.com/firebase/firebase-android-sdk/pull/7153))
 
 # 17.0.0
 

firebase-dataconnect/api.txt

@@ -95,6 +95,31 @@ package com.google.firebase.dataconnect {
     method public static com.google.firebase.dataconnect.DataConnectSettings copy(com.google.firebase.dataconnect.DataConnectSettings, String host = host, boolean sslEnabled = sslEnabled);
   }
 
+  public sealed interface EnumValue<T extends java.lang.Enum<? extends T>> {
+    method public String getStringValue();
+    method public T? getValue();
+    property public abstract String stringValue;
+    property public abstract T? value;
+  }
+
+  public static final class EnumValue.Known<T extends java.lang.Enum<T>> implements com.google.firebase.dataconnect.EnumValue<T> {
+    ctor public EnumValue.Known(T value);
+    method public com.google.firebase.dataconnect.EnumValue.Known<T> copy(T value = value);
+    method public String getStringValue();
+    method public T getValue();
+    property public String stringValue;
+    property public T value;
+  }
+
+  public static final class EnumValue.Unknown implements com.google.firebase.dataconnect.EnumValue {
+    ctor public EnumValue.Unknown(String stringValue);
+    method public com.google.firebase.dataconnect.EnumValue.Unknown copy(String stringValue = stringValue);
+    method public String getStringValue();
+    method public Void? getValue();
+    property public String stringValue;
+    property public Void? value;
+  }
+
   @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.WARNING, message="This declaration is \"experimental\": its signature and/or semantics " + "may change in backwards-incompatible ways at any time without notice, " + "up to and including complete removal. " + "If you have a use case that relies on this declaration please open a " + "\"feature request\" issue at https://github.com/firebase/firebase-android-sdk " + "requesting this declaration\'s promotion from \"experimental\" to \"fully-supported\".") @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalFirebaseDataConnect {
   }
 
@@ -346,6 +371,14 @@ package com.google.firebase.dataconnect.serializers {
     field public static final com.google.firebase.dataconnect.serializers.AnyValueSerializer INSTANCE;
   }
 
+  public class EnumValueSerializer<T extends java.lang.Enum<T>> implements kotlinx.serialization.KSerializer<com.google.firebase.dataconnect.EnumValue<? extends T>> {
+    ctor public EnumValueSerializer(Iterable<? extends T> values);
+    method public com.google.firebase.dataconnect.EnumValue<T> deserialize(kotlinx.serialization.encoding.Decoder decoder);
+    method public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();
+    method public void serialize(kotlinx.serialization.encoding.Encoder encoder, com.google.firebase.dataconnect.EnumValue<? extends T> value);
+    property public kotlinx.serialization.descriptors.SerialDescriptor descriptor;
+  }
+
   public final class JavaTimeLocalDateSerializer implements kotlinx.serialization.KSerializer<java.time.LocalDate> {
     method public java.time.LocalDate deserialize(kotlinx.serialization.encoding.Decoder decoder);
     method public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor();

firebase-dataconnect/gradle.properties

@@ -1,2 +1,2 @@
-version=17.0.1
+version=17.1.0
 latestReleasedVersion=17.0.0

firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/EnumIntegrationTest.kt

@@ -14,8 +14,13 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalFirebaseDataConnect::class)
+
 package com.google.firebase.dataconnect
 
+import com.google.firebase.dataconnect.EnumValue.Known
+import com.google.firebase.dataconnect.EnumValue.Unknown
+import com.google.firebase.dataconnect.serializers.EnumValueSerializer
 import com.google.firebase.dataconnect.testutil.DataConnectIntegrationTestBase
 import com.google.firebase.dataconnect.testutil.property.arbitrary.dataConnect
 import com.google.firebase.dataconnect.testutil.property.arbitrary.enumWithNull
@@ -94,9 +99,13 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
       val insertVariables = InsertNonNullableVariables(enumValue)
       val key = dataConnect.mutation(insertVariables).execute().data.key
       val queryVariables = GetNonNullableByKeyVariables(key)
-      val queryRef = dataConnect.query(queryVariables)
+      val queryRef =
+        dataConnect
+          .query(queryVariables)
+          .withDataDeserializer(serializer<GetNonNullableByKeySubsetData>())
       val queryResult = queryRef.execute()
-      queryResult.asClue { it.data.item.value shouldBe enumValue }
+      val expectedValue = enumValue.toN5ekmae3jnSubsetEnumValue()
+      queryResult.asClue { it.data.item.value shouldBe expectedValue }
     }
   }
 
@@ -117,8 +126,8 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
 
   @Test
   fun queryNonNullableByUndefinedEnumValue() = runTest {
-    val tag = Arb.dataConnect.tag().next(rs)
-    val (value1, value2, value3) = Arb.threeValues(Arb.enum<N5ekmae3jn>()).next(rs)
+    val tag = Arb.dataConnect.tag().next()
+    val (value1, value2, value3) = Arb.threeValues(Arb.enum<N5ekmae3jn>()).next()
     val insertVariables = Insert3NonNullableVariables(tag, value1, value2, value3)
     dataConnect.mutation(insertVariables).execute().data
     val queryVariables = GetNonNullableByTagAndValueVariables(tag, OptionalVariable.Undefined)
@@ -128,8 +137,8 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
 
   @Test
   fun queryNonNullableByNullEnumValue() = runTest {
-    val tag = Arb.dataConnect.tag().next(rs)
-    val (value1, value2, value3) = Arb.threeValues(Arb.enum<N5ekmae3jn>()).next(rs)
+    val tag = Arb.dataConnect.tag().next()
+    val (value1, value2, value3) = Arb.threeValues(Arb.enum<N5ekmae3jn>()).next()
     val insertVariables = Insert3NonNullableVariables(tag, value1, value2, value3)
     dataConnect.mutation(insertVariables).execute()
     val queryVariables = GetNonNullableByTagAndValueVariables(tag, OptionalVariable.Value(null))
@@ -183,6 +192,15 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
     @Serializable data class Item(val value: N5ekmae3jn)
   }
 
+  @Serializable
+  private data class GetNonNullableByKeySubsetData(val item: Item) {
+    @Serializable
+    data class Item(
+      @Serializable(with = N5ekmae3jnSubset.Serializer::class)
+      val value: EnumValue<N5ekmae3jnSubset>
+    )
+  }
+
   //////////////////////////////////////////////////////////////////////////////////////////////////
   // Tests for EnumNullable table.
   //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -227,9 +245,13 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
       val insertVariables = InsertNullableVariables(enumValue)
       val key = dataConnect.mutation(insertVariables).execute().data.key
       val queryVariables = GetNullableByKeyVariables(key)
-      val queryRef = dataConnect.query(queryVariables)
+      val queryRef =
+        dataConnect
+          .query(queryVariables)
+          .withDataDeserializer(serializer<GetNullableByKeySubsetData>())
       val queryResult = queryRef.execute()
-      queryResult.asClue { it.data.item.value shouldBe enumValue }
+      val expectedValue = enumValue?.toN5ekmae3jnSubsetEnumValue()
+      queryResult.asClue { it.data.item.value shouldBe expectedValue }
     }
   }
 
@@ -306,6 +328,15 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
     @Serializable data class Item(val value: N5ekmae3jn?)
   }
 
+  @Serializable
+  private data class GetNullableByKeySubsetData(val item: Item) {
+    @Serializable
+    data class Item(
+      @Serializable(with = N5ekmae3jnSubset.Serializer::class)
+      val value: EnumValue<N5ekmae3jnSubset>?
+    )
+  }
+
   //////////////////////////////////////////////////////////////////////////////////////////////////
   // Tests for EnumNonNullableTableDefault table.
   //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -377,9 +408,14 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
       val insertVariables = InsertNonNullableListOfNonNullableVariables(values)
       val key = dataConnect.mutation(insertVariables).execute().data.key
       val queryVariables = GetNonNullableListOfNonNullableByKeyVariables(key)
-      val queryRef = dataConnect.query(queryVariables)
+      val queryRef =
+        dataConnect
+          .query(queryVariables)
+          .withDataDeserializer(serializer<GetNonNullableListOfNonNullableByKeySubsetData>())
       val queryResult = queryRef.execute()
-      queryResult.asClue { it.data.item.value shouldBe values }
+      val expectedEnumValues: List<EnumValue<N5ekmae3jnSubset>> =
+        values.map { it.toN5ekmae3jnSubsetEnumValue() }
+      queryResult.asClue { it.data.item.value shouldBe expectedEnumValues }
     }
   }
 
@@ -397,6 +433,15 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
     @Serializable data class Item(val value: List<N5ekmae3jn?>)
   }
 
+  @Serializable
+  private data class GetNonNullableListOfNonNullableByKeySubsetData(val item: Item) {
+    @Serializable
+    data class Item(
+      val value:
+        List<@Serializable(with = N5ekmae3jnSubset.Serializer::class) EnumValue<N5ekmae3jnSubset>?>?
+    )
+  }
+
   //////////////////////////////////////////////////////////////////////////////////////////////////
   // Tests for EnumNonNullableListOfNullable table.
   //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -437,9 +482,14 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
       val insertVariables = InsertNonNullableListOfNullableVariables(values)
       val key = dataConnect.mutation(insertVariables).execute().data.key
       val queryVariables = GetNonNullableListOfNullableByKeyVariables(key)
-      val queryRef = dataConnect.query(queryVariables)
+      val queryRef =
+        dataConnect
+          .query(queryVariables)
+          .withDataDeserializer(serializer<GetNonNullableListOfNonNullableByKeySubsetData>())
       val queryResult = queryRef.execute()
-      queryResult.asClue { it.data.item.value shouldBe values }
+      val expectedEnumValues: List<EnumValue<N5ekmae3jnSubset>?> =
+        values.map { it?.toN5ekmae3jnSubsetEnumValue() }
+      queryResult.asClue { it.data.item.value shouldBe expectedEnumValues }
     }
   }
 
@@ -499,9 +549,14 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
       val insertVariables = InsertNullableListOfNonNullableVariables(values)
       val key = dataConnect.mutation(insertVariables).execute().data.key
       val queryVariables = GetNullableListOfNonNullableByKeyVariables(key)
-      val queryRef = dataConnect.query(queryVariables)
+      val queryRef =
+        dataConnect
+          .query(queryVariables)
+          .withDataDeserializer(serializer<GetNonNullableListOfNonNullableByKeySubsetData>())
       val queryResult = queryRef.execute()
-      queryResult.asClue { it.data.item.value shouldBe values }
+      val expectedEnumValues: List<EnumValue<N5ekmae3jnSubset>?> =
+        values.map { it?.toN5ekmae3jnSubsetEnumValue() }
+      queryResult.asClue { it.data.item.value shouldBe expectedEnumValues }
     }
   }
 
@@ -561,9 +616,14 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
       val insertVariables = InsertNullableListOfNullableVariables(values)
       val key = dataConnect.mutation(insertVariables).execute().data.key
       val queryVariables = GetNullableListOfNullableByKeyVariables(key)
-      val queryRef = dataConnect.query(queryVariables)
+      val queryRef =
+        dataConnect
+          .query(queryVariables)
+          .withDataDeserializer(serializer<GetNonNullableListOfNonNullableByKeySubsetData>())
       val queryResult = queryRef.execute()
-      queryResult.asClue { it.data.item.value shouldBe values }
+      val expectedEnumValues: List<EnumValue<N5ekmae3jnSubset>?> =
+        values.map { it?.toN5ekmae3jnSubsetEnumValue() }
+      queryResult.asClue { it.data.item.value shouldBe expectedEnumValues }
     }
   }
 
@@ -701,6 +761,15 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
     N3HWNCRWBP,
   }
 
+  @Suppress("SpellCheckingInspection", "unused")
+  private enum class N5ekmae3jnSubset {
+    DPSKD6HR3A,
+    XGWGVMYTHJ,
+    QJX7C7RD5T;
+
+    object Serializer : EnumValueSerializer<N5ekmae3jnSubset>(N5ekmae3jnSubset.entries)
+  }
+
   @Suppress("SpellCheckingInspection", "unused")
   private enum class S7yayynb25 {
     XJ27ZAXKD3,
@@ -714,6 +783,20 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
     /** The default number of iterations to use in property-based tests. */
     const val NUM_ITERATIONS = 10
 
+    @Suppress("SpellCheckingInspection")
+    fun N5ekmae3jn.toN5ekmae3jnSubsetOrNull(): N5ekmae3jnSubset? =
+      when (this) {
+        N5ekmae3jn.DPSKD6HR3A -> N5ekmae3jnSubset.DPSKD6HR3A
+        N5ekmae3jn.XGWGVMYTHJ -> N5ekmae3jnSubset.XGWGVMYTHJ
+        N5ekmae3jn.QJX7C7RD5T -> N5ekmae3jnSubset.QJX7C7RD5T
+        else -> null
+      }
+
+    @Suppress("SpellCheckingInspection")
+    fun N5ekmae3jn.toN5ekmae3jnSubsetEnumValue(): EnumValue<N5ekmae3jnSubset> {
+      return Known(toN5ekmae3jnSubsetOrNull() ?: return Unknown(name))
+    }
+
     fun FirebaseDataConnect.mutation(
       variables: InsertNonNullableVariables
     ): MutationRef<InsertData, InsertNonNullableVariables> =