26 Commits

Author SHA1 Message Date
21c19af696 Merge pull request 'v0.0.11' (#16) from dev into master
Reviewed-on: #16
2026-06-04 10:35:40 +00:00
Timi
2db85de88d v0.0.11
All checks were successful
CI/CD / build-deploy (pull_request) Successful in 11s
2026-06-04 18:35:18 +08:00
Timi
f9a985f939 nullable ArgMap value 2026-06-04 18:29:03 +08:00
fc04d50d0f Merge pull request 'v0.0.10' (#15) from dev into master
Reviewed-on: #15
2026-05-07 07:06:53 +00:00
Timi
22cff23b96 v0.0.10
All checks were successful
CI/CD / build-deploy (pull_request) Successful in 11s
2026-05-07 14:53:25 +08:00
515387dd32 Merge pull request 'v0.0.9' (#14) from dev into master
Reviewed-on: #14
2026-05-06 09:27:58 +00:00
Timi
51f5ec3b2f v0.0.9
All checks were successful
CI/CD / build-deploy (pull_request) Successful in 10s
2026-05-06 17:22:18 +08:00
9fb406427f Merge pull request 'v0.0.8' (#13) from dev into master
Reviewed-on: #13
2026-03-25 07:41:06 +00:00
Timi
a694189d96 v0.0.8
All checks were successful
CI/CD / build-deploy (pull_request) Successful in 38s
2026-03-25 15:39:04 +08:00
386fded0a3 Merge pull request 'v0.0.8' (#12) from dev into master
Reviewed-on: #12
2026-03-25 07:32:57 +00:00
Timi
c6e2e9cc6d v0.0.8
Some checks failed
CI/CD / build-deploy (pull_request) Failing after 53s
2026-03-25 15:32:19 +08:00
88fdc79c82 Merge pull request 'v0.0.8' (#11) from dev into master
Reviewed-on: #11
2026-03-25 07:25:09 +00:00
Timi
c5466ec373 v0.0.8
Some checks failed
CI/CD / build-deploy (pull_request) Failing after 1m15s
2026-03-25 15:24:55 +08:00
571ed377a8 Merge pull request 'v0.0.8' (#10) from dev into master
Reviewed-on: #10
2026-03-25 07:22:40 +00:00
Timi
0cf0458127 v0.0.8
Some checks failed
CI/CD / build-deploy (pull_request) Failing after 5s
2026-03-25 15:22:22 +08:00
6b84af1f16 Merge pull request 'v0.0.8' (#9) from dev into master
Reviewed-on: #9
2026-03-25 07:04:17 +00:00
Timi
d4233f6c46 v0.0.8
Some checks failed
CI/CD / build-deploy (pull_request) Failing after 25s
2026-03-25 15:03:58 +08:00
4302084b95 Merge pull request 'v0.0.8' (#8) from dev into master
Reviewed-on: #8
2026-03-25 06:48:12 +00:00
Timi
b15090d558 v0.0.8
Some checks failed
CI/CD / build-deploy (pull_request) Failing after 1m1s
2026-03-25 14:47:46 +08:00
4f8054dc94 Merge pull request 'v0.0.7' (#7) from dev into master
Reviewed-on: #7
2026-03-17 08:40:14 +00:00
Timi
26f34fda40 v0.0.7
All checks were successful
CI/CD / build-deploy (pull_request) Successful in 28s
2026-03-17 16:39:55 +08:00
5c1e1ee52c Merge pull request 'v0.0.6' (#6) from dev into master
Reviewed-on: #6
2026-03-17 03:02:07 +00:00
Timi
25f431c009 v0.0.6
All checks were successful
CI/CD / build-deploy (pull_request) Successful in 1m30s
2026-03-17 11:01:44 +08:00
01074e1ac2 Merge pull request 'v0.0.5' (#5) from dev into master
Reviewed-on: #5
2026-03-16 09:13:40 +00:00
Timi
ada0f96e57 v0.0.5
All checks were successful
CI/CD / build-deploy (pull_request) Successful in 3m4s
2026-03-16 17:13:10 +08:00
Timi
ef7b9af9b7 add bodyEntity 2026-03-16 16:34:46 +08:00
17 changed files with 725 additions and 188 deletions

View File

@@ -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"

4
.gitignore vendored
View File

@@ -1,3 +1,7 @@
AGENTS.md
CLAUDE.md
.claude
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/

2
.serena/.gitignore vendored Normal file
View File

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

View File

@@ -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。

View File

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

View File

@@ -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`,运行测试时需要显式覆盖。

View File

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

154
.serena/project.yml Normal file
View File

@@ -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 readonly.
# 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: []

12
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>com.imyeyu.network</groupId>
<artifactId>timi-network</artifactId>
<version>0.0.4</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>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.13.2</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.21.3</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>

View File

@@ -1,70 +1,219 @@
package com.imyeyu.network;
import com.imyeyu.utils.Encoder;
import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
import org.apache.hc.client5.http.fluent.Form;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.NameValuePair;
import java.util.HashMap;
import java.io.File;
import java.io.InputStream;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
/**
* HashMap 构建 {@link org.apache.hc.client5.http.fluent.Form} 参数列表
* 请求参数列表
* <p>
* 该实现允许同名 key 重复出现,适用于 query 参数和表单参数场景。
*
* @author 夜雨
* @since 2025-06-26 15:41
*/
public class ArgMap<K, V> extends HashMap<K, V> {
public class ArgMap<K, V> {
private final List<Map.Entry<K, V>> entries = new ArrayList<>();
/**
* 追加一个参数。
*
* @param key 参数名
* @param value 参数值
* @return 当前对象
*/
public ArgMap<K, V> put(K key, V value) {
entries.add(new AbstractMap.SimpleImmutableEntry<>(key, value));
return this;
}
/**
* 按插入顺序遍历全部参数。
*
* @param consumer 处理逻辑
*/
public void forEach(BiConsumer<? super K, ? super V> consumer) {
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);
}
/**
* 返回参数数量。
*
* @return 参数数量
*/
public int size() {
return entries.size();
}
/**
* 判断参数列表是否为空。
*
* @return 是否为空
*/
public boolean isEmpty() {
return entries.isEmpty();
}
/**
* 清空全部参数。
*/
public void clear() {
entries.clear();
}
/**
* 返回只读参数视图。
*
* @return 参数条目列表
*/
public List<Map.Entry<K, V>> entries() {
return Collections.unmodifiableList(entries);
}
/**
* 转换为 multipart 实体。
*
* @return multipart 请求体
*/
public HttpEntity toEntity() {
MultipartEntityBuilder builder = MultipartEntityBuilder.create();
forEachNonNull((k, v) -> {
String key = k.toString();
switch (v) {
case File file -> builder.addBinaryBody(key, file);
case byte[] bytes -> builder.addBinaryBody(key, bytes);
case InputStream stream -> builder.addBinaryBody(key, stream, ContentType.APPLICATION_OCTET_STREAM, key);
default -> builder.addTextBody(key, v.toString());
}
});
return builder.build();
}
/**
* 转换为表单参数列表。
*
* @return 表单参数列表
*/
public List<NameValuePair> toNameValuePair() {
Form form = Form.form();
for (Map.Entry<K, V> item : entrySet()) {
form.add(item.getKey().toString(), item.getValue().toString());
}
forEachNonNull((k, v) -> form.add(k.toString(), v.toString()));
return form.build();
}
/**
* 转换为 query string。
*
* @return query string
*/
public String toURL() {
StringBuilder sb = new StringBuilder();
for (Map.Entry<K, V> item : entrySet()) {
sb.append(item.getKey().toString()).append('=').append(Encoder.urlArg(item.getValue().toString()));
sb.append('&');
if (!hasNonNullValue()) {
return "";
}
StringBuilder sb = new StringBuilder();
forEachNonNull((k, v) -> sb.append(k.toString()).append('=').append(Encoder.urlArg(v.toString())).append('&'));
sb.deleteCharAt(sb.length() - 1);
return sb.toString();
}
/**
* 将参数拼接到指定 URL。
*
* @param url 原始 URL
* @return 拼接后的 URL
*/
public String toURL(String url) {
String query = toURL();
if (query.isEmpty()) {
return url;
}
StringBuilder sb = new StringBuilder(url);
if (url.contains("?")) {
if (!url.endsWith("?") && !url.endsWith("&")) {
sb.append('&');
}
sb.append(toURL());
sb.append(query);
return sb.toString();
} else {
return url + "?" + toURL();
}
return url + "?" + query;
}
/**
* 使用一组参数创建对象。
*
* @param key 参数名
* @param value 参数值
* @param <K> key 类型
* @param <V> value 类型
* @return 参数对象
*/
public static <K, V> ArgMap<K, V> of(K key, V value) {
ArgMap<K, V> map = new ArgMap<>();
map.put(key, value);
return map;
return new ArgMap<K, V>().put(key, value);
}
/**
* 使用两组参数创建对象。
*
* @param key1 参数名 1
* @param value1 参数值 1
* @param key2 参数名 2
* @param value2 参数值 2
* @param <K> key 类型
* @param <V> value 类型
* @return 参数对象
*/
public static <K, V> ArgMap<K, V> of(K key1, V value1, K key2, V value2) {
ArgMap<K, V> map = new ArgMap<>();
map.put(key1, value1);
map.put(key2, value2);
return map;
return new ArgMap<K, V>().put(key1, value1).put(key2, value2);
}
/**
* 使用三组参数创建对象。
*
* @param key1 参数名 1
* @param value1 参数值 1
* @param key2 参数名 2
* @param value2 参数值 2
* @param key3 参数名 3
* @param value3 参数值 3
* @param <K> key 类型
* @param <V> value 类型
* @return 参数对象
*/
public static <K, V> ArgMap<K, V> of(K key1, V value1, K key2, V value2, K key3, V value3) {
ArgMap<K, V> map = new ArgMap<>();
map.put(key1, value1);
map.put(key2, value2);
map.put(key3, value3);
return map;
return new ArgMap<K, V>().put(key1, value1).put(key2, value2).put(key3, value3);
}
}

View File

@@ -3,6 +3,7 @@ package com.imyeyu.network;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import org.apache.hc.client5.http.fluent.Request;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.util.Timeout;
import java.io.IOException;
@@ -49,6 +50,11 @@ public class CommonRequest {
return this;
}
public CommonRequest bodyEntity(HttpEntity entity) {
request.body(entity);
return this;
}
public String asString() throws IOException {
return request.execute().returnContent().asString();
}

View File

@@ -3,6 +3,7 @@ package com.imyeyu.network;
import com.imyeyu.io.IO;
import org.apache.hc.client5.http.fluent.Request;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.ProtocolException;
@@ -16,7 +17,7 @@ import java.nio.file.Path;
* @author 夜雨
* @since 2025-06-26 13:03
*/
public class FileRequest extends CommonRequest {
public class FileRequest extends JacksonRequest {
protected FileRequest(Request request) {
super(request);
@@ -58,6 +59,18 @@ public class FileRequest extends CommonRequest {
return this;
}
@Override
public FileRequest body(Object object) {
super.body(object);
return this;
}
@Override
public FileRequest bodyEntity(HttpEntity entity) {
super.bodyEntity(entity);
return this;
}
public void toFile(String path, String fileName) throws IOException, NoPermissionException {
toFile(new File(IO.fitPath(path) + fileName));
}

View File

@@ -1,93 +0,0 @@
package com.imyeyu.network;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
import com.imyeyu.java.TimiJava;
import org.apache.hc.client5.http.fluent.Request;
import org.apache.hc.core5.http.ContentType;
import java.io.IOException;
/**
* @author 夜雨
* @since 2025-07-15 14:27
*/
public class GsonRequest extends CommonRequest {
private static final Gson GSON = new Gson();
private Gson gson = null;
protected GsonRequest(Request request) {
super(request);
}
protected Gson getGson() {
return TimiJava.firstNotNull(gson, GSON);
}
public static GsonRequest wrap(Request request) {
return new GsonRequest(request);
}
public static GsonRequest get(String url) {
return new GsonRequest(Request.get(url));
}
public static GsonRequest post(String url) {
return new GsonRequest(Request.post(url));
}
public GsonRequest gson(Gson gson) {
this.gson = gson;
return this;
}
@Override
public GsonRequest timeout(long ms) {
super.timeout(ms);
return this;
}
@Override
public GsonRequest header(String key, String value) {
request.addHeader(key, value);
return this;
}
@Override
public GsonRequest token(String token) {
request.addHeader("Token", token);
return this;
}
@Override
public GsonRequest language(String langHeader) {
request.addHeader("Accept-Language", langHeader);
return this;
}
public GsonRequest body(Object object) {
request.bodyString(getGson().toJson(object), ContentType.APPLICATION_JSON);
return this;
}
public <T> T resultAs(Class<T> clazz) throws IOException {
return getGson().fromJson(super.asString(), clazz);
}
public <T> T resultAs(TypeToken<T> typeToken) throws IOException {
return getGson().fromJson(super.asString(), typeToken);
}
public JsonObject asJsonObject() throws IOException {
return JsonParser.parseString(super.asString()).getAsJsonObject();
}
public JsonArray asJsonArray() throws IOException {
return JsonParser.parseString(super.asString()).getAsJsonArray();
}
}

View File

@@ -0,0 +1,213 @@
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 java.io.IOException;
import java.lang.reflect.Type;
import java.text.SimpleDateFormat;
/**
* 基于 Jackson 的请求封装。
*
* @author 夜雨
* @since 2025-07-15 14:27
*/
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) {
super(request);
}
/**
* 获取当前请求使用的对象映射器。
*
* @return 对象映射器
*/
protected ObjectMapper getObjectMapper() {
if (objectMapper != null) {
return objectMapper;
}
return OBJECT_MAPPER;
}
/**
* 包装现有请求对象。
*
* @param request 请求对象
* @return Jackson 请求
*/
public static JacksonRequest wrap(Request request) {
return new JacksonRequest(request);
}
/**
* 创建 GET 请求。
*
* @param url 请求地址
* @return Jackson 请求
*/
public static JacksonRequest get(String url) {
return new JacksonRequest(Request.get(url));
}
/**
* 创建 POST 请求。
*
* @param url 请求地址
* @return Jackson 请求
*/
public static JacksonRequest post(String url) {
return new JacksonRequest(Request.post(url));
}
/**
* 指定对象映射器。
*
* @param objectMapper 对象映射器
* @return 当前请求
*/
public JacksonRequest objectMapper(ObjectMapper objectMapper) {
this.objectMapper = objectMapper;
return this;
}
@Override
public JacksonRequest timeout(long ms) {
super.timeout(ms);
return this;
}
@Override
public JacksonRequest header(String key, String value) {
request.addHeader(key, value);
return this;
}
@Override
public JacksonRequest token(String token) {
request.addHeader("Token", token);
return this;
}
@Override
public JacksonRequest language(String langHeader) {
request.addHeader("Accept-Language", langHeader);
return this;
}
/**
* 设置 JSON 请求体。
*
* @param object 要序列化的对象
* @return 当前请求
* @throws IllegalArgumentException JSON 序列化失败时抛出
*/
public JacksonRequest body(Object object) {
try {
request.bodyString(getObjectMapper().writeValueAsString(object), ContentType.APPLICATION_JSON);
return this;
} catch (JacksonException e) {
throw new IllegalArgumentException("Jackson serialize request body failed", e);
}
}
@Override
public JacksonRequest bodyEntity(HttpEntity entity) {
super.bodyEntity(entity);
return this;
}
/**
* 将响应体解析为指定类型。
*
* @param clazz 目标类型
* @param <T> 结果类型
* @return 解析结果
* @throws IOException 读取或解析失败
*/
public <T> T resultAs(Class<T> clazz) throws IOException {
return getObjectMapper().readValue(super.asString(), clazz);
}
/**
* 将响应体解析为指定泛型类型。
*
* @param typeReference 目标类型引用
* @param <T> 结果类型
* @return 解析结果
* @throws IOException 读取或解析失败
*/
public <T> T resultAs(TypeReference<T> typeReference) throws IOException {
return getObjectMapper().readValue(super.asString(), typeReference);
}
/**
* 将响应体解析为指定反射类型。
*
* @param type 目标类型
* @param <T> 结果类型
* @return 解析结果
* @throws IOException 读取或解析失败
*/
public <T> T resultAs(Type type) throws IOException {
return getObjectMapper().readValue(super.asString(), getObjectMapper().constructType(type));
}
/**
* 将响应体解析为 JSON 节点。
*
* @return JSON 节点
* @throws IOException 读取或解析失败
*/
public JsonNode asJsonNode() throws IOException {
return getObjectMapper().readTree(super.asString());
}
/**
* 将响应体解析为 JSON 对象。
*
* @return JSON 对象节点
* @throws IOException 读取或解析失败
*/
public ObjectNode asJsonObject() throws IOException {
JsonNode jsonNode = asJsonNode();
if (jsonNode instanceof ObjectNode objectNode) {
return objectNode;
}
throw new IOException("Response body is not a JSON object");
}
/**
* 将响应体解析为 JSON 数组。
*
* @return JSON 数组节点
* @throws IOException 读取或解析失败
*/
public ArrayNode asJsonArray() throws IOException {
JsonNode jsonNode = asJsonNode();
if (jsonNode instanceof ArrayNode arrayNode) {
return arrayNode;
}
throw new IOException("Response body is not a JSON array");
}
}

View File

@@ -66,6 +66,18 @@ public class ProgressiveRequest extends FileRequest {
return this;
}
@Override
public ProgressiveRequest body(Object object) {
super.body(object);
return this;
}
@Override
public ProgressiveRequest bodyEntity(HttpEntity entity) {
super.bodyEntity(entity);
return this;
}
@Override
public void toFile(Path outputPath) throws IOException, NoPermissionException {
processResponse(request.execute(), IO.getOutputStream(outputPath.toFile()));

View File

@@ -1,16 +1,19 @@
package com.imyeyu.network;
import com.google.gson.reflect.TypeToken;
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 java.io.IOException;
import java.lang.reflect.Type;
/**
* @author 夜雨
* @since 2025-07-15 14:34
*/
public class TimiRequest extends GsonRequest {
public class TimiRequest extends JacksonRequest {
protected TimiRequest(Request request) {
super(request);
@@ -58,6 +61,12 @@ public class TimiRequest extends GsonRequest {
return this;
}
@Override
public TimiRequest bodyEntity(HttpEntity entity) {
super.bodyEntity(entity);
return this;
}
@Override
public String asString() throws IOException {
return resultAs(String.class);
@@ -68,16 +77,48 @@ public class TimiRequest extends GsonRequest {
return Double.parseDouble(asString());
}
/**
* 读取 Timi 响应中的数据字段。
*
* @param clazz 数据类型
* @param <T> 数据泛型
* @return 数据内容
* @throws IOException 读取或解析失败
*/
public <T> T resultAs(Class<T> clazz) throws IOException {
TimiResponse<T> resp = getGson().fromJson(asJsonObject(), TypeToken.getParameterized(TimiResponse.class, clazz).getType());
TimiResponse<T> resp = getObjectMapper().treeToValue(asJsonObject(), timiResponseType(clazz));
if (resp.isFail()) {
throw resp.toException();
}
return resp.getData();
}
public <T> T resultAs(TypeToken<T> typeToken) throws IOException {
TimiResponse<T> resp = getGson().fromJson(asJsonObject(), TypeToken.getParameterized(TimiResponse.class, typeToken.getType()).getType());
/**
* 读取 Timi 响应中的泛型数据字段。
*
* @param typeReference 数据类型引用
* @param <T> 数据泛型
* @return 数据内容
* @throws IOException 读取或解析失败
*/
public <T> T resultAs(TypeReference<T> typeReference) throws IOException {
TimiResponse<T> resp = getObjectMapper().treeToValue(asJsonObject(), timiResponseType(typeReference));
if (resp.isFail()) {
throw resp.toException();
}
return resp.getData();
}
/**
* 读取 Timi 响应中的泛型数据字段。
*
* @param type 数据类型
* @param <T> 数据泛型
* @return 数据内容
* @throws IOException 读取或解析失败
*/
public <T> T resultAs(Type type) throws IOException {
TimiResponse<T> resp = getObjectMapper().treeToValue(asJsonObject(), timiResponseType(type));
if (resp.isFail()) {
throw resp.toException();
}
@@ -86,9 +127,39 @@ public class TimiRequest extends GsonRequest {
@Override
public void execute() throws IOException {
TimiResponse<?> resp = getGson().fromJson(asJsonObject(), TypeToken.getParameterized(TimiResponse.class, Object.class).getType());
TimiResponse<?> resp = getObjectMapper().treeToValue(asJsonObject(), timiResponseType(Object.class));
if (resp.isFail()) {
throw resp.toException();
}
}
/**
* 构造带泛型的 Timi 响应类型。
*
* @param clazz 数据类型
* @return Jackson 类型
*/
protected JavaType timiResponseType(Class<?> clazz) {
return getObjectMapper().getTypeFactory().constructParametricType(TimiResponse.class, clazz);
}
/**
* 构造带泛型的 Timi 响应类型。
*
* @param typeReference 数据类型引用
* @return Jackson 类型
*/
protected JavaType timiResponseType(TypeReference<?> typeReference) {
return getObjectMapper().getTypeFactory().constructParametricType(TimiResponse.class, getObjectMapper().constructType(typeReference));
}
/**
* 构造带泛型的 Timi 响应类型。
*
* @param type 数据类型
* @return Jackson 类型
*/
protected JavaType timiResponseType(Type type) {
return getObjectMapper().getTypeFactory().constructParametricType(TimiResponse.class, getObjectMapper().constructType(type));
}
}

View File

@@ -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;
/**
*
*
@@ -24,4 +27,31 @@ public class ArgMapTest {
String url = ArgMap.of("newKey", "newValue").toURL("http://localhost/test" + uri);
assert url.equals("http://localhost/test/detail?id=123&key=value&newKey=newValue");
}
@Test
public void duplicateKeyTest() {
ArgMap<String, String> argMap = new ArgMap<>();
argMap.put("id", "1");
argMap.put("id", "2");
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");
}
}