done

Author: hectorcast-db

NEXT_CHANGELOG.md

@@ -13,4 +13,4 @@
 ### Internal Changes
 
 ### API Changes
-* [Breaking] Change `username` field for `com.databricks.sdk.service.iamv2.User` to no longer be required.
+* [Breaking] Change `username` field for `com.databricks.sdk.service.iamv2.User` to no longer be required.

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

@@ -52,7 +52,7 @@ public Builder withDatabricksConfig(DatabricksConfig config) {
       this.getAuthTypeFunc = v -> config.getAuthType();
       this.httpClient = config.getHttpClient();
       this.debugTruncateBytes = config.getDebugTruncateBytes();
-       this.accountId = config.getAccountId();
+      this.accountId = config.getAccountId();
       this.workspaceId = config.getWorkspaceId();
       this.isDebugHeaders = config.isDebugHeaders();
 

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

@@ -249,11 +249,6 @@ public synchronized Map<String, String> authenticate() throws DatabricksExceptio
       }
       Map<String, String> headers = new HashMap<>(headerFactory.headers());
 
-      // For unified hosts with workspace operations, add the X-Databricks-Org-Id header
-      if (getHostType() == HostType.UNIFIED && workspaceId != null && !workspaceId.isEmpty()) {
-        headers.put("X-Databricks-Org-Id", workspaceId);
-      }
-
       return headers;
     } catch (DatabricksException e) {
       String msg = String.format("%s auth: %s", credentialsProvider.authType(), e.getMessage());