Merge branch 'main' into feat/pipeline/public-preview

Author: wu-hui

.github/workflows/semver-check.yml

@@ -1,5 +1,7 @@
 # Unreleased
 
+- [changed] Added `equals()` function to `GenerativeBackend`.
+
 # 17.7.0
 
 - [changed] Added `LiveAudioConversationConfig` to control different aspects of the conversation

firebase-ai/CHANGELOG.md

@@ -16,6 +16,8 @@
 
 package com.google.firebase.ai.type
 
+import java.util.Objects
+
 /** Represents a reference to a backend for generative AI. */
 public class GenerativeBackend
 internal constructor(internal val location: String, internal val backend: GenerativeBackendEnum) {
@@ -40,6 +42,22 @@ internal constructor(internal val location: String, internal val backend: Genera
       return GenerativeBackend(location, GenerativeBackendEnum.VERTEX_AI)
     }
   }
+
+  override fun equals(other: Any?): Boolean {
+    if (other is GenerativeBackend) {
+      return when (other.backend) {
+        GenerativeBackendEnum.GOOGLE_AI -> {
+          other.backend == this.backend
+        }
+        GenerativeBackendEnum.VERTEX_AI -> {
+          other.backend == this.backend && other.location == this.location
+        }
+      }
+    }
+    return false
+  }
+
+  override fun hashCode(): Int = Objects.hash(this.backend, this.location)
 }
 
 internal enum class GenerativeBackendEnum {

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/GenerativeBackend.kt

@@ -1,5 +1,8 @@
 # Unreleased
 
+- [changed] Internal refactor for reporting "paths" in response data.
+  [#7613](https://github.com/firebase/firebase-android-sdk/pull/7613))
+
 # 17.1.2
 
 - [changed] Internal refactor for managing Auth and App Check tokens

firebase-dataconnect/CHANGELOG.md

@@ -54,3 +54,75 @@ public sealed interface DataConnectPathSegment {
     override fun toString(): String = index.toString()
   }
 }
+
+internal typealias DataConnectPath = List<DataConnectPathSegment>
+
+internal fun <T : DataConnectPathSegment> List<T>.toPathString(): String = buildString {
+  appendPathStringTo(this)
+}
+
+internal fun <T : DataConnectPathSegment> List<T>.appendPathStringTo(sb: StringBuilder) {
+  forEachIndexed { segmentIndex, segment ->
+    when (segment) {
+      is DataConnectPathSegment.Field -> {
+        if (segmentIndex != 0) {
+          sb.append('.')
+        }
+        sb.append(segment.field)
+      }
+      is DataConnectPathSegment.ListIndex -> {
+        sb.append('[')
+        sb.append(segment.index)
+        sb.append(']')
+      }
+    }
+  }
+}
+
+internal fun MutableList<in DataConnectPathSegment.Field>.addField(
+  field: String
+): DataConnectPathSegment.Field = DataConnectPathSegment.Field(field).also { add(it) }
+
+internal fun MutableList<in DataConnectPathSegment.ListIndex>.addListIndex(
+  index: Int
+): DataConnectPathSegment.ListIndex = DataConnectPathSegment.ListIndex(index).also { add(it) }
+
+internal inline fun <T> MutableList<in DataConnectPathSegment.Field>.withAddedField(
+  field: String,
+  block: () -> T
+): T = withAddedPathSegment(DataConnectPathSegment.Field(field), block)
+
+internal inline fun <T> MutableList<in DataConnectPathSegment.ListIndex>.withAddedListIndex(
+  index: Int,
+  block: () -> T
+): T = withAddedPathSegment(DataConnectPathSegment.ListIndex(index), block)
+
+internal inline fun <T, S : DataConnectPathSegment> MutableList<in S>.withAddedPathSegment(
+  pathSegment: S,
+  block: () -> T
+): T {
+  add(pathSegment)
+  try {
+    return block()
+  } finally {
+    val removedSegment = removeLastOrNull()
+    check(removedSegment === pathSegment) {
+      "internal error x6tzdsszmc: removed $removedSegment, but expected $pathSegment"
+    }
+  }
+}
+
+internal fun List<DataConnectPathSegment>.withAddedField(
+  field: String
+): List<DataConnectPathSegment> = withAddedPathSegment(DataConnectPathSegment.Field(field))
+
+internal fun List<DataConnectPathSegment>.withAddedListIndex(
+  index: Int
+): List<DataConnectPathSegment> = withAddedPathSegment(DataConnectPathSegment.ListIndex(index))
+
+internal fun List<DataConnectPathSegment>.withAddedPathSegment(
+  pathSegment: DataConnectPathSegment
+): List<DataConnectPathSegment> = buildList {
+  addAll(this@withAddedPathSegment)
+  add(pathSegment)
+}

firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/DataConnectPathSegment.kt

@@ -19,6 +19,7 @@ package com.google.firebase.dataconnect.core
 import com.google.firebase.dataconnect.DataConnectOperationFailureResponse
 import com.google.firebase.dataconnect.DataConnectOperationFailureResponse.ErrorInfo
 import com.google.firebase.dataconnect.DataConnectPathSegment
+import com.google.firebase.dataconnect.appendPathStringTo
 import java.util.Objects
 
 internal class DataConnectOperationFailureResponseImpl<Data>(
@@ -41,24 +42,10 @@ internal class DataConnectOperationFailureResponseImpl<Data>(
     override fun hashCode(): Int = Objects.hash("ErrorInfoImpl", message, path)
 
     override fun toString(): String = buildString {
-      path.forEachIndexed { segmentIndex, segment ->
-        when (segment) {
-          is DataConnectPathSegment.Field -> {
-            if (segmentIndex != 0) {
-              append('.')
-            }
-            append(segment.field)
-          }
-          is DataConnectPathSegment.ListIndex -> {
-            append('[').append(segment.index).append(']')
-          }
-        }
-      }
-
-      if (path.isNotEmpty()) {
+      path.appendPathStringTo(this)
+      if (isNotEmpty()) {
         append(": ")
       }
-
       append(message)
     }
   }