optimize codes update comments

core/src/main/java/com/alibaba/fastjson2/JSON.java

@@ -458,8 +458,9 @@ static <T> T parseObject(byte[] bytes, int offset, int length, Charset charset,
      * @param type     specify the {@link Type} to be converted
      * @param consumer the consumer of the parsing result object
      * @param features features to be enabled in parsing
-     * @throws JSONException IO exception occurred in reading
+     * @throws JSONException If the first byte cannot be read for any reason other than end of file, or if the input stream has been closed, or if some other I/O error occurs
      * @see JSON#parseObject(InputStream, Charset, char, Type, Consumer, JSONReader.Feature...)
+     * @since 2.0.2
      */
     static <T> void parseObject(InputStream input, Type type, Consumer<T> consumer, JSONReader.Feature... features) {
         parseObject(input, StandardCharsets.UTF_8, '\n', type, consumer, features);
@@ -474,7 +475,8 @@ static <T> void parseObject(InputStream input, Type type, Consumer<T> consumer,
      * @param type      specify the {@link Type} to be converted
      * @param consumer  the consumer of the parsing result object
      * @param features  features to be enabled in parsing
-     * @throws JSONException IO exception occurred in reading
+     * @throws JSONException If the first byte cannot be read for any reason other than end of file, or if the input stream has been closed, or if some other I/O error occurs
+     * @since 2.0.2
      */
     @SuppressWarnings("unchecked")
     static <T> void parseObject(InputStream input, Charset charset, char delimiter, Type type, Consumer<T> consumer, JSONReader.Feature... features) {
@@ -546,7 +548,8 @@ static <T> void parseObject(InputStream input, Charset charset, char delimiter,
      * @param delimiter specify the delimiter
      * @param type      specify the {@link Type} to be converted
      * @param consumer  the consumer of the parsing result object
-     * @throws JSONException IO exception occurred in reading
+     * @throws JSONException If the first byte cannot be read for any reason other than end of file, or if the input stream has been closed, or if some other I/O error occurs
+     * @since 2.0.2
      */
     @SuppressWarnings("unchecked")
     static <T> void parseObject(Reader input, char delimiter, Type type, Consumer<T> consumer) {
@@ -1166,6 +1169,9 @@ static <T> T toJavaObject(Object object, Class<T> clazz) {
         return TypeUtils.cast(object, clazz);
     }
 
+    /**
+     * @since 2.0.2
+     */
     static void mixIn(Class<?> target, Class<?> mixinSource) {
         JSONFactory.defaultObjectWriterProvider.mixIn(target, mixinSource);
         JSONFactory.getDefaultObjectReaderProvider().mixIn(target, mixinSource);
@@ -1176,6 +1182,7 @@ static void mixIn(Class<?> target, Class<?> mixinSource) {
      *
      * @see JSONFactory#getDefaultObjectReaderProvider()
      * @see com.alibaba.fastjson2.reader.ObjectReaderProvider#register(Type, ObjectReader)
+     * @since 2.0.2
      */
     static boolean register(Type type, ObjectReader<?> objectReader) {
         return JSONFactory.getDefaultObjectReaderProvider().register(type, objectReader);
@@ -1186,6 +1193,7 @@ static boolean register(Type type, ObjectReader<?> objectReader) {
      *
      * @see JSONFactory#getDefaultObjectReaderProvider()
      * @see com.alibaba.fastjson2.writer.ObjectWriterProvider#register(Type, ObjectWriter)
+     * @since 2.0.2
      */
     static boolean register(Type type, ObjectWriter<?> objectReader) {
         return JSONFactory.defaultObjectWriterProvider.register(type, objectReader);

core/src/main/java/com/alibaba/fastjson2/JSONObject.java

@@ -88,6 +88,7 @@ public Object get(Object key) {
         if (key instanceof Number
                 || key instanceof Character
                 || key instanceof Boolean
+                || key instanceof UUID
         ) {
             return super.get(
                     key.toString()
@@ -97,35 +98,56 @@ public Object get(Object key) {
         return super.get(key);
     }
 
+    /**
+     * Returns a set view of the mappings contained in this map
+     */
     @Override
+    @SuppressWarnings("unchecked")
     public Set<Map.Entry<String, Object>> entrySet() {
         return super.entrySet();
     }
 
+    /**
+     * Returns a set view of the keys contained in this map
+     */
     @Override
+    @SuppressWarnings("unchecked")
     public Set<String> keySet() {
         return super.keySet();
     }
 
+    /**
+     * Returns true if this map contains a mapping for the specified key
+     *
+     * @param key the key whose presence in this map is to be tested
+     */
+    public boolean containsKey(String key) {
+        return super.containsKey(key);
+    }
+
+    /**
+     * Returns true if this map contains a mapping for the specified key
+     *
+     * @param key the key whose presence in this map is to be tested
+     */
     @Override
     public boolean containsKey(Object key) {
-        boolean result = super.containsKey(key);
-        if (!result) {
-            if (key instanceof Number
-                    || key instanceof Character
-                    || key instanceof Boolean
-                    || key instanceof UUID
-            ) {
-                result = super.containsKey(key.toString());
-            }
+        if (key instanceof Number
+                || key instanceof Character
+                || key instanceof Boolean
+                || key instanceof UUID
+        ) {
+            return super.containsKey(key.toString());
         }
-        return result;
+
+        return super.containsKey(key);
     }
 
     /**
      * @param key          the key whose associated value is to be returned
      * @param defaultValue the default mapping of the key
      */
+    @SuppressWarnings("unchecked")
     public Object getOrDefault(String key, Object defaultValue) {
         return super.getOrDefault(
                 key, defaultValue
@@ -138,10 +160,12 @@ public Object getOrDefault(String key, Object defaultValue) {
      * @since 2.0.2
      */
     @Override
+    @SuppressWarnings("unchecked")
     public Object getOrDefault(Object key, Object defaultValue) {
         if (key instanceof Number
                 || key instanceof Character
                 || key instanceof Boolean
+                || key instanceof UUID
         ) {
             return super.getOrDefault(
                     key.toString(), defaultValue

core/src/main/java/com/alibaba/fastjson2/TypeReference.java

@@ -50,7 +50,7 @@ public TypeReference() {
      * @throws NullPointerException If the {@link Type} is null
      */
     @SuppressWarnings("unchecked")
-    public TypeReference(Type type, boolean raw) {
+    public TypeReference(Type type) {
         if (type == null) {
             throw new NullPointerException();
         }
@@ -60,11 +60,23 @@ public TypeReference(Type type, boolean raw) {
     }
 
     /**
+     * For example
+     * <pre>{@code
+     * Class<T> klass = ...;
+     * TypeReference<Response<T>> ref = new TypeReference<Response<T>>(new Type[]{klass}){};
+     * }</pre>
+     *
      * @param actualTypeArguments an array of Type objects representing the actual type arguments to this type
+     * @throws NullPointerException If the {@code actualTypeArguments} is null or empty
      * @since 2.0.2
      */
     @SuppressWarnings("unchecked")
-    public TypeReference(Type... actualTypeArguments) {
+    public TypeReference(Type[] actualTypeArguments) {
+        if (actualTypeArguments == null ||
+            actualTypeArguments.length == 0) {
+            throw new NullPointerException();
+        }
+
         Class<?> thisClass = getClass();
         Type superClass = thisClass.getGenericSuperclass();
         ParameterizedType argType = (ParameterizedType) ((ParameterizedType) superClass).getActualTypeArguments()[0];
@@ -145,7 +157,7 @@ public T parseArray(JSONArray object) {
      * @param type specify the {@link Type} to be converted
      */
     public static TypeReference<?> get(Type type) {
-        return new TypeReference<Object>(type, true) {
+        return new TypeReference<Object>(type) {
             // nothing
         };
     }

core/src/test/java/com/alibaba/fastjson2/v1issues/issue_1600/Issue1612.java

@@ -4,6 +4,8 @@
 import com.alibaba.fastjson2.TypeReference;
 import org.junit.jupiter.api.Test;
 
+import java.lang.reflect.Type;
+
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
@@ -23,12 +25,12 @@ public void test() {
         assertNotNull(user);
     }
 
-    public static <T> RegResponse<T> testFastJson(Class<T> clasz) {
+    public static <T> RegResponse<T> testFastJson(Class<T> clazz) {
 
         //把body解析成一个对象
         String body = "{\"retCode\":\"200\", \"result\":{\"name\":\"Zhangsan\",\"password\":\"123\"}}";
 
-        return JSON.parseObject(body, new TypeReference<RegResponse<T>>(clasz) {});
+        return JSON.parseObject(body, new TypeReference<RegResponse<T>>(new Type[]{clazz}) {});
     }
 }