JsonUtils rename method name

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());
     }
     

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());

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;
 	}

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> T json2Object(String json, Class<T> cls) {
+    public static <T> T stringToObject(String json, Class<T> 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 <T> Class
      * @param json String
      * @return Object
      */
 
-    public static <T> T gson2Object(String json, Class<T> cls) {
+    public static <T> T gsonStringToObject(String json, Class<T> 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

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;
 	}

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);

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());
     }
 

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)));
     }
 
 }

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)));
     }
 }

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)));
     }
 }

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)));
     }
 
 }

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)));
     }
 
 }

maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySystemLogsService.java

@@ -98,7 +98,7 @@ public class HistorySystemLogsService  extends JpaBaseService<HistorySystemLogs>
 		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);
 	}

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

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(),

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<String, String> authKey=JsonUtils.gson2Object(responseBody, HashMap.class);
+			HashMap<String, String> 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<String, String> authKey=JsonUtils.gson2Object(responseBody, HashMap.class);
+			HashMap<String, String> authKey=JsonUtils.gsonStringToObject(responseBody, HashMap.class);
 			redirect_uri=authKey.get("webmailUrl");
 		}
 		

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;
     }

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;
 	}

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 {
 				HashMap<String,Object>authzException=new HashMap<String,Object>();
 				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"); 
 			}
 	}
 	

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 {
 			HashMap<String,Object>authzException=new HashMap<String,Object>();
 			authzException.put(OAuth2Exception.ERROR, e.getOAuth2ErrorCode());
 			authzException.put(OAuth2Exception.DESCRIPTION,e.getMessage());
-			return JsonUtils.object2Json(authzException);
+			return JsonUtils.toString(authzException);
 		}
 	}
 	

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;

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();

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<String,String> headers =new HashMap<String,String>();
 		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<String,String> headers =new HashMap<String,String>();
 		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);
 

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<String,String> headers =new HashMap<String,String>();
 				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()) {

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();

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()) {

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()) {

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);
 		

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<extraAttributeLabel.length;i++){
 				extraAttributeMap.put(extraAttributeLabel[i], extraAttributeValue[i]);
 			}
-			String extraAttribute=JsonUtils.object2Json(extraAttributeMap);
+			String extraAttribute=JsonUtils.toString(extraAttributeMap);
 			userInfo.setExtraAttribute(extraAttribute);
 		}
 	}