fix

Author: JingsongLi

paimon-api/src/main/java/org/apache/paimon/rest/HttpClient.java

@@ -47,6 +47,7 @@
 import static okhttp3.ConnectionSpec.MODERN_TLS;
 import static org.apache.paimon.rest.LoggingInterceptor.DEFAULT_REQUEST_ID;
 import static org.apache.paimon.rest.LoggingInterceptor.REQUEST_ID_KEY;
+import static org.apache.paimon.rest.RESTObjectMapper.OBJECT_MAPPER;
 
 /** HTTP client for REST catalog. */
 public class HttpClient implements RESTClient {
@@ -124,7 +125,7 @@ public <T extends RESTResponse> T post(
             Class<T> responseType,
             RESTAuthFunction restAuthFunction) {
         try {
-            String bodyStr = RESTObjectMapper.OBJECT_MAPPER.writeValueAsString(body);
+            String bodyStr = OBJECT_MAPPER.writeValueAsString(body);
             Map<String, String> authHeaders = getHeaders(path, "POST", bodyStr, restAuthFunction);
             RequestBody requestBody = buildRequestBody(bodyStr);
             Request request =
@@ -155,7 +156,7 @@ public <T extends RESTResponse> T delete(String path, RESTAuthFunction restAuthF
     public <T extends RESTResponse> T delete(
             String path, RESTRequest body, RESTAuthFunction restAuthFunction) {
         try {
-            String bodyStr = RESTObjectMapper.OBJECT_MAPPER.writeValueAsString(body);
+            String bodyStr = OBJECT_MAPPER.writeValueAsString(body);
             Map<String, String> authHeaders = getHeaders(path, "DELETE", bodyStr, restAuthFunction);
             RequestBody requestBody = buildRequestBody(bodyStr);
             Request request =
@@ -189,9 +190,7 @@ private <T extends RESTResponse> T exec(Request request, Class<T> responseType)
             if (!response.isSuccessful()) {
                 ErrorResponse error;
                 try {
-                    error =
-                            RESTObjectMapper.OBJECT_MAPPER.readValue(
-                                    responseBodyStr, ErrorResponse.class);
+                    error = OBJECT_MAPPER.readValue(responseBodyStr, ErrorResponse.class);
                 } catch (JsonProcessingException e) {
                     error =
                             new ErrorResponse(
@@ -206,7 +205,7 @@ private <T extends RESTResponse> T exec(Request request, Class<T> responseType)
                 errorHandler.accept(error, requestId);
             }
             if (responseType != null && responseBodyStr != null) {
-                return RESTObjectMapper.OBJECT_MAPPER.readValue(responseBodyStr, responseType);
+                return OBJECT_MAPPER.readValue(responseBodyStr, responseType);
             } else if (responseType == null) {
                 return null;
             } else {

paimon-api/src/main/java/org/apache/paimon/rest/auth/DLFAuthProviderFactory.java

@@ -24,6 +24,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static org.apache.paimon.rest.RESTCatalogOptions.URI;
+
 /** Factory for {@link DLFAuthProvider}. */
 public class DLFAuthProviderFactory implements AuthProviderFactory {
 
@@ -36,7 +38,7 @@ public String identifier() {
     public AuthProvider create(Options options) {
         String region =
                 options.getOptional(RESTCatalogOptions.DLF_REGION)
-                        .orElseGet(() -> parseRegionFromUri(options.get(RESTCatalogOptions.URI)));
+                        .orElseGet(() -> parseRegionFromUri(options.get(URI)));
         if (options.getOptional(RESTCatalogOptions.DLF_TOKEN_LOADER).isPresent()) {
             DLFTokenLoader dlfTokenLoader =
                     DLFTokenLoaderFactory.createDLFTokenLoader(

paimon-api/src/main/java/org/apache/paimon/utils/ThreadPoolUtils.java

@@ -44,6 +44,8 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import static org.apache.paimon.utils.ThreadUtils.newDaemonThreadFactory;
+
 /** Utils for thread pool. */
 public class ThreadPoolUtils {
 
@@ -71,15 +73,14 @@ public static ThreadPoolExecutor createCachedThreadPool(
                         1,
                         TimeUnit.MINUTES,
                         workQueue,
-                        ThreadUtils.newDaemonThreadFactory(namePrefix));
+                        newDaemonThreadFactory(namePrefix));
         executor.allowCoreThreadTimeOut(true);
         return executor;
     }
 
     public static ScheduledExecutorService createScheduledThreadPool(
             int threadNum, String namePrefix) {
-        return new ScheduledThreadPoolExecutor(
-                threadNum, ThreadUtils.newDaemonThreadFactory(namePrefix));
+        return new ScheduledThreadPoolExecutor(threadNum, newDaemonThreadFactory(namePrefix));
     }
 
     /** This method aims to parallel process tasks with memory control and sequentially. */

paimon-core/pom.xml

@@ -63,22 +63,8 @@ under the License.
             <scope>provided</scope>
         </dependency>
 
-        <!-- test dependencies -->
 
-        <dependency>
-            <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-api</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>mockwebserver</artifactId>
-            <version>${okhttp.version}</version>
-            <scope>test</scope>
-        </dependency>
+        <!-- test dependencies -->
 
         <dependency>
             <groupId>org.apache.paimon</groupId>
@@ -225,6 +211,12 @@ under the License.
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <version>${okhttp.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>