Merge pull request 'v0.0.11' (#10) from dev into master

Reviewed-on: #10

.serena/.gitignore

@@ -0,0 +1,2 @@
+/cache
+/project.local.yml

.serena/project.yml

@@ -0,0 +1,154 @@
+# the name by which the project can be referenced within Serena
+project_name: "timi-utils"
+
+
+# list of languages for which language servers are started; choose from:
+#   al                  bash                clojure             cpp                 csharp
+#   csharp_omnisharp    dart                elixir              elm                 erlang
+#   fortran             fsharp              go                  groovy              haskell
+#   haxe                java                julia               kotlin              lua
+#   markdown
+#   matlab              nix                 pascal              perl                php
+#   php_phpactor        powershell          python              python_jedi         r
+#   rego                ruby                ruby_solargraph     rust                scala
+#   swift               terraform           toml                typescript          typescript_vts
+#   vue                 yaml                zig
+#   (This list may be outdated. For the current list, see values of Language enum here:
+#   https://github.com/oraios/serena/blob/main/src/solidlsp/ls_config.py
+#   For some languages, there are alternative language servers, e.g. csharp_omnisharp, ruby_solargraph.)
+# Note:
+#   - For C, use cpp
+#   - For JavaScript, use typescript
+#   - For Free Pascal/Lazarus, use pascal
+# Special requirements:
+#   Some languages require additional setup/installations.
+#   See here for details: https://oraios.github.io/serena/01-about/020_programming-languages.html#language-servers
+# When using multiple languages, the first language server that supports a given file will be used for that file.
+# The first language is the default language and the respective language server will be used as a fallback.
+# Note that when using the JetBrains backend, language servers are not used and this list is correspondingly ignored.
+languages:
+- java
+
+# the encoding used by text files in the project
+# For a list of possible encodings, see https://docs.python.org/3.11/library/codecs.html#standard-encodings
+encoding: "utf-8"
+
+# line ending convention to use when writing source files.
+# Possible values: unset (use global setting), "lf", "crlf", or "native" (platform default)
+# This does not affect Serena's own files (e.g. memories and configuration files), which always use native line endings.
+line_ending:
+
+# The language backend to use for this project.
+# If not set, the global setting from serena_config.yml is used.
+# Valid values: LSP, JetBrains
+# Note: the backend is fixed at startup. If a project with a different backend
+# is activated post-init, an error will be returned.
+language_backend:
+
+# whether to use project's .gitignore files to ignore files
+ignore_all_files_in_gitignore: true
+
+# advanced configuration option allowing to configure language server-specific options.
+# Maps the language key to the options.
+# Have a look at the docstring of the constructors of the LS implementations within solidlsp (e.g., for C# or PHP) to see which options are available.
+# No documentation on options means no options are available.
+ls_specific_settings: {}
+
+# list of additional paths to ignore in this project.
+# Same syntax as gitignore, so you can use * and **.
+# Note: global ignored_paths from serena_config.yml are also applied additively.
+ignored_paths: []
+
+# whether the project is in read-only mode
+# If set to true, all editing tools will be disabled and attempts to use them will result in an error
+# Added on 2025-04-18
+read_only: false
+
+# list of tool names to exclude.
+# This extends the existing exclusions (e.g. from the global configuration)
+#
+# Below is the complete list of tools for convenience.
+# To make sure you have the latest list of tools, and to view their descriptions, 
+# execute `uv run scripts/print_tool_overview.py`.
+#
+#  * `activate_project`: Activates a project based on the project name or path.
+#  * `check_onboarding_performed`: Checks whether project onboarding was already performed.
+#  * `create_text_file`: Creates/overwrites a file in the project directory.
+#  * `delete_memory`: Delete a memory file. Should only happen if a user asks for it explicitly,
+#       for example by saying that the information retrieved from a memory file is no longer correct
+#       or no longer relevant for the project.
+#  * `edit_memory`: Replaces content matching a regular expression in a memory.
+#  * `execute_shell_command`: Executes a shell command.
+#  * `find_file`: Finds files in the given relative paths
+#  * `find_referencing_symbols`: Finds symbols that reference the given symbol using the language server backend
+#  * `find_symbol`: Performs a global (or local) search using the language server backend.
+#  * `get_current_config`: Prints the current configuration of the agent, including the active and available projects, tools, contexts, and modes.
+#  * `get_symbols_overview`: Gets an overview of the top-level symbols defined in a given file.
+#  * `initial_instructions`: Provides instructions Serena usage (i.e. the 'Serena Instructions Manual')
+#       for clients that do not read the initial instructions when the MCP server is connected.
+#  * `insert_after_symbol`: Inserts content after the end of the definition of a given symbol.
+#  * `insert_before_symbol`: Inserts content before the beginning of the definition of a given symbol.
+#  * `list_dir`: Lists files and directories in the given directory (optionally with recursion).
+#  * `list_memories`: List available memories. Any memory can be read using the `read_memory` tool.
+#  * `onboarding`: Performs onboarding (identifying the project structure and essential tasks, e.g. for testing or building).
+#  * `read_file`: Reads a file within the project directory.
+#  * `read_memory`: Read the content of a memory file. This tool should only be used if the information
+#       is relevant to the current task. You can infer whether the information
+#       is relevant from the memory file name.
+#       You should not read the same memory file multiple times in the same conversation.
+#  * `rename_memory`: Renames or moves a memory. Moving between project and global scope is supported
+#       (e.g., renaming "global/foo" to "bar" moves it from global to project scope).
+#  * `rename_symbol`: Renames a symbol throughout the codebase using language server refactoring capabilities.
+#       For JB, we use a separate tool.
+#  * `replace_content`: Replaces content in a file (optionally using regular expressions).
+#  * `replace_symbol_body`: Replaces the full definition of a symbol using the language server backend.
+#  * `safe_delete_symbol`:
+#  * `search_for_pattern`: Performs a search for a pattern in the project.
+#  * `write_memory`: Write some information (utf-8-encoded) about this project that can be useful for future tasks to a memory in md format.
+#       The memory name should be meaningful.
+excluded_tools: []
+
+# list of tools to include that would otherwise be disabled (particularly optional tools that are disabled by default).
+# This extends the existing inclusions (e.g. from the global configuration).
+included_optional_tools: []
+
+# fixed set of tools to use as the base tool set (if non-empty), replacing Serena's default set of tools.
+# This cannot be combined with non-empty excluded_tools or included_optional_tools.
+fixed_tools: []
+
+# list of mode names to that are always to be included in the set of active modes
+# The full set of modes to be activated is base_modes + default_modes.
+# If the setting is undefined, the base_modes from the global configuration (serena_config.yml) apply.
+# Otherwise, this setting overrides the global configuration.
+# Set this to [] to disable base modes for this project.
+# Set this to a list of mode names to always include the respective modes for this project.
+base_modes:
+
+# list of mode names that are to be activated by default.
+# The full set of modes to be activated is base_modes + default_modes.
+# If the setting is undefined, the default_modes from the global configuration (serena_config.yml) apply.
+# Otherwise, this overrides the setting from the global configuration (serena_config.yml).
+# This setting can, in turn, be overridden by CLI parameters (--mode).
+default_modes:
+
+# initial prompt for the project. It will always be given to the LLM upon activating the project
+# (contrary to the memories, which are loaded on demand).
+initial_prompt: ""
+
+# time budget (seconds) per tool call for the retrieval of additional symbol information
+# such as docstrings or parameter information.
+# This overrides the corresponding setting in the global configuration; see the documentation there.
+# If null or missing, use the setting from the global configuration.
+symbol_info_budget:
+
+# list of regex patterns which, when matched, mark a memory entry as read‑only.
+# Extends the list from the global configuration, merging the two lists.
+read_only_memory_patterns: []
+
+# list of regex patterns for memories to completely ignore.
+# Matching memories will not appear in list_memories or activate_project output
+# and cannot be accessed via read_memory or write_memory.
+# To access ignored memory files, use the read_file tool on the raw file path.
+# Extends the list from the global configuration, merging the two lists.
+# Example: ["_archive/.*", "_episodes/.*"]
+ignored_memory_patterns: []

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.imyeyu.utils</groupId>
 	<artifactId>timi-utils</artifactId>
-	<version>0.0.4</version>
+	<version>0.0.11</version>
 
 	<properties>
 		<maven.test.skip>true</maven.test.skip>
@@ -49,7 +49,7 @@
 					<dependency>
 						<groupId>org.projectlombok</groupId>
 						<artifactId>lombok</artifactId>
-						<version>1.18.36</version>
+						<version>1.18.46</version>
 					</dependency>
 				</dependencies>
 			</plugin>
@@ -91,7 +91,7 @@
 		<dependency>
 			<groupId>com.imyeyu.java</groupId>
 			<artifactId>timi-java</artifactId>
-			<version>0.0.3</version>
+			<version>0.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>de.mkammerer</groupId>
@@ -108,7 +108,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.34</version>
+			<version>1.18.46</version>
 		</dependency>
 	</dependencies>
 </project>

src/main/java/com/imyeyu/utils/Collect.java

@@ -8,11 +8,13 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.BitSet;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -352,4 +354,60 @@ public class Collect {
 
 		return result;
 	}
+
+	/**
+	 * 移除数组中的 null 和重复元素
+	 *
+	 * @param items 源数组
+	 * @param <T>   数组数据类型
+	 * @return 非 null、去重结果数组
+	 */
+	@SafeVarargs
+	@SuppressWarnings("unchecked")
+	public static <T> T[] distinctNonNull(T... items) {
+		if (items == null) {
+			return null;
+		}
+		LinkedHashSet<T> resultSet = distinctNonNullSet(Arrays.asList(items), items.length);
+		T[] result = (T[]) Array.newInstance(items.getClass().getComponentType(), resultSet.size());
+		return resultSet.toArray(result);
+	}
+
+	/**
+	 * 移除集合中的 null 和重复元素
+	 *
+	 * @param set 源集合
+	 * @param <T> 集合数据类型
+	 * @return 非 null、去重结果集合
+	 */
+	public static <T> Set<T> distinctNonNull(Set<T> set) {
+		if (set == null) {
+			return null;
+		}
+		return distinctNonNullSet(set, set.size());
+	}
+
+	/**
+	 * 移除列表中的 null 和重复元素
+	 *
+	 * @param list 源列表
+	 * @param <T>  列表数据类型
+	 * @return 非 null、去重结果列表
+	 */
+	public static <T> List<T> distinctNonNull(List<T> list) {
+		if (list == null) {
+			return null;
+		}
+		return new ArrayList<>(distinctNonNullSet(list, list.size()));
+	}
+
+	private static <T> LinkedHashSet<T> distinctNonNullSet(Iterable<T> items, int size) {
+		LinkedHashSet<T> result = new LinkedHashSet<>(size);
+		for (T item : items) {
+			if (item != null) {
+				result.add(item);
+			}
+		}
+		return result;
+	}
 }

