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

Reviewed-on: #1

.serena/.gitignore

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

.serena/project.yml

@@ -1,154 +0,0 @@
-# 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,13 +6,13 @@
 
 	<groupId>com.imyeyu.utils</groupId>
 	<artifactId>timi-utils</artifactId>
-	<version>0.0.6</version>
+	<version>0.0.2</version>
 
 	<properties>
-		<maven.test.skip>true</maven.test.skip>
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.test.skip>true</maven.test.skip>
 	</properties>
 
 	<build>
@@ -27,42 +27,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>
@@ -91,7 +59,7 @@
 		<dependency>
 			<groupId>com.imyeyu.java</groupId>
 			<artifactId>timi-java</artifactId>
-			<version>0.0.4</version>
+			<version>0.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>de.mkammerer</groupId>
@@ -109,6 +77,7 @@
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 			<version>1.18.34</version>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 </project>

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

@@ -8,13 +8,11 @@ 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;
@@ -354,60 +352,4 @@ 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/OS.java

@@ -82,8 +82,7 @@ public class OS {
 	public static void run(String command) {
 		try {
 			Runtime.getRuntime().exec(new String[] {command});
-		} catch (Exception e) {
+		} catch (Exception ignored) {
-			throw new RuntimeException(e);
 		}
 	}
 

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

@@ -3,8 +3,6 @@ package com.imyeyu.utils;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.CallbackArgReturn;
 import com.imyeyu.java.ref.Ref;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,8 +31,6 @@ public class StringInterpolator {
 	private final Map<String, CallbackArgReturn<String, String>> filterMap = new HashMap<>();
 
 	/** 空值处理策略 */
-	@Setter
-	@Getter
 	private boolean nullable = false;
 
 	public StringInterpolator(String regex) {
@@ -154,6 +150,14 @@ public class StringInterpolator {
 		filterMap.clear();
 	}
 
+	public void setNullable(boolean nullable) {
+		this.nullable = nullable;
+	}
+
+	public boolean isNullable() {
+		return nullable;
+	}
+
 	/** 表达式部分内部类 */
 	private record ExpressionParts(String variable, String[] filters) {
 	}

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

@@ -67,6 +67,45 @@ public class Text {
 		return String.format("%0" + l + "d", number);
 	}
 
+	/**
+	 * 驼峰转下划线
+	 *
+	 * @param camelCaseStr 驼峰字符串
+	 * @return 下划线字符串
+	 */
+	public static String camelCase2underscore(String camelCaseStr) {
+		return camelCaseStr.replaceAll("([a-z])([A-Z])", "$1_$2").toLowerCase();
+	}
+
+	/**
+	 * 下划线转驼峰
+	 *
+	 * @param underscoreName 下划线字符串
+	 * @return 驼峰字符串
+	 */
+	public static String underscore2camelCase(String underscoreName) {
+		if (TimiJava.isEmpty(underscoreName)) {
+			return underscoreName;
+		}
+		StringBuilder result = new StringBuilder();
+		boolean flag = false;
+		for (int i = 0; i < underscoreName.length(); i++) {
+			char c = underscoreName.charAt(i);
+			if ('_' == c) {
+				flag = true;
+			} else {
+				if (flag) {
+					result.append(Character.toUpperCase(c));
+					flag = false;
+				} else {
+					result.append(c);
+				}
+			}
+		}
+		return result.toString();
+	}
+
+
 	/**
 	 * 与多个字符串进行与比较
 	 *
@@ -352,44 +391,6 @@ public class Text {
 		return sb.toString();
 	}
 
-	/**
-	 * 驼峰转下划线
-	 *
-	 * @param camelCaseStr 驼峰字符串
-	 * @return 下划线字符串
-	 */
-	public static String camelCase2underscore(String camelCaseStr) {
-		return camelCaseStr.replaceAll("([a-z])([A-Z])", "$1_$2").toLowerCase();
-	}
-
-	/**
-	 * 下划线转驼峰
-	 *
-	 * @param underscoreName 下划线字符串
-	 * @return 驼峰字符串
-	 */
-	public static String underscore2camelCase(String underscoreName) {
-		if (TimiJava.isEmpty(underscoreName)) {
-			return underscoreName;
-		}
-		StringBuilder result = new StringBuilder();
-		boolean flag = false;
-		for (int i = 0; i < underscoreName.length(); i++) {
-			char c = underscoreName.charAt(i);
-			if ('_' == c) {
-				flag = true;
-			} else {
-				if (flag) {
-					result.append(Character.toUpperCase(c));
-					flag = false;
-				} else {
-					result.append(c);
-				}
-			}
-		}
-		return result.toString();
-	}
-
 	/**
 	 * 获取驼峰类名
 	 *
@@ -399,8 +400,4 @@ public class Text {
 	public static String camelCaseClassName(Class<?> clazz) {
 		return Character.toLowerCase(clazz.getSimpleName().charAt(0)) + clazz.getSimpleName().substring(1);
 	}
-
-	public static String underscoreClassName(Class<?> clazz) {
-		return camelCase2underscore(clazz.getSimpleName());
-	}
 }

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

@@ -1,7 +1,6 @@
 package com.imyeyu.utils;
 
 import com.imyeyu.java.TimiJava;
-import lombok.Getter;
 
 import java.text.SimpleDateFormat;
 import java.time.Instant;
@@ -387,28 +386,77 @@ public class Time {
 	 * @author 夜雨
 	 * @version 2022-10-12 14:46
 	 */
-	@Getter
 	public static class Between {
 
-		/** 年 */
 		int year;
-
-		/** 月 */
 		int month;
-
-		/** 天 */
 		int day;
-
-		/** 小时 */
 		int hour;
-
-		/** 分钟 */
 		int minute;
-
-		/** 秒 */
 		int second;
-
-		/** 毫秒 */
 		int millis;
+
+		/**
+		 * 获取年数
+		 *
+		 * @return 年数
+		 */
+		public int getYear() {
+			return year;
+		}
+
+		/**
+		 * 获取月数
+		 *
+		 * @return 月数
+		 */
+		public int getMonth() {
+			return month;
+		}
+
+		/**
+		 * 获取天数
+		 *
+		 * @return 天数
+		 */
+		public int getDay() {
+			return day;
+		}
+
+		/**
+		 * 获取小时
+		 *
+		 * @return 小时
+		 */
+		public int getHour() {
+			return hour;
+		}
+
+		/**
+		 * 获取分钟
+		 *
+		 * @return 分钟
+		 */
+		public int getMinute() {
+			return minute;
+		}
+
+		/**
+		 * 获取秒
+		 *
+		 * @return 秒
+		 */
+		public int getSecond() {
+			return second;
+		}
+
+		/**
+		 * 获取毫秒
+		 *
+		 * @return 毫秒
+		 */
+		public int getMillis() {
+			return millis;
+		}
 	}
 }

src/test/java/test/TestCollect.java

@@ -1,44 +0,0 @@
-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));
-	}
-}