Skip to content

fix：解决 Quick Debug 窗口输入的JSON参数中，首字母大写 的字段没有赋值 #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
javalover123 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix：解决 Quick Debug 窗口输入的JSON参数中，首字母大写 的字段没有赋值 #165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 52 additions & 1 deletion debug-tools-idea/src/main/java/io/github/future0923/debug/tools/idea/ui/main/MainDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.Messages;
import io.github.future0923.debug.tools.base.hutool.core.io.FileUtil;
import io.github.future0923.debug.tools.base.hutool.core.lang.TypeReference;
import io.github.future0923.debug.tools.base.hutool.core.util.StrUtil;
import io.github.future0923.debug.tools.base.hutool.json.JSON;
import io.github.future0923.debug.tools.base.hutool.json.JSONArray;
import io.github.future0923.debug.tools.base.hutool.json.JSONObject;
import io.github.future0923.debug.tools.base.utils.DebugToolsDigestUtil;
import io.github.future0923.debug.tools.common.dto.RunContentDTO;
import io.github.future0923.debug.tools.common.dto.RunDTO;
Expand All @@ -49,10 +53,15 @@
import javax.swing.*;
import java.io.File;
import java.io.IOException;
import java.util.ListIterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static io.github.future0923.debug.tools.base.hutool.json.JSONUtil.parse;
import static io.github.future0923.debug.tools.base.hutool.json.JSONUtil.toBean;

/**
* @author future0923
*/
Expand Down Expand Up @@ -109,7 +118,7 @@ protected void doOKAction() {
paramCacheDto.setTraceMethodDTO(traceMethodDTO);
paramCacheDto.setMethodAround(methodAroundName);
settingState.putMethodParamCache(methodDataContext.getCacheKey(), paramCacheDto);
Map<String, RunContentDTO> contentMap = DebugToolsJsonUtils.toRunContentDTOMap(text);
Map<String, RunContentDTO> contentMap = toRunContentDTOMap(text);
Map<String, String> headers = Stream.of(itemHeaderMap, settingState.getGlobalHeader())
.flatMap(map -> map.entrySet().stream())
.collect(Collectors.toMap(
Expand Down Expand Up @@ -191,4 +200,46 @@ protected void doOKAction() {
cancelAction.putValue(Action.NAME, DebugToolsBundle.message("action.cancel"));
return cancelAction;
}

private Map<String, RunContentDTO> toRunContentDTOMap(String jsonInput) {
JSON json = parse(jsonInput, DebugToolsJsonUtils.JSON_CONFIG);
json = handleJSON(json);
return toBean(json, new TypeReference<Map<String, RunContentDTO>>() {
}, true);
}

private JSON handleJSON(JSON json) {
if (json instanceof JSONArray a) {
return handleJSONArray(a);
} else if (json instanceof JSONObject o) {
return handleJSONObject(o);
}
return json;
}

private JSONArray handleJSONArray(JSONArray array) {
final ListIterator<Object> iterator = array.listIterator();
while (iterator.hasNext()) {
Object ele = iterator.next();
if (ele instanceof JSONArray a) {
handleJSONArray(a);
} else if (ele instanceof JSONObject o) {
iterator.set(handleJSONObject(o));
}
}
return array;
}

private JSONObject handleJSONObject(JSONObject jsonObject) {
final JSONObject result = new JSONObject(DebugToolsJsonUtils.JSON_CONFIG);
for (Entry<String, Object> entry : jsonObject) {
// json字符串中，字段名首字母 转为小写，避免符合 set方法的字段不能赋值
result.set(StrUtil.lowerFirst(entry.getKey()), entry.getValue());
if (entry.getValue() instanceof JSON json) {
handleJSON(json);
}
}
return result;
}

}