This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 8f8455ce87 [rest] Move DATA_TOKEN_ENABLED to inner RESTTokenFileIO
8f8455ce87 is described below
commit 8f8455ce87978578ee83349fe91a9158cee35a73
Author: JingsongLi <[email protected]>
AuthorDate: Wed Mar 12 11:11:02 2025 +0800
[rest] Move DATA_TOKEN_ENABLED to inner RESTTokenFileIO
---
paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalog.java | 3 +--
.../src/main/java/org/apache/paimon/rest/RESTCatalogOptions.java | 6 ------
.../src/main/java/org/apache/paimon/rest/RESTTokenFileIO.java | 8 ++++++++
.../src/test/java/org/apache/paimon/rest/MockRESTCatalogTest.java | 2 +-
.../src/test/java/org/apache/paimon/rest/RESTTestFileIO.java | 2 +-
.../src/test/java/org/apache/paimon/flink/RESTCatalogITCase.java | 5 +++--
6 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalog.java
b/paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalog.java
index cbaadb2558..cbdb66ccfe 100644
--- a/paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalog.java
+++ b/paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalog.java
@@ -171,8 +171,7 @@ public class RESTCatalog implements Catalog,
SupportsSnapshots, SupportsBranches
context = CatalogContext.create(options, context.preferIO(),
context.fallbackIO());
this.context = context;
this.resourcePaths = ResourcePaths.forCatalogProperties(options);
-
- this.dataTokenEnabled =
options.get(RESTCatalogOptions.DATA_TOKEN_ENABLED);
+ this.dataTokenEnabled =
options.get(RESTTokenFileIO.DATA_TOKEN_ENABLED);
}
@Override
diff --git
a/paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalogOptions.java
b/paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalogOptions.java
index e1c11c4e6a..0dd5bc2a00 100644
--- a/paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalogOptions.java
+++ b/paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalogOptions.java
@@ -79,10 +79,4 @@ public class RESTCatalogOptions {
.stringType()
.noDefaultValue()
.withDescription("REST Catalog auth DLF security token");
-
- public static final ConfigOption<Boolean> DATA_TOKEN_ENABLED =
- ConfigOptions.key("data-token.enabled")
- .booleanType()
- .defaultValue(false)
- .withDescription("Whether to support data token provided
by the REST server.");
}
diff --git
a/paimon-core/src/main/java/org/apache/paimon/rest/RESTTokenFileIO.java
b/paimon-core/src/main/java/org/apache/paimon/rest/RESTTokenFileIO.java
index 0228e169b4..e8ff504fe2 100644
--- a/paimon-core/src/main/java/org/apache/paimon/rest/RESTTokenFileIO.java
+++ b/paimon-core/src/main/java/org/apache/paimon/rest/RESTTokenFileIO.java
@@ -26,6 +26,8 @@ import org.apache.paimon.fs.FileStatus;
import org.apache.paimon.fs.Path;
import org.apache.paimon.fs.PositionOutputStream;
import org.apache.paimon.fs.SeekableInputStream;
+import org.apache.paimon.options.ConfigOption;
+import org.apache.paimon.options.ConfigOptions;
import org.apache.paimon.options.Options;
import org.apache.paimon.rest.responses.GetTableTokenResponse;
import org.apache.paimon.utils.IOUtils;
@@ -47,6 +49,12 @@ public class RESTTokenFileIO implements FileIO {
private static final long serialVersionUID = 1L;
+ public static final ConfigOption<Boolean> DATA_TOKEN_ENABLED =
+ ConfigOptions.key("data-token.enabled")
+ .booleanType()
+ .defaultValue(false)
+ .withDescription("Whether to support data token provided
by the REST server.");
+
private static final Cache<RESTToken, FileIO> FILE_IO_CACHE =
Caffeine.newBuilder()
.expireAfterAccess(30, TimeUnit.MINUTES)
diff --git
a/paimon-core/src/test/java/org/apache/paimon/rest/MockRESTCatalogTest.java
b/paimon-core/src/test/java/org/apache/paimon/rest/MockRESTCatalogTest.java
index a58d3fcb83..eade813969 100644
--- a/paimon-core/src/test/java/org/apache/paimon/rest/MockRESTCatalogTest.java
+++ b/paimon-core/src/test/java/org/apache/paimon/rest/MockRESTCatalogTest.java
@@ -177,7 +177,7 @@ class MockRESTCatalogTest extends RESTCatalogTestBase {
@Override
protected Catalog newRestCatalogWithDataToken() {
- options.set(RESTCatalogOptions.DATA_TOKEN_ENABLED, true);
+ options.set(RESTTokenFileIO.DATA_TOKEN_ENABLED, true);
options.set(
RESTTestFileIO.DATA_PATH_CONF_KEY,
dataPath.replaceFirst("file", RESTFileIOTestLoader.SCHEME));
diff --git
a/paimon-core/src/test/java/org/apache/paimon/rest/RESTTestFileIO.java
b/paimon-core/src/test/java/org/apache/paimon/rest/RESTTestFileIO.java
index 58d331faa6..b471aecf5d 100644
--- a/paimon-core/src/test/java/org/apache/paimon/rest/RESTTestFileIO.java
+++ b/paimon-core/src/test/java/org/apache/paimon/rest/RESTTestFileIO.java
@@ -30,7 +30,7 @@ import org.apache.paimon.options.Options;
import java.io.IOException;
-import static org.apache.paimon.rest.RESTCatalogOptions.DATA_TOKEN_ENABLED;
+import static org.apache.paimon.rest.RESTTokenFileIO.DATA_TOKEN_ENABLED;
/**
* A {@link org.apache.paimon.fs.FileIO} implementation for testing.
diff --git
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/RESTCatalogITCase.java
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/RESTCatalogITCase.java
index ee5907c3dd..36efa4817c 100644
---
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/RESTCatalogITCase.java
+++
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/RESTCatalogITCase.java
@@ -26,6 +26,7 @@ import org.apache.paimon.rest.RESTCatalogServer;
import org.apache.paimon.rest.RESTFileIOTestLoader;
import org.apache.paimon.rest.RESTTestFileIO;
import org.apache.paimon.rest.RESTToken;
+import org.apache.paimon.rest.RESTTokenFileIO;
import org.apache.paimon.rest.auth.AuthProvider;
import org.apache.paimon.rest.auth.AuthProviderEnum;
import org.apache.paimon.rest.auth.BearTokenAuthProvider;
@@ -71,7 +72,7 @@ class RESTCatalogITCase extends CatalogITCaseBase {
ImmutableMap.of(
RESTCatalogInternalOptions.PREFIX.key(),
"paimon",
- RESTCatalogOptions.DATA_TOKEN_ENABLED.key(),
+ RESTTokenFileIO.DATA_TOKEN_ENABLED.key(),
"true",
CatalogOptions.WAREHOUSE.key(),
warehouse),
@@ -169,7 +170,7 @@ class RESTCatalogITCase extends CatalogITCaseBase {
options.put(RESTCatalogOptions.URI.key(), serverUrl);
options.put(RESTCatalogOptions.TOKEN.key(), initToken);
options.put(RESTCatalogOptions.TOKEN_PROVIDER.key(),
AuthProviderEnum.BEAR.identifier());
- options.put(RESTCatalogOptions.DATA_TOKEN_ENABLED.key(), "true");
+ options.put(RESTTokenFileIO.DATA_TOKEN_ENABLED.key(), "true");
options.put(
RESTTestFileIO.DATA_PATH_CONF_KEY,
dataPath.replaceFirst("file", RESTFileIOTestLoader.SCHEME));
