优化框架代码写法

适配 Gson 2.10.1 版本

Author: getActivity

README.md

@@ -39,9 +39,9 @@ android {
 
 dependencies {
     // Gson 解析容错：https://github.com/getActivity/GsonFactory
-    implementation 'com.github.getActivity:GsonFactory:6.3'
+    implementation 'com.github.getActivity:GsonFactory:6.5'
     // Json 解析框架：https://github.com/google/gson
-    implementation 'com.google.code.gson:gson:2.9.1'
+    implementation 'com.google.code.gson:gson:2.10.1'
 }
 ```
 
@@ -262,6 +262,8 @@ GsonFactory.setJsonCallback(new JsonCallback() {
 
 * 省市区 Json 数据：[ProvinceJson](https://github.com/getActivity/ProvinceJson) ![](https://img.shields.io/github/stars/getActivity/ProvinceJson.svg) ![](https://img.shields.io/github/forks/getActivity/ProvinceJson.svg)
 
+* Markdown 语法文档：[MarkdownDoc](https://github.com/getActivity/MarkdownDoc) ![](https://img.shields.io/github/stars/getActivity/MarkdownDoc.svg) ![](https://img.shields.io/github/forks/getActivity/MarkdownDoc.svg)
+
 #### 微信公众号：Android轮子哥
 
 ![](https://raw.githubusercontent.com/getActivity/Donate/master/picture/official_ccount.png)

app/build.gradle

@@ -5,10 +5,10 @@ android {
 
     defaultConfig {
         applicationId "com.hjq.gson.factory.demo"
-        minSdkVersion 14
+        minSdkVersion 16
         targetSdkVersion 31
-        versionCode 63
-        versionName "6.3"
+        versionCode 65
+        versionName "6.5"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
@@ -67,7 +67,10 @@ dependencies {
 
     // Json 解析框架：https://github.com/google/gson
     // noinspection GradleDependency
-    implementation 'com.google.code.gson:gson:2.9.1'
+    implementation 'com.google.code.gson:gson:2.10.1'
+
+    // 标题栏框架：https://github.com/getActivity/TitleBar
+    implementation 'com.github.getActivity:TitleBar:10.0'
 
     // Bugly 异常捕捉：https://bugly.qq.com/docs/user-guide/instruction-manual-android/?v=20190418140644
     implementation 'com.tencent.bugly:crashreport:4.0.4'

app/src/androidTest/java/com/hjq/gson/factory/test/JsonUnitTest.java

@@ -1,6 +1,7 @@
 package com.hjq.gson.factory.test;
 
 import android.content.Context;
+import android.util.Log;
 
 import androidx.test.platform.app.InstrumentationRegistry;
 
@@ -9,7 +10,6 @@
 import com.google.gson.stream.JsonToken;
 import com.hjq.gson.factory.GsonFactory;
 import com.hjq.gson.factory.JsonCallback;
-import com.tencent.bugly.crashreport.CrashReport;
 
 import org.junit.After;
 import org.junit.Before;
@@ -35,15 +35,16 @@ public final class JsonUnitTest {
      */
     @Before
     public void onTestBefore() {
+        // CrashReport.initCrashReport(InstrumentationRegistry.getInstrumentation().getContext());
         mGson = GsonFactory.getSingletonGson();
         // 设置 Json 解析容错监听
         GsonFactory.setJsonCallback(new JsonCallback() {
 
             @Override
             public void onTypeException(TypeToken<?> typeToken, String fieldName, JsonToken jsonToken) {
-                // Log.e("GsonFactory", "类型解析异常：" + typeToken + "#" + fieldName + "，后台返回的类型为：" + jsonToken);
+                Log.e("GsonFactory", "类型解析异常：" + typeToken + "#" + fieldName + "，后台返回的类型为：" + jsonToken);
                 // 上报到 Bugly 错误列表
-                CrashReport.postCatchedException(new IllegalArgumentException("类型解析异常：" + typeToken + "#" + fieldName + "，后台返回的类型为：" + jsonToken));
+                // CrashReport.postCatchedException(new IllegalArgumentException("类型解析异常：" + typeToken + "#" + fieldName + "，后台返回的类型为：" + jsonToken));
             }
         });
     }

app/src/main/java/com/hjq/gson/factory/demo/MainActivity.java

@@ -1,14 +1,29 @@
 package com.hjq.gson.factory.demo;
 
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.hjq.bar.OnTitleBarListener;
+import com.hjq.bar.TitleBar;
+
 public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        TitleBar titleBar = findViewById(R.id.tb_main_bar);
+        titleBar.setOnTitleBarListener(new OnTitleBarListener() {
+            @Override
+            public void onTitleClick(TitleBar titleBar) {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(titleBar.getTitle().toString()));
+                startActivity(intent);
+            }
+        });
     }
 }

app/src/main/res/layout/activity_main.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -8,12 +8,19 @@
     android:orientation="vertical"
     tools:context=".MainActivity">
 
-    <TextView
-        android:layout_width="wrap_content"
+    <com.hjq.bar.TitleBar
+        android:id="@+id/tb_main_bar"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
+        app:leftIcon="@null"
+        app:title="https://github.com/getActivity/GsonFactory" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
         android:text="请看单元测试的代码"
         android:textColor="#333333"
         android:textSize="18sp" />
 
-</FrameLayout>
+</LinearLayout>

library/build.gradle

@@ -5,8 +5,8 @@ android {
 
     defaultConfig {
         minSdkVersion 11
-        versionCode 63
-        versionName "6.3"
+        versionCode 65
+        versionName "6.5"
     }
 
     // 使用 JDK 1.8
@@ -34,7 +34,7 @@ afterEvaluate {
 dependencies {
     // Json 解析框架：https://github.com/google/gson
     // noinspection GradleDependency
-    implementation 'com.google.code.gson:gson:2.9.1'
+    implementation 'com.google.code.gson:gson:2.10.1'
 }
 
 // 防止编码问题

library/src/main/java/com/hjq/gson/factory/element/ReflectiveTypeAdapterFactory.java

@@ -130,6 +130,6 @@ private static boolean excludeField(Field field, boolean serialize, Excluder exc
     }
 
     private List<String> getFieldNames(Field field) {
-        return ReflectiveTypeUtils.getFieldName(mFieldNamingPolicy, field);
+        return ReflectiveTypeUtils.getFieldNames(mFieldNamingPolicy, field);
     }
 }

library/src/main/java/com/hjq/gson/factory/element/ReflectiveTypeUtils.java

@@ -24,10 +24,10 @@
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Currency;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
@@ -174,18 +174,22 @@ public static TypeAdapter<?> getTypeAdapter(ConstructorConstructor constructor,
         return typeAdapter;
     }
 
-    public static List<String> getFieldName(FieldNamingStrategy fieldNamingPolicy, Field field) {
-        SerializedName serializedName = field.getAnnotation(SerializedName.class);
-        List<String> fieldNames = new LinkedList<>();
-        if (serializedName == null) {
-            fieldNames.add(fieldNamingPolicy.translateName(field));
-        } else {
-            fieldNames.add(serializedName.value());
-            String[] alternates = serializedName.alternate();
-            for (String alternate : alternates) {
-                fieldNames.add(alternate);
-            }
+    public static List<String> getFieldNames(FieldNamingStrategy fieldNamingPolicy, Field field) {
+        SerializedName annotation = field.getAnnotation(SerializedName.class);
+        if (annotation == null) {
+            String name = fieldNamingPolicy.translateName(field);
+            return Collections.singletonList(name);
         }
+
+        String serializedName = annotation.value();
+        String[] alternates = annotation.alternate();
+        if (alternates.length == 0) {
+            return Collections.singletonList(serializedName);
+        }
+
+        List<String> fieldNames = new ArrayList<>(alternates.length + 1);
+        fieldNames.add(serializedName);
+        Collections.addAll(fieldNames, alternates);
         return fieldNames;
     }
 }

library/src/main/java/com/hjq/gson/factory/element/TypeAdapterRuntimeTypeWrapper.java

@@ -3,6 +3,7 @@
 import com.google.gson.Gson;
 import com.google.gson.TypeAdapter;
 import com.google.gson.internal.bind.ReflectiveTypeAdapterFactory;
+import com.google.gson.internal.bind.SerializationDelegatingTypeAdapter;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
@@ -43,31 +44,51 @@ public void write(JsonWriter out, T value) throws IOException {
         // Third preference: reflective type adapter for the runtime type (if it is a sub class of the declared type)
         // Fourth preference: reflective type adapter for the declared type
 
-        TypeAdapter chosen = mDelegate;
+        TypeAdapter chosen;
         Type runtimeType = getRuntimeTypeIfMoreSpecific(mType, value);
         if (runtimeType != mType) {
             TypeAdapter runtimeTypeAdapter = mGson.getAdapter(TypeToken.get(runtimeType));
             if (!(runtimeTypeAdapter instanceof ReflectiveTypeAdapterFactory.Adapter)) {
                 // The user registered a type adapter for the runtime type, so we will use that
                 chosen = runtimeTypeAdapter;
-            } else if (!(mDelegate instanceof ReflectiveTypeAdapterFactory.Adapter)) {
+            } else if (!isReflective(mDelegate)) {
                 // The user registered a type adapter for Base class, so we prefer it over the
                 // reflective type adapter for the runtime type
                 chosen = mDelegate;
             } else {
                 // Use the type adapter for runtime type
                 chosen = runtimeTypeAdapter;
             }
+        } else {
+            chosen = mDelegate;
         }
         chosen.write(out, value);
     }
 
+    /**
+     * Returns whether the type adapter uses reflection.
+     *
+     * @param typeAdapter the type adapter to check.
+     */
+    private static boolean isReflective(TypeAdapter<?> typeAdapter) {
+        // Run this in loop in case multiple delegating adapters are nested
+        while (typeAdapter instanceof SerializationDelegatingTypeAdapter) {
+            TypeAdapter<?> delegate = ((SerializationDelegatingTypeAdapter<?>) typeAdapter).getSerializationDelegate();
+            // Break if adapter does not delegate serialization
+            if (delegate == typeAdapter) {
+                break;
+            }
+            typeAdapter = delegate;
+        }
+
+        return typeAdapter instanceof ReflectiveTypeAdapterFactory.Adapter;
+    }
+
     /**
      * Finds a compatible runtime type if it is more specific
      */
-    private Type getRuntimeTypeIfMoreSpecific(Type type, Object value) {
-        if (value != null
-                && (type == Object.class || type instanceof TypeVariable<?> || type instanceof Class<?>)) {
+    private static Type getRuntimeTypeIfMoreSpecific(Type type, Object value) {
+        if (value != null && (type instanceof Class<?> || type instanceof TypeVariable<?>)) {
             type = value.getClass();
         }
         return type;