This is an automated email from the ASF dual-hosted git repository.
yzou pushed a commit to branch yzou-test-shade
in repository https://gitbox.apache.org/repos/asf/polaris.git
commit 3ccc73f591ae3e9e9a8f08c481207aa59ac0ac80
Author: Yun Zou <yunzou.colost...@gmail.com>
AuthorDate: Wed Jun 18 11:02:15 2025 -0700
add comment
---
.../spark/quarkus/it/PolarisManagementClient.java | 18 ++++--------------
.../polaris/spark/quarkus/it/SparkIntegrationBase.java | 3 ---
plugins/spark/v3.5/spark/build.gradle.kts | 4 +---
.../polaris/spark/rest/CreateGenericTableRequest.java | 1 +
.../org/apache/polaris/spark/rest/GenericTable.java | 1 +
.../polaris/spark/rest/ListGenericTablesResponse.java | 1 +
.../polaris/spark/rest/LoadGenericTableResponse.java | 1 +
7 files changed, 9 insertions(+), 20 deletions(-)
diff --git
a/plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/PolarisManagementClient.java
b/plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/PolarisManagementClient.java
index 6214d384f..e4fd1237c 100644
---
a/plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/PolarisManagementClient.java
+++
b/plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/PolarisManagementClient.java
@@ -32,14 +32,14 @@ import org.apache.iceberg.rest.RESTClient;
import org.apache.iceberg.rest.auth.AuthSession;
import org.apache.iceberg.rest.auth.OAuth2Util;
import org.apache.iceberg.rest.responses.OAuthTokenResponse;
-import org.apache.polaris.service.it.env.CatalogApi;
import org.apache.polaris.service.it.env.ClientCredentials;
import org.apache.polaris.service.it.env.ManagementApi;
import org.apache.polaris.service.it.env.PolarisApiEndpoints;
-import org.apache.polaris.service.it.ext.PolarisServerManager;
/**
- * RestClient used
+ * That class provides rest client that is can be used to talk to Polaris
Management service and
+ * auth token endpoint. This class is currently used by Spark Client tests for
commands that can not
+ * be issued through spark command, such as createCatalog etc.
*/
public final class PolarisManagementClient implements AutoCloseable {
private final PolarisApiEndpoints endpoints;
@@ -68,12 +68,7 @@ public final class PolarisManagementClient implements
AutoCloseable {
return new PolarisManagementClient(endpoints);
}
- /**
- * This method should be used by test code to make top-level entity names.
The purpose of this
- * method is two-fold:
- * <li>Identify top-level entities for latger clean-up by {@link
#cleanUp(ClientCredentials)}.
- * <li>Allow {@link PolarisServerManager}s to customize top-level entities
per environment.
- */
+ /** This method should be used by test code to make top-level entity names.
*/
public String newEntityName(String hint) {
return polarisServerManager().transformEntityName(hint + "_" + clientId);
}
@@ -86,11 +81,6 @@ public final class PolarisManagementClient implements
AutoCloseable {
return managementApi(obtainToken(credentials));
}
- public CatalogApi catalogApi(ClientCredentials credentials) {
- return new CatalogApi(
- client, endpoints, obtainToken(credentials),
endpoints.catalogApiEndpoint());
- }
-
/** Requests an access token from the Polaris server for the given {@link
ClientCredentials}. */
public String obtainToken(ClientCredentials credentials) {
OAuthTokenResponse response =
diff --git
a/plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/SparkIntegrationBase.java
b/plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/SparkIntegrationBase.java
index 54f18c4b6..8d16c36ad 100644
---
a/plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/SparkIntegrationBase.java
+++
b/plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/SparkIntegrationBase.java
@@ -38,7 +38,6 @@ import org.apache.polaris.core.admin.model.Catalog;
import org.apache.polaris.core.admin.model.CatalogProperties;
import org.apache.polaris.core.admin.model.PolarisCatalog;
import org.apache.polaris.core.admin.model.StorageConfigInfo;
-import org.apache.polaris.service.it.env.CatalogApi;
import org.apache.polaris.service.it.env.ClientCredentials;
import org.apache.polaris.service.it.env.IntegrationTestsHelper;
import org.apache.polaris.service.it.env.ManagementApi;
@@ -64,7 +63,6 @@ public abstract class SparkIntegrationBase {
protected PolarisApiEndpoints endpoints;
protected PolarisManagementClient client;
protected ManagementApi managementApi;
- protected CatalogApi catalogApi;
protected String catalogName;
protected String sparkToken;
@@ -87,7 +85,6 @@ public abstract class SparkIntegrationBase {
client = PolarisManagementClient.managementClient(endpoints);
sparkToken = client.obtainToken(credentials);
managementApi = client.managementApi(credentials);
- catalogApi = client.catalogApi(credentials);
warehouseDir =
IntegrationTestsHelper.getTemporaryDirectory(tempDir).resolve("spark-warehouse");
diff --git a/plugins/spark/v3.5/spark/build.gradle.kts
b/plugins/spark/v3.5/spark/build.gradle.kts
index d275e50ed..838ac3cc7 100644
--- a/plugins/spark/v3.5/spark/build.gradle.kts
+++ b/plugins/spark/v3.5/spark/build.gradle.kts
@@ -103,9 +103,7 @@ tasks.named<ShadowJar>("shadowJar") {
// Optimization: Minimize the JAR (remove unused classes from dependencies)
// The iceberg-spark-runtime plugin is always packaged along with our
polaris-spark plugin,
// therefore excluded from the optimization.
- minimize {
- exclude(dependency("org.apache.iceberg:iceberg-spark-runtime-*.*"))
- }
+ minimize {
exclude(dependency("org.apache.iceberg:iceberg-spark-runtime-*.*")) }
}
// ensure the shadowJar job is run for both `assemble` and `build` task
diff --git
a/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/CreateGenericTableRequest.java
b/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/CreateGenericTableRequest.java
index e7b1d5a62..46aec88d1 100644
---
a/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/CreateGenericTableRequest.java
+++
b/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/CreateGenericTableRequest.java
@@ -25,6 +25,7 @@ import java.util.Objects;
import org.apache.iceberg.shaded.com.fasterxml.jackson.annotation.JsonCreator;
import org.apache.iceberg.shaded.com.fasterxml.jackson.annotation.JsonProperty;
+// TODO: auto generate the class based on spec
@jakarta.annotation.Generated(
value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen",
date = "2025-06-16T22:51:23.661280-07:00[America/Los_Angeles]",
diff --git
a/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/GenericTable.java
b/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/GenericTable.java
index 37f90da97..f3c9fc523 100644
---
a/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/GenericTable.java
+++
b/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/GenericTable.java
@@ -25,6 +25,7 @@ import java.util.Objects;
import org.apache.iceberg.shaded.com.fasterxml.jackson.annotation.JsonCreator;
import org.apache.iceberg.shaded.com.fasterxml.jackson.annotation.JsonProperty;
+// TODO: auto generate the class based on spec
@jakarta.annotation.Generated(
value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen",
date = "2025-06-16T22:51:23.661280-07:00[America/Los_Angeles]",
diff --git
a/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/ListGenericTablesResponse.java
b/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/ListGenericTablesResponse.java
index e94eee6c4..611259c30 100644
---
a/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/ListGenericTablesResponse.java
+++
b/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/ListGenericTablesResponse.java
@@ -26,6 +26,7 @@ import org.apache.iceberg.catalog.TableIdentifier;
import org.apache.iceberg.shaded.com.fasterxml.jackson.annotation.JsonCreator;
import org.apache.iceberg.shaded.com.fasterxml.jackson.annotation.JsonProperty;
+// TODO: auto generate the class based on spec
@jakarta.annotation.Generated(
value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen",
date = "2025-06-16T22:51:23.661280-07:00[America/Los_Angeles]",
diff --git
a/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/LoadGenericTableResponse.java
b/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/LoadGenericTableResponse.java
index e77899ec9..572125b25 100644
---
a/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/LoadGenericTableResponse.java
+++
b/plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/rest/LoadGenericTableResponse.java
@@ -24,6 +24,7 @@ import java.util.Objects;
import org.apache.iceberg.shaded.com.fasterxml.jackson.annotation.JsonCreator;
import org.apache.iceberg.shaded.com.fasterxml.jackson.annotation.JsonProperty;
+// TODO: auto generate the class based on spec
@jakarta.annotation.Generated(
value = "org.openapitools.codegen.languages.JavaResteasyServerCodegen",
date = "2025-06-16T22:51:23.661280-07:00[America/Los_Angeles]",
