Merge pull request 'v0.0.2' (#1) from dev into master

Reviewed-on: #1

pom.xml

@@ -6,11 +6,10 @@
 
 	<groupId>com.imyeyu.lang</groupId>
 	<artifactId>timi-lang</artifactId>
-	<version>0.1.0</version>
+	<version>0.0.2</version>
 	<packaging>jar</packaging>
 
 	<properties>
-		<java.version>21</java.version>
 		<maven.test.skip>true</maven.test.skip>
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
@@ -29,42 +28,10 @@
 				<artifactId>maven-source-plugin</artifactId>
 				<version>3.3.1</version>
 			</plugin>
-			<plugin>
-				<groupId>org.projectlombok</groupId>
-				<artifactId>lombok-maven-plugin</artifactId>
-				<version>1.18.20.0</version>
-				<configuration>
-					<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
-					<outputDirectory>${project.build.directory}/delombok</outputDirectory>
-					<addOutputDirectory>false</addOutputDirectory>
-					<encoding>UTF-8</encoding>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>delombok</goal>
-						</goals>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.projectlombok</groupId>
-						<artifactId>lombok</artifactId>
-						<version>1.18.36</version>
-					</dependency>
-				</dependencies>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>3.11.2</version>
-				<configuration>
-					<sourcepath>${project.build.directory}/delombok</sourcepath>
-					<encoding>UTF-8</encoding>
-					<charset>UTF-8</charset>
-					<docencoding>UTF-8</docencoding>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>
@@ -93,7 +60,7 @@
 		<dependency>
 			<groupId>com.imyeyu.io</groupId>
 			<artifactId>timi-io</artifactId>
-			<version>0.1.1</version>
+			<version>0.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>

src/main/java/com/imyeyu/lang/bean/Language.java

@@ -1,74 +0,0 @@
-package com.imyeyu.lang.bean;
-
-import com.imyeyu.java.ref.Ref;
-import lombok.Data;
-
-/**
- * 多语言
- *
- * @author 夜雨
- * @since 2022-02-23 11:25
- */
-@Data
-public class Language {
-
-	/**
-	 * 支持语言枚举
-	 *
-	 * @author 夜雨
-	 * @since 2025-12-05 14:31
-	 */
-	public enum Enum {
-
-		/** 英语 */
-		en_US,
-
-		/** 简中 */
-		zh_CN,
-
-		/** 繁中 */
-		zh_TW,
-
-		/** 日语 */
-		ja_JP,
-
-		/** 韩语 */
-		ko_KR,
-
-		/** 俄语 */
-		ru_RU,
-
-		/** 德语 */
-		de_DE;
-	}
-
-	protected String key;
-
-	protected String zhCN;
-
-	protected String zhTW;
-
-	protected String enUS;
-
-	protected String ruRU;
-
-	protected String koKR;
-
-	protected String jaJP;
-
-	protected String deDE;
-
-	/**
-	 * 获取指定语言值
-	 *
-	 * @param language 指定语言
-	 * @return 值
-	 */
-	public String getValue(Enum language) {
-		try {
-			return Ref.getFieldValue(this, language.toString().replace("_", ""), String.class);
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException(e);
-		}
-	}
-}

src/main/java/com/imyeyu/lang/bean/LanguageMapping.java

@@ -1,54 +0,0 @@
-package com.imyeyu.lang.bean;
-
-import java.util.Map;
-
-/**
- * 多语言映射接口
- *
- * @author 夜雨
- * @since 2024-04-03 11:27
- */
-public interface LanguageMapping {
-
-	/**
-	 * 添加映射
-	 *
-	 * @param key   键
-	 * @param value 值
-	 */
-	void add(String key, String value);
-
-	/**
-	 * 是否存在映射
-	 *
-	 * @param key 键
-	 * @return true 为存在
-	 */
-	boolean has(String key);
-
-	/**
-	 * 获取映射值
-	 *
-	 * @param key 键
-	 * @return 值
-	 */
-	String message(String key);
-
-	/**
-	 * 获取映射值，不存在时使用默认值
-	 *
-	 * @param key 键
-	 * @param def 默认值
-	 * @return 值
-	 */
-	String message(String key, String def);
-
-	/**
-	 * 获取映射值并插入参数
-	 *
-	 * @param key     键
-	 * @param argsMap 参数列表
-	 * @return 值
-	 */
-	String message(String key, Map<String, Object> argsMap);
-}

src/main/java/com/imyeyu/lang/bean/Multilingual.java

@@ -1,21 +0,0 @@
-package com.imyeyu.lang.bean;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 多语言数据契约
- *
- * @author 夜雨
- * @since 2026-09-18 13:35
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class Multilingual extends Language implements MultilingualValue {
-
-	/** 唯一标识 */
-	private String id;
-
-	/** 业务类型 */
-	private String bizType;
-}

src/main/java/com/imyeyu/lang/bean/MultilingualValue.java

@@ -1,25 +0,0 @@
-package com.imyeyu.lang.bean;
-
-/**
- * 多语言值对象
- *
- * @author 夜雨
- * @since 2026-09-18 13:35
- */
-public interface MultilingualValue {
-
-	/**
-	 * 获取唯一标识
-	 *
-	 * @return 唯一标识
-	 */
-	String getId();
-
-	/**
-	 * 获取指定语言值
-	 *
-	 * @param language 指定语言
-	 * @return 语言值
-	 */
-	String getValue(Language.Enum language);
-}

src/main/java/com/imyeyu/lang/mapper/AbstractLanguageMapper.java

@@ -1,10 +1,8 @@
 package com.imyeyu.lang.mapper;
 
-import com.imyeyu.lang.bean.Language;
+import com.imyeyu.java.bean.Language;
-import com.imyeyu.lang.bean.LanguageMapping;
+import com.imyeyu.java.bean.LanguageMapping;
 import com.imyeyu.utils.StringInterpolator;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.util.Map;
 
@@ -20,11 +18,9 @@ public abstract class AbstractLanguageMapper implements LanguageMapping {
 	protected final StringInterpolator INTERPOLATOR = StringInterpolator.createDollarInterpolator();
 
 	/** 当前映射器所属语言 */
-	@Getter
 	protected final Language.Enum language;
 
-	/** true 为启用调试模式 */
+	/** 是否启用调试模式，启用后将抛出异常而不是返回默认值 */
-	@Setter
 	protected boolean isDebugging = false;
 
 	/**
@@ -36,6 +32,24 @@ public abstract class AbstractLanguageMapper implements LanguageMapping {
 		this.language = language;
 	}
 
+	/**
+	 * 获取当前映射器所属语言
+	 *
+	 * @return 语言枚举
+	 */
+	public Language.Enum getLanguage() {
+		return language;
+	}
+
+	/**
+	 * 设置调试模式，调试模式下，找不到映射时将抛出异常而不是返回默认值
+	 *
+	 * @param debugging true 为启用调试模式
+	 */
+	public void setDebugging(boolean debugging) {
+		isDebugging = debugging;
+	}
+
 	/**
 	 * 获取文本
 	 *
@@ -44,8 +58,8 @@ public abstract class AbstractLanguageMapper implements LanguageMapping {
 	 * @return 获取结果
 	 */
 	@Override
-	public String message(String key, String def) {
+	public String text(String key, String def) {
-		String result = message(key);
+		String result = text(key);
 		return result.equals(key) ? def : result;
 	}
 
@@ -57,7 +71,7 @@ public abstract class AbstractLanguageMapper implements LanguageMapping {
 	 * @return 替换占位符后的文本
 	 */
 	@Override
-	public String message(String key, Map<String, Object> args) {
+	public String textArgs(String key, Map<String, Object> args) {
-		return INTERPOLATOR.inject(message(key), args);
+		return INTERPOLATOR.inject(text(key), args);
 	}
 }

src/main/java/com/imyeyu/lang/mapper/FileLanguageMap.java

@@ -1,7 +1,7 @@
 package com.imyeyu.lang.mapper;
 
 import com.imyeyu.io.IO;
-import com.imyeyu.lang.bean.Language;
+import com.imyeyu.java.bean.Language;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;

src/main/java/com/imyeyu/lang/mapper/LanguageMap.java

@@ -1,7 +1,8 @@
 package com.imyeyu.lang.mapper;
 
 import com.imyeyu.java.TimiJava;
-import com.imyeyu.lang.bean.Language;
+import com.imyeyu.java.bean.CallbackArgReturn;
+import com.imyeyu.java.bean.Language;
 import com.imyeyu.utils.Text;
 
 import java.util.HashMap;
@@ -26,7 +27,7 @@ public class LanguageMap extends AbstractLanguageMapper {
 	{
 		INTERPOLATOR.putFilter("lang", value -> {
 			if (value.startsWith("@")) {
-				value = message(value.substring(1));
+				value = text(value.substring(1));
 			}
 			return value;
 		});
@@ -83,20 +84,20 @@ public class LanguageMap extends AbstractLanguageMapper {
 	 *     mapping=@test.msg
 	 *     no_mapping=\@test.msg
 	 *
-	 *     MultilingualResolver.text("mapping");    // Hello world
+	 *     Multilingual.text("mapping");    // Hello world
-	 *     MultilingualResolver.text("no_mapping"); // @test.msg
+	 *     Multilingual.text("no_mapping"); // @test.msg
 	 * </pre>
 	 *
 	 * @param key 键
 	 * @return 文本值
 	 */
 	@Override
-	public String message(String key) {
+	public String text(String key) {
 		if (map.containsKey(key)) {
 			String result = map.get(key);
 			if (result.startsWith("@")) {
 				// 递归映射
-				return message(result.substring(1));
+				return text(result.substring(1));
 			} else {
 				if (result.startsWith("\\@")) {
 					return result.substring(1);
@@ -134,8 +135,8 @@ public class LanguageMap extends AbstractLanguageMapper {
 	 * @return 获取结果
 	 */
 	@Override
-	public String message(String key, String def) {
+	public String text(String key, String def) {
-		String result = message(key);
+		String result = text(key);
 		return key.equals(result) ? def : result;
 	}
 
@@ -147,7 +148,7 @@ public class LanguageMap extends AbstractLanguageMapper {
 	 * @return 结果
 	 */
 	@Override
-	public String message(String key, Map<String, Object> argsMap) {
+	public String textArgs(String key, Map<String, Object> argsMap) {
-		return INTERPOLATOR.inject(message(key), argsMap);
+		return INTERPOLATOR.inject(text(key), argsMap);
 	}
 }

src/main/java/com/imyeyu/lang/mapper/PropertiesLanguageMap.java

@@ -1,6 +1,6 @@
 package com.imyeyu.lang.mapper;
 
-import com.imyeyu.lang.bean.Language;
+import com.imyeyu.java.bean.Language;
 
 import java.util.HashMap;
 import java.util.Properties;

src/main/java/com/imyeyu/lang/mapper/ResourcesLanguageMap.java

@@ -1,7 +1,7 @@
 package com.imyeyu.lang.mapper;
 
 import com.imyeyu.io.IO;
-import com.imyeyu.lang.bean.Language;
+import com.imyeyu.java.bean.Language;
 
 import java.io.FileNotFoundException;
 import java.io.InputStream;

src/main/java/com/imyeyu/lang/multi/FileMultilingual.java

@@ -1,6 +1,6 @@
-package com.imyeyu.lang;
+package com.imyeyu.lang.multi;
 
-import com.imyeyu.lang.bean.Language;
+import com.imyeyu.java.bean.Language;
 import com.imyeyu.lang.mapper.AbstractLanguageMapper;
 import com.imyeyu.lang.mapper.FileLanguageMap;
 import com.imyeyu.lang.mapper.LanguageMap;
@@ -11,9 +11,9 @@ import com.imyeyu.lang.mapper.LanguageMap;
  * @author 夜雨
  * @version 2024-04-09 01:06
  */
-public class FileMultilingualResolver extends MultilingualResolver {
+public class FileMultilingual extends Multilingual {
 
-	public FileMultilingualResolver() {
+	public FileMultilingual() {
 	}
 
 	/**
@@ -21,7 +21,7 @@ public class FileMultilingualResolver extends MultilingualResolver {
 	 *
 	 * @param path 文件路径模板，使用 %s 作为语言代码占位符，例如：lang/app_%s.lang
 	 */
-	public FileMultilingualResolver(String path) {
+	public FileMultilingual(String path) {
 		addAll(path);
 	}
 
@@ -36,16 +36,16 @@ public class FileMultilingualResolver extends MultilingualResolver {
 	 */
 	public void addAll(String path) {
 		Language.Enum[] values = Language.Enum.values();
-		for (Language.Enum value : values) {
+		for (int i = 0; i < values.length; i++) {
-			FileLanguageMap mapper = new FileLanguageMap(value);
+			FileLanguageMap mapper = new FileLanguageMap(values[i]);
 			mapper.load(path);
-			if (multilingualMap.containsKey(value)) {
+			if (multilingualMap.containsKey(values[i])) {
-				AbstractLanguageMapper existMapper = multilingualMap.get(value);
+				AbstractLanguageMapper existMapper = multilingualMap.get(values[i]);
 				if (existMapper instanceof LanguageMap map) {
 					map.union(mapper);
 				}
 			} else {
-				add(value, mapper);
+				add(values[i], mapper);
 			}
 		}
 	}

src/main/java/com/imyeyu/lang/multi/Multilingual.java

@@ -1,11 +1,10 @@
-package com.imyeyu.lang;
+package com.imyeyu.lang.multi;
 
 import com.imyeyu.java.bean.CallbackArg;
+import com.imyeyu.java.bean.Language;
+import com.imyeyu.java.bean.LanguageMapping;
 import com.imyeyu.java.ref.Ref;
-import com.imyeyu.lang.bean.Language;
-import com.imyeyu.lang.bean.LanguageMapping;
 import com.imyeyu.lang.mapper.AbstractLanguageMapper;
-import lombok.Getter;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,7 +20,7 @@ import java.util.Objects;
  *     say.msg=hello {0}
  *
  *     // 加载
- *     MultilingualResolver lang = MultilingualResolver.getInstance();
+ *     Multilingual lang = Multilingual.getInstance();
  *     lang.load(Language.zh_CN, "lang/timijava/%s.lang");
  *
  *     // 加载所有支持的映射文件
@@ -31,17 +30,17 @@ import java.util.Objects;
  *     lang.setActivated("zh_CN");
  *
  *     // 引用当前激活语言
- *     MultilingualResolver.text("say.msg");
+ *     Multilingual.text("say.msg");
- *     MultilingualResolver.text("say.msg", "timi-java");
+ *     Multilingual.text("say.msg", "timi-java");
  *
  *     // 动态引用
- *     MultilingualResolver.map("en_US").text("say.msg");
+ *     Multilingual.map("en_US").text("say.msg");
  * </pre>
  *
  * @author 夜雨
  * @version 2021-10-25 15:16
  */
-public class MultilingualResolver implements LanguageMapping {
+public class Multilingual implements LanguageMapping {
 
 	/** 多语言映射表，存储各语言对应的映射器 */
 	protected final Map<Language.Enum, AbstractLanguageMapper> multilingualMap;
@@ -50,7 +49,6 @@ public class MultilingualResolver implements LanguageMapping {
 	protected final List<CallbackArg<Language.Enum>> updateActiveListeners;
 
 	/** 当前激活语言 */
-	@Getter
 	protected Language.Enum activated;
 
 	/** 是否启用调试模式 */
@@ -62,7 +60,7 @@ public class MultilingualResolver implements LanguageMapping {
 	 * 根据系统默认 Locale 初始化激活语言，如果无法识别则默认为中文
 	 * </p>
 	 */
-	public MultilingualResolver() {
+	public Multilingual() {
 		multilingualMap = new HashMap<>();
 		updateActiveListeners = new ArrayList<>();
 
@@ -123,11 +121,20 @@ public class MultilingualResolver implements LanguageMapping {
 		String[] localSp = activated.toString().split("_");
 		Locale.setDefault(new Locale(localSp[0], localSp[1]));
 
-		for (CallbackArg<Language.Enum> updateActiveListener : updateActiveListeners) {
+		for (int i = 0; i < updateActiveListeners.size(); i++) {
-			updateActiveListener.handler(activated);
+			updateActiveListeners.get(i).handler(activated);
 		}
 	}
 
+	/**
+	 * 获取当前激活的语言
+	 *
+	 * @return 当前激活语言
+	 */
+	public Language.Enum getActivated() {
+		return activated;
+	}
+
 	/**
 	 * 设置调试模式
 	 * <p>
@@ -199,19 +206,19 @@ public class MultilingualResolver implements LanguageMapping {
 	 *     mapping=@test.msg
 	 *     no_mapping=\@test.msg
 	 *
-	 *     MultilingualResolver.text("mapping");    // Hello world
+	 *     Multilingual.text("mapping");    // Hello world
-	 *     MultilingualResolver.text("no_mapping"); // @test.msg
+	 *     Multilingual.text("no_mapping"); // @test.msg
 	 * </pre>
 	 *
 	 * @param key 键
 	 * @return 文本值
 	 */
 	@Override
-	public String message(String key) {
+	public String text(String key) {
 		if (multilingualMap.get(getActivated()) == null) {
 			return key;
 		}
-		return multilingualMap.get(getActivated()).message(key);
+		return multilingualMap.get(getActivated()).text(key);
 	}
 
 	/**
@@ -222,11 +229,11 @@ public class MultilingualResolver implements LanguageMapping {
 	 * @return 获取结果
 	 */
 	@Override
-	public String message(String key, String def) {
+	public String text(String key, String def) {
 		if (multilingualMap.get(getActivated()) == null) {
 			return Objects.requireNonNullElse(def, key);
 		}
-		return multilingualMap.get(getActivated()).message(key, def);
+		return multilingualMap.get(getActivated()).text(key, def);
 	}
 
 	/**
@@ -237,10 +244,10 @@ public class MultilingualResolver implements LanguageMapping {
 	 * @return 结果
 	 */
 	@Override
-	public String message(String key, Map<String, Object> argsMap) {
+	public String textArgs(String key, Map<String, Object> argsMap) {
 		if (multilingualMap.get(getActivated()) == null) {
 			return key;
 		}
-		return multilingualMap.get(getActivated()).message(key, argsMap);
+		return multilingualMap.get(getActivated()).textArgs(key, argsMap);
 	}
 }

src/main/java/com/imyeyu/lang/multi/ResourcesMultilingual.java

@@ -1,6 +1,6 @@
-package com.imyeyu.lang;
+package com.imyeyu.lang.multi;
 
-import com.imyeyu.lang.bean.Language;
+import com.imyeyu.java.bean.Language;
 import com.imyeyu.lang.mapper.AbstractLanguageMapper;
 import com.imyeyu.lang.mapper.LanguageMap;
 import com.imyeyu.lang.mapper.ResourcesLanguageMap;
@@ -14,9 +14,9 @@ import com.imyeyu.lang.mapper.ResourcesLanguageMap;
  * @author 夜雨
  * @version 2024-04-09 01:03
  */
-public class ResourcesMultilingualResolver extends MultilingualResolver {
+public class ResourcesMultilingual extends Multilingual {
 
-	public ResourcesMultilingualResolver() {
+	public ResourcesMultilingual() {
 	}
 
 	/**
@@ -24,7 +24,7 @@ public class ResourcesMultilingualResolver extends MultilingualResolver {
 	 *
 	 * @param path 资源文件路径模板，使用 %s 作为语言代码占位符，例如：lang/app_%s.lang
 	 */
-	public ResourcesMultilingualResolver(String path) {
+	public ResourcesMultilingual(String path) {
 		addAll(path);
 	}
 
@@ -39,16 +39,16 @@ public class ResourcesMultilingualResolver extends MultilingualResolver {
 	 */
 	public void addAll(String path) {
 		Language.Enum[] values = Language.Enum.values();
-		for (Language.Enum value : values) {
+		for (int i = 0; i < values.length; i++) {
-			ResourcesLanguageMap mapper = new ResourcesLanguageMap(value);
+			ResourcesLanguageMap mapper = new ResourcesLanguageMap(values[i]);
 			mapper.load(path);
-			if (multilingualMap.containsKey(value)) {
+			if (multilingualMap.containsKey(values[i])) {
-				AbstractLanguageMapper existMapper = multilingualMap.get(value);
+				AbstractLanguageMapper existMapper = multilingualMap.get(values[i]);
 				if (existMapper instanceof LanguageMap map) {
 					map.union(mapper);
 				}
 			} else {
-				add(value, mapper);
+				add(values[i], mapper);
 			}
 		}
 	}

src/test/java/test/TestLang.java

@@ -1,6 +1,6 @@
 package test;
 
-import com.imyeyu.lang.bean.Language;
+import com.imyeyu.java.bean.Language;
 import com.imyeyu.lang.mapper.ResourcesLanguageMap;
 import org.junit.jupiter.api.Test;
 
@@ -16,6 +16,6 @@ public class TestLang {
 	public void testArgs() {
 		ResourcesLanguageMap map = new ResourcesLanguageMap(Language.Enum.zh_CN);
 		map.load("zh_CN.lang");
-		System.out.println(map.message("test", Map.of("msg", "hello world")));
+		System.out.println(map.textArgs("test", Map.of("msg", "hello world")));
 	}
 }