Added auto auto-increment for integer and long id fields,

Made either updatedAt and createdAt optional for @dates,
Modified toSnakeCase conversion to properly support multiple uppercase characters in a sequence,
Added dependency injection for Models and Observers,
Added a method to register models by package

Author: JanHolger

pom.xml

@@ -8,6 +8,13 @@
     <artifactId>ORM</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+    <repositories>
+        <repository>
+            <id>javawebstack</id>
+            <url>https://repo.javawebstack.org</url>
+        </repository>
+    </repositories>
+
     <build>
         <plugins>
             <plugin>
@@ -46,6 +53,11 @@
             <artifactId>reflections</artifactId>
             <version>0.9.12</version>
         </dependency>
+        <dependency>
+            <groupId>org.javawebstack</groupId>
+            <artifactId>Injector</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <distributionManagement>

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

@@ -3,6 +3,7 @@
 import org.javawebstack.orm.exception.ORMConfigurationException;
 import org.javawebstack.orm.migration.AutoMigrator;
 import org.javawebstack.orm.wrapper.SQL;
+import org.reflections.Reflections;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,6 +31,15 @@ public static <T extends Model> Repo<T> register(Class<T> model, SQL sql) throws
         return register(model, sql, new ORMConfig());
     }
 
+    public void register(Package p, SQL sql, ORMConfig config) throws ORMConfigurationException {
+        for(Class<? extends Model> model : new Reflections(p.getName()).getSubTypesOf(Model.class))
+            ORM.register(model, sql, config);
+    }
+
+    public void register(Package p, SQL sql) throws ORMConfigurationException {
+        register(p, sql, new ORMConfig());
+    }
+
     public static void unregister(Class<? extends Model> model){
         repositories.remove(model);
     }

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

@@ -1,5 +1,6 @@
 package org.javawebstack.orm;
 
+import org.javawebstack.injector.Injector;
 import org.javawebstack.orm.mapper.DefaultMapper;
 import org.javawebstack.orm.mapper.TypeMapper;
 
@@ -11,7 +12,10 @@ public class ORMConfig {
     private boolean camelToSnakeCase = true;
     private int defaultSize = 0;
     private boolean idPrimaryKey = true;
+    private boolean idAutoIncrement = true;
     private final List<TypeMapper> typeMappers = new ArrayList<>();
+    private Injector injector;
+
     public ORMConfig(){
         typeMappers.add(new DefaultMapper());
     }
@@ -35,6 +39,14 @@ public ORMConfig setIdPrimaryKey(boolean idPrimaryKey){
         this.idPrimaryKey = idPrimaryKey;
         return this;
     }
+    public ORMConfig setIdAutoIncrement(boolean idAutoIncrement){
+        this.idAutoIncrement = idAutoIncrement;
+        return this;
+    }
+    public ORMConfig setInjector(Injector injector){
+        this.injector = injector;
+        return this;
+    }
     public boolean isCamelToSnakeCase() {
         return camelToSnakeCase;
     }
@@ -50,6 +62,14 @@ public List<TypeMapper> getTypeMappers(){
     public boolean isIdPrimaryKey() {
         return idPrimaryKey;
     }
+    public boolean isIdAutoIncrement(){
+        return idAutoIncrement;
+    }
+
+    public Injector getInjector() {
+        return injector;
+    }
+
     public TypeMapper getTypeMapper(Class<?> type, int size){
         for(TypeMapper mapper : getTypeMappers()){
             SQLType sqlType = mapper.getType(type, size);

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

@@ -50,6 +50,8 @@ public void save(T entry){
     }
 
     public void create(T entry){
+        if(info.getConfig().getInjector() != null)
+            info.getConfig().getInjector().inject(entry);
         observers.forEach(o -> o.saving(entry));
         observers.forEach(o -> o.creating(entry));
         executeCreate(entry);
@@ -61,8 +63,10 @@ private void executeCreate(T entry){
         try {
             if(info.hasDates()){
                 Timestamp now = Timestamp.from(Instant.now());
-                info.getField(info.getCreatedField()).set(entry, now);
-                info.getField(info.getUpdatedField()).set(entry, now);
+                if(info.hasCreated())
+                    info.getField(info.getCreatedField()).set(entry, now);
+                if(info.hasUpdated())
+                    info.getField(info.getUpdatedField()).set(entry, now);
             }
             List<Object> params = new ArrayList<>();
             StringBuilder sb = new StringBuilder("INSERT INTO `");
@@ -171,6 +175,8 @@ private Object getId(T entry){
     }
 
     public Repo<T> observe(Observer<T> observer){
+        if(info.getConfig().getInjector() != null)
+            info.getConfig().getInjector().inject(observer);
         observers.add(observer);
         return this;
     }

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

@@ -1,5 +1,6 @@
 package org.javawebstack.orm;
 
+import org.javawebstack.injector.Injector;
 import org.javawebstack.orm.exception.ORMQueryException;
 import org.javawebstack.orm.mapper.TypeMapper;
 
@@ -26,9 +27,14 @@ public static <T extends Model> List<T> map(Repo<T> repo, ResultSet rs, List<Cla
         try {
             while (rs.next()){
                 T t = (T) repo.getInfo().getModelConstructor().newInstance();
+                Injector injector = repo.getInfo().getConfig().getInjector();
+                if(injector != null)
+                    injector.inject(t);
                 for(Class<? extends Model> model : joinedModels){
                     Repo<Model> r = Repo.get((Class<Model>) model);
                     Model o = (Model) r.getInfo().getModelConstructor().newInstance();
+                    if(injector != null)
+                        injector.inject(o);
                     t.internalAddJoinedModel(model, mapBack(r, rs, o));
                 }
                 list.add(mapBack(repo, rs, t));

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

@@ -118,8 +118,19 @@ public boolean hasDates(){
         return dates != null;
     }
 
+    public boolean hasCreated(){
+        return hasDates() && getFields().contains(getCreatedField());
+    }
+
+    public boolean hasUpdated(){
+        return hasDates() && getFields().contains(getUpdatedField());
+    }
+
     public boolean isAutoIncrement(){
-        return fieldConfigs.get(idField).ai();
+        return (
+                getField(getIdField()).getType().equals(Integer.class) ||
+                getField(getIdField()).getType().equals(Long.class)
+        ) && (fieldConfigs.get(idField).ai() || config.isIdAutoIncrement());
     }
 
     public String getSoftDeleteField(){

src/main/java/org/javawebstack/orm/query/Query.java

@@ -259,7 +259,7 @@ public void update(T entity){
     }
 
     public void update(Map<String, Object> values){
-        if(repo.getInfo().hasDates())
+        if(repo.getInfo().hasUpdated())
             values.put(repo.getInfo().getColumnName(repo.getInfo().getUpdatedField()), Timestamp.from(Instant.now()));
         List<Object> parameters = new ArrayList<>();
         List<String> sets = new ArrayList<>();

src/main/java/org/javawebstack/orm/util/Helper.java

@@ -7,7 +7,8 @@ public static String toSnakeCase(String source){
         sb.append(Character.toLowerCase(source.charAt(0)));
         for(int i=1; i<source.length(); i++){
             if(Character.isUpperCase(source.charAt(i))){
-                sb.append("_");
+                if(!Character.isUpperCase(source.charAt(i-1)))
+                    sb.append("_");
                 sb.append(Character.toLowerCase(source.charAt(i)));
             }else{
                 sb.append(source.charAt(i));