src/main/java/com/imyeyu/utils/Regex.java

@@ -52,8 +52,8 @@ public class Regex {
 	/** 用户名 (4-16 位字母、数字、下划线) */
 	public static final String USERNAME = "^[a-zA-Z0-9_]{4,16}$";
 
-	/** 密码 (6-18 位，包含字母和数字) */
-	public static final String PASSWORD = "^(?=.*[a-zA-Z])(?=.*\\d)[a-zA-Z0-9]{6,18}$";
+	/** 密码 (6-18 位，包含字母和数字，允许特殊字符) */
+	public static final String PASSWORD = "^(?=.*[a-zA-Z])(?=.*\\d)[a-zA-Z0-9!#$%&()*+,\\-./:;<=>?@\\[\\]\\^_`{|}~]{6,32}$";
 
 	/** 中文字符 */
 	public static final String CHINESE_CHAR = "^[\\u4e00-\\u9fa5]+$";

src/main/java/com/imyeyu/utils/Text.java

@@ -15,8 +15,16 @@ import java.util.UUID;
  */
 public class Text {
 
+	public static String LETTER_POOL = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+	public static String NUMBER_POOL = "0123456789";
+
+	public static String LETTER_NUMBER_POOL = LETTER_POOL + NUMBER_POOL;
+
+	public static String PASSWORD_CHAR_POOL = LETTER_NUMBER_POOL + "!#$%&()*+,-./:;<=>?@[]^_`{|}~";
+
 	/** 十六进制小写 */
-	public static char[] HEX_DIGITS_LOWER = "0123456789abcdef".toCharArray();
+	public static char[] HEX_DIGITS_LOWER = (NUMBER_POOL + "abcdef").toCharArray();
 
 	/**
 	 * 是否为半角字符
@@ -75,8 +83,8 @@ public class Text {
 	 * @return true 时全部其他字符串和比较字符串一致
 	 */
 	public static boolean eqAnd(String string, String... other) {
-		for (int i = 0; i < other.length; i++) {
-			if (!string.equals(other[i])) {
+		for (String s : other) {
+			if (!string.equals(s)) {
 				return false;
 			}
 		}
@@ -91,8 +99,8 @@ public class Text {
 	 * @return true 时其他字符串存在和比较字符串一致
 	 */
 	public static boolean eqOr(String string, String... other) {
-		for (int i = 0; i < other.length; i++) {
-			if (!string.equals(other[i])) {
+		for (String s : other) {
+			if (!string.equals(s)) {
 				return false;
 			}
 		}
@@ -107,8 +115,8 @@ public class Text {
 	 * @return true 时全部其他字符串和比较字符串一致
 	 */
 	public static boolean eqIgnoreCaseAnd(String string, String... other) {
-		for (int i = 0; i < other.length; i++) {
-			if (!string.equalsIgnoreCase(other[i])) {
+		for (String s : other) {
+			if (!string.equalsIgnoreCase(s)) {
 				return false;
 			}
 		}
@@ -123,8 +131,8 @@ public class Text {
 	 * @return true 时其他字符串存在和比较字符串一致
 	 */
 	public static boolean eqIgnoreCaseOr(String string, String... other) {
-		for (int i = 0; i < other.length; i++) {
-			if (string.equalsIgnoreCase(other[i])) {
+		for (String s : other) {
+			if (string.equalsIgnoreCase(s)) {
 				return true;
 			}
 		}
@@ -141,8 +149,8 @@ public class Text {
 	public static boolean containsIgnoreCase(String string, String... other) {
 		String stringUpper = string.toUpperCase();
 		String stringLower = string.toLowerCase();
-		for (int i = 0; i < other.length; i++) {
-			if (stringLower.contains(other[i].toLowerCase()) || stringUpper.contains(other[i].toUpperCase())) {
+		for (String s : other) {
+			if (stringLower.contains(s.toLowerCase()) || stringUpper.contains(s.toUpperCase())) {
 				return true;
 			}
 		}
@@ -150,18 +158,38 @@ public class Text {
 	}
 
 	public static String randomString(int length) {
-		return randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", length);
+		return randomString(LETTER_NUMBER_POOL, length);
 	}
 
 	public static String randomString(String pool, int length) {
 		SecureRandom r = new SecureRandom();
 		StringBuilder sb = new StringBuilder();
 		for (int i = 0; i < length; i++) {
-			sb.append(pool.charAt(r.nextInt(pool.length() - 1)));
+			sb.append(pool.charAt(r.nextInt(pool.length())));
 		}
 		return sb.toString();
 	}
 
+	public static String randomPassword(int length) {
+		if (length < 6 || 32 < length) {
+			throw new IllegalArgumentException("Password length must be between 6 and 32");
+		}
+		SecureRandom r = new SecureRandom();
+		char[] chars = new char[length];
+		chars[0] = LETTER_POOL.charAt(r.nextInt(LETTER_POOL.length()));
+		chars[1] = NUMBER_POOL.charAt(r.nextInt(NUMBER_POOL.length()));
+		for (int i = 2; i < length; i++) {
+			chars[i] = PASSWORD_CHAR_POOL.charAt(r.nextInt(PASSWORD_CHAR_POOL.length()));
+		}
+		for (int i = chars.length - 1; 0 < i; i--) {
+			int j = r.nextInt(i + 1);
+			char temp = chars[i];
+			chars[i] = chars[j];
+			chars[j] = temp;
+		}
+		return new String(chars);
+	}
+
 	/**
 	 * 较短的临时 UUID，如果使用在庞大的数据里，很可能会发生重复
 	 *
@@ -403,4 +431,8 @@ public class Text {
 	public static String underscoreClassName(Class<?> clazz) {
 		return camelCase2underscore(clazz.getSimpleName());
 	}
+
+	public static String bizClassName(Class<?> clazz) {
+		return underscoreClassName(clazz).toUpperCase();
+	}
 }

src/test/java/test/TestCollect.java

@@ -0,0 +1,44 @@
+package test;
+
+import com.imyeyu.utils.Collect;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+/**
+ * @author 夜雨
+ * @since 2026-05-22 15:20
+ */
+public class TestCollect {
+
+	@Test
+	public void testDistinctNonNullArray() {
+		String[] result = Collect.distinctNonNull("a", null, "b", "a", null, "c", "b");
+
+		assertArrayEquals(new String[]{"a", "b", "c"}, result);
+		assertNull(Collect.distinctNonNull((String[]) null));
+	}
+
+	@Test
+	public void testDistinctNonNullSet() {
+		Set<String> source = new LinkedHashSet<>(Arrays.asList("a", null, "b", "c"));
+
+		assertEquals(new LinkedHashSet<>(Arrays.asList("a", "b", "c")), Collect.distinctNonNull(source));
+		assertNull(Collect.distinctNonNull((Set<String>) null));
+	}
+
+	@Test
+	public void testDistinctNonNullList() {
+		List<String> source = Arrays.asList("a", null, "b", "a", null, "c", "b");
+
+		assertEquals(Arrays.asList("a", "b", "c"), Collect.distinctNonNull(source));
+		assertNull(Collect.distinctNonNull((List<String>) null));
+	}
+}

src/test/java/test/TestRegex.java

@@ -0,0 +1,36 @@
+package test;
+
+import com.imyeyu.utils.Regex;
+import com.imyeyu.utils.Text;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * @author 夜雨
+ * @since 2026-06-11 14:00
+ */
+public class TestRegex {
+
+	@Test
+	public void testPassword() {
+		assert Regex.isMatch(Regex.PASSWORD, "abc123");
+		assert Regex.isMatch(Regex.PASSWORD, "abc123!");
+		assert Regex.isMatch(Regex.PASSWORD, "Abc123[]^_`{|}~");
+		assert Regex.isMatch(Regex.PASSWORD, "A1!#$%&*+,-./:@?");
+		for (int i = 0; i < 20; i++) {
+			assert Regex.isMatch(Regex.PASSWORD, Text.randomPassword(20));
+		}
+
+		assert Regex.isNotMatch(Regex.PASSWORD, "abcdef!");
+		assert Regex.isNotMatch(Regex.PASSWORD, "123456!");
+		assert Regex.isNotMatch(Regex.PASSWORD, "Ab1!");
+		assert Regex.isNotMatch(Regex.PASSWORD, "Abcdefghijklmnopqrstuvwxzy123456!");
+		assert Regex.isNotMatch(Regex.PASSWORD, "Abc123\\");
+		assert Regex.isNotMatch(Regex.PASSWORD, "Abc123\"");
+		assert Regex.isNotMatch(Regex.PASSWORD, "Abc123'");
+		assert Regex.isNotMatch(Regex.PASSWORD, "Abc123 ");
+		assertThrows(IllegalArgumentException.class, () -> Text.randomPassword(5));
+		assertThrows(IllegalArgumentException.class, () -> Text.randomPassword(33));
+	}
+}