Skip to content

Update inlineData Java specific API to match Kotlin #6361

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.

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
merged 1 commit into from
Oct 9, 2024

Conversation

rlazo
Copy link
Collaborator

@rlazo rlazo commented Oct 9, 2024

The order of the arguments was changed from (mimeType, bytes) to (bytes, mimeType).

The order of the arguments was changed from (mimeType, bytes)
to (bytes, mimeType).
@rlazo rlazo requested review from davidmotson and daymxn October 9, 2024 17:16
Copy link
Contributor

github-actions bot commented Oct 9, 2024

Javadoc Changes:
--- /home/runner/diff/original/firebase-kotlindoc/android/com/google/firebase/vertexai/type/Content.Builder.html	2024-10-09 17:22:49.290919697 +0000
+++ /home/runner/diff/modified/firebase-kotlindoc/android/com/google/firebase/vertexai/type/Content.Builder.html	2024-10-09 17:20:42.754709677 +0000
@@ -91,8 +91,8 @@
           <tr>
             <td><code>final @<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html">Content.Builder</a></code></td>
             <td>
-              <div><code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#addInlineData(kotlin.String,kotlin.ByteArray)">addInlineData</a>(@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="https://developer.android.com/reference/kotlin/java/lang/String.html">String</a>&nbsp;mimeType,&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> byte[]&nbsp;bytes)</code></div>
-              <p>Wraps the provided <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.String,kotlin.ByteArray)">bytes</a></code> and <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.String,kotlin.ByteArray)">mimeType</a></code> inside a <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/InlineDataPart.html">InlineDataPart</a></code> and adds it to the <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#parts()">parts</a></code> list.</p>
+              <div><code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#addInlineData(kotlin.ByteArray,kotlin.String)">addInlineData</a>(@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> byte[]&nbsp;bytes,&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="https://developer.android.com/reference/kotlin/java/lang/String.html">String</a>&nbsp;mimeType)</code></div>
+              <p>Wraps the provided <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.ByteArray,kotlin.String)">bytes</a></code> and <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.ByteArray,kotlin.String)">mimeType</a></code> inside a <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/InlineDataPart.html">InlineDataPart</a></code> and adds it to the <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#parts()">parts</a></code> list.</p>
             </td>
           </tr>
           <tr>
@@ -152,10 +152,10 @@
         <pre class="api-signature no-pretty-print">public&nbsp;final&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html">Content.Builder</a>&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#addImage(android.graphics.Bitmap)">addImage</a>(@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="https://developer.android.com/reference/kotlin/android/graphics/Bitmap.html">Bitmap</a>&nbsp;image)</pre>
         <p>Wraps the provided <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#image(android.graphics.Bitmap)">image</a></code> inside an <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/ImagePart.html">ImagePart</a></code> and adds it to the <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#parts()">parts</a></code> list.</p>
       </div>
-      <div class="api-item"><a name="addInlineData(kotlin.String, kotlin.ByteArray)"></a><a name="addInlineData-kotlin.String-kotlin.ByteArray-"></a><a name="addinlinedata"></a>
-        <h3 class="api-name" id="addInlineData(kotlin.String,kotlin.ByteArray)">addInlineData</h3>
-        <pre class="api-signature no-pretty-print">public&nbsp;final&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html">Content.Builder</a>&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#addInlineData(kotlin.String,kotlin.ByteArray)">addInlineData</a>(@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="https://developer.android.com/reference/kotlin/java/lang/String.html">String</a>&nbsp;mimeType,&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> byte[]&nbsp;bytes)</pre>
-        <p>Wraps the provided <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.String,kotlin.ByteArray)">bytes</a></code> and <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.String,kotlin.ByteArray)">mimeType</a></code> inside a <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/InlineDataPart.html">InlineDataPart</a></code> and adds it to the <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#parts()">parts</a></code> list.</p>
+      <div class="api-item"><a name="addInlineData(kotlin.ByteArray, kotlin.String)"></a><a name="addInlineData-kotlin.ByteArray-kotlin.String-"></a><a name="addinlinedata"></a>
+        <h3 class="api-name" id="addInlineData(kotlin.ByteArray,kotlin.String)">addInlineData</h3>
+        <pre class="api-signature no-pretty-print">public&nbsp;final&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html">Content.Builder</a>&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#addInlineData(kotlin.ByteArray,kotlin.String)">addInlineData</a>(@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> byte[]&nbsp;bytes,&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="https://developer.android.com/reference/kotlin/java/lang/String.html">String</a>&nbsp;mimeType)</pre>
+        <p>Wraps the provided <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.ByteArray,kotlin.String)">bytes</a></code> and <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.ByteArray,kotlin.String)">mimeType</a></code> inside a <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/InlineDataPart.html">InlineDataPart</a></code> and adds it to the <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/Content.Builder.html#parts()">parts</a></code> list.</p>
       </div>
       <div class="api-item"><a name="addPart-com.google.firebase.vertexai.type.Part-"></a><a name="addpart"></a>
         <h3 class="api-name" id="addPart(com.google.firebase.vertexai.type.Part)">addPart</h3>
