googleapis
diff --git a/‎.github/sync-repo-settings.yaml
-34 b/‎.github/sync-repo-settings.yaml
-34
diff --git a/‎.github/workflows/hermetic_library_generation.yaml
+1-1 b/‎.github/workflows/hermetic_library_generation.yaml
+1-1
diff --git a/‎.github/workflows/unmanaged_dependency_check.yaml
+1-1 b/‎.github/workflows/unmanaged_dependency_check.yaml
+1-1
diff --git a/‎.kokoro/presubmit/graalvm-native-17.cfg
+1-1 b/‎.kokoro/presubmit/graalvm-native-17.cfg
+1-1
diff --git a/‎.kokoro/presubmit/graalvm-native.cfg
+1-1 b/‎.kokoro/presubmit/graalvm-native.cfg
+1-1
diff --git a/‎.readme-partials.yaml
+97 b/‎.readme-partials.yaml
+97
diff --git a/‎CHANGELOG.md
+52-36 b/‎CHANGELOG.md
+52-36
@@ -186,40 +186,6 @@ branchProtectionRules:
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
       - javadoc
-  - pattern: grpc-experimental
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (17)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-      - OwlBot Post Processor
-      - 'Kokoro - Test: Java GraalVM Native Image'
-      - 'Kokoro - Test: Java 17 GraalVM Native Image'
-      - javadoc
-  - pattern: grpc-experimental
-    isAdminEnforced: true
-    requiredApprovingReviewCount: 1
-    requiresCodeOwnerReviews: true
-    requiresStrictStatusChecks: false
-    requiredStatusCheckContexts:
-      - dependencies (17)
-      - lint
-      - clirr
-      - units (8)
-      - units (11)
-      - 'Kokoro - Test: Integration'
-      - cla/google
-      - OwlBot Post Processor
-      - 'Kokoro - Test: Java GraalVM Native Image'
-      - 'Kokoro - Test: Java 17 GraalVM Native Image'
-      - javadoc
 permissionRules:
   - team: yoshi-admins
     permission: admin
 
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.46.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.49.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
 
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.36.1
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.39.0
       with:
         bom-path: google-cloud-datastore-bom/pom.xml
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.36.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.39.0"
 }
 
 env_vars: {
 
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.36.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.39.0"
 }
 
 env_vars: {
 
@@ -185,6 +185,103 @@ custom_content: |
   To customize the number of channels your client uses, you can update the channel provider in the DatastoreOptions. 
   See [ChannelPoolSettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.grpc.ChannelPoolSettings) and [Performance Best Practices](https://grpc.io/docs/guides/performance/) for more information on channel pools and best practices for performance.
   
+  Example:
+  ```java
+  InstantiatingGrpcChannelProvider channelProvider =
+        DatastoreSettings.defaultGrpcTransportProviderBuilder()
+                .setChannelPoolSettings(
+                       ChannelPoolSettings.builder()
+                                .setInitialChannelCount(MIN_VAL)
+                                .setMaxChannelCount(MAX_VAL)
+                                .build())
+                .build();
+  
+  DatastoreOptions options = DatastoreOptions.newBuilder()
+                            .setProjectId("my-project")
+                            .setChannelProvider(channelProvider)
+                            .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+                            .build();
+  ```
+  
+  gRPC Java Datastore Client User Guide
+  -------
+  In this feature launch, the [Java Datastore client](https://github.com/googleapis/java-datastore) now offers gRPC as a transport layer option with experimental support. Using [gRPC connection pooling](https://grpc.io/docs/guides/performance/) enables distributing RPCs over multiple connections which may improve performance.
+  
+  #### Download Instructions
+  Instructions:
+  1. Clone the grpc-experimental branch from GitHub:
+  ```python
+  git clone -b grpc-experimental https://github.com/googleapis/java-datastore.git
+  ```
+  2. Run the following commands to build the library:
+  ```python
+  # Go to the directory the code was downloaded to
+  cd java-datastore/
+  
+  # Build the library
+  mvn clean install -DskipTests=true
+  ```
+  3. Add the following dependency to your project:
+  ```xml
+  <dependency>
+    <groupId>com.google.cloud</groupId>
+    <artifactId>google-cloud-datastore</artifactId>
+    <version>2.20.0-grpc-experimental-1-SNAPSHOT</version>
+  </dependency>
+  ```
+  
+  #### How to Use
+  To opt-in to the gRPC transport behavior, simply add the below line of code (`setTransportOptions`) to your Datastore client instantiation.
+  
+  Example:
+  ```java
+  DatastoreOptions datastoreOptions =
+       DatastoreOptions.newBuilder()
+               .setProjectId("my-project")
+               .setDatabaseId("my-database")
+               .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+               .build();
+  ```
+  Setting the transport options explicitly to `GrpcTransportOptions` will signal the client to use gRPC instead of HTTP when making calls to the server.
+  
+  To revert back to the existing stable behavior and transport, simply remove the transport options line or replace it with `HttpTransportOptions`. Please note this will require an application rebuild and restart.
+  Example:
+  ```java
+  // will default to existing HTTP transport behavior
+  DatastoreOptions datastoreOptions = DatastoreOptions.newBuilder()
+      .setProjectId("my-project")
+      .setDatabaseId("my-database")
+      .build();
+  
+  // will also default to existing HTTP transport behavior
+  DatastoreOptions datastoreOptions =
+              DatastoreOptions.newBuilder()
+                .setProjectId("my-project")
+                .setDatabaseId("my-database")
+                .setTransportOptions(HttpTransportOptions.newBuilder()
+                .setConnectTimeout(1000)
+                .build()).build();
+  ```
+  
+  Note: client instantiations that already use `setTransportOptions` with `HttpTransportOptions` will continue to have the same behavior. Only transports that are explicitly set to gRPC will change.
+  
+  #### Verify Datastore Transport Options Type
+  To verify which type of TransportOptions you have successfully configured, you can use the below lines of code to compare transport options type:
+  ```java
+  // checks if using gRPC transport options
+  boolean isGRPC = datastore.getOptions().getTransportOptions() instanceof GrpcTransportOptions;
+  
+  // checks if using HTTP transport options
+  boolean isHTTP = datastore.getOptions().getTransportOptions() instanceof HTTPTransportOptions;
+  ```
+  
+  #### New Features
+  There are new gRPC specific features available to use in this update.
+  
+  ##### Channel Pooling
+  To customize the number of channels your client uses, you can update the channel provider in the DatastoreOptions. 
+  See [ChannelPoolSettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.grpc.ChannelPoolSettings) and [Performance Best Practices](https://grpc.io/docs/guides/performance/) for more information on channel pools and best practices for performance.
+  
   Example:
   ```java
   InstantiatingGrpcChannelProvider channelProvider =
 
@@ -1,5 +1,57 @@
 # Changelog
 
+## [2.24.2](https://github.com/googleapis/java-datastore/compare/v2.24.1...v2.24.2) (2024-11-06)
+
+
+### Bug Fixes
+
+* **doc:** Add discriptions for TransactionCallable interface ([#1644](https://github.com/googleapis/java-datastore/issues/1644)) ([173a883](https://github.com/googleapis/java-datastore/commit/173a88330cc5693f54504348cf39bf3191db2250))
+* **doc:** Fix return types for batch interface ([#1645](https://github.com/googleapis/java-datastore/issues/1645)) ([1189211](https://github.com/googleapis/java-datastore/commit/11892116f0fb8eacb711a8f48e780e48a232f987))
+
+## [2.24.1](https://github.com/googleapis/java-datastore/compare/v2.24.0...v2.24.1) (2024-10-28)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.39.0 ([#1640](https://github.com/googleapis/java-datastore/issues/1640)) ([fe61f66](https://github.com/googleapis/java-datastore/commit/fe61f6691a5e3c8fbfc974b6fe613a69652241ca))
+* Update googleapis/sdk-platform-java action to v2.49.0 ([#1638](https://github.com/googleapis/java-datastore/issues/1638)) ([57598d7](https://github.com/googleapis/java-datastore/commit/57598d7d59cd6917f23a653403613e4edc160c64))
+
+## [2.24.0](https://github.com/googleapis/java-datastore/compare/v2.23.0...v2.24.0) (2024-10-24)
+
+
+### Features
+
+* Add FindNearest API to the stable branch ([3512ba2](https://github.com/googleapis/java-datastore/commit/3512ba2f1bcd358e3c39c36944e05873b3f25f51))
+
+
+### Bug Fixes
+
+* **sample:** Change update entity sample to use transaction ([#1633](https://github.com/googleapis/java-datastore/issues/1633)) ([c44f17a](https://github.com/googleapis/java-datastore/commit/c44f17a7bb93d688367611ee2533c59c940ae61f))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.38.0 ([#1632](https://github.com/googleapis/java-datastore/issues/1632)) ([6453f1e](https://github.com/googleapis/java-datastore/commit/6453f1e44f370a13434ef68295ae5638612032c8))
+* Update googleapis/sdk-platform-java action to v2.48.0 ([#1628](https://github.com/googleapis/java-datastore/issues/1628)) ([d3bce79](https://github.com/googleapis/java-datastore/commit/d3bce79467254b3128a8f16d5754e91d29ece525))
+
+## [2.23.0](https://github.com/googleapis/java-datastore/compare/v2.22.0...v2.23.0) (2024-10-14)
+
+
+### Features
+
+* Support for field update operators in the Datastore API and resolution strategies when there is a conflict at write time ([b299266](https://github.com/googleapis/java-datastore/commit/b299266e42037b731ee7bbba21dbded73a37323c))
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.46.1 ([678eee2](https://github.com/googleapis/java-datastore/commit/678eee2dfb6d447a852edd436137f8ebfbe50d74))
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.47.0 ([b299266](https://github.com/googleapis/java-datastore/commit/b299266e42037b731ee7bbba21dbded73a37323c))
+
+
+### Dependencies
+
+* Update sdk platform java dependencies ([#1617](https://github.com/googleapis/java-datastore/issues/1617)) ([6eaff23](https://github.com/googleapis/java-datastore/commit/6eaff23f9de25ae6ad2a4fea67c0b65a243c08fd))
+
 ## [2.22.0](https://github.com/googleapis/java-datastore/compare/v2.21.3...v2.22.0) (2024-09-26)
 
 
@@ -99,42 +151,6 @@
 * **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#1406](https://github.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://github.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac))
 
 
-### Dependencies
-
-* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1426](https://github.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://github.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639))
-* Update dependency com.google.errorprone:error_prone_core to v2.27.0 ([#1411](https://github.com/googleapis/java-datastore/issues/1411)) ([a3f5a2c](https://github.com/googleapis/java-datastore/commit/a3f5a2c24bff408479541e08278e888cf3166727))
-* Update dependency com.google.errorprone:error_prone_core to v2.27.1 ([#1421](https://github.com/googleapis/java-datastore/issues/1421)) ([48d7daf](https://github.com/googleapis/java-datastore/commit/48d7dafc0c7a49e95bf41d29865ac872b0de0faf))
-* Update dependency com.google.guava:guava-testlib to v33.2.0-jre ([#1422](https://github.com/googleapis/java-datastore/issues/1422)) ([5a5dfdf](https://github.com/googleapis/java-datastore/commit/5a5dfdfb0855cf485b875ab071b79979d24f98dd))
-
-## [2.20.0](https://github.com/googleapis/java-datastore/compare/v2.19.3...v2.20.0) (2024-05-27)
-
-
-### Features
-
-* New PropertyMask field which allows partial commits, lookups, and query results ([#1455](https://github.com/googleapis/java-datastore/issues/1455)) ([ff5e397](https://github.com/googleapis/java-datastore/commit/ff5e39775446216b4806f55f14dacb7fc8e8854b))
-
-
-### Bug Fixes
-
-* Migrate off TextPrinter's deprecated methods ([#1452](https://github.com/googleapis/java-datastore/issues/1452)) ([c3c1317](https://github.com/googleapis/java-datastore/commit/c3c131735863d71971110e2ac7ac0244ce16ee92))
-* Set the correct database id on the key parent when calling Key#getParent ([#1457](https://github.com/googleapis/java-datastore/issues/1457)) ([992815d](https://github.com/googleapis/java-datastore/commit/992815d9989d04f7b371dfa320ed17894626a07f))
-
-## [2.19.3](https://github.com/googleapis/java-datastore/compare/v2.19.2...v2.19.3) (2024-05-16)
-
-
-### Dependencies
-
-* Update actions/checkout action to v4 ([#1390](https://github.com/googleapis/java-datastore/issues/1390)) ([80dbca1](https://github.com/googleapis/java-datastore/commit/80dbca1246facf21b08d33e5c6a09b9708b6ce63))
-* Update dependency com.google.cloud:sdk-platform-java-config to v3.30.1 ([#1443](https://github.com/googleapis/java-datastore/issues/1443)) ([79f6c46](https://github.com/googleapis/java-datastore/commit/79f6c46bdbabc66082f23e9562ee9541e0fdeac9))
-
-## [2.19.2](https://github.com/googleapis/java-datastore/compare/v2.19.1...v2.19.2) (2024-05-03)
-
-
-### Bug Fixes
-
-* **deps:** Update the Java code generator (gapic-generator-java) to 2.39.0 ([#1406](https://github.com/googleapis/java-datastore/issues/1406)) ([b265fb3](https://github.com/googleapis/java-datastore/commit/b265fb3c3b8ebc972edbe5a7beae816379846dac))
-
-
 ### Dependencies
 
 * Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#1426](https://github.com/googleapis/java-datastore/issues/1426)) ([ac3a1c1](https://github.com/googleapis/java-datastore/commit/ac3a1c10f64c8338346f8fb39f4857f47e8fc639))
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Configure the docker image for kokoro-trampoline.`
`4`	`4`	`env_vars: {`
`5`	`5`	`key: "TRAMPOLINE_IMAGE"`
`6`		`- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.36.1"`
	`6`	`+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.39.0"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`env_vars: {`