重构了资源加载系统

Author: jimichan

.gitignore

@@ -44,4 +44,5 @@ mynlp_work/**
 **/hash
 
 **/model/dependency
-**/model/segment
+**/model/segment
+/temp/

mynlp-core/src/main/java/com/mayabot/nlp/Environment.java

@@ -19,53 +19,67 @@
 
 import com.mayabot.nlp.logging.InternalLogger;
 import com.mayabot.nlp.logging.InternalLoggerFactory;
+import com.mayabot.nlp.resources.MynlpResource;
+import com.mayabot.nlp.resources.MynlpResourceFactory;
 import com.mayabot.nlp.utils.PathUtils;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import static com.mayabot.nlp.Settings.KEY_DATA_DIR;
-import static com.mayabot.nlp.Settings.KEY_WORK_DIR;
-import static com.mayabot.nlp.Settings.KEY_WORK_DIR_NAME;
+import static com.mayabot.nlp.Settings.*;
 
-public class Environment{
+public class Environment {
 
     private final Settings settings;
 
+
     private final String dataPath;//word dir ./data
 
     /**
      * Path to the temporary file directory used by the JDK
      */
 //    private final Path tmpFile = PathUtils.get(System.getProperty("java.io.tmpdir"));
 
-    private final ResourceLoader resourceLoader;
-
     private final File workDirPath;
 
     private InternalLogger logger = InternalLoggerFactory.getInstance(Environment.class);
 
+
+    private final MynlpResourceFactory mynlpResourceFactory;
+
     public Environment(Settings settings) {
         this.settings = settings;
 
-        dataPath = settings.get(KEY_DATA_DIR, System.getProperty(KEY_DATA_DIR,"data"));
+        dataPath = settings.get(KEY_DATA_DIR, System.getProperty(KEY_DATA_DIR, "data"));
 
-        resourceLoader = new ResourceLoader(dataPath);
-
-        String workDir = settings.get(KEY_WORK_DIR, System.getProperty(KEY_WORK_DIR,"java.io.tmpdir"));
-        String wordDirName = settings.get(KEY_WORK_DIR_NAME,
-                System.getProperty(KEY_WORK_DIR_NAME,"mynlp"));
-        String workDirPath = workDir+File.separator+wordDirName;
+        String workDir = settings.get(KEY_WORK_DIR, System.getProperty(KEY_WORK_DIR, "java.io.tmpdir"));
+        String workDirName = settings.get(KEY_WORK_DIR_NAME,
+                System.getProperty(KEY_WORK_DIR_NAME, "mynlp"));
+        String workDirPath = workDir + File.separator + workDirName;
 
         //replace java.io.tmpdir
-        workDirPath = workDirPath.replace("java.io.tmpdir",PathUtils.get(System.getProperty("java.io.tmpdir")).toAbsolutePath().toString());
+        workDirPath = workDirPath.replace("java.io.tmpdir", PathUtils.get(System.getProperty("java.io.tmpdir")).toAbsolutePath().toString());
 
         this.workDirPath = Paths.get(workDirPath).toFile();
 
         this.workDirPath.mkdirs();
 
-        logger.info("Mynlp work dir path {}",this.workDirPath.getAbsolutePath());
-        logger.info("Mynlp data dir path {}",new File(dataPath).getAbsolutePath());
+
+        mynlpResourceFactory = new MynlpResourceFactory(this.getDataPath());
+
+        logger.info("Mynlp work dir path {}", this.workDirPath.getAbsolutePath());
+        logger.info("Mynlp data dir path {}", new File(dataPath).getAbsolutePath());
+    }
+
+    public MynlpResource loadResource(String setting, String defaultPath) {
+        String url = this.getSettings().get(setting, defaultPath);
+        return this.mynlpResourceFactory.load(url);
+    }
+
+    public MynlpResource loadResource(Setting<String> setting) {
+        String url = this.getSettings().get(setting);
+        return this.mynlpResourceFactory.load(url);
     }
 
     public File getWorkDirPath() {
@@ -80,7 +94,12 @@ public Settings getSettings() {
         return settings;
     }
 
-    public ResourceLoader getResourceLoader() {
-        return resourceLoader;
+    public Path getDataPath() {
+        return Paths.get(new File(dataPath).getAbsolutePath());
     }
+
+    public MynlpResourceFactory getMynlpResourceFactory() {
+        return mynlpResourceFactory;
+    }
+
 }

mynlp-core/src/main/java/com/mayabot/nlp/MyNlps.java

@@ -26,6 +26,7 @@
 import com.google.inject.spi.TypeListener;
 import com.mayabot.nlp.logging.InternalLogger;
 import com.mayabot.nlp.logging.InternalLoggerFactory;
+import com.mayabot.nlp.resources.MynlpResourceFactory;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -54,6 +55,8 @@ private static Injector createInject() {
 
         Environment environment = new Environment(settings);
 
+
+
         ArrayList<Module> modules = Lists.newArrayList();
 
         modules.add(new AbstractModule() {
@@ -62,8 +65,7 @@ protected void configure() {
 
                 bind(Settings.class).toInstance(settings);
                 bind(Environment.class).toInstance(environment);
-                bind(ResourceLoader.class).toInstance(environment.getResourceLoader());
-
+                bind(MynlpResourceFactory.class).toInstance(environment.getMynlpResourceFactory());
 
                 //process initialize interface
                 bindListener(new AbstractMatcher<TypeLiteral<?>>() {

mynlp-core/src/main/java/com/mayabot/nlp/ResourceLoader.java

@@ -0,0 +1,55 @@
+package com.mayabot.nlp;
+
+import com.google.common.primitives.Booleans;
+import com.google.common.primitives.Ints;
+
+import java.util.function.Function;
+
+public class Setting<T> {
+
+    private String key;
+
+    private String defaultValue;
+
+    private Function<String,T> parse;
+
+    private Setting(){
+
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public Function<String, T> getParse() {
+        return parse;
+    }
+
+    public static Setting<Integer> intSetting(String key, int value) {
+        Setting<Integer> setting = new Setting<>();
+        setting.key = key;
+        setting.defaultValue = value + "";
+        setting.parse = Ints::tryParse;
+        return setting;
+    }
+
+    public static Setting<String> stringSetting(String key, String  value) {
+        Setting<String> setting = new Setting<>();
+        setting.key = key;
+        setting.defaultValue = value ;
+        setting.parse = Function.identity();
+        return setting;
+    }
+
+    public static Setting<Boolean> newBoolSetting(String key,String  value) {
+        Setting<Boolean> setting = new Setting<>();
+        setting.key = key;
+        setting.defaultValue = value+"" ;
+        setting.parse = v -> v.equalsIgnoreCase("true");
+        return setting;
+    }
+}

mynlp-core/src/main/java/com/mayabot/nlp/Setting.java

@@ -58,6 +58,12 @@ public class Settings {
     public static final String KEY_WORK_DIR = "mynlp.work.dir";
     public static final String KEY_WORK_DIR_NAME = "mynlp.work.name";
 
+
+    public <T> T get(Setting<T> setting){
+        String value = get(setting.getKey(), setting.getDefaultValue());
+        return setting.getParse().apply(value);
+    }
+
     /**
      * 从遇到的第一个文件开始。
      * 2. classpath://maya_nlp.yml
@@ -167,7 +173,11 @@ public String get(String setting, String defaultValue) {
     }
 
     public List<String> getAsList(String setting) {
-        String obj = get(setting);
+        return getAsList(setting, null);
+    }
+
+    public List<String> getAsList(String setting,String default_) {
+        String obj = get(setting,default_);
 
         if (obj == null) {
             return null;
@@ -177,6 +187,8 @@ public List<String> getAsList(String setting) {
     }
 
 
+
+
     /**
      * A settings that are filtered (and key is removed) with the specified prefix.
      */