--- /home/runner/diff/original/firebase-kotlindoc/kotlin/com/google/firebase/vertexai/type/Content.Builder.html	2024-10-09 17:22:49.286919691 +0000
+++ /home/runner/diff/modified/firebase-kotlindoc/kotlin/com/google/firebase/vertexai/type/Content.Builder.html	2024-10-09 17:20:42.746709664 +0000
@@ -69,8 +69,8 @@
           <tr>
             <td><code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html">Content.Builder</a></code></td>
             <td>
-              <div><code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.String,kotlin.ByteArray)">inlineData</a>(mimeType:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html">String</a>,&nbsp;bytes:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-byte-array/index.html">ByteArray</a>)</code></div>
-              <p>Wraps the provided <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.String,kotlin.ByteArray)">bytes</a></code> and <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.String,kotlin.ByteArray)">mimeType</a></code> inside a <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/InlineDataPart.html">InlineDataPart</a></code> and adds it to the <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#parts()">parts</a></code> list.</p>
+              <div><code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.ByteArray,kotlin.String)">inlineData</a>(bytes:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-byte-array/index.html">ByteArray</a>,&nbsp;mimeType:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html">String</a>)</code></div>
+              <p>Wraps the provided <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.ByteArray,kotlin.String)">bytes</a></code> and <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.ByteArray,kotlin.String)">mimeType</a></code> inside a <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/InlineDataPart.html">InlineDataPart</a></code> and adds it to the <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#parts()">parts</a></code> list.</p>
             </td>
           </tr>
           <tr>
@@ -143,10 +143,10 @@
         <pre class="api-signature no-pretty-print">fun&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#image(android.graphics.Bitmap)">image</a>(image:&nbsp;<a href="https://developer.android.com/reference/kotlin/android/graphics/Bitmap.html">Bitmap</a>):&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html">Content.Builder</a></pre>
         <p>Wraps the provided <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#image(android.graphics.Bitmap)">image</a></code> inside an <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/ImagePart.html">ImagePart</a></code> and adds it to the <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#parts()">parts</a></code> list.</p>
       </div>
