Fix immutablelist parameters

Author: wu-hui

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

@@ -32,7 +32,6 @@
 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;
 import com.google.cloud.firestore.spi.v1.FirestoreRpc;
 import com.google.cloud.firestore.telemetry.TraceUtil;
 import com.google.common.annotations.VisibleForTesting;
@@ -418,13 +417,15 @@ public <T> ApiFuture<T> runTransaction(@Nonnull final Transaction.Function<T> up
   @Nonnull
   @Override
   public <T> ApiFuture<T> runTransaction(
-      @Nonnull final Transaction.Function<T> updateFunction, @Nonnull TransactionOptions transactionOptions) {
+      @Nonnull final Transaction.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 Transaction.AsyncFunction<T> updateFunction) {
     return runAsyncTransaction(updateFunction, TransactionOptions.create());
   }
 
@@ -444,7 +445,7 @@ public <T> ApiFuture<T> runAsyncTransaction(
       // that cannot be tracked client side.
       return new ServerSideTransactionRunner<>(this, updateFunction, transactionOptions).run();
     }
-}
+  }
 
   @Nonnull
   @Override

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

@@ -836,7 +836,7 @@ public void onResponse(ExecutePipelineResponse response) {
               if (numDocuments > 100) {
                 Tracing.getTracer()
                     .getCurrentSpan()
-                    .addAnnotation("Firestore.Pipeline: Received "+numDocuments+" results");
+                    .addAnnotation("Firestore.Pipeline: Received " + numDocuments + " results");
                 docCounterPerTraceUpdate = 0;
               }
 

google-cloud-firestore/src/main/java/com/google/cloud/firestore/pipeline/expressions/Add.java

@@ -18,12 +18,12 @@
 
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
-import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
 
 @BetaApi
 public final class Add extends Function {
   @InternalApi
   Add(Expr left, Expr right) {
-    super("add", Lists.newArrayList(left, right));
+    super("add", ImmutableList.of(left, right));
   }
 }

google-cloud-firestore/src/main/java/com/google/cloud/firestore/pipeline/expressions/And.java

@@ -18,12 +18,13 @@
 
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 
 @BetaApi
 public final class And extends Function implements FilterCondition {
   @InternalApi
   And(List<FilterCondition> conditions) {
-    super("and", conditions);
+    super("and", ImmutableList.copyOf(conditions));
   }
 }

google-cloud-firestore/src/main/java/com/google/cloud/firestore/pipeline/expressions/ArrayConcat.java

@@ -18,13 +18,13 @@
 
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
-import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 
 @BetaApi
 public final class ArrayConcat extends Function {
   @InternalApi
   ArrayConcat(Expr array, List<Expr> rest) {
-    super("array_concat", Lists.asList(array, rest.toArray(new Expr[] {})));
+    super("array_concat", ImmutableList.<Expr>builder().add(array).addAll(rest).build());
   }
 }

google-cloud-firestore/src/main/java/com/google/cloud/firestore/pipeline/expressions/ArrayContains.java

@@ -18,12 +18,14 @@
 
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
-import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
 
 @BetaApi
 public final class ArrayContains extends Function implements FilterCondition {
   @InternalApi
   ArrayContains(Expr array, Expr element) {
-    super("array_contains", Lists.newArrayList(array, element));
+    super(
+        "array_contains",
+        ImmutableList.of(array, element == null ? Constant.nullValue() : element));
   }
 }

google-cloud-firestore/src/main/java/com/google/cloud/firestore/pipeline/expressions/ArrayContainsAll.java

@@ -18,13 +18,13 @@
 
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
-import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 
 @BetaApi
 public final class ArrayContainsAll extends Function implements FilterCondition {
   @InternalApi
   ArrayContainsAll(Expr array, List<Expr> elements) {
-    super("array_contains_all", Lists.newArrayList(array, new ListOfExprs(elements)));
+    super("array_contains_all", ImmutableList.of(array, new ListOfExprs(elements)));
   }
 }

google-cloud-firestore/src/main/java/com/google/cloud/firestore/pipeline/expressions/ArrayContainsAny.java

@@ -18,13 +18,13 @@
 
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
-import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 
 @BetaApi
 public final class ArrayContainsAny extends Function implements FilterCondition {
   @InternalApi
   ArrayContainsAny(Expr array, List<Expr> elements) {
-    super("array_contains_any", Lists.newArrayList(array, new ListOfExprs(elements)));
+    super("array_contains_any", ImmutableList.of(array, new ListOfExprs(elements)));
   }
 }

google-cloud-firestore/src/main/java/com/google/cloud/firestore/pipeline/expressions/ArrayElement.java

@@ -18,12 +18,12 @@
 
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
-import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
 
 @BetaApi
 public class ArrayElement extends Function {
   @InternalApi
   ArrayElement() {
-    super("array_element", Lists.newArrayList());
+    super("array_element", ImmutableList.of());
   }
 }

google-cloud-firestore/src/main/java/com/google/cloud/firestore/pipeline/expressions/ArrayFilter.java

@@ -18,12 +18,12 @@
 
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
-import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
 
 @BetaApi
 public final class ArrayFilter extends Function {
   @InternalApi
   ArrayFilter(Expr array, FilterCondition filter) {
-    super("array_filter", Lists.newArrayList(array, filter));
+    super("array_filter", ImmutableList.of(array, filter));
   }
 }