[Do Not Submit] experiments

.idx/.gitignore

@@ -0,0 +1,2 @@
+
+gc/

.idx/dev.nix

@@ -0,0 +1,17 @@
+{ pkgs, ... }: {
+
+  # Which nixpkgs channel to use.
+  channel = "stable-23.11"; # or "unstable"
+
+  # Use https://search.nixos.org/packages to find packages
+  packages = [
+    pkgs.jdk11 # Or jdk8, jdk17, etc. - match your project's requirements
+    pkgs.maven
+    pkgs.kotlin
+  ];
+
+  # Sets environment variables in the workspace
+  env = {
+    SOME_ENV_VAR = "hello";
+  };
+}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic"
+}

README.md

@@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.39.0')
+implementation platform('com.google.cloud:libraries-bom:26.40.0')
 
 implementation 'com.google.cloud:google-cloud-firestore'
 ```
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-firestore:3.21.1'
+implementation 'com.google.cloud:google-cloud-firestore:3.21.3'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.21.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.21.3"
 ```
 <!-- {x-version-update-end} -->
 
@@ -222,7 +222,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-firestore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.21.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-firestore/3.21.3
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java

@@ -486,6 +486,15 @@ public FirestoreAdminStub createStub() throws IOException {
             "Transport not supported: %s", getTransportChannelProvider().getTransportName()));
   }
 
+  /** Returns the endpoint set by the user or the the service's default endpoint. */
+  @Override
+  public String getEndpoint() {
+    if (super.getEndpoint() != null) {
+      return super.getEndpoint();
+    }
+    return getDefaultEndpoint();
+  }
+
   /** Returns the default service name. */
   @Override
   public String getServiceName() {
@@ -1377,6 +1386,15 @@ public UnaryCallSettings.Builder<RestoreDatabaseRequest, Operation> restoreDatab
       return deleteBackupScheduleSettings;
     }
 
+    /** Returns the endpoint set by the user or the the service's default endpoint. */
+    @Override
+    public String getEndpoint() {
+      if (super.getEndpoint() != null) {
+        return super.getEndpoint();
+      }
+      return getDefaultEndpoint();
+    }
+
     @Override
     public FirestoreAdminStubSettings build() throws IOException {
       return new FirestoreAdminStubSettings(this);

google-cloud-firestore/pom.xml

@@ -16,6 +16,7 @@
   </parent>
   <properties>
     <site.installationModule>google-cloud-firestore</site.installationModule>
+    <kotlin.version>1.9.22</kotlin.version>
   </properties>
   <dependencies>
     <dependency>
@@ -173,6 +174,17 @@
       <version>3.14.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>${kotlin.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-test</artifactId>
+      <version>${kotlin.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <reporting>
@@ -214,6 +226,78 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-maven-plugin</artifactId>
+        <version>${kotlin.version}</version>
+        <executions>
+          <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <sourceDirs>
+                <source>src/main/java</source>
+                <source>target/generated-sources/annotations</source>
+              </sourceDirs>
+            </configuration>
+          </execution>
+          <execution>
+            <id>test-compile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>test-compile</goal>
+            </goals>
+            <configuration>
+              <sourceDirs>
+                <source>src/test/java</source>
+                <source>target/generated-test-sources/test-annotations</source>
+              </sourceDirs>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <jvmTarget>1.8</jvmTarget>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-compile</id>
+            <phase>none</phase>
+          </execution>
+          <execution>
+            <id>default-testCompile</id>
+            <phase>none</phase>
+          </execution>
+          <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>testCompile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

google-cloud-firestore/src/main/java/com/google/cloud/firestore/AggregateQuery.java

@@ -24,6 +24,7 @@
 import com.google.api.gax.rpc.StatusCode;
 import com.google.api.gax.rpc.StreamController;
 import com.google.cloud.Timestamp;
+import com.google.cloud.firestore.pipeline.AggregatorTarget;
 import com.google.cloud.firestore.v1.FirestoreSettings;
 import com.google.common.collect.ImmutableMap;
 import com.google.firestore.v1.RunAggregationQueryRequest;
@@ -65,6 +66,16 @@ public Query getQuery() {
     return query;
   }
 
+  @Nonnull
+  public Pipeline toPipeline() {
+    return getQuery()
+        .toPipeline()
+        .aggregate(
+            this.aggregateFieldList.stream()
+                .map(PipelineUtils::toPipelineAggregatorTarget)
+                .toArray(AggregatorTarget[]::new));
+  }
+
   /**
    * Executes this query.
    *

google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java

@@ -29,6 +29,8 @@
 import com.google.api.gax.rpc.StreamController;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.Timestamp;
+import com.google.cloud.firestore.Transaction.AsyncFunction;
+import com.google.cloud.firestore.Transaction.Function;
 import com.google.cloud.firestore.spi.v1.FirestoreRpc;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
@@ -385,30 +387,28 @@ public CollectionGroup collectionGroup(@Nonnull final String collectionId) {
 
   @Nonnull
   @Override
-  public <T> ApiFuture<T> runTransaction(@Nonnull final Transaction.Function<T> updateFunction) {
+  public <T> ApiFuture<T> runTransaction(@Nonnull final Function<T> updateFunction) {
     return runAsyncTransaction(
         new TransactionAsyncAdapter<>(updateFunction), TransactionOptions.create());
   }
 
   @Nonnull
   @Override
   public <T> ApiFuture<T> runTransaction(
-      @Nonnull final Transaction.Function<T> updateFunction,
-      @Nonnull TransactionOptions transactionOptions) {
+      @Nonnull final Function<T> updateFunction, @Nonnull TransactionOptions transactionOptions) {
     return runAsyncTransaction(new TransactionAsyncAdapter<>(updateFunction), transactionOptions);
   }
 
   @Nonnull
   @Override
-  public <T> ApiFuture<T> runAsyncTransaction(
-      @Nonnull final Transaction.AsyncFunction<T> updateFunction) {
+  public <T> ApiFuture<T> runAsyncTransaction(@Nonnull final AsyncFunction<T> updateFunction) {
     return runAsyncTransaction(updateFunction, TransactionOptions.create());
   }
 
   @Nonnull
   @Override
   public <T> ApiFuture<T> runAsyncTransaction(
-      @Nonnull final Transaction.AsyncFunction<T> updateFunction,
+      @Nonnull final AsyncFunction<T> updateFunction,
       @Nonnull TransactionOptions transactionOptions) {
 
     if (transactionOptions.getReadTime() != null) {
@@ -519,10 +519,10 @@ public void shutdownNow() {
     closed = true;
   }
 
-  private static class TransactionAsyncAdapter<T> implements Transaction.AsyncFunction<T> {
-    private final Transaction.Function<T> syncFunction;
+  private static class TransactionAsyncAdapter<T> implements AsyncFunction<T> {
+    private final Function<T> syncFunction;
 
-    public TransactionAsyncAdapter(Transaction.Function<T> syncFunction) {
+    public TransactionAsyncAdapter(Function<T> syncFunction) {
       this.syncFunction = syncFunction;
     }