Remove ObjectSubclassInfo class, fix unit test.

Author: richardjrossiii

Parse/src/main/java/com/parse/ParseObjectSubclassingController.java

@@ -14,31 +14,8 @@
 import java.util.Map;
 
 /* package */ class ParseObjectSubclassingController {
-  private static class ObjectSubclassInfo {
-    public final Class<? extends ParseObject> type;
-    public final Constructor<? extends ParseObject> constructor;
-
-    public ObjectSubclassInfo(Class<? extends ParseObject> clazz) throws NoSuchMethodException, IllegalAccessException {
-      type = clazz;
-      constructor = getConstructor(clazz);
-    }
-
-    private static Constructor<? extends ParseObject> getConstructor(Class<? extends  ParseObject> clazz) throws NoSuchMethodException, IllegalAccessException {
-      Constructor<? extends ParseObject> constructor = clazz.getDeclaredConstructor();
-      if (constructor == null) {
-        throw new NoSuchMethodException();
-      }
-      int modifiers = constructor.getModifiers();
-      if (Modifier.isPublic(modifiers) || (clazz.getPackage().getName().equals("com.parse") &&
-          !(Modifier.isProtected(modifiers) || Modifier.isPrivate(modifiers)))) {
-        return constructor;
-      }
-      throw new IllegalAccessException();
-    }
-  }
-
   private final Object mutex = new Object();
-  private final Map<String, ObjectSubclassInfo> registeredSubclasses = new HashMap<>();
+  private final Map<String, Constructor<? extends ParseObject>> registeredSubclasses = new HashMap<>();
 
   /* package */ String getClassName(Class<? extends ParseObject> clazz) {
     ParseClassName info = clazz.getAnnotation(ParseClassName.class);
@@ -49,15 +26,15 @@ private static Constructor<? extends ParseObject> getConstructor(Class<? extends
   }
 
   /* package */ boolean isSubclassValid(String className, Class<? extends ParseObject> clazz) {
-    ObjectSubclassInfo info = null;
+    Constructor<? extends ParseObject> constructor = null;
 
     synchronized (mutex) {
-      info = registeredSubclasses.get(className);
+      constructor = registeredSubclasses.get(className);
     }
 
-    return info == null
+    return constructor == null
       ? clazz == ParseObject.class
-      : info.type == clazz;
+      : constructor.getDeclaringClass() == clazz;
   }
 
   /* package */ void registerSubclass(Class<? extends ParseObject> clazz) {
@@ -66,29 +43,30 @@ private static Constructor<? extends ParseObject> getConstructor(Class<? extends
     }
 
     String className = getClassName(clazz);
-    ObjectSubclassInfo previousInfo = null;
+    Constructor<? extends ParseObject> previousConstructor = null;
 
     synchronized (mutex) {
-      previousInfo = registeredSubclasses.get(className);
-      if (previousInfo != null) {
-        if (clazz.isAssignableFrom(previousInfo.type)) {
+      previousConstructor = registeredSubclasses.get(className);
+      if (previousConstructor != null) {
+        Class<? extends ParseObject> previousClass = previousConstructor.getDeclaringClass();
+        if (clazz.isAssignableFrom(previousClass)) {
           // Previous subclass is more specific or equal to the current type, do nothing.
           return;
-        } else if (previousInfo.type.isAssignableFrom(clazz)) {
+        } else if (previousClass.isAssignableFrom(clazz)) {
           // Previous subclass is parent of new child subclass, fallthrough and actually
           // register this class.
           /* Do nothing */
         } else {
           throw new IllegalArgumentException(
-            "Tried to register both " + previousInfo.type.getName() + " and " +
-             clazz.getName() + " as the ParseObject subclass of " + className + ". " +
-             "Cannot determine the right class to use because netiher inherits from the other."
+            "Tried to register both " + previousClass.getName() + " and " + clazz.getName() +
+            " as the ParseObject subclass of " + className + ". " + "Cannot determine the right " +
+            "class to use because neither inherits from the other."
           );
         }
       }
 
       try {
-        registeredSubclasses.put(className, new ObjectSubclassInfo(clazz));
+        registeredSubclasses.put(className, getConstructor(clazz));
       } catch (NoSuchMethodException ex) {
         throw new IllegalArgumentException(
           "Cannot register a type that does not implement the default constructor!"
@@ -100,7 +78,7 @@ private static Constructor<? extends ParseObject> getConstructor(Class<? extends
       }
     }
 
-    if (previousInfo != null) {
+    if (previousConstructor != null) {
       // TODO: This is super tightly coupled. Let's remove it when automatic registration is in.
       // NOTE: Perform this outside of the mutex, to prevent any potential deadlocks.
       if (className.equals(getClassName(ParseUser.class))) {
@@ -120,20 +98,33 @@ private static Constructor<? extends ParseObject> getConstructor(Class<? extends
   }
 
   /* package */ ParseObject newInstance(String className) {
-    ObjectSubclassInfo info = null;
+    Constructor<? extends ParseObject> constructor = null;
 
     synchronized (mutex) {
-      info = registeredSubclasses.get(className);
+      constructor = registeredSubclasses.get(className);
     }
 
     try {
-      return info != null
-        ? info.constructor.newInstance()
+      return constructor != null
+        ? constructor.newInstance()
         : new ParseObject(className);
     } catch (RuntimeException e) {
       throw e;
     } catch (Exception e) {
       throw new RuntimeException("Failed to create instance of subclass.", e);
     }
   }
+
+  private static Constructor<? extends ParseObject> getConstructor(Class<? extends  ParseObject> clazz) throws NoSuchMethodException, IllegalAccessException {
+    Constructor<? extends ParseObject> constructor = clazz.getDeclaredConstructor();
+    if (constructor == null) {
+      throw new NoSuchMethodException();
+    }
+    int modifiers = constructor.getModifiers();
+    if (Modifier.isPublic(modifiers) || (clazz.getPackage().getName().equals("com.parse") &&
+      !(Modifier.isProtected(modifiers) || Modifier.isPrivate(modifiers)))) {
+      return constructor;
+    }
+    throw new IllegalAccessException();
+  }
 }

Parse/src/test/java/com/parse/ParseRoleTest.java

@@ -155,7 +155,7 @@ public void testPutFailureWithInvalidNameValueSet() {
 
   @Test
   public void testGetQuery() {
-    ParseQuery query = ParseRole.getQuery();
+    ParseQuery<?> query = ParseRole.getQuery();
 
     assertEquals(ParseCorePlugins.getInstance().getSubclassingController().getClassName(ParseRole.class), query.getBuilder().getClassName());
   }