mirror of
https://github.com/yanlongqi/jhinno-openapi-java-sdk.git
synced 2026-03-22 06:15:10 +08:00
feat: 优化JSON序列化输出和测试代码格式
- 为JsonUtil添加格式化输出功能,启用INDENT_OUTPUT提高可读性 - 优化AppApiTest中的输出格式,使用JsonUtil格式化输出并改进显示格式 - 更新JobApiTest中的测试参数 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -3,6 +3,7 @@ package com.jhinno.sdk.openapi.utils;
|
|||||||
import com.fasterxml.jackson.core.type.TypeReference;
|
import com.fasterxml.jackson.core.type.TypeReference;
|
||||||
import com.fasterxml.jackson.databind.DeserializationFeature;
|
import com.fasterxml.jackson.databind.DeserializationFeature;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import com.fasterxml.jackson.databind.SerializationFeature;
|
||||||
import com.jhinno.sdk.openapi.CommonConstant;
|
import com.jhinno.sdk.openapi.CommonConstant;
|
||||||
import lombok.SneakyThrows;
|
import lombok.SneakyThrows;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
@@ -19,6 +20,7 @@ public class JsonUtil {
|
|||||||
OBJECT_MAPPER.setTimeZone(TimeZone.getTimeZone("GMT+8"));
|
OBJECT_MAPPER.setTimeZone(TimeZone.getTimeZone("GMT+8"));
|
||||||
OBJECT_MAPPER.setDateFormat(new SimpleDateFormat(CommonConstant.NORM_DATETIME_PATTERN));
|
OBJECT_MAPPER.setDateFormat(new SimpleDateFormat(CommonConstant.NORM_DATETIME_PATTERN));
|
||||||
OBJECT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
OBJECT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||||
|
OBJECT_MAPPER.enable(SerializationFeature.INDENT_OUTPUT);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SneakyThrows
|
@SneakyThrows
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public class AppApiTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testDefaultParamsStartApp() {
|
public void testDefaultParamsStartApp() {
|
||||||
AppStartedInfo appStartedInfo = jhAppApiExecution.desktopStart("linux_desktop");
|
AppStartedInfo appStartedInfo = jhAppApiExecution.desktopStart("linux_desktop");
|
||||||
System.out.println(appStartedInfo);
|
System.out.println(JsonUtil.objectToString(appStartedInfo));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -51,7 +51,7 @@ public class AppApiTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testGetSessionsList() {
|
public void testGetSessionsList() {
|
||||||
List<SessionInfo> desktopList = jhAppApiExecution.getDesktopList();
|
List<SessionInfo> desktopList = jhAppApiExecution.getDesktopList();
|
||||||
System.out.println(desktopList);
|
System.out.println(JsonUtil.objectToString(desktopList));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -60,7 +60,7 @@ public class AppApiTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testGetDesktopsByParams() {
|
public void testGetDesktopsByParams() {
|
||||||
List<SessionInfo> desktopList = jhAppApiExecution.getDesktopsByParams(null, "Windows桌面");
|
List<SessionInfo> desktopList = jhAppApiExecution.getDesktopsByParams(null, "Windows桌面");
|
||||||
System.out.println(desktopList);
|
System.out.println(JsonUtil.objectToString(desktopList));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -69,7 +69,7 @@ public class AppApiTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testGetDesktopsById() {
|
public void testGetDesktopsById() {
|
||||||
List<SessionInfo> desktopList = jhAppApiExecution.getDesktopsById(Arrays.asList("151", "7637", "123"));
|
List<SessionInfo> desktopList = jhAppApiExecution.getDesktopsById(Arrays.asList("151", "7637", "123"));
|
||||||
System.out.println(desktopList);
|
System.out.println(JsonUtil.objectToString(desktopList));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -78,7 +78,7 @@ public class AppApiTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testGetDesktopsByName() {
|
public void testGetDesktopsByName() {
|
||||||
List<SessionInfo> desktopList = jhAppApiExecution.getDesktopsByName("Linux桌面");
|
List<SessionInfo> desktopList = jhAppApiExecution.getDesktopsByName("Linux桌面");
|
||||||
System.out.println(desktopList);
|
System.out.println(JsonUtil.objectToString(desktopList));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -111,7 +111,7 @@ public class AppApiTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testConnectJhapp() {
|
public void testConnectJhapp() {
|
||||||
AppStartedInfo appStartedInfo = jhAppApiExecution.connectJhapp("151");
|
AppStartedInfo appStartedInfo = jhAppApiExecution.connectJhapp("151");
|
||||||
System.out.println(appStartedInfo);
|
System.out.println(JsonUtil.objectToString(appStartedInfo));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -152,21 +152,35 @@ public class AppApiTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testGetAppList() {
|
public void testGetAppList() {
|
||||||
List<AppInfo> appList = jhAppApiExecution.getAppList();
|
List<AppInfo> appList = jhAppApiExecution.getAppList();
|
||||||
System.out.println("全部列表" + JsonUtil.objectToString(appList));
|
System.out.println("全部列表:");
|
||||||
|
System.out.println(JsonUtil.objectToString(appList));
|
||||||
|
|
||||||
// 类型获取
|
// 类型获取
|
||||||
System.out.println("系统应用" + JsonUtil.objectToString(AppTypeConstant.AppType.SYSTEM_APP.getAppList(appList)));
|
System.out.println("系统应用:");
|
||||||
System.out.println("计算应用" + JsonUtil.objectToString(AppTypeConstant.AppType.BATCH_APP.getAppList(appList)));
|
System.out.println(JsonUtil.objectToString(AppTypeConstant.AppType.SYSTEM_APP.getAppList(appList)));
|
||||||
System.out.println("图形应用" + JsonUtil.objectToString(AppTypeConstant.AppType.DESKTOP_APP.getAppList(appList)));
|
|
||||||
|
System.out.println("计算应用:");
|
||||||
|
System.out.println(JsonUtil.objectToString(AppTypeConstant.AppType.BATCH_APP.getAppList(appList)));
|
||||||
|
|
||||||
|
System.out.println("图形应用:");
|
||||||
|
System.out.println(JsonUtil.objectToString(AppTypeConstant.AppType.DESKTOP_APP.getAppList(appList)));
|
||||||
|
|
||||||
// 操作系统分类
|
// 操作系统分类
|
||||||
System.out.println("系统应用" + JsonUtil.objectToString(AppTypeConstant.AppOsType.SYSTEM.getAppList(appList)));
|
System.out.println("系统应用:");
|
||||||
System.out.println("Linux应用" + JsonUtil.objectToString(AppTypeConstant.AppOsType.LINUX.getAppList(appList)));
|
System.out.println(JsonUtil.objectToString(AppTypeConstant.AppOsType.SYSTEM.getAppList(appList)));
|
||||||
System.out.println("Windows应用" + JsonUtil.objectToString(AppTypeConstant.AppOsType.WINDOWS.getAppList(appList)));
|
|
||||||
|
System.out.println("Linux应用:");
|
||||||
|
System.out.println(JsonUtil.objectToString(AppTypeConstant.AppOsType.LINUX.getAppList(appList)));
|
||||||
|
|
||||||
|
System.out.println("Windows应用:");
|
||||||
|
System.out.println(JsonUtil.objectToString(AppTypeConstant.AppOsType.WINDOWS.getAppList(appList)));
|
||||||
|
|
||||||
// 应用分类
|
// 应用分类
|
||||||
System.out.println("系统应用" + JsonUtil.objectToString(AppTypeConstant.AppCategory.SYSTEM.getAppList(appList)));
|
System.out.println("系统应用:");
|
||||||
System.out.println("景行发布应用" + JsonUtil.objectToString(AppTypeConstant.AppCategory.APP.getAppList(appList)));
|
System.out.println(JsonUtil.objectToString(AppTypeConstant.AppCategory.SYSTEM.getAppList(appList)));
|
||||||
|
|
||||||
|
System.out.println("景行发布应用:");
|
||||||
|
System.out.println(JsonUtil.objectToString(AppTypeConstant.AppCategory.APP.getAppList(appList)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -174,7 +188,7 @@ public class AppApiTest {
|
|||||||
*/
|
*/
|
||||||
@Test
|
@Test
|
||||||
public void testGetAppUrl() {
|
public void testGetAppUrl() {
|
||||||
System.out.println(jhAppApiExecution.getAppUrl("jhadmin", "myjobmana"));
|
System.out.println(JsonUtil.objectToString(jhAppApiExecution.getAppUrl("jhadmin", "myjobmana")));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -182,7 +196,7 @@ public class AppApiTest {
|
|||||||
*/
|
*/
|
||||||
@Test
|
@Test
|
||||||
public void testGetAppInfoSuffixList() {
|
public void testGetAppInfoSuffixList() {
|
||||||
System.out.println(jhAppApiExecution.getAppInfoSuffixList(Collections.singletonList(".cas")));
|
System.out.println(JsonUtil.objectToString(jhAppApiExecution.getAppInfoSuffixList(Collections.singletonList(".cas"))));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -190,6 +204,6 @@ public class AppApiTest {
|
|||||||
*/
|
*/
|
||||||
@Test
|
@Test
|
||||||
public void testGetUseLabelList() {
|
public void testGetUseLabelList() {
|
||||||
System.out.println(jhAppApiExecution.getUseLabelList());
|
System.out.println(JsonUtil.objectToString(jhAppApiExecution.getUseLabelList()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ public class JobApiTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testSubmitJob() {
|
public void testSubmitJob() {
|
||||||
Map<String, Object> params = new HashMap<>();
|
Map<String, Object> params = new HashMap<>();
|
||||||
params.put("JH_CAS", "$HOME/test.sh");
|
params.put("JH_CAS", "$HOME/test1.sh");
|
||||||
params.put("JH_NCPU", "1");
|
params.put("JH_NCPU", "1");
|
||||||
params.put("JH_JOB_CONF", "public");
|
params.put("JH_JOB_CONF", "public");
|
||||||
System.out.println(execution.submit("yanlongqi", "common_sub", params));
|
System.out.println(execution.submit("yanlongqi", "common_sub", params));
|
||||||
|
|||||||
Reference in New Issue
Block a user