-      <div class="api-item"><a name="inlineData(kotlin.String, kotlin.ByteArray)"></a><a name="inlineData-kotlin.String-kotlin.ByteArray-"></a><a name="inlinedata"></a>
-        <h3 class="api-name" id="inlineData(kotlin.String,kotlin.ByteArray)">inlineData</h3>
-        <pre class="api-signature no-pretty-print">fun&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.String,kotlin.ByteArray)">inlineData</a>(mimeType:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html">String</a>,&nbsp;bytes:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-byte-array/index.html">ByteArray</a>):&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html">Content.Builder</a></pre>
-        <p>Wraps the provided <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.String,kotlin.ByteArray)">bytes</a></code> and <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.String,kotlin.ByteArray)">mimeType</a></code> inside a <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/InlineDataPart.html">InlineDataPart</a></code> and adds it to the <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#parts()">parts</a></code> list.</p>
+      <div class="api-item"><a name="inlineData(kotlin.ByteArray, kotlin.String)"></a><a name="inlineData-kotlin.ByteArray-kotlin.String-"></a><a name="inlinedata"></a>
+        <h3 class="api-name" id="inlineData(kotlin.ByteArray,kotlin.String)">inlineData</h3>
+        <pre class="api-signature no-pretty-print">fun&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.ByteArray,kotlin.String)">inlineData</a>(bytes:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-byte-array/index.html">ByteArray</a>,&nbsp;mimeType:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html">String</a>):&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html">Content.Builder</a></pre>
+        <p>Wraps the provided <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.ByteArray,kotlin.String)">bytes</a></code> and <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#inlineData(kotlin.ByteArray,kotlin.String)">mimeType</a></code> inside a <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/InlineDataPart.html">InlineDataPart</a></code> and adds it to the <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/Content.Builder.html#parts()">parts</a></code> list.</p>
       </div>
       <div class="api-item"><a name="part-com.google.firebase.vertexai.type.Part-"></a><a name="part"></a>
         <h3 class="api-name" id="part(com.google.firebase.vertexai.type.Part)">part</h3>

@google-oss-bot
Copy link
Contributor

1 Warning
⚠️ Did you forget to add a changelog entry? (Add the 'no-changelog' label to the PR to silence this warning.)

Generated by 🚫 Danger

Copy link
Contributor

github-actions bot commented Oct 9, 2024

Test Results

 20 files   -  28   20 suites   - 28   14s ⏱️ - 1m 17s
112 tests  - 366  112 ✅  - 365  0 💤  - 1  0 ❌ ±0 
224 runs   - 732  224 ✅  - 730  0 💤  - 2  0 ❌ ±0 

Results for commit 5892dd0. ± Comparison against base commit 4ee86a3.

This pull request removes 478 and adds 112 tests. Note that renamed tests count towards both.
com.google.firebase.dataconnect.AnyValueSerializerUnitTest ‑ descriptor should have expected values
com.google.firebase.dataconnect.AnyValueSerializerUnitTest ‑ deserialize() should throw UnsupportedOperationException
com.google.firebase.dataconnect.AnyValueSerializerUnitTest ‑ serialize() should throw UnsupportedOperationException
com.google.firebase.dataconnect.AnyValueUnitTest ‑ constructor(Boolean) creates an object with the expected value
com.google.firebase.dataconnect.AnyValueUnitTest ‑ constructor(Double) creates an object with the expected value (edge cases)
com.google.firebase.dataconnect.AnyValueUnitTest ‑ constructor(Double) creates an object with the expected value (normal cases)
com.google.firebase.dataconnect.AnyValueUnitTest ‑ constructor(List) creates an object with the expected value (edge cases)
com.google.firebase.dataconnect.AnyValueUnitTest ‑ constructor(List) creates an object with the expected value (normal cases)
com.google.firebase.dataconnect.AnyValueUnitTest ‑ constructor(Map) creates an object with the expected value (edge cases)
com.google.firebase.dataconnect.AnyValueUnitTest ‑ constructor(Map) creates an object with the expected value (normal cases)
…
com.google.firebase.vertexai.GenerativeModelTesting ‑ addition
com.google.firebase.vertexai.SchemaTests ‑ basic schema declaration
com.google.firebase.vertexai.SchemaTests ‑ full schema declaration
com.google.firebase.vertexai.StreamingSnapshotTests ‑ citation parsed correctly
com.google.firebase.vertexai.StreamingSnapshotTests ‑ empty content
com.google.firebase.vertexai.StreamingSnapshotTests ‑ http errors
com.google.firebase.vertexai.StreamingSnapshotTests ‑ image rejected
com.google.firebase.vertexai.StreamingSnapshotTests ‑ invalid api key
com.google.firebase.vertexai.StreamingSnapshotTests ‑ invalid json
com.google.firebase.vertexai.StreamingSnapshotTests ‑ long reply
…

@rlazo rlazo merged commit 11a813f into main Oct 9, 2024
29 checks passed
@rlazo rlazo deleted the rl.java.api.inlinedata branch October 9, 2024 17:26
@firebase firebase locked and limited conversation to collaborators Nov 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants