fix field order

NeoGitCrt1 · NeoGitCrt1 · commit be00ec44a1e4 · 2022-05-29T15:47:55.000+08:00
diff --git a/APIJSONORM/src/main/java/apijson/JSON.java b/APIJSONORM/src/main/java/apijson/JSON.java
@@ -6,8 +6,8 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.parser.Feature;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson2.JSONReader;
 
 import java.util.List;
 
@@ -64,12 +64,10 @@ public static String getCorrectJson(String s, boolean isArray) {
 	 * @param json
 	 * @return
 	 */
-	private static final Feature[] DEFAULT_FASTJSON_FEATURES = {Feature.OrderedField, Feature.AllowSingleQuotes, Feature.UseBigDecimal, Feature.UseObjectArray};
+	private static final JSONReader.Feature[] DEFAULT_FASTJSON_FEATURES = {JSONReader.Feature.FieldBased, JSONReader.Feature.UseBigDecimalForDoubles};
 	public static Object parse(Object obj) {
-		int features = com.alibaba.fastjson.JSON.DEFAULT_PARSER_FEATURE;
-		features |= Feature.OrderedField.getMask();
 		try {
-			return com.alibaba.fastjson.JSON.parse(obj instanceof String ? (String) obj : toJSONString(obj), DEFAULT_FASTJSON_FEATURES);
+			return com.alibaba.fastjson2.JSON.parse(obj instanceof String ? (String) obj : toJSONString(obj), DEFAULT_FASTJSON_FEATURES);
 		} catch (Exception e) {
 			Log.i(TAG, "parse  catch \n" + e.getMessage());
 		}
@@ -91,32 +89,7 @@ public static JSONObject parseObject(Object obj) {
 	 * @return
 	 */
 	public static JSONObject parseObject(String json) {
-		return parseObject(json, DEFAULT_FASTJSON_FEATURES);
-	}
-
-	/**
-	 * json转JSONObject
-	 *
-	 * @param json
-	 * @param features
-	 * @return
-	 */
-	public static JSONObject parseObject(String json, Feature... features) {
-		try {
-			return com.alibaba.fastjson.JSON.parseObject(getCorrectJson(json), JSONObject.class, features);
-		} catch (Exception e) {
-			Log.i(TAG, "parseObject  catch \n" + e.getMessage());
-		}
-		return null;
-	}
-
-	/**JSONObject转实体类
-	 * @param object
-	 * @param clazz
-	 * @return
-	 */
-	public static <T> T parseObject(JSONObject object, Class<T> clazz) {
-		return parseObject(toJSONString(object), clazz);
+		return parseObject(json, JSONObject.class);
 	}
 	/**json转实体类
 	 * @param json
@@ -128,9 +101,7 @@ public static <T> T parseObject(String json, Class<T> clazz) {
 			Log.e(TAG, "parseObject  clazz == null >> return null;");
 		} else {
 			try {
-				int features = com.alibaba.fastjson.JSON.DEFAULT_PARSER_FEATURE;
-				features |= Feature.OrderedField.getMask();
-				return com.alibaba.fastjson.JSON.parseObject(getCorrectJson(json), clazz, DEFAULT_FASTJSON_FEATURES);
+				return com.alibaba.fastjson2.JSON.parseObject(getCorrectJson(json), clazz, DEFAULT_FASTJSON_FEATURES);
 			} catch (Exception e) {
 				Log.i(TAG, "parseObject  catch \n" + e.getMessage());
 			}
diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -425,7 +425,7 @@ else if (value instanceof String) { // //key{}@ getRealKey, 引用赋值路径
 				String replaceKey = key.substring(0, key.length() - 1);
 
 				//						System.out.println("getObject  key.endsWith(@) >> parseRelation = " + parseRelation);
-				String targetPath = AbstractParser.getValuePath(type == TYPE_ITEM ? path : parentPath, new String((String) value));
+				String targetPath = AbstractParser.getValuePath(type == TYPE_ITEM ? path : parentPath, (String) value);
 
 				//先尝试获取，尽量保留缺省依赖路径，这样就不需要担心路径改变
 				Object target = onReferenceParse(targetPath);
