Merge pull request 'v0.0.4' (#3) from dev into master

Reviewed-on: #3

pom.xml

@@ -6,10 +6,11 @@
 
 	<groupId>com.imyeyu.lang</groupId>
 	<artifactId>timi-lang</artifactId>
-	<version>0.0.2</version>
+	<version>0.0.4</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>
@@ -28,10 +29,42 @@
 				<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>
@@ -60,7 +93,7 @@
 		<dependency>
 			<groupId>com.imyeyu.io</groupId>
 			<artifactId>timi-io</artifactId>
-			<version>0.0.2</version>
+			<version>0.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>

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

@@ -3,6 +3,8 @@ package com.imyeyu.lang.mapper;
 import com.imyeyu.java.bean.Language;
 import com.imyeyu.java.bean.LanguageMapping;
 import com.imyeyu.utils.StringInterpolator;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Map;
 
@@ -18,9 +20,11 @@ public abstract class AbstractLanguageMapper implements LanguageMapping {
 	protected final StringInterpolator INTERPOLATOR = StringInterpolator.createDollarInterpolator();
 
 	/** 当前映射器所属语言 */
+	@Getter
 	protected final Language.Enum language;
 
-	/** 是否启用调试模式，启用后将抛出异常而不是返回默认值 */
+	/** true 为启用调试模式 */
+	@Setter
 	protected boolean isDebugging = false;
 
 	/**
@@ -32,24 +36,6 @@ 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;
-	}
-
 	/**
 	 * 获取文本
 	 *

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

@@ -1,7 +1,6 @@
 package com.imyeyu.lang.mapper;
 
 import com.imyeyu.java.TimiJava;
-import com.imyeyu.java.bean.CallbackArgReturn;
 import com.imyeyu.java.bean.Language;
 import com.imyeyu.utils.Text;
 

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

@@ -36,16 +36,16 @@ public class FileMultilingual extends Multilingual {
 	 */
 	public void addAll(String path) {
 		Language.Enum[] values = Language.Enum.values();
-		for (int i = 0; i < values.length; i++) {
-			FileLanguageMap mapper = new FileLanguageMap(values[i]);
+		for (Language.Enum value : values) {
+			FileLanguageMap mapper = new FileLanguageMap(value);
 			mapper.load(path);
-			if (multilingualMap.containsKey(values[i])) {
-				AbstractLanguageMapper existMapper = multilingualMap.get(values[i]);
+			if (multilingualMap.containsKey(value)) {
+				AbstractLanguageMapper existMapper = multilingualMap.get(value);
 				if (existMapper instanceof LanguageMap map) {
 					map.union(mapper);
 				}
 			} else {
-				add(values[i], mapper);
+				add(value, mapper);
 			}
 		}
 	}

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

@@ -5,6 +5,7 @@ import com.imyeyu.java.bean.Language;
 import com.imyeyu.java.bean.LanguageMapping;
 import com.imyeyu.java.ref.Ref;
 import com.imyeyu.lang.mapper.AbstractLanguageMapper;
+import lombok.Getter;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -49,6 +50,7 @@ public class Multilingual implements LanguageMapping {
 	protected final List<CallbackArg<Language.Enum>> updateActiveListeners;
 
 	/** 当前激活语言 */
+	@Getter
 	protected Language.Enum activated;
 
 	/** 是否启用调试模式 */
@@ -121,20 +123,11 @@ public class Multilingual implements LanguageMapping {
 		String[] localSp = activated.toString().split("_");
 		Locale.setDefault(new Locale(localSp[0], localSp[1]));
 
-		for (int i = 0; i < updateActiveListeners.size(); i++) {
-			updateActiveListeners.get(i).handler(activated);
+		for (CallbackArg<Language.Enum> updateActiveListener : updateActiveListeners) {
+			updateActiveListener.handler(activated);
 		}
 	}
 
-	/**
-	 * 获取当前激活的语言
-	 *
-	 * @return 当前激活语言
-	 */
-	public Language.Enum getActivated() {
-		return activated;
-	}
-
 	/**
 	 * 设置调试模式
 	 * <p>

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

@@ -39,16 +39,16 @@ public class ResourcesMultilingual extends Multilingual {
 	 */
 	public void addAll(String path) {
 		Language.Enum[] values = Language.Enum.values();
-		for (int i = 0; i < values.length; i++) {
-			ResourcesLanguageMap mapper = new ResourcesLanguageMap(values[i]);
+		for (Language.Enum value : values) {
+			ResourcesLanguageMap mapper = new ResourcesLanguageMap(value);
 			mapper.load(path);
-			if (multilingualMap.containsKey(values[i])) {
-				AbstractLanguageMapper existMapper = multilingualMap.get(values[i]);
+			if (multilingualMap.containsKey(value)) {
+				AbstractLanguageMapper existMapper = multilingualMap.get(value);
 				if (existMapper instanceof LanguageMap map) {
 					map.union(mapper);
 				}
 			} else {
-				add(values[i], mapper);
+				add(value, mapper);
 			}
 		}
 	}