getAdapter changes

Flipkart · Nov 25, 2017 · da97c95 · da97c95
1 parent b9f8dcf
commit da97c95
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/...rary-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java b/...rary-compiler/src/main/java/com/vimeo/stag/processor/generators/StagFactoryGenerator.java
@@ -32,7 +32,8 @@ public StagFactoryGenerator(List<ClassInfo> classInfoList, String fileName) {
     public TypeSpec getTypeAdapterFactorySpec() {
         TypeSpec.Builder adapterBuilder = TypeSpec.classBuilder(fileName)
                 .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
-//                .addSuperinterface(TypeAdapterFactory.class)
+                .addSuperinterface(TypeAdapterFactory.class)
+                .addMethod(createStaticAdapterCreationMethod())
                 .addMethod(getCreateMethodSpec());
 
         return adapterBuilder.build();
@@ -42,10 +43,31 @@ public TypeSpec getTypeAdapterFactorySpec() {
     private MethodSpec getCreateMethodSpec() {
         TypeVariableName genericType = TypeVariableName.get("T");
         AnnotationSpec suppressions = AnnotationSpec.builder(SuppressWarnings.class)
-                .addMember("value", "\"unchecked\" /* Protected by TypeToken */")
+                .addMember("value", "\"unchecked\"")
                 .addMember("value", "\"rawtypes\"")
                 .build();
         MethodSpec.Builder builder = MethodSpec.methodBuilder("create")
+                .addTypeVariable(genericType)
+                .addParameter(Gson.class, "gson")
+                .addParameter(ParameterizedTypeName.get(ClassName.get(TypeToken.class), genericType), "type")
+                .returns(ParameterizedTypeName.get(ClassName.get(TypeAdapter.class), genericType))
+                .addAnnotation(suppressions)
+                .addAnnotation(Override.class)
+                .addModifiers(Modifier.PUBLIC);
+
+        builder.addCode("return getAdapter(gson, type);\n");
+
+        return builder.build();
+    }
+
+    @NotNull
+    private MethodSpec createStaticAdapterCreationMethod() {
+        TypeVariableName genericType = TypeVariableName.get("T");
+        AnnotationSpec suppressions = AnnotationSpec.builder(SuppressWarnings.class)
+                .addMember("value", "\"unchecked\"")
+                .addMember("value", "\"rawtypes\"")
+                .build();
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("getAdapter")
                 .addTypeVariable(genericType)
                 .addParameter(Gson.class, "gson")
                 .addParameter(ParameterizedTypeName.get(ClassName.get(TypeToken.class), genericType), "type")

diff --git a/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java b/stag-library-compiler/src/main/java/com/vimeo/stag/processor/generators/StagGenerator.java
@@ -123,7 +123,7 @@ private TypeSpec getAdapterFactorySpec() {
         int count = 1;
         for (String stagFileName : generatedStagFactoryWrappers) {
             String fieldName = "adapter" + count;
-            createMethodBuilder.addStatement("TypeAdapter<T> " + fieldName + " = " + stagFileName + ".create(gson, type)");
+            createMethodBuilder.addStatement("TypeAdapter<T> " + fieldName + " = " + stagFileName + ".getAdapter(gson, type)");
             createMethodBuilder.beginControlFlow("if (" + fieldName + " != null)");
             createMethodBuilder.addStatement("return " + fieldName);
             createMethodBuilder.endControlFlow();