chore(api) remove JAVA_DATE since codegen does not generate java.lang.Date (#867)

Author: richardmcclellan

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

@@ -20,8 +20,6 @@
 import com.amplifyframework.core.model.Model;
 import com.amplifyframework.core.model.temporal.Temporal;
 
-import java.util.Date;
-
 /**
  * Enumerate the types used in the fields
  * of {@link com.amplifyframework.core.model.Model} classes.
@@ -52,11 +50,6 @@ public enum JavaFieldType {
      */
     STRING(String.class),
 
-    /**
-     * Represents the java.lang.Date data type.
-     */
-    JAVA_DATE(Date.class),
-
     /**
      * Represents the Date data type.
      */

aws-api/src/androidTest/java/com/amplifyframework/api/aws/CodeGenerationInstrumentationTest.java

@@ -21,6 +21,7 @@
 import com.amplifyframework.api.aws.test.R;
 import com.amplifyframework.api.graphql.GraphQLResponse;
 import com.amplifyframework.core.model.annotations.BelongsTo;
+import com.amplifyframework.core.model.temporal.Temporal;
 import com.amplifyframework.testmodels.noteswithauth.PrivateNote;
 import com.amplifyframework.testmodels.personcar.MaritalStatus;
 import com.amplifyframework.testmodels.personcar.Person;
@@ -82,7 +83,7 @@ public void queryMatchesMutationResult() throws ApiException, ParseException {
             .firstName("David")
             .lastName("Daudelin")
             .age(29)
-            .dob(new SimpleDateFormat("MM/dd/yyyy").parse("07/25/1990"))
+            .dob(new Temporal.Date(new SimpleDateFormat("MM/dd/yyyy").parse("07/25/1990")))
             .relationship(MaritalStatus.married)
             .build();
         Person createdPerson = api.create(PERSON_API_NAME, david);

aws-api/src/test/java/com/amplifyframework/api/aws/AppSyncGraphQLRequestFactoryTest.java

@@ -101,7 +101,7 @@ public void buildMutationFromPredicateAndMutationType() throws AmplifyException,
             .firstName("Tony")
             .lastName("Swanson")
             .age(19)
-            .dob(new Date(2000, 1, 15))
+            .dob(new Temporal.Date(new Date(2000, 1, 15)))
             .id(expectedId)
             .relationship(MaritalStatus.single)
             .build();

aws-datastore/src/main/java/com/amplifyframework/datastore/storage/sqlite/TypeConverter.java

@@ -45,7 +45,6 @@ private TypeConverter() {
         JAVA_TO_SQL.put(JavaFieldType.STRING, SQLiteDataType.TEXT);
         JAVA_TO_SQL.put(JavaFieldType.ENUM, SQLiteDataType.TEXT);
         JAVA_TO_SQL.put(JavaFieldType.DATE, SQLiteDataType.TEXT);
-        JAVA_TO_SQL.put(JavaFieldType.JAVA_DATE, SQLiteDataType.TEXT);
         JAVA_TO_SQL.put(JavaFieldType.DATE_TIME, SQLiteDataType.TEXT);
         JAVA_TO_SQL.put(JavaFieldType.TIME, SQLiteDataType.TEXT);
         JAVA_TO_SQL.put(JavaFieldType.TIMESTAMP, SQLiteDataType.INTEGER);

core/build.gradle

@@ -26,6 +26,7 @@ dependencies {
     implementation dependency.androidx.nav.uiktx
     implementation dependency.androidx.nav.dynamicfeatures
 
+    testImplementation project(path: ':aws-api-appsync') // Used to reference Temporal types in tests.
     testImplementation project(path: ':testmodels')
     testImplementation(project(path: ':testutils')) {
         transitive = false

core/src/test/java/com/amplifyframework/core/model/ModelSchemaTest.java

@@ -20,14 +20,14 @@
 import com.amplifyframework.AmplifyException;
 import com.amplifyframework.core.model.annotations.AuthRule;
 import com.amplifyframework.core.model.annotations.ModelConfig;
+import com.amplifyframework.core.model.temporal.Temporal;
 import com.amplifyframework.testmodels.personcar.MaritalStatus;
 import com.amplifyframework.testmodels.personcar.Person;
 
 import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -70,7 +70,7 @@ public void modelSchemaIsGeneratedForPersonModel() throws AmplifyException {
         expectedFields.put("dob", ModelField.builder()
             .targetType("AWSDate")
             .name("dob")
-            .type(Date.class)
+            .type(Temporal.Date.class)
             .build());
         expectedFields.put("age", ModelField.builder()
             .targetType("Int")

testmodels/src/main/java/com/amplifyframework/testmodels/personcar/Person.java

@@ -22,8 +22,8 @@
 import com.amplifyframework.core.model.annotations.ModelConfig;
 import com.amplifyframework.core.model.annotations.ModelField;
 import com.amplifyframework.core.model.query.predicate.QueryField;
+import com.amplifyframework.core.model.temporal.Temporal;
 
-import java.util.Date;
 import java.util.Objects;
 import java.util.UUID;
 
@@ -55,7 +55,7 @@ public final class Person implements Model {
     private final Integer age;
 
     @ModelField(targetType = "AWSDate")
-    private final Date dob;
+    private final Temporal.Date dob;
 
     @ModelField
     private final MaritalStatus relationship;
@@ -64,7 +64,7 @@ private Person(String id,
                    String first_name,
                    String last_name,
                    Integer age,
-                   Date dob,
+                   Temporal.Date dob,
                    MaritalStatus relationship) {
         this.id = id;
         this.first_name = first_name;
@@ -161,7 +161,7 @@ public Integer getAge() {
      * Returns the person's date of birth.
      * @return date of birth.
      */
-    public Date getDob() {
+    public Temporal.Date getDob() {
         return dob;
     }
 
@@ -251,7 +251,7 @@ public interface FinalStep {
          * @param dob The person's date of birth.
          * @return next step.
          */
-        FinalStep dob(Date dob);
+        FinalStep dob(Temporal.Date dob);
 
         /**
          * Set the person's relationship status.
@@ -276,7 +276,7 @@ private static class Builder implements
         private String first_name;
         private String last_name;
         private Integer age;
-        private Date dob;
+        private Temporal.Date dob;
         private MaritalStatus relationship;
 
         /**
@@ -341,8 +341,8 @@ public FinalStep age(Integer age) {
          * @param dob The person's date of birth.
          * @return Current Builder instance, for fluent method chaining
          */
-        public FinalStep dob(Date dob) {
-            this.dob = dob == null ? null : new Date(dob.getTime());
+        public FinalStep dob(Temporal.Date dob) {
+            this.dob = dob == null ? null : new Temporal.Date(dob.toDate());
             return this;
         }
 
@@ -381,7 +381,7 @@ private NewBuilder(String id,
                 String first_name,
                 String last_name,
                 Integer age,
-                Date dob,
+                Temporal.Date dob,
                 MaritalStatus relationship) {
             super.id(id);
             super.firstName(first_name)
@@ -412,7 +412,7 @@ public NewBuilder age(Integer age) {
         }
 
         @Override
-        public NewBuilder dob(Date dob) {
+        public NewBuilder dob(Temporal.Date dob) {
             return (NewBuilder) super.dob(dob);
         }