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

Reviewed-on: #16

.gitea/workflows/ci.yml

@@ -92,71 +92,20 @@ jobs:
           }
           EOF
           )
-          echo "Creating release with tag: $RELEASE_TAG"
-          echo "API URL: $api_url"
-          echo "Target commit: $RELEASE_TARGET"
-
-          http_code=$(curl -sS -w "%{http_code}" -o /tmp/release_response.json -X POST "$api_url" \
+          response=$(curl -sS -X POST "$api_url" \
             -H "Authorization: token $GITEA_TOKEN" \
             -H "Content-Type: application/json" \
             -d "$payload")
-
-          response=$(cat /tmp/release_response.json)
-          echo "HTTP Status: $http_code"
-          echo "Response: $response"
-
-          if [ "$http_code" -ne 201 ]; then
-            echo "Failed to create release (HTTP $http_code)"
-            if echo "$response" | grep -q "already exists"; then
-              echo "Release with tag $RELEASE_TAG already exists"
-            fi
-            exit 1
-          fi
-
-          release_id=$(echo "$response" | grep -oP '"id":\K[0-9]+' | head -n 1 || true)
-          if [ -z "$release_id" ]; then
-            echo "Failed to extract release ID from response"
+          release_id=$(echo "$response" | grep -o '"id":[0-9]*' | head -n 1 | grep -o '[0-9]*')
+          if [ -z "$release_id" ] || echo "$response" | grep -q '"message"'; then
+            echo "Create release failed: $response"
             exit 1
           fi
           echo "Release created: id=$release_id"
-
-          echo "Listing jar files in target directory:"
-          ls -lh target/*.jar || echo "No jar files found"
-
-          upload_count=0
           for asset_path in target/*.jar; do
-            if [ ! -f "$asset_path" ]; then
-              echo "Skipping non-existent file: $asset_path"
-              continue
-            fi
             asset_name=$(basename "$asset_path")
-            file_size=$(stat -c%s "$asset_path" 2>/dev/null || echo "unknown")
-            echo "Uploading asset: $asset_name (size: $file_size bytes)"
-
-            upload_url="$api_url/$release_id/assets?name=$asset_name"
-            echo "Upload URL: $upload_url"
-
-            set +e
-            http_code=$(curl -sS -w "%{http_code}" -o /tmp/asset_response.json -X POST "$upload_url" \
+            curl -sS -X POST "$api_url/$release_id/assets?name=$asset_name" \
               -H "Authorization: token $GITEA_TOKEN" \
               -H "Content-Type: application/octet-stream" \
-              --data-binary @"$asset_path" 2>/dev/null)
-            curl_exit=$?
-            set -e
-
-            if [ $curl_exit -ne 0 ]; then
-              echo "✗ Curl failed with exit code $curl_exit for $asset_name"
-              cat /tmp/asset_response.json 2>/dev/null || echo "No response file"
-              continue
-            fi
-
-            if [ "$http_code" = "201" ]; then
-              echo "✓ Successfully uploaded: $asset_name"
-              upload_count=$((upload_count + 1))
-            else
-              echo "✗ Failed to upload $asset_name (HTTP $http_code)"
-              cat /tmp/asset_response.json 2>/dev/null || echo "No response body"
-            fi
+              --data-binary @"$asset_path"
           done
-
-          echo "Upload complete: $upload_count file(s) uploaded"

.serena/.gitignore

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

.serena/memories/project_overview.md

@@ -0,0 +1,6 @@
+# 项目概览
+- 项目名：timi-network
+- 作用：对 httpclient5 做二次封装的 Java 网络操作工具库。
+- 技术栈：JDK 21、Maven、Apache HttpClient 5 Fluent、Jackson、Lombok、JUnit 4。
+- 代码结构：`src/main/java/com/imyeyu/network` 下为核心实现；`src/test/java/com/imyeyu/network/test` 下为测试与示例。
+- 运行环境：Windows 开发环境，文件编码 UTF-8。

.serena/memories/style_conventions.md

@@ -0,0 +1,7 @@
+# 风格约定
+- 交流、注释、文档使用中文。
+- Java 使用 tab 缩进。
+- 注释要求使用 javadoc 风格。
+- 优先简单直接的实现，避免过度设计。
+- 尽量使用官方 API，不无故引入外部依赖。
+- 项目当前测试较少，默认不主动新增测试，除非任务明确要求。

.serena/memories/suggested_commands.md

@@ -0,0 +1,9 @@
+# 常用命令
+- 查看状态：`git status --short`
+- 列文件：`Get-ChildItem -Force`
+- 搜索文件：`rg --files`
+- 搜索内容：`rg "关键字" src`
+- 运行单测：`mvn -DskipTests=false -Dtest=ArgMapTest test`
+- 打包：`mvn -q -DskipTests package`
+
+说明：`pom.xml` 默认配置了 `maven.test.skip=true`，运行测试时需要显式覆盖。

.serena/memories/task_completion.md

@@ -0,0 +1,5 @@
+# 完成任务后的检查
+- 优先检查受影响的最小范围测试是否通过。
+- 若使用 Maven，注意默认 `maven.test.skip=true`，需要显式开启测试。
+- 查看 `git status --short`，确认仅包含预期改动。
+- 若未运行测试，需要明确说明原因。

.serena/project.yml

@@ -0,0 +1,154 @@
+# the name by which the project can be referenced within Serena
+project_name: "timi-network"
+
+
+# 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.network</groupId>
 	<artifactId>timi-network</artifactId>
-	<version>0.0.5</version>
+	<version>0.0.11</version>
 	<packaging>jar</packaging>
 
 	<properties>
@@ -92,17 +92,17 @@
 		<dependency>
 			<groupId>com.imyeyu.io</groupId>
 			<artifactId>timi-io</artifactId>
-			<version>0.0.2</version>
+			<version>0.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5-fluent</artifactId>
-			<version>5.6</version>
+			<version>5.6.1</version>
 		</dependency>
 		<dependency>
-			<groupId>tools.jackson.core</groupId>
+			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>3.1.0</version>
+			<version>2.21.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>

src/main/java/com/imyeyu/network/ArgMap.java

@@ -49,6 +49,28 @@ public class ArgMap<K, V> {
 		entries.forEach(entry -> consumer.accept(entry.getKey(), entry.getValue()));
 	}
 
+	/**
+	 * 按插入顺序遍历全部非空参数。
+	 *
+	 * @param consumer 处理逻辑
+	 */
+	private void forEachNonNull(BiConsumer<? super K, ? super V> consumer) {
+		entries.forEach(entry -> {
+			if (entry.getValue() != null) {
+				consumer.accept(entry.getKey(), entry.getValue());
+			}
+		});
+	}
+
+	/**
+	 * 是否存在可输出的非空参数。
+	 *
+	 * @return 是否存在非空参数
+	 */
+	private boolean hasNonNullValue() {
+		return entries.stream().anyMatch(entry -> entry.getValue() != null);
+	}
+
 	/**
 	 * 返回参数数量。
 	 *
@@ -90,7 +112,7 @@ public class ArgMap<K, V> {
 	 */
 	public HttpEntity toEntity() {
 		MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-		forEach((k, v) -> {
+		forEachNonNull((k, v) -> {
 			String key = k.toString();
 			switch (v) {
 				case File file -> builder.addBinaryBody(key, file);
@@ -109,7 +131,7 @@ public class ArgMap<K, V> {
 	 */
 	public List<NameValuePair> toNameValuePair() {
 		Form form = Form.form();
-		forEach((k, v) -> form.add(k.toString(), v.toString()));
+		forEachNonNull((k, v) -> form.add(k.toString(), v.toString()));
 		return form.build();
 	}
 
@@ -119,11 +141,11 @@ public class ArgMap<K, V> {
 	 * @return query string
 	 */
 	public String toURL() {
-		if (isEmpty()) {
+		if (!hasNonNullValue()) {
 			return "";
 		}
 		StringBuilder sb = new StringBuilder();
-		forEach((k, v) -> sb.append(k.toString()).append('=').append(Encoder.urlArg(v.toString())).append('&'));
+		forEachNonNull((k, v) -> sb.append(k.toString()).append('=').append(Encoder.urlArg(v.toString())).append('&'));
 		sb.deleteCharAt(sb.length() - 1);
 		return sb.toString();
 	}
@@ -135,7 +157,8 @@ public class ArgMap<K, V> {
 	 * @return 拼接后的 URL
 	 */
 	public String toURL(String url) {
-		if (isEmpty()) {
+		String query = toURL();
+		if (query.isEmpty()) {
 			return url;
 		}
 		StringBuilder sb = new StringBuilder(url);
@@ -143,10 +166,10 @@ public class ArgMap<K, V> {
 			if (!url.endsWith("?") && !url.endsWith("&")) {
 				sb.append('&');
 			}
-			sb.append(toURL());
+			sb.append(query);
 			return sb.toString();
 		}
-		return url + "?" + toURL();
+		return url + "?" + query;
 	}
 
 	/**

src/main/java/com/imyeyu/network/JacksonRequest.java

@@ -1,17 +1,20 @@
 package com.imyeyu.network;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.hc.client5.http.fluent.Request;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpEntity;
-import tools.jackson.core.JacksonException;
-import tools.jackson.core.type.TypeReference;
-import tools.jackson.databind.JsonNode;
-import tools.jackson.databind.ObjectMapper;
-import tools.jackson.databind.node.ArrayNode;
-import tools.jackson.databind.node.ObjectNode;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
+import java.text.SimpleDateFormat;
 
 /**
  * 基于 Jackson 的请求封装。
@@ -23,6 +26,12 @@ public class JacksonRequest extends CommonRequest {
 
 	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
+	static {
+		OBJECT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		OBJECT_MAPPER.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+		OBJECT_MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+	}
+
 	private ObjectMapper objectMapper = null;
 
 	protected JacksonRequest(Request request) {

src/main/java/com/imyeyu/network/TimiRequest.java

@@ -1,10 +1,10 @@
 package com.imyeyu.network;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JavaType;
 import com.imyeyu.java.bean.timi.TimiResponse;
 import org.apache.hc.client5.http.fluent.Request;
 import org.apache.hc.core5.http.HttpEntity;
-import tools.jackson.core.type.TypeReference;
-import tools.jackson.databind.JavaType;
 
 import java.io.IOException;
 import java.lang.reflect.Type;

src/test/java/com/imyeyu/network/test/ArgMapTest.java

@@ -1,8 +1,11 @@
 package com.imyeyu.network.test;
 
 import com.imyeyu.network.ArgMap;
+import org.apache.hc.core5.http.NameValuePair;
 import org.junit.Test;
 
+import java.util.List;
+
 /**
  *
  *
@@ -33,4 +36,22 @@ public class ArgMapTest {
 		assert argMap.toURL().equals("id=1&id=2");
 		assert argMap.toURL("/detail").equals("/detail?id=1&id=2");
 	}
+
+	@Test
+	public void nullValueToURLTest() {
+		assert ArgMap.of("key", null).toURL().isEmpty();
+		assert ArgMap.of("key", null).toURL("/detail").equals("/detail");
+		assert ArgMap.of("key", null).toURL("/detail?id=123").equals("/detail?id=123");
+
+		String url = ArgMap.of("key", null, "name", "夜雨").toURL("/detail");
+		assert url.equals("/detail?name=%E5%A4%9C%E9%9B%A8");
+	}
+
+	@Test
+	public void nullValueToNameValuePairTest() {
+		List<NameValuePair> pairs = ArgMap.of("key", null, "name", "value").toNameValuePair();
+		assert pairs.size() == 1;
+		assert pairs.getFirst().getName().equals("name");
+		assert pairs.getFirst().getValue().equals("value");
+	}
 }