Fixing Pipeline Issues

Author: rahulmane-goog

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java

@@ -197,8 +197,6 @@ interface TransactionCallable<T> {
    */
   List<Key> allocateId(IncompleteKey... keys);
 
-
-
   /**
    * Returns a list of keys using the allocated ids with specified {@link
    * DatastoreExecutionOptions}.
@@ -379,8 +377,6 @@ interface TransactionCallable<T> {
   @Override
   List<Entity> put(FullEntity<?>... entities);
 
-
-
   /**
    * {@inheritDoc} with specified {@link DatastoreExecutionOptions}.
    *
@@ -580,7 +576,8 @@ interface TransactionCallable<T> {
   <T> QueryResults<T> run(Query<T> query, ExplainOptions explainOptions, ReadOption... options);
 
   /**
-   * Submits a {@link Query} with specified {@link DatastoreExecutionOptions} and returns its result.
+   * Submits a {@link Query} with specified {@link DatastoreExecutionOptions} and returns its
+   * result.
    */
   @BetaApi
   <T> QueryResults<T> run(Query<T> query, DatastoreExecutionOptions executionOptions);
@@ -658,8 +655,8 @@ AggregationResults runAggregation(
       AggregationQuery query, ExplainOptions explainOptions, ReadOption... options);
 
   /**
-   * Submits an {@link AggregationQuery} with specified {@link DatastoreExecutionOptions} and returns
-   * {@link AggregationResults}.
+   * Submits an {@link AggregationQuery} with specified {@link DatastoreExecutionOptions} and
+   * returns {@link AggregationResults}.
    */
   @BetaApi
   AggregationResults runAggregation(

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java

@@ -112,8 +112,7 @@ final class DatastoreImpl extends BaseService<DatastoreOptions> implements Datas
   private static final ExceptionHandler TRANSACTION_OPERATION_EXCEPTION_HANDLER =
       TransactionOperationExceptionHandler.build();
 
-  private final TraceUtil otelTraceUtil =
-      getOptions().getTraceUtil();
+  private final TraceUtil otelTraceUtil = getOptions().getTraceUtil();
   private final DatastoreMetricsRecorder metricsRecorder;
   private final OpenTelemetry builtInOpenTelemetry;
 
@@ -180,8 +179,7 @@ static class TracedReadWriteTransactionCallable<T> implements Callable<T> {
     private final TraceUtil.Span parentSpan;
 
     TracedReadWriteTransactionCallable(
-        ReadWriteTransactionCallable<T> delegate,
-        @Nullable TraceUtil.Span parentSpan) {
+        ReadWriteTransactionCallable<T> delegate, @Nullable TraceUtil.Span parentSpan) {
       this.delegate = delegate;
       this.parentSpan = parentSpan;
     }
@@ -473,8 +471,6 @@ public Key allocateId(IncompleteKey key) {
     return DatastoreHelper.allocateId(this, key);
   }
 
-
-
   private boolean verifyIncompleteKeyType(Iterable<IncompleteKey> keys) {
     for (IncompleteKey key : keys) {
       if (key instanceof Key) {
@@ -491,7 +487,8 @@ public List<Key> allocateId(IncompleteKey... keys) {
 
   @Override
   @BetaApi
-  public List<Key> allocateId(List<IncompleteKey> keys, DatastoreExecutionOptions executionOptions) {
+  public List<Key> allocateId(
+      List<IncompleteKey> keys, DatastoreExecutionOptions executionOptions) {
     Preconditions.checkArgument(
         verifyIncompleteKeyType(keys), "keys must be IncompleteKey instances");
     if (keys.isEmpty()) {
@@ -503,8 +500,7 @@ public List<Key> allocateId(List<IncompleteKey> keys, DatastoreExecutionOptions
     }
     requestPb.setProjectId(getOptions().getProjectId());
     requestPb.setDatabaseId(getOptions().getDatabaseId());
-    requestPb.setRequestOptions(
-        createRequestOptions(getOptions(), executionOptions));
+    requestPb.setRequestOptions(createRequestOptions(getOptions(), executionOptions));
     AllocateIdsResponse responsePb = allocateIds(requestPb.build());
     ImmutableList.Builder<Key> keyList = ImmutableList.builder();
     for (com.google.datastore.v1.Key keyPb : responsePb.getKeysList()) {
@@ -548,7 +544,8 @@ public List<Entity> add(FullEntity<?>... entities) {
   @SuppressWarnings("unchecked")
   @Override
   @BetaApi
-  public List<Entity> add(List<FullEntity<?>> entities, DatastoreExecutionOptions executionOptions) {
+  public List<Entity> add(
+      List<FullEntity<?>> entities, DatastoreExecutionOptions executionOptions) {
     if (entities.isEmpty()) {
       return Collections.emptyList();
     }
@@ -664,8 +661,7 @@ Iterator<Entity> get(
     }
     requestPb.setProjectId(getOptions().getProjectId());
     requestPb.setDatabaseId(getOptions().getDatabaseId());
-    requestPb.setRequestOptions(
-        createRequestOptions(getOptions(), executionOptions));
+    requestPb.setRequestOptions(createRequestOptions(getOptions(), executionOptions));
     return new ResultsIterator(requestPb);
   }
 
@@ -746,8 +742,7 @@ public List<Key> reserveIds(List<Key> keys, DatastoreExecutionOptions executionO
     }
     requestPb.setProjectId(getOptions().getProjectId());
     requestPb.setDatabaseId(getOptions().getDatabaseId());
-    requestPb.setRequestOptions(
-        createRequestOptions(getOptions(), executionOptions));
+    requestPb.setRequestOptions(createRequestOptions(getOptions(), executionOptions));
     ReserveIdsResponse responsePb = reserveIds(requestPb.build());
     ImmutableList.Builder<Key> keyList = ImmutableList.builder();
     if (responsePb.isInitialized()) {
@@ -800,7 +795,8 @@ public List<Entity> put(FullEntity<?>... entities) {
   @SuppressWarnings("unchecked")
   @Override
   @BetaApi
-  public List<Entity> put(List<FullEntity<?>> entities, DatastoreExecutionOptions executionOptions) {
+  public List<Entity> put(
+      List<FullEntity<?>> entities, DatastoreExecutionOptions executionOptions) {
     if (entities.isEmpty()) {
       return Collections.emptyList();
     }

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java

@@ -273,7 +273,6 @@ public Builder setRequestTags(List<String> requestTags) {
       return this;
     }
 
-
     /**
      * Sets the {@link DatastoreOpenTelemetryOptions} to be used for this Datastore instance.
      *
@@ -397,8 +396,8 @@ public String getDatabaseId() {
   /**
    * Returns the request tags to be associated with all requests sent by this client.
    *
-   * <p>These instance-level tags are merged with any request-level options or tags passed via {@link
-   * DatastoreExecutionOptions} before sending a request.
+   * <p>These instance-level tags are merged with any request-level options or tags passed via
+   * {@link DatastoreExecutionOptions} before sending a request.
    *
    * @return the request tags
    */

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java

@@ -17,6 +17,7 @@
 package com.google.cloud.datastore;
 
 import static com.google.cloud.datastore.RequestOptionsHelper.createRequestOptions;
+
 import com.google.api.core.BetaApi;
 import com.google.cloud.datastore.Query.ResultType;
 import com.google.cloud.datastore.models.ExplainMetrics;
@@ -131,8 +132,7 @@ private void sendRequest() {
     if (explainOptions != null) {
       requestPb.setExplainOptions(explainOptions);
     }
-    requestPb.setRequestOptions(
-        createRequestOptions(datastore.getOptions(), requestOptions));
+    requestPb.setRequestOptions(createRequestOptions(datastore.getOptions(), requestOptions));
     query.populatePb(requestPb);
     runQueryResponsePb = datastore.runQuery(requestPb.build());
     mostRecentQueryPb = requestPb.getQuery();

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java

@@ -192,10 +192,7 @@ public static <Q extends Query<?>> QueryConfig<Q> createWithDatastoreExecutionOp
               ? executionOptions.getRequestOptions().toPb()
               : RequestOptions.getDefaultInstance();
       return new QueryConfig<>(
-          query,
-          explainOptions,
-          executionOptions.getReadOptions(),
-          requestOptions);
+          query, explainOptions, executionOptions.getReadOptions(), requestOptions);
     }
   }
 }

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RequestOptionsHelper.java

@@ -38,8 +38,8 @@ private RequestOptionsHelper() {}
    * @param datastoreOptions the global Datastore options containing instance-level tags
    * @param executionOptions the execution options containing request-level options (must not be
    *     null)
-   * @return a new merged {@link RequestOptions} proto containing both request-level options/tags and
-   *     instance-level tags
+   * @return a new merged {@link RequestOptions} proto containing both request-level options/tags
+   *     and instance-level tags
    */
   public static RequestOptions createRequestOptions(
       DatastoreOptions datastoreOptions, @Nonnull DatastoreExecutionOptions executionOptions) {
@@ -53,8 +53,8 @@ public static RequestOptions createRequestOptions(
    *
    * @param datastoreOptions the global Datastore options containing instance-level tags
    * @param requestOptions the individual request-level options, or {@code null}
-   * @return a new merged {@link RequestOptions} proto containing both request-level options/tags and
-   *     instance-level tags
+   * @return a new merged {@link RequestOptions} proto containing both request-level options/tags
+   *     and instance-level tags
    */
   public static RequestOptions createRequestOptions(
       DatastoreOptions datastoreOptions,
@@ -73,8 +73,8 @@ public static RequestOptions createRequestOptions(
    *
    * @param datastoreOptions the global Datastore options containing instance-level tags
    * @param requestOptions the individual request-level options, or {@code null}
-   * @return a new merged {@link RequestOptions} proto containing both request-level options/tags and
-   *     instance-level tags
+   * @return a new merged {@link RequestOptions} proto containing both request-level options/tags
+   *     and instance-level tags
    */
   public static RequestOptions createRequestOptions(
       DatastoreOptions datastoreOptions, RequestOptions requestOptions) {

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java

@@ -48,6 +48,8 @@ final class TransactionImpl extends BaseDatastoreBatchWriter implements Transact
 
   @Nonnull private final TraceUtil traceUtil;
 
+  private final DatastoreExecutionOptions executionOptions;
+
   static class ResponseImpl implements Transaction.Response {
 
     private final CommitResponse response;
@@ -60,8 +62,7 @@ static class ResponseImpl implements Transaction.Response {
 
     @Override
     public List<Key> getGeneratedKeys() {
-      Iterator<MutationResult> results =
-          response.getMutationResultsList().iterator();
+      Iterator<MutationResult> results = response.getMutationResultsList().iterator();
       List<Key> generated = new ArrayList<>(numAutoAllocatedIds);
       for (int i = 0; i < numAutoAllocatedIds; i++) {
         generated.add(Key.fromPb(results.next().getKey()));
@@ -84,19 +85,18 @@ public List<Key> getGeneratedKeys() {
       DatastoreExecutionOptions executionOptions) {
     super("transaction");
     this.datastore = datastore;
-    BeginTransactionRequest.Builder requestPb =
-        BeginTransactionRequest.newBuilder();
+    this.executionOptions =
+        executionOptions != null ? executionOptions : DatastoreExecutionOptions.getDefaultInstance();
+    BeginTransactionRequest.Builder requestPb = BeginTransactionRequest.newBuilder();
 
     requestPb.setProjectId(this.datastore.getOptions().getProjectId());
     requestPb.setDatabaseId(this.datastore.getOptions().getDatabaseId());
 
     if (options != null) {
       requestPb.setTransactionOptions(options);
     }
-    RequestOptions requestOptions =
-        executionOptions != null ? executionOptions.getRequestOptions() : null;
-    requestPb.setRequestOptions(
-        createRequestOptions(datastore.getOptions(), requestOptions));
+    RequestOptions requestOptions = this.executionOptions.getRequestOptions();
+    requestPb.setRequestOptions(createRequestOptions(datastore.getOptions(), requestOptions));
 
     transactionId = datastore.requestTransactionId(requestPb);
     this.readOptionProtoPreparer = new ReadOptionProtoPreparer();
@@ -155,23 +155,21 @@ public AggregationResults runAggregation(AggregationQuery query, ExplainOptions
   public Transaction.Response commit(DatastoreExecutionOptions executionOptions) {
     validateActive();
     List<Mutation> mutationsPb = toMutationPbList();
-    CommitRequest.Builder requestPb =
-        CommitRequest.newBuilder();
+    CommitRequest.Builder requestPb = CommitRequest.newBuilder();
     requestPb.setMode(CommitRequest.Mode.TRANSACTIONAL);
     requestPb.setTransaction(transactionId);
     requestPb.addAllMutations(mutationsPb);
     requestPb.setProjectId(datastore.getOptions().getProjectId());
     requestPb.setDatabaseId(datastore.getOptions().getDatabaseId());
-    requestPb.setRequestOptions(
-        createRequestOptions(datastore.getOptions(), executionOptions));
+    requestPb.setRequestOptions(createRequestOptions(datastore.getOptions(), executionOptions));
     CommitResponse responsePb = datastore.commit(requestPb.build());
     deactivate();
     return new ResponseImpl(responsePb, toAddAutoId().size());
   }
 
   @Override
   public Transaction.Response commit() {
-    return commit(DatastoreExecutionOptions.getDefaultInstance());
+    return commit(this.executionOptions);
   }
 
   @Override
@@ -188,7 +186,7 @@ public void rollback(DatastoreExecutionOptions executionOptions) {
 
   @Override
   public void rollback() {
-    rollback(DatastoreExecutionOptions.getDefaultInstance());
+    rollback(this.executionOptions);
   }
 
   @Override

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/execution/AggregationQueryExecutor.java

@@ -49,8 +49,8 @@ public class AggregationQueryExecutor
    *
    * @param datastoreRpc the {@link DatastoreRpc} used to run aggregation query requests against the
    *     Datastore service.
-   * @param datastoreOptions the {@link DatastoreOptions} containing configuration such as project ID
-   *     and database ID.
+   * @param datastoreOptions the {@link DatastoreOptions} containing configuration such as project
+   *     ID and database ID.
    */
   public AggregationQueryExecutor(DatastoreRpc datastoreRpc, DatastoreOptions datastoreOptions) {
     this.datastoreRpc = datastoreRpc;
@@ -74,7 +74,8 @@ public AggregationResults execute(
         query,
         DatastoreExecutionOptions.newBuilder()
             .setExplainOptions(explainOptions)
-            .setReadOptions(readOptions != null ? Arrays.asList(readOptions) : Collections.emptyList())
+            .setReadOptions(
+                readOptions != null ? Arrays.asList(readOptions) : Collections.emptyList())
             .build());
   }
 
@@ -83,8 +84,8 @@ public AggregationResults execute(
    * DatastoreExecutionOptions}.
    *
    * @param query the {@link AggregationQuery} to execute.
-   * @param executionOptions the {@link DatastoreExecutionOptions} containing options such as explain
-   *     options, request options, and read options.
+   * @param executionOptions the {@link DatastoreExecutionOptions} containing options such as
+   *     explain options, request options, and read options.
    * @return the {@link AggregationResults} produced by executing the query.
    */
   public AggregationResults execute(
@@ -99,7 +100,9 @@ public AggregationResults execute(
   private RunAggregationQueryRequest getRunAggregationQueryRequest(
       AggregationQuery query, DatastoreExecutionOptions executionOptions) {
     DatastoreExecutionOptions effectiveOptions =
-        executionOptions != null ? executionOptions : DatastoreExecutionOptions.getDefaultInstance();
+        executionOptions != null
+            ? executionOptions
+            : DatastoreExecutionOptions.getDefaultInstance();
     QueryConfig<AggregationQuery> queryConfig =
         QueryConfig.createWithDatastoreExecutionOptions(query, effectiveOptions);
     return this.protoPreparer.prepare(queryConfig);