Revert "fix(aws-datastore): selection set for nested custom types (#730)" (#777)

This reverts commit c0134e1.

Author: TrekSoft

aws-api-appsync/src/main/java/com/amplifyframework/api/aws/SelectionSet.java

@@ -24,15 +24,13 @@
 import com.amplifyframework.api.graphql.QueryType;
 import com.amplifyframework.core.model.Model;
 import com.amplifyframework.core.model.ModelSchema;
-import com.amplifyframework.core.model.types.JavaFieldType;
 import com.amplifyframework.util.Empty;
 import com.amplifyframework.util.FieldFinder;
 import com.amplifyframework.util.Wrap;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -225,7 +223,7 @@ private Set<SelectionSet> getModelFields(Class<? extends Model> clazz, int depth
             }
 
             ModelSchema schema = ModelSchema.fromModelClass(clazz);
-            for (Field field : FieldFinder.findModelFieldsIn(clazz)) {
+            for (Field field : FieldFinder.findFieldsIn(clazz)) {
                 String fieldName = field.getName();
                 if (schema.getAssociations().containsKey(fieldName)) {
                     if (List.class.isAssignableFrom(field.getType())) {
@@ -239,8 +237,6 @@ private Set<SelectionSet> getModelFields(Class<? extends Model> clazz, int depth
                         Set<SelectionSet> fields = getModelFields((Class<Model>) field.getType(), depth - 1);
                         result.add(new SelectionSet(fieldName, fields));
                     }
-                } else if (isCustomType(field)) {
-                    result.add(new SelectionSet(fieldName, getNestedCustomTypeFields(getClassForField(field))));
                 } else {
                     result.add(new SelectionSet(fieldName, null));
                 }
@@ -250,57 +246,5 @@ private Set<SelectionSet> getModelFields(Class<? extends Model> clazz, int depth
             }
             return result;
         }
-
-        /**
-         * We handle customType fields differently as DEPTH does not apply here.
-         * @param clazz class we wish to build selection set for
-         * @return
-         */
-        private Set<SelectionSet> getNestedCustomTypeFields(Class<?> clazz) {
-            Set<SelectionSet> result = new HashSet<>();
-            for (Field field : FieldFinder.findAllFieldsIn(clazz)) {
-                String fieldName = field.getName();
-                if (isCustomType(field)) {
-                    result.add(new SelectionSet(fieldName, getNestedCustomTypeFields(getClassForField(field))));
-                } else {
-                    result.add(new SelectionSet(fieldName, null));
-                }
-            }
-            return result;
-        }
-
-        /**
-         * Helper to determine if field is a custom type. If custom types we need to build nested selection set.
-         * @param field field we wish to check
-         * @return
-         */
-        private static boolean isCustomType(@NonNull Field field) {
-            Class<?> cls = getClassForField(field);
-            if (Model.class.isAssignableFrom(cls) || Enum.class.isAssignableFrom(cls)) {
-                return false;
-            }
-            try {
-                JavaFieldType.from(cls.getSimpleName());
-                return false;
-            } catch (IllegalArgumentException exception) {
-                // if we get here then field is  a custom type
-                return true;
-            }
-        }
-
-        /**
-         * Get the class of a field. If field is a collection, it returns the Generic type
-         * @return
-         */
-        static Class<?> getClassForField(Field field) {
-            Class<?> typeClass;
-            if (Collection.class.isAssignableFrom(field.getType())) {
-                ParameterizedType listType = (ParameterizedType) field.getGenericType();
-                typeClass = (Class) listType.getActualTypeArguments()[0];
-            } else {
-                typeClass = field.getType();
-            }
-            return typeClass;
-        }
     }
 }

aws-api-appsync/src/main/java/com/amplifyframework/core/model/types/JavaFieldType.java

@@ -65,12 +65,6 @@ public enum JavaFieldType {
      */
     TIME(Temporal.Time.class.getSimpleName()),
 
-    /**
-     * Represents the Timestamp data type.
-     * Is not currently used by TypeConverter as AWS_TIMESTAMP is being stored as long.
-     */
-    TIMESTAMP(Temporal.Timestamp.class.getSimpleName()),
-
     /**
      * Represents the Enum type.
      */

aws-api-appsync/src/test/java/com/amplifyframework/api/aws/SelectionSetTest.java

@@ -18,7 +18,6 @@
 import com.amplifyframework.AmplifyException;
 import com.amplifyframework.api.graphql.QueryType;
 import com.amplifyframework.testmodels.commentsblog.Post;
-import com.amplifyframework.testmodels.parenting.Parent;
 import com.amplifyframework.testutils.Resources;
 
 import org.junit.Test;
@@ -42,18 +41,4 @@ public void selectionSetSerializesToExpectedValue() throws AmplifyException {
                 .build();
         assertEquals(Resources.readAsString("selection-set-post.txt"), selectionSet.toString() + "\n");
     }
-
-    /**
-     * Test that custom type selection set serialization works as expected.
-     * @throws AmplifyException if a ModelSchema can't be derived from Post.class
-     */
-    @Test
-    public void nestedCustomTypeSelectionSetSerializesToExpectedValue() throws AmplifyException {
-        SelectionSet selectionSet = SelectionSet.builder()
-                .modelClass(Parent.class)
-                .operation(QueryType.GET)
-                .requestOptions(new DefaultGraphQLRequestOptions())
-                .build();
-        assertEquals(Resources.readAsString("selection-set-parent.txt"), selectionSet.toString() + "\n");
-    }
 }

aws-api-appsync/src/test/resources/selection-set-parent.txt

@@ -91,7 +91,6 @@ public static Object convertRawValueToTarget(
             case LONG:
             case FLOAT:
             case STRING:
-            case TIMESTAMP:
                 // these types require no special treatment
                 return value;
             case BOOLEAN:
@@ -159,7 +158,6 @@ public Object convertValueFromSource(
                 case FLOAT:
                     return cursor.getFloat(columnIndex);
                 case LONG:
-                case TIMESTAMP:
                     return cursor.getLong(columnIndex);
                 case DATE:
                     return new Temporal.Date(valueAsString);