Don't reference CREATOR directly

Author: grandstaish

compiler/src/main/java/nz/bradcampbell/paperparcel/model/properties/ParcelableProperty.java

@@ -22,14 +22,14 @@ public ParcelableProperty(boolean isNullable, TypeName typeName, boolean isInter
   protected CodeBlock readFromParcelInner(CodeBlock.Builder block, ParameterSpec in, @Nullable FieldSpec classLoader,
                                           Map<ClassName, CodeBlock> typeAdaptersMap, Set<String> scopedVariableNames) {
     TypeName rawTypeName = getRawTypeName(getTypeName());
-    return CodeBlock.of("$T.CREATOR.createFromParcel($N)", rawTypeName, in);
+    return CodeBlock.of("$N.readParcelable($T.class.getClassLoader())", in, rawTypeName);
   }
 
   @Override
   protected void writeToParcelInner(
       CodeBlock.Builder block, ParameterSpec dest, ParameterSpec flags, CodeBlock sourceLiteral,
       Map<ClassName, CodeBlock> typeAdaptersMap, Set<String> scopedVariableNames) {
-    block.addStatement("$L.writeToParcel($N, $N)", sourceLiteral, dest, flags);
+    block.addStatement("$N.writeParcelable($L, $N)", dest, sourceLiteral, flags);
   }
 
   private TypeName getRawTypeName(TypeName typeName) {

compiler/src/test/java/nz/bradcampbell/paperparcel/ArrayTests.java

@@ -128,7 +128,7 @@ public class ArrayTests {
         "for (int childIndex = 0; childIndex < childSize; childIndex++) {",
         "Bitmap outChildComponent = null;",
         "if (in.readInt() == 0) {",
-        "outChildComponent = Bitmap.CREATOR.createFromParcel(in);",
+        "outChildComponent = in.readParcelable(Bitmap.class.getClassLoader());",
         "}",
         "child[childIndex] = outChildComponent;",
         "}",
@@ -162,7 +162,7 @@ public class ArrayTests {
         "dest.writeInt(1);",
         "} else {",
         "dest.writeInt(0);",
-        "childItem.writeToParcel(dest, flags);",
+        "dest.writeParcelable(childItem, flags);",
         "}",
         "}",
         "}",

compiler/src/test/java/nz/bradcampbell/paperparcel/ParcelableTests.java

@@ -44,7 +44,7 @@ public class ParcelableTests {
         "@Override public TestParcel createFromParcel(Parcel in) {",
         "Bitmap outChild = null;",
         "if (in.readInt() == 0) {",
-        "outChild = Bitmap.CREATOR.createFromParcel(in);",
+        "outChild = in.readParcelable(Bitmap.class.getClassLoader());",
         "}",
         "Test data = new Test(outChild);",
         "return new TestParcel(data);",
@@ -66,7 +66,7 @@ public class ParcelableTests {
         "dest.writeInt(1);",
         "} else {",
         "dest.writeInt(0);",
-        "child.writeToParcel(dest, flags);",
+        "dest.writeParcelable(child, flags);",
         "}",
         "}",
         "}"
@@ -146,7 +146,7 @@ public class ParcelableTests {
         "@Override public RootParcel createFromParcel(Parcel in) {",
         "Child outChild = null;",
         "if (in.readInt() == 0) {",
-        "outChild = Child.CREATOR.createFromParcel(in);",
+        "outChild = in.readParcelable(Child.class.getClassLoader())",
         "}",
         "Root data = new Root(outChild);",
         "return new RootParcel(data);",
@@ -168,7 +168,7 @@ public class ParcelableTests {
         "dest.writeInt(1);",
         "} else {",
         "dest.writeInt(0);",
-        "child.writeToParcel(dest, flags);",
+        "dest.writeParcelable(child, flags);",
         "}",
         "}",
         "}"

compiler/src/test/java/nz/bradcampbell/paperparcel/SerializableTests.java

@@ -198,7 +198,7 @@ public class SerializableTests {
         "@Override public TestParcel createFromParcel(Parcel in) {",
         "Child outChild = null;",
         "if (in.readInt() == 0) {",
-        "outChild = Child.CREATOR.createFromParcel(in);",
+        "outChild = in.readParcelable(Child.class.getClassLoader());",
         "}",
         "Test data = new Test(outChild);",
         "return new TestParcel(data);",
@@ -220,7 +220,7 @@ public class SerializableTests {
         "dest.writeInt(1);",
         "} else {",
         "dest.writeInt(0);",
-        "child.writeToParcel(dest, flags);",
+        "dest.writeParcelable(child, flags);",
         "}",
         "}",
         "}"