Skip to content

Commit c17a8ad

Browse files
authored
Merge 4417c2b into 0a880cc
2 parents 0a880cc + 4417c2b commit c17a8ad

34 files changed

+4892
-343
lines changed

firebase-firestore/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Unreleased
2-
2+
* [feature] Add support for the following new types: MinKey, MaxKey, RegexValue, Int32Value, BsonObjectId, BsonTimestamp, and BsonBinaryData. [#6928](//github.com/firebase/firebase-android-sdk/pull/6928)
33

44
# 25.1.4
55
* [fixed] Fixed the `null` value handling in `whereNotEqualTo` and `whereNotIn` filters.

firebase-firestore/api.txt

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,25 @@ package com.google.firebase.firestore {
4747
method public byte[] toBytes();
4848
}
4949

50+
public final class BsonBinaryData {
51+
method public com.google.protobuf.ByteString dataAsByteString();
52+
method public byte[] dataAsBytes();
53+
method public static com.google.firebase.firestore.BsonBinaryData fromByteString(int, com.google.protobuf.ByteString);
54+
method public static com.google.firebase.firestore.BsonBinaryData fromBytes(int, byte[]);
55+
method public int subtype();
56+
}
57+
58+
public final class BsonObjectId {
59+
ctor public BsonObjectId(String);
60+
field public final String! value;
61+
}
62+
63+
public final class BsonTimestamp {
64+
ctor public BsonTimestamp(long, long);
65+
field public final long increment;
66+
field public final long seconds;
67+
}
68+
5069
public class CollectionReference extends com.google.firebase.firestore.Query {
5170
method public com.google.android.gms.tasks.Task<com.google.firebase.firestore.DocumentReference!> add(Object);
5271
method public com.google.firebase.firestore.DocumentReference document();
@@ -109,6 +128,9 @@ package com.google.firebase.firestore {
109128
method public <T> T? get(String, Class<T!>, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
110129
method public com.google.firebase.firestore.Blob? getBlob(String);
111130
method public Boolean? getBoolean(String);
131+
method public com.google.firebase.firestore.BsonBinaryData? getBsonBinaryData(String);
132+
method public com.google.firebase.firestore.BsonObjectId? getBsonObjectId(String);
133+
method public com.google.firebase.firestore.BsonTimestamp? getBsonTimestamp(String);
112134
method public java.util.Map<java.lang.String!,java.lang.Object!>? getData();
113135
method public java.util.Map<java.lang.String!,java.lang.Object!>? getData(com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
114136
method public java.util.Date? getDate(String);
@@ -117,9 +139,13 @@ package com.google.firebase.firestore {
117139
method public Double? getDouble(String);
118140
method public com.google.firebase.firestore.GeoPoint? getGeoPoint(String);
119141
method public String getId();
142+
method public com.google.firebase.firestore.Int32Value? getInt32Value(String);
120143
method public Long? getLong(String);
144+
method public com.google.firebase.firestore.MaxKey? getMaxKey(String);
121145
method public com.google.firebase.firestore.SnapshotMetadata getMetadata();
146+
method public com.google.firebase.firestore.MinKey? getMinKey(String);
122147
method public com.google.firebase.firestore.DocumentReference getReference();
148+
method public com.google.firebase.firestore.RegexValue? getRegexValue(String);
123149
method public String? getString(String);
124150
method public com.google.firebase.Timestamp? getTimestamp(String);
125151
method public com.google.firebase.Timestamp? getTimestamp(String, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
@@ -303,6 +329,11 @@ package com.google.firebase.firestore {
303329
@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public @interface IgnoreExtraProperties {
304330
}
305331

332+
public final class Int32Value {
333+
ctor public Int32Value(int);
334+
field public final int value;
335+
}
336+
306337
public enum ListenSource {
307338
enum_constant public static final com.google.firebase.firestore.ListenSource CACHE;
308339
enum_constant public static final com.google.firebase.firestore.ListenSource DEFAULT;
@@ -360,6 +391,10 @@ package com.google.firebase.firestore {
360391
public interface LocalCacheSettings {
361392
}
362393

394+
public final class MaxKey {
395+
method public static com.google.firebase.firestore.MaxKey instance();
396+
}
397+
363398
public final class MemoryCacheSettings implements com.google.firebase.firestore.LocalCacheSettings {
364399
method public com.google.firebase.firestore.MemoryGarbageCollectorSettings getGarbageCollectorSettings();
365400
method public static com.google.firebase.firestore.MemoryCacheSettings.Builder newBuilder();
@@ -396,6 +431,10 @@ package com.google.firebase.firestore {
396431
enum_constant public static final com.google.firebase.firestore.MetadataChanges INCLUDE;
397432
}
398433

434+
public final class MinKey {
435+
method public static com.google.firebase.firestore.MinKey instance();
436+
}
437+
399438
public interface OnProgressListener<ProgressT> {
400439
method public void onProgress(ProgressT);
401440
}
@@ -491,6 +530,12 @@ package com.google.firebase.firestore {
491530
method public <T> java.util.List<T!> toObjects(Class<T!>, com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior);
492531
}
493532

533+
public final class RegexValue {
534+
ctor public RegexValue(String, String);
535+
field public final String! options;
536+
field public final String! pattern;
537+
}
538+
494539
@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD}) public @interface ServerTimestamp {
495540
}
496541

0 commit comments

Comments
 (0)