[improve][core]修改全局知识库配置组织格式，

4 files changed, 21 insertions, 14 deletions

diff --git a/groot-common/src/main/java/com/geedgenetworks/common/config/CommonConfigDomProcessor.java b/groot-common/src/main/java/com/geedgenetworks/common/config/CommonConfigDomProcessor.java
index 6dc9469..740249f 100644
--- a/groot-common/src/main/java/com/geedgenetworks/common/config/CommonConfigDomProcessor.java
+++ b/groot-common/src/main/java/com/geedgenetworks/common/config/CommonConfigDomProcessor.java
@@ -64,8 +64,10 @@ public class CommonConfigDomProcessor extends AbstractDomConfigProcessor {
 
             if (CommonConfigOptions.KNOWLEDGE_BASE_NAME.key().equals(name)) {
                 knowledgeBaseConfig.setName(getTextContent(node));
-            } else if (CommonConfigOptions.KNOWLEDGE_BASE_TYPE.key().equals(name)) {
-                knowledgeBaseConfig.setType(getTextContent(node));
+            } else if (CommonConfigOptions.KNOWLEDGE_BASE_FS_TYPE.key().equals(name)) {
+                knowledgeBaseConfig.setFsType(getTextContent(node));
+            } else if (CommonConfigOptions.KNOWLEDGE_BASE_FS_PATH.key().equals(name)) {
+                knowledgeBaseConfig.setFsPath(getTextContent(node));
             } else if (CommonConfigOptions.KNOWLEDGE_BASE_FILES.key().equals(name)) {
                 knowledgeBaseConfig.setFiles(parseKnowledgeBaseFilesConfig(node));
             } else if (CommonConfigOptions.KNOWLEDGE_BASE_PROPERTIES.key().equals(name)) {
diff --git a/groot-common/src/main/java/com/geedgenetworks/common/config/CommonConfigOptions.java b/groot-common/src/main/java/com/geedgenetworks/common/config/CommonConfigOptions.java
index 9105afe..6a3def2 100644
--- a/groot-common/src/main/java/com/geedgenetworks/common/config/CommonConfigOptions.java
+++ b/groot-common/src/main/java/com/geedgenetworks/common/config/CommonConfigOptions.java
@@ -19,12 +19,16 @@ public class CommonConfigOptions {
                     .stringType()
                     .defaultValue("")
                     .withDescription("The name of knowledgebase.");
-    public static final Option<String> KNOWLEDGE_BASE_TYPE =
-            Options.key("type")
+    public static final Option<String> KNOWLEDGE_BASE_FS_TYPE =
+            Options.key("fs_type")
                     .stringType()
                     .defaultValue("")
-                    .withDescription("The type of knowledgebase.");
-
+                    .withDescription("The filesystem type of knowledgebase.");
+    public static final Option<String> KNOWLEDGE_BASE_FS_PATH =
+            Options.key("fs_path")
+                    .stringType()
+                    .defaultValue("")
+                    .withDescription("The filesystem path of knowledgebase.");
     public static final Option<List<String>> KNOWLEDGE_BASE_FILES =
             Options.key("files")
                     .listType()
diff --git a/groot-common/src/main/java/com/geedgenetworks/common/config/KnowledgeBaseConfig.java b/groot-common/src/main/java/com/geedgenetworks/common/config/KnowledgeBaseConfig.java
index c02df61..b8e0160 100644
--- a/groot-common/src/main/java/com/geedgenetworks/common/config/KnowledgeBaseConfig.java
+++ b/groot-common/src/main/java/com/geedgenetworks/common/config/KnowledgeBaseConfig.java
@@ -13,19 +13,20 @@ import static com.google.common.base.Preconditions.checkArgument;
 @Data
 public class KnowledgeBaseConfig implements Serializable {
     private String name = CommonConfigOptions.KNOWLEDGE_BASE_NAME.defaultValue();
-    private String type = CommonConfigOptions.KNOWLEDGE_BASE_TYPE.defaultValue();
+    private String fsType = CommonConfigOptions.KNOWLEDGE_BASE_FS_TYPE.defaultValue();
+    private String fsPath = CommonConfigOptions.KNOWLEDGE_BASE_FS_PATH.defaultValue();
     private Map<String, String> properties = CommonConfigOptions.KNOWLEDGE_BASE_PROPERTIES.defaultValue();
     private List<String> files = CommonConfigOptions.KNOWLEDGE_BASE_FILES.defaultValue();
 
-    public void setType(String type) {
-        checkArgument(StringUtil.isNotBlank(type) && Arrays.asList("asnlookup", "geoiplookup").contains(type.toLowerCase())
-                , CommonConfigOptions.KNOWLEDGE_BASE_TYPE + "Type should be asnlookup or geoiplookup");
-        this.type = type;
+    public void setFsType(String fsType) {
+        this.fsType = fsType;
+    }
+
+    public void setFsPath(String fsPath) {
+        this.fsPath = fsPath;
     }
 
     public void setFiles(List<String> files) {
-        checkArgument(files != null && files.size() > 0,
-                CommonConfigOptions.KNOWLEDGE_BASE_FILES + "files should not be null");
         this.files = files;
     }
 
diff --git a/groot-common/src/test/java/com/geedgenetworks/common/config/YamlGrootStreamConfigParserTest.java b/groot-common/src/test/java/com/geedgenetworks/common/config/YamlGrootStreamConfigParserTest.java
index 9a122ed..80c3690 100644
--- a/groot-common/src/test/java/com/geedgenetworks/common/config/YamlGrootStreamConfigParserTest.java
+++ b/groot-common/src/test/java/com/geedgenetworks/common/config/YamlGrootStreamConfigParserTest.java
@@ -20,7 +20,7 @@ public class YamlGrootStreamConfigParserTest {
         Assertions.assertNotNull(config);
         Assertions.assertNotNull(config.getCommonConfig().getKnowledgeBaseConfig());
         Assertions.assertTrue(config.getCommonConfig().getKnowledgeBaseConfig().size() > 0);
-        Assertions.assertTrue(Arrays.asList("asnlookup", "geoiplookup").contains(config.getCommonConfig().getKnowledgeBaseConfig().get(0).getType()));
+        Assertions.assertTrue(Arrays.asList("http", "hdfs","local").contains(config.getCommonConfig().getKnowledgeBaseConfig().get(0).getFsType()));
         Assertions.assertTrue(config.getUDFPluginConfig().size() > 0);
 
     }