add const for magics and fix

Author: mh-northlander

src/main/java/com/worksap/nlp/elasticsearch/sudachi/ConfigAdapter.kt

@@ -51,30 +51,35 @@ class ConfigAdapter(anchor: PathAnchor, settings: Settings, env: Environment) {
 
   companion object {
     const val PARAM_SPLIT_MODE_DEPRECATED = "mode"
+    const val PARAM_SPLIT_MODE = "split_mode"
     const val PARAM_SETTINGS_PATH = "settings_path"
+    const val PARAM_RESOURCES_PATH = "resources_path"
     const val PARAM_ADDITIONAL_SETTINGS = "additional_settings"
     const val PARAM_DISCARD_PUNCTUATION = "discard_punctuation"
 
-    private object SplitModeFlag : EnumFlag<SplitMode>("split_mode", SplitMode.C)
+    const val DEFAULT_SETTINGS_FILENAME = "sudachi.json"
+    const val DEFAULT_RESOURCE_PATH = "sudachi"
+
+    private object SplitModeFlag : EnumFlag<SplitMode>(PARAM_SPLIT_MODE, SplitMode.C)
 
     @JvmStatic
     fun splitMode(settings: Settings): SplitMode {
       if (settings.get(PARAM_SPLIT_MODE_DEPRECATED, null) != null) {
         throw IllegalArgumentException(
-            "Setting $PARAM_SPLIT_MODE_DEPRECATED is deprecated, use SudachiSplitFilter instead",
+            "Setting $PARAM_SPLIT_MODE_DEPRECATED is deprecated, use $PARAM_SPLIT_MODE instead",
         )
       }
       return SplitModeFlag.get(settings)
     }
 
     @JvmStatic
     fun resourcesPath(env: Environment, settings: Settings): Path {
-      return env.configFile().resolve(settings.get("resources_path", "sudachi"))
+      return env.configFile().resolve(settings.get(PARAM_RESOURCES_PATH, DEFAULT_RESOURCE_PATH))
     }
 
     private fun readDefaultConfig(root: Path, baseAnchor: PathAnchor): Config {
       val anchor = PathAnchor.filesystem(root).andThen(baseAnchor)
-      val resolved = root.resolve("sudachi.json")
+      val resolved = root.resolve(DEFAULT_SETTINGS_FILENAME)
       val exists =
           try {
             resolved.exists()

src/main/java/com/worksap/nlp/elasticsearch/sudachi/index/SudachiTokenizerFactory.kt

@@ -50,9 +50,8 @@ class SudachiTokenizerFactory(
     }
   }
 
-  private val mode = ConfigAdapter.splitMode(settings)
-
   private val config = ConfigAdapter(service.anchor, settings, env)
+  private val mode = config.mode
 
   private val dictionary by lazy { service.forConfig(config.compiled) }