[incubator-seatunnel] branch dev updated: [Engine][Checkpoint]Unified naming style (#3714)

[dijiekstra]

This is an automated email from the ASF dual-hosted git repository.

dijiekstra pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git


The following commit(s) were added to refs/heads/dev by this push:
     new bc0bd3bec [Engine][Checkpoint]Unified naming style (#3714)
bc0bd3bec is described below

commit bc0bd3bec3a9d8f6a07b13276578d210da95c662
Author: Kirs <k...@apache.org>
AuthorDate: Tue Dec 13 16:51:51 2022 +0800

    [Engine][Checkpoint]Unified naming style (#3714)
    
    * [Engine][Checkpoint]Unified naming style
    update storageNameSpace to namespace
    
    * Fix S3 config check error
---
 docs/en/seatunnel-engine/checkpoint-storage.md                          | 2 +-
 .../apache/seatunnel/connectors/seatunnel/file/s3/config/S3Conf.java    | 2 +-
 .../seatunnel/engine/checkpoint/storage/constants/StorageConstants.java | 2 +-
 .../engine/checkpoint/storage/hdfs/LocalFileCheckPointTest.java         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/seatunnel-engine/checkpoint-storage.md 
b/docs/en/seatunnel-engine/checkpoint-storage.md
index feca342da..de681b023 100644
--- a/docs/en/seatunnel-engine/checkpoint-storage.md
+++ b/docs/en/seatunnel-engine/checkpoint-storage.md
@@ -28,7 +28,7 @@ seatunnel:
                 type: hdfs #plugin name of checkpoint storage, we support 
hdfs(S3, local, hdfs), localfile (native local file) is the default, but this 
plugin is de
               # plugin configuration
                 plugin-config: 
-                  storageNameSpace: #checkpoint storage parent path, the 
default value is /seatunnel/checkpoint
+                  namespace: #checkpoint storage parent path, the default 
value is /seatunnel/checkpoint
                   K1: V1 # plugin other configuration
                   K2: V2 # plugin other configuration   
 ```
diff --git 
a/seatunnel-connectors-v2/connector-file/connector-file-s3/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/s3/config/S3Conf.java
 
b/seatunnel-connectors-v2/connector-file/connector-file-s3/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/s3/config/S3Conf.java
index e4602d899..5e6698022 100644
--- 
a/seatunnel-connectors-v2/connector-file/connector-file-s3/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/s3/config/S3Conf.java
+++ 
b/seatunnel-connectors-v2/connector-file/connector-file-s3/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/s3/config/S3Conf.java
@@ -72,7 +72,7 @@ public class S3Conf extends HadoopConf {
     }
 
     private static void putS3SK(Map<String, String> s3Options, Config config) {
-        if (!CheckConfigUtil.isValidParam(config, 
S3Config.S3_ACCESS_KEY.key()) && CheckConfigUtil.isValidParam(config, 
S3Config.S3_SECRET_KEY.key())) {
+        if (!CheckConfigUtil.isValidParam(config, 
S3Config.S3_ACCESS_KEY.key()) && !CheckConfigUtil.isValidParam(config, 
S3Config.S3_SECRET_KEY.key())) {
             return;
         }
         String accessKey = config.getString(S3Config.S3_ACCESS_KEY.key());
diff --git 
a/seatunnel-engine/seatunnel-engine-storage/checkpoint-storage-api/src/main/java/org/apache/seatunnel/engine/checkpoint/storage/constants/StorageConstants.java
 
b/seatunnel-engine/seatunnel-engine-storage/checkpoint-storage-api/src/main/java/org/apache/seatunnel/engine/checkpoint/storage/constants/StorageConstants.java
index 7ce1957e5..1de7b69e8 100644
--- 
a/seatunnel-engine/seatunnel-engine-storage/checkpoint-storage-api/src/main/java/org/apache/seatunnel/engine/checkpoint/storage/constants/StorageConstants.java
+++ 
b/seatunnel-engine/seatunnel-engine-storage/checkpoint-storage-api/src/main/java/org/apache/seatunnel/engine/checkpoint/storage/constants/StorageConstants.java
@@ -25,5 +25,5 @@ public class StorageConstants {
     /**
      * The name of the configuration property that specifies the name of the 
file system.
      */
-    public static final String STORAGE_NAME_SPACE = "storageNameSpace";
+    public static final String STORAGE_NAME_SPACE = "namespace";
 }
diff --git 
a/seatunnel-engine/seatunnel-engine-storage/checkpoint-storage-plugins/checkpoint-storage-hdfs/src/test/java/org/apache/seatunnel/engine/checkpoint/storage/hdfs/LocalFileCheckPointTest.java
 
b/seatunnel-engine/seatunnel-engine-storage/checkpoint-storage-plugins/checkpoint-storage-hdfs/src/test/java/org/apache/seatunnel/engine/checkpoint/storage/hdfs/LocalFileCheckPointTest.java
index 14c6a7aea..fdfefc93f 100644
--- 
a/seatunnel-engine/seatunnel-engine-storage/checkpoint-storage-plugins/checkpoint-storage-hdfs/src/test/java/org/apache/seatunnel/engine/checkpoint/storage/hdfs/LocalFileCheckPointTest.java
+++ 
b/seatunnel-engine/seatunnel-engine-storage/checkpoint-storage-plugins/checkpoint-storage-hdfs/src/test/java/org/apache/seatunnel/engine/checkpoint/storage/hdfs/LocalFileCheckPointTest.java
@@ -34,7 +34,7 @@ public class LocalFileCheckPointTest extends 
AbstractFileCheckPointTest {
     @BeforeAll
     public static void setup() throws CheckpointStorageException {
         HashMap config = new HashMap();
-        config.put("storageNameSpace", "/tmp/");
+        config.put("namespace", "/tmp/");
         STORAGE = new HdfsStorage(config);
         initStorageData();
     }