Merge branch 'master' into TimothyGillespie/adjustTypeMapping

Author: TimothyGillespie

src/main/java/org/javawebstack/orm/Model.java

@@ -1,7 +1,6 @@
 package org.javawebstack.orm;
 
 import org.javawebstack.injector.Injector;
-import org.javawebstack.orm.exception.ORMQueryException;
 import org.javawebstack.orm.query.Query;
 
 import java.lang.reflect.Field;
@@ -53,10 +52,11 @@ void updateOriginal() {
     public Map<String, Object> getFieldValues() {
         TableInfo info = Repo.get(getClass()).getInfo();
         Map<String, Object> values = new HashMap<>();
-        for(String field : info.getFields()) {
+        for (String field : info.getFields()) {
             try {
                 values.put(field, info.getField(field).get(this));
-            } catch (IllegalAccessException ignored) { }
+            } catch (IllegalAccessException ignored) {
+            }
         }
         return values;
     }
@@ -66,15 +66,15 @@ public Map<String, Object> getOriginalValues() {
     }
 
     public <T> T getOriginalValue(String field) {
-        if(internalOriginalValues.get(field) == null)
+        if (internalOriginalValues.get(field) == null)
             return null;
         return (T) internalOriginalValues.get(field);
     }
 
     public boolean isDirty(String... fields) {
         List<String> dirty = getDirtyFields();
-        for(String f : fields) {
-            if(dirty.contains(f))
+        for (String f : fields) {
+            if (dirty.contains(f))
                 return true;
         }
         return false;
@@ -84,12 +84,12 @@ public List<String> getDirtyFields() {
         List<String> dirty = new ArrayList<>();
         Map<String, Object> original = getOriginalValues();
         Map<String, Object> current = getFieldValues();
-        for(String key : current.keySet()) {
+        for (String key : current.keySet()) {
             Object o = original.get(key);
             Object c = current.get(key);
-            if(o == null && c == null)
+            if (o == null && c == null)
                 continue;
-            if(o == null || !o.equals(c))
+            if (o == null || !o.equals(c))
                 dirty.add(key);
         }
         return dirty;

src/main/java/org/javawebstack/orm/wrapper/MySQL.java

@@ -2,7 +2,6 @@
 
 import org.javawebstack.orm.exception.ORMQueryException;
 
-import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -37,7 +36,7 @@ public Connection getConnection() {
             if (c != null) {
                 try {
                     c.close();
-                } catch (SQLException throwables) {
+                } catch (SQLException ignored) {
                 }
             }
             c = null;

src/test/java/org/javawebstack/orm/test/DatesTest.java

@@ -0,0 +1,63 @@
+package org.javawebstack.orm.test;
+
+import org.javawebstack.orm.Model;
+import org.javawebstack.orm.ORM;
+import org.javawebstack.orm.ORMConfig;
+import org.javawebstack.orm.Repo;
+import org.javawebstack.orm.annotation.Column;
+import org.javawebstack.orm.annotation.Dates;
+import org.javawebstack.orm.annotation.SoftDelete;
+import org.javawebstack.orm.exception.ORMConfigurationException;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.sql.Timestamp;
+
+public class DatesTest extends ORMTestCase {
+    @Test
+    public void testTimes() throws ORMConfigurationException {
+        ORMConfig config = new ORMConfig()
+                .setDefaultSize(255);
+        ORM.register(TimesModel.class, sql(), config);
+        ORM.autoMigrate(true);
+
+        TimesModel timesModel = new TimesModel();
+        timesModel.save();
+
+        timesModel = Repo.get(TimesModel.class).get(timesModel.id);
+        assertNotNull(timesModel.createdAt);
+
+        // updated_at test
+        timesModel.exampleField = " ";
+        timesModel.save();
+
+        timesModel = Repo.get(TimesModel.class).get(timesModel.id);
+        assertNotNull(timesModel.updatedAt);
+
+        // deleted_at test
+        timesModel.delete();
+
+        timesModel = Repo.get(TimesModel.class).query().withDeleted().where("id", timesModel.id).first();
+        assertNotNull(timesModel.deletedAt);
+    }
+
+    @Dates
+    @SoftDelete
+    public static class TimesModel extends Model {
+        @Column
+        public int id;
+
+        @Column
+        public String exampleField;
+
+        @Column
+        public Timestamp createdAt;
+
+        @Column
+        public Timestamp updatedAt;
+
+        @Column
+        public Timestamp deletedAt;
+    }
+}

src/test/java/org/javawebstack/orm/test/TypesTest.java

@@ -8,7 +8,6 @@
 import org.javawebstack.orm.exception.ORMConfigurationException;
 import org.junit.jupiter.api.Test;
 
-import javax.swing.text.TabSet;
 import java.sql.Timestamp;
 import java.time.Instant;