From d22358bb98adb0b8e9aae60a7bfcbe88b79ae7b9 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Sun, 18 Sep 2022 10:41:43 +0800 Subject: [PATCH] JsonUtils rename method name --- .../impl/sms/SmsOtpAuthnYunxin.java | 4 ++-- .../kerberos/HttpKerberosEntryPoint.java | 2 +- .../kerberos/RemoteKerberosService.java | 2 +- .../main/java/org/maxkey/util/JsonUtils.java | 20 +++++++++---------- .../java/org/maxkey/entity/ExtraAttrs.java | 4 ++-- .../org/maxkey/web/HttpRequestAdapter.java | 6 +++--- ...imEnterpriseUserJsonString2ObjectTest.java | 4 ++-- .../resources/ScimEnterpriseUserJsonTest.java | 2 +- .../ScimGroupJsonString2ObjectTest.java | 4 ++-- .../scim/resources/ScimGroupJsonTest.java | 2 +- .../ScimUserJsonString2ObjectTest.java | 4 ++-- .../scim/resources/ScimUserJsonTest.java | 2 +- .../service/HistorySystemLogsService.java | 2 +- .../provision/thread/ProvisioningRunner.java | 2 +- .../provision/thread/ProvisioningThread.java | 2 +- .../adapter/ExtendApiCndnsApiMailAdapter.java | 4 ++-- .../adapter/ExtendApiQQExmailAdapter.java | 4 ++-- .../endpoint/OAuthDefaultUserInfoAdapter.java | 2 +- .../userinfo/endpoint/UserInfoEndpoint.java | 4 ++-- .../endpoint/UserInfoOIDCEndpoint.java | 4 ++-- .../adapter/TokenBasedDefaultAdapter.java | 2 +- .../feishu/FeishuAccessTokenService.java | 2 +- .../feishu/FeishuOrganizationService.java | 4 ++-- .../feishu/FeishuUsersService.java | 2 +- .../WorkweixinAccessTokenService.java | 2 +- .../WorkweixinOrganizationService.java | 2 +- .../workweixin/WorkweixinUsersService.java | 2 +- .../kerberos/KerberosPrincipal.java | 2 +- .../web/contorller/UserInfoController.java | 2 +- 29 files changed, 50 insertions(+), 50 deletions(-) diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java index e13f05148..bf82ecdef 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java @@ -124,7 +124,7 @@ public class SmsOtpAuthnYunxin extends SmsOtpAuthn { //String responseString = "{\"code\":200,\"msg\":\"1\",\"obj\":\"740673\"}"; logger.debug("responseString " + responseString); YunxinSms yunxinSms = - JsonUtils.gson2Object(responseString,YunxinSms.class); + JsonUtils.gsonStringToObject(responseString,YunxinSms.class); logger.debug("responseEntity code " + yunxinSms.getObj()); nonce = yunxinSms.getObj() == null ?nonce:yunxinSms.getObj(); logger.debug("nonce " + nonce); @@ -226,7 +226,7 @@ public class SmsOtpAuthnYunxin extends SmsOtpAuthn { ).randomGenerate(); System.out.println(nonce); String mapJson = "{\"code\":200,\"msg\":\"1\",\"obj\":\"740673\"}"; - YunxinSms yunxinSms = JsonUtils.gson2Object(mapJson,YunxinSms.class); + YunxinSms yunxinSms = JsonUtils.gsonStringToObject(mapJson,YunxinSms.class); System.out.println("code " + yunxinSms.getObj()); } diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/HttpKerberosEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/HttpKerberosEntryPoint.java index 6f0fd2928..06e3dec25 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/HttpKerberosEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/HttpKerberosEntryPoint.java @@ -88,7 +88,7 @@ public class HttpKerberosEntryPoint implements AsyncHandlerInterceptor { } _logger.debug("decoder Kerberos Token "+decoderKerberosToken); KerberosToken kerberosToken=new KerberosToken(); - kerberosToken=(KerberosToken)JsonUtils.json2Object(decoderKerberosToken, kerberosToken); + kerberosToken=(KerberosToken)JsonUtils.stringToObject(decoderKerberosToken, kerberosToken); _logger.debug("Kerberos Token "+kerberosToken); DateTime notOnOrAfter=DateUtils.toUtcDate(kerberosToken.getNotOnOrAfter()); diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java index efcab950e..6c7120dd2 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java @@ -46,7 +46,7 @@ public class RemoteKerberosService implements KerberosService{ userDomainUrlList.add(userDomainUrl); } _logger.debug(""+userDomainUrlList); - String userDomainUrlJson=JsonUtils.object2Json(userDomainUrlList); + String userDomainUrlJson=JsonUtils.toString(userDomainUrlList); _logger.debug("userDomain Url Json "+userDomainUrlJson); return userDomainUrlJson; } diff --git a/maxkey-common/src/main/java/org/maxkey/util/JsonUtils.java b/maxkey-common/src/main/java/org/maxkey/util/JsonUtils.java index 1d4849f00..f6ebd2ec8 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/JsonUtils.java +++ b/maxkey-common/src/main/java/org/maxkey/util/JsonUtils.java @@ -27,13 +27,13 @@ import java.io.IOException; public class JsonUtils { /** - * Transform json string to java bean object. + * jackson Transform json string to java bean object. * * @param json String * @param bean Object * @return Object */ - public static Object json2Object(String json, Object bean) { + public static Object stringToObject(String json, Object bean) { try { bean = (new ObjectMapper()).readValue(json, bean.getClass()); } catch (JsonParseException e) { @@ -47,13 +47,13 @@ public class JsonUtils { } /** - * Transform json string to java bean object. + * jackson Transform json string to java bean object. * * @param json String * @param cls Class * @return Object */ - public static T json2Object(String json, Class cls) { + public static T stringToObject(String json, Class cls) { T bean = null; try { bean = (new ObjectMapper()).readValue(json, cls); @@ -68,12 +68,12 @@ public class JsonUtils { } /** - * Transform java bean object to json string. + * jackson Transform java bean object to json string. * * @param bean Object * @return string */ - public static String object2Json(Object bean) { + public static String toString(Object bean) { String json = ""; try { json = (new ObjectMapper()).writeValueAsString(bean); @@ -88,25 +88,25 @@ public class JsonUtils { } /** - * Transform json string to java bean object use Gson. + * Gson Transform json string to java bean object. * * @param Class * @param json String * @return Object */ - public static T gson2Object(String json, Class cls) { + public static T gsonStringToObject(String json, Class cls) { T newBean = (new Gson()).fromJson(json, cls); return newBean; } /** - * Transform java bean object to json string use Gson. + * Gson Transform java bean object to json string . * * @param bean Object * @return string */ - public static String gson2Json(Object bean) { + public static String gsonToString(Object bean) { String json = ""; // convert java object to JSON format, // and returned as JSON formatted string diff --git a/maxkey-core/src/main/java/org/maxkey/entity/ExtraAttrs.java b/maxkey-core/src/main/java/org/maxkey/entity/ExtraAttrs.java index 18f914ae9..bd8657dac 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/ExtraAttrs.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/ExtraAttrs.java @@ -44,7 +44,7 @@ public class ExtraAttrs { public ExtraAttrs(String arrayJsonString) { String extraAttrsJsonString= "{\"extraAttrs\":"+arrayJsonString+"}"; _logger.debug("Extra Attrs Json String " +extraAttrsJsonString); - ExtraAttrs extraAttrs=JsonUtils.gson2Object(extraAttrsJsonString, ExtraAttrs.class); + ExtraAttrs extraAttrs=JsonUtils.gsonStringToObject(extraAttrsJsonString, ExtraAttrs.class); this.extraAttrs=extraAttrs.getExtraAttrs(); } @@ -77,7 +77,7 @@ public class ExtraAttrs { } public String toJsonString(){ - String jsonString =JsonUtils.gson2Json(extraAttrs); + String jsonString =JsonUtils.gsonToString(extraAttrs); _logger.debug("jsonString " +jsonString); return jsonString; } diff --git a/maxkey-core/src/main/java/org/maxkey/web/HttpRequestAdapter.java b/maxkey-core/src/main/java/org/maxkey/web/HttpRequestAdapter.java index 4bbe84687..8a027b606 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/HttpRequestAdapter.java +++ b/maxkey-core/src/main/java/org/maxkey/web/HttpRequestAdapter.java @@ -108,7 +108,7 @@ public class HttpRequestAdapter { e.printStackTrace(); } }else if(mediaType.equals(ContentType.APPLICATION_JSON)) { - String jsonString = JsonUtils.gson2Json(parameterMap); + String jsonString = JsonUtils.gsonToString(parameterMap); StringEntity stringEntity =new StringEntity(jsonString, "UTF-8"); stringEntity.setContentType(ContentType.APPLICATION_JSON); httpMethod.setEntity(stringEntity); @@ -148,7 +148,7 @@ public class HttpRequestAdapter { buildHeader(httpMethod,headers); // 封装put请求参数 - String jsonString = JsonUtils.gson2Json(data); + String jsonString = JsonUtils.gsonToString(data); StringEntity stringEntity =new StringEntity(jsonString, "UTF-8"); stringEntity.setContentType(ContentType.APPLICATION_JSON); httpMethod.setEntity(stringEntity); @@ -185,7 +185,7 @@ public class HttpRequestAdapter { buildHeader(httpMethod,headers); // 封装put请求参数 - String jsonString = JsonUtils.gson2Json(data); + String jsonString = JsonUtils.gsonToString(data); StringEntity stringEntity =new StringEntity(jsonString, "UTF-8"); stringEntity.setContentType(ContentType.APPLICATION_JSON); httpMethod.setEntity(stringEntity); diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java index 6f4b88f50..0ad4926c7 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java +++ b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java @@ -25,10 +25,10 @@ public class ScimEnterpriseUserJsonString2ObjectTest { public static void main(String[] args) { String userJsonString = ReadJson2String.read("ScimEnterpriseUserJsonString.json"); - ScimEnterpriseUser u = JsonUtils.json2Object(userJsonString, ScimEnterpriseUser.class); + ScimEnterpriseUser u = JsonUtils.stringToObject(userJsonString, ScimEnterpriseUser.class); System.out.println( - (new JsonPretty()).format(JsonUtils.object2Json(u))); + (new JsonPretty()).format(JsonUtils.toString(u))); System.out.println(u.getEnterprise().getCostCenter()); } diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java index f001d1250..f04c49ad1 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java +++ b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java @@ -77,7 +77,7 @@ public class ScimEnterpriseUserJsonTest { u.setEnterprise(ent); System.out.println( - (new JsonPretty()).format(JsonUtils.object2Json(u))); + (new JsonPretty()).format(JsonUtils.toString(u))); } } diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java index 3e48fdeaa..cc136f02e 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java +++ b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java @@ -23,10 +23,10 @@ import org.maxkey.util.JsonUtils; public class ScimGroupJsonString2ObjectTest { public static void main(String[] args) { String userJsonString = ReadJson2String.read("ScimGroupJsonString.json"); - ScimGroup g = JsonUtils.json2Object(userJsonString, ScimGroup.class); + ScimGroup g = JsonUtils.stringToObject(userJsonString, ScimGroup.class); System.out.println( - (new JsonPretty()).format(JsonUtils.object2Json(g))); + (new JsonPretty()).format(JsonUtils.toString(g))); } } diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java index 894569cd2..66b971314 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java +++ b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java @@ -58,6 +58,6 @@ public class ScimGroupJsonTest { g.setMembers(mrSet); System.out.println( - (new JsonPretty()).format(JsonUtils.object2Json(g))); + (new JsonPretty()).format(JsonUtils.toString(g))); } } diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java index 7a46f9cc1..6c471ffa8 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java +++ b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java @@ -25,9 +25,9 @@ public class ScimUserJsonString2ObjectTest { public static void main(String[] args) { String userJsonString = ReadJson2String.read("ScimUserJsonString.json"); - ScimUser u = JsonUtils.json2Object(userJsonString, ScimUser.class); + ScimUser u = JsonUtils.stringToObject(userJsonString, ScimUser.class); System.out.println( - (new JsonPretty()).format(JsonUtils.object2Json(u))); + (new JsonPretty()).format(JsonUtils.toString(u))); } } diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java index 4ff35e25d..aada57365 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java +++ b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java @@ -70,7 +70,7 @@ public class ScimUserJsonTest { u.setEmails(ueList); System.out.println( - (new JsonPretty()).format(JsonUtils.object2Json(u))); + (new JsonPretty()).format(JsonUtils.toString(u))); } } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySystemLogsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySystemLogsService.java index 2559bdd40..c9985a284 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySystemLogsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySystemLogsService.java @@ -98,7 +98,7 @@ public class HistorySystemLogsService extends JpaBaseService systemLog.setUsername(operator.getUsername()); systemLog.setDisplayName(operator.getDisplayName()); systemLog.setInstId(operator.getInstId()); - systemLog.setJsonCotent(JsonUtils.gson2Json(entity)); + systemLog.setJsonCotent(JsonUtils.gsonToString(entity)); _logger.trace("System Log {}" ,systemLog); getMapper().insert(systemLog); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunner.java b/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunner.java index 2fcd8c88a..a3806b1f5 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunner.java +++ b/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunner.java @@ -112,7 +112,7 @@ public class ProvisioningRunner { } public void provisionLog(String conName,String topic,String actionType,String sourceId,String sourceName,String resultMessage,int instid) { - Message resultMsg = JsonUtils.json2Object(resultMessage, Message.class); + Message resultMsg = JsonUtils.stringToObject(resultMessage, Message.class); String result = "success"; if(resultMsg == null || resultMsg.getCode() != 0) { result = "fail"; diff --git a/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningThread.java b/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningThread.java index 8cdfe0de3..2680b91ac 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningThread.java +++ b/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningThread.java @@ -50,7 +50,7 @@ public class ProvisioningThread extends Thread{ public void run() { _logger.debug("send message \n{}" ,new JsonPretty().jacksonFormat(msg.getSourceObject())); msg.setContent(ObjectTransformer.serialize((Serializable)msg.getSourceObject())); - Inst inst = JsonUtils.gson2Object(JsonUtils.gson2Json(msg.getSourceObject()), Inst.class); + Inst inst = JsonUtils.gsonStringToObject(JsonUtils.gsonToString(msg.getSourceObject()), Inst.class); jdbcTemplate.update(PROVISION_INSERT_STATEMENT, new Object[] { msg.getId(), msg.getTopic(), msg.getActionType(), msg.getContent(), diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java index 88386ac58..2f44abcb6 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiCndnsApiMailAdapter.java @@ -98,7 +98,7 @@ public class ExtendApiCndnsApiMailAdapter extends AbstractAuthorizeAdapter { String responseBody = new HttpRequestAdapter().post( String.format(ADMIN_AUTHKEY_URI,details.getPrincipal(),sign,timestamp),requestParamenter); - HashMap authKey=JsonUtils.gson2Object(responseBody, HashMap.class); + HashMap authKey=JsonUtils.gsonStringToObject(responseBody, HashMap.class); redirect_uri = authKey.get("adminUrl"); }else { @@ -110,7 +110,7 @@ public class ExtendApiCndnsApiMailAdapter extends AbstractAuthorizeAdapter { String responseBody = new HttpRequestAdapter().post( String.format(AUTHKEY_URI,details.getPrincipal(),sign,timestamp),requestParamenter); - HashMap authKey=JsonUtils.gson2Object(responseBody, HashMap.class); + HashMap authKey=JsonUtils.gsonStringToObject(responseBody, HashMap.class); redirect_uri=authKey.get("webmailUrl"); } diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java index 9297d3b7c..ae38acb70 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/adapter/ExtendApiQQExmailAdapter.java @@ -96,7 +96,7 @@ public class ExtendApiQQExmailAdapter extends AbstractAuthorizeAdapter { String accessToken = tokenCache.getIfPresent(corpid); if(accessToken == null) { String responseBody = new HttpRequestAdapter().get(String.format(TOKEN_URI,corpid,corpsecret),null); - Token token =JsonUtils.gson2Object(responseBody,Token.class); + Token token =JsonUtils.gsonStringToObject(responseBody,Token.class); _logger.debug("access_token {}" , token); accessToken = token.getAccess_token(); tokenCache.put(corpid, accessToken); @@ -108,7 +108,7 @@ public class ExtendApiQQExmailAdapter extends AbstractAuthorizeAdapter { _logger.debug("userId {}" , userId); String authKeyBody = new HttpRequestAdapter().get(String.format(AUTHKEY_URI,accessToken,userId),null); - ExMailLoginUrl exMailLoginUrl = JsonUtils.gson2Object(authKeyBody, ExMailLoginUrl.class); + ExMailLoginUrl exMailLoginUrl = JsonUtils.gsonStringToObject(authKeyBody, ExMailLoginUrl.class); _logger.debug("LoginUrl {} " , exMailLoginUrl); return exMailLoginUrl; } diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java index e8e656efa..b68d7c47f 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java @@ -68,7 +68,7 @@ public class OAuthDefaultUserInfoAdapter extends AbstractAuthorizeAdapter { beanMap.put("institution", userInfo.getInstId()); beanMap.put(WebConstants.ONLINE_TICKET_NAME, principal.getSession().getFormattedId()); - String info= JsonUtils.object2Json(beanMap); + String info= JsonUtils.toString(beanMap); return info; } diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java index bd820000b..8076a1242 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java @@ -90,7 +90,7 @@ public class UserInfoEndpoint { } if (!StringGenerator.uuidMatches(access_token)) { - httpResponseAdapter.write(response,JsonUtils.gson2Json(accessTokenFormatError(access_token)),"json"); + httpResponseAdapter.write(response,JsonUtils.gsonToString(accessTokenFormatError(access_token)),"json"); } OAuth2Authentication oAuth2Authentication =null; @@ -123,7 +123,7 @@ public class UserInfoEndpoint { HashMapauthzException=new HashMap(); authzException.put(OAuth2Exception.ERROR, e.getOAuth2ErrorCode()); authzException.put(OAuth2Exception.DESCRIPTION,e.getMessage()); - httpResponseAdapter.write(response,JsonUtils.gson2Json(authzException),"json"); + httpResponseAdapter.write(response,JsonUtils.gsonToString(authzException),"json"); } } diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java index 517d9b615..2bff53e5c 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java @@ -105,7 +105,7 @@ public class UserInfoOIDCEndpoint { String access_token = AuthorizationHeaderUtils.resolveBearer(request); if (!StringGenerator.uuidMatches(access_token)) { - return JsonUtils.gson2Json(accessTokenFormatError(access_token)); + return JsonUtils.gsonToString(accessTokenFormatError(access_token)); } String principal=""; @@ -275,7 +275,7 @@ public class UserInfoOIDCEndpoint { HashMapauthzException=new HashMap(); authzException.put(OAuth2Exception.ERROR, e.getOAuth2ErrorCode()); authzException.put(OAuth2Exception.DESCRIPTION,e.getMessage()); - return JsonUtils.object2Json(authzException); + return JsonUtils.toString(authzException); } } diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java index 39499e59d..24da8bdba 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java @@ -90,7 +90,7 @@ public class TokenBasedDefaultAdapter extends AbstractAuthorizeAdapter { beanMap.put("expires", expiresString); - token = JsonUtils.object2Json(beanMap); + token = JsonUtils.toString(beanMap); _logger.debug("Token : {}",token); return token; diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuAccessTokenService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuAccessTokenService.java index 016d40b11..38debdc97 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuAccessTokenService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuAccessTokenService.java @@ -54,7 +54,7 @@ public class FeishuAccessTokenService { parameterMap.put("app_secret", appSecret); String responseBody = request.post(TOKEN_URL, parameterMap,null); - AccessToken accessToken = JsonUtils.gson2Object(responseBody, AccessToken.class); + AccessToken accessToken = JsonUtils.gsonStringToObject(responseBody, AccessToken.class); _logger.debug("accessToken " + accessToken); if(accessToken.getErrcode()== 0){ return accessToken.getTenant_access_token(); diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuOrganizationService.java index 4366a09d2..58cd27842 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuOrganizationService.java @@ -104,7 +104,7 @@ public class FeishuOrganizationService extends AbstractSynchronizerService imple HashMap headers =new HashMap(); headers.put("Authorization", AuthorizationHeaderUtils.createBearer(access_token)); String responseBody = request.get(String.format(DEPTS_URL, deptId),headers); - FeishuDeptsResponse deptsResponse =JsonUtils.gson2Object(responseBody, FeishuDeptsResponse.class); + FeishuDeptsResponse deptsResponse =JsonUtils.gsonStringToObject(responseBody, FeishuDeptsResponse.class); _logger.trace("response : " + responseBody); @@ -116,7 +116,7 @@ public class FeishuOrganizationService extends AbstractSynchronizerService imple HashMap headers =new HashMap(); headers.put("Authorization", AuthorizationHeaderUtils.createBearer(access_token)); String responseBody = request.get(String.format(url, deptId),headers); - FeishuDeptsResponse deptsResponse =JsonUtils.gson2Object(responseBody, FeishuDeptsResponse.class); + FeishuDeptsResponse deptsResponse =JsonUtils.gsonStringToObject(responseBody, FeishuDeptsResponse.class); _logger.trace("response : " + responseBody); diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuUsersService.java index 97ee3936a..78028e2bc 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuUsersService.java @@ -53,7 +53,7 @@ public class FeishuUsersService extends AbstractSynchronizerService implements I HashMap headers =new HashMap(); headers.put("Authorization", AuthorizationHeaderUtils.createBearer(access_token)); String responseBody = request.get(String.format(USERS_URL,relatedOrg.getOriginId()),headers); - FeishuUsersResponse usersResponse =JsonUtils.gson2Object(responseBody, FeishuUsersResponse.class); + FeishuUsersResponse usersResponse =JsonUtils.gsonStringToObject(responseBody, FeishuUsersResponse.class); _logger.trace("response : " + responseBody); if(usersResponse.getCode() == 0 && usersResponse.getData().getItems() != null) { for(FeishuUsers feiShuUser : usersResponse.getData().getItems()) { diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java index e41177907..ab94177b1 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java @@ -47,7 +47,7 @@ public class WorkweixinAccessTokenService { HttpRequestAdapter request =new HttpRequestAdapter(); String responseBody = request.get(String.format(TOKEN_URL, corpid,corpsecret)); - AccessToken accessToken = JsonUtils.gson2Object(responseBody, AccessToken.class); + AccessToken accessToken = JsonUtils.gsonStringToObject(responseBody, AccessToken.class); _logger.debug("accessToken " + accessToken); if(accessToken.getErrcode()== 0){ return accessToken.getAccess_token(); diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java index 4c82af818..0aed80cb8 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java @@ -100,7 +100,7 @@ public class WorkweixinOrganizationService extends AbstractSynchronizerService i public WorkWeixinDeptsResponse requestDepartmentList(String access_token) { HttpRequestAdapter request =new HttpRequestAdapter(); String responseBody = request.get(String.format(DEPTS_URL, access_token)); - WorkWeixinDeptsResponse deptsResponse =JsonUtils.gson2Object(responseBody, WorkWeixinDeptsResponse.class); + WorkWeixinDeptsResponse deptsResponse =JsonUtils.gsonStringToObject(responseBody, WorkWeixinDeptsResponse.class); _logger.trace("response : " + responseBody); for(WorkWeixinDepts dept : deptsResponse.getDepartment()) { diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java index c29b56809..7dc7a93d6 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java @@ -49,7 +49,7 @@ public class WorkweixinUsersService extends AbstractSynchronizerService implemen for(SynchroRelated relatedOrg : synchroRelateds) { HttpRequestAdapter request =new HttpRequestAdapter(); String responseBody = request.get(String.format(USERS_URL, access_token,relatedOrg.getOriginId())); - WorkWeixinUsersResponse usersResponse =JsonUtils.gson2Object(responseBody, WorkWeixinUsersResponse.class); + WorkWeixinUsersResponse usersResponse =JsonUtils.gsonStringToObject(responseBody, WorkWeixinUsersResponse.class); _logger.trace("response : " + responseBody); for(WorkWeixinUsers user : usersResponse.getUserlist()) { diff --git a/maxkey-webs/maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java b/maxkey-webs/maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java index 3f21a9be3..2fc03ed81 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java +++ b/maxkey-webs/maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java @@ -63,7 +63,7 @@ public class KerberosPrincipal { System.out.println(DateUtils.toUtc(datetime)); String json="{\"fullPrincipal\":\"Administrator@CONNSEC.COM\",\"principal\":\"Administrator\",\"userDomain\":\"CONNSEC\",\"notOnOrAfter\":\"2014-01-18T07:10:16.624Z\"}"; KerberosToken kerberosToken=new KerberosToken(); - kerberosToken=(KerberosToken)JsonUtils.json2Object(json, kerberosToken); + kerberosToken=(KerberosToken)JsonUtils.stringToObject(json, kerberosToken); System.out.println(kerberosToken); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserInfoController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserInfoController.java index 7a795ccb6..8760ae6c9 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserInfoController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserInfoController.java @@ -208,7 +208,7 @@ public class UserInfoController { for(int i=0;i