fix conflict

Author: yang-chengg

.release_metadata.json

@@ -1,3 +1,3 @@
 {
-    "timestamp": "2025-04-22 12:07:45+0000"
+    "timestamp": "2025-04-24 18:23:33+0000"
 }

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Version changelog
 
+## Release v0.47.0
+
+### API Changes
+* Added `updateEndpointBudgetPolicy()` and `updateEndpointCustomTags()` methods for `workspaceClient.vectorSearchEndpoints()` service.
+* Added `nodeTypeFlexibility` field for `com.databricks.sdk.service.compute.EditInstancePool`.
+* Added `pageSize` and `pageToken` fields for `com.databricks.sdk.service.compute.GetEvents`.
+* Added `nextPageToken` and `prevPageToken` fields for `com.databricks.sdk.service.compute.GetEventsResponse`.
+* Added `nodeTypeFlexibility` field for `com.databricks.sdk.service.compute.GetInstancePool`.
+* Added `nodeTypeFlexibility` field for `com.databricks.sdk.service.compute.InstancePoolAndStats`.
+* Added `effectivePerformanceTarget` field for `com.databricks.sdk.service.jobs.RepairHistoryItem`.
+* Added `performanceTarget` field for `com.databricks.sdk.service.jobs.RepairRun`.
+* Added `budgetPolicyId` field for `com.databricks.sdk.service.vectorsearch.CreateEndpoint`.
+* Added `customTags` and `effectiveBudgetPolicyId` fields for `com.databricks.sdk.service.vectorsearch.EndpointInfo`.
+* Added `DISABLED` enum value for `com.databricks.sdk.service.jobs.TerminationCodeCode`.
+* [Breaking] Changed `createIndex()` method for `workspaceClient.vectorSearchIndexes()` service to return `com.databricks.sdk.service.vectorsearch.VectorIndex` class.
+* [Breaking] Changed `deleteDataVectorIndex()` method for `workspaceClient.vectorSearchIndexes()` service . HTTP method/verb has changed.
+* [Breaking] Changed `deleteDataVectorIndex()` method for `workspaceClient.vectorSearchIndexes()` service with new required argument order.
+* [Breaking] Changed `dataArray` field for `com.databricks.sdk.service.vectorsearch.ResultData` to type `com.databricks.sdk.service.vectorsearch.ListValueList` class.
+* [Breaking] Changed waiter for `workspaceClient.vectorSearchEndpoints().createEndpoint()` method.
+* [Breaking] Removed `nullValue` field for `com.databricks.sdk.service.vectorsearch.Value`.
+
+
 ## Release v0.46.0
 
 ### New Features and Improvements

NEXT_CHANGELOG.md

@@ -1,6 +1,6 @@
 # NEXT CHANGELOG
 
-## Release v0.47.0
+## Release v0.48.0
 
 ### New Features and Improvements
 

databricks-sdk-java/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.databricks</groupId>
     <artifactId>databricks-sdk-parent</artifactId>
-    <version>0.46.0</version>
+    <version>0.47.0</version>
   </parent>
   <artifactId>databricks-sdk-java</artifactId>
   <properties>

databricks-sdk-java/src/main/java/com/databricks/sdk/core/UserAgent.java

@@ -36,7 +36,7 @@ public String getValue() {
   // TODO: check if reading from
   // /META-INF/maven/com.databricks/databrics-sdk-java/pom.properties
   // or getClass().getPackage().getImplementationVersion() is enough.
-  private static final String version = "0.46.0";
+  private static final String version = "0.47.0";
 
   public static void withProduct(String product, String productVersion) {
     UserAgent.product = product;

databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/IDToken.java

@@ -0,0 +1,31 @@
+package com.databricks.sdk.core.oauth;
+
+/**
+ * Represents an ID Token provided by an identity provider from an OAuth flow. This token can later
+ * be exchanged for an access token.
+ */
+public class IDToken {
+  // The string value of the ID Token
+  private final String value;
+
+  /**
+   * Constructs an IDToken with a value.
+   *
+   * @param value The ID Token string.
+   */
+  public IDToken(String value) {
+    if (value == null || value.isEmpty()) {
+      throw new IllegalArgumentException("ID Token value cannot be null or empty");
+    }
+    this.value = value;
+  }
+
+  /**
+   * Returns the value of the ID Token.
+   *
+   * @return The string representation of the ID Token.
+   */
+  public String getValue() {
+    return value;
+  }
+}

databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/IDTokenSource.java

@@ -0,0 +1,12 @@
+package com.databricks.sdk.core.oauth;
+
+/** IDTokenSource is anything that returns an IDToken given an audience. */
+public interface IDTokenSource {
+  /**
+   * Retrieves an ID Token for the specified audience.
+   *
+   * @param audience The intended recipient of the ID Token.
+   * @return An {@link IDToken} containing the token value.
+   */
+  IDToken getIDToken(String audience);
+}

databricks-sdk-java/src/test/java/com/databricks/sdk/core/oauth/IDTokenTest.java

@@ -0,0 +1,22 @@
+package com.databricks.sdk.core.oauth;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class IDTokenTest {
+
+  private static final String accessToken = "testIdToken";
+
+  @Test
+  void testIDTokenWithValue() {
+    IDToken idToken = new IDToken(accessToken);
+    assertEquals(accessToken, idToken.getValue());
+  }
+
+  @Test
+  void testIDTokenWithNullValue() {
+    assertThrows(IllegalArgumentException.class, () -> new IDToken(null));
+  }
+}

examples/docs/pom.xml

@@ -24,7 +24,7 @@
     <dependency>
       <groupId>com.databricks</groupId>
       <artifactId>databricks-sdk-java</artifactId>
-      <version>0.46.0</version>
+      <version>0.47.0</version>
     </dependency>
   </dependencies>
 </project>

examples/spring-boot-oauth-u2m-demo/pom.xml

@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.databricks</groupId>
       <artifactId>databricks-sdk-java</artifactId>
-      <version>0.46.0</version>
+      <version>0.47.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>