Implemented dependency injection

Author: JanHolger

pom.xml

@@ -52,7 +52,19 @@
         <url>https://github.com/JavaWebStack/orm/tree/master</url>
     </scm>
 
+    <repositories>
+        <repository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </repository>
+    </repositories>
+
     <dependencies>
+        <dependency>
+            <groupId>org.javawebstack</groupId>
+            <artifactId>commons</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.javawebstack</groupId>
             <artifactId>abstract-data</artifactId>

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

@@ -1,5 +1,6 @@
 package org.javawebstack.orm;
 
+import org.javawebstack.commons.inject.Injector;
 import org.javawebstack.orm.query.Query;
 
 import java.lang.reflect.Field;
@@ -22,6 +23,9 @@ public class Model {
 
     {
         updateOriginal();
+        Injector injector = Repo.get(getClass()).getInfo().getConfig().getInjector();
+        if(injector != null)
+            injector.inject(this);
     }
 
     static {

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

@@ -10,12 +10,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Logger;
 
 public class ORM {
 
-    public static final Logger LOGGER = Logger.getLogger("ORM");
-
     private static final Map<Class<? extends Model>, Repo<?>> repositories = new HashMap<>();
 
     public static <T extends Model> Repo<T> repo(Class<T> model) {

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

@@ -1,5 +1,6 @@
 package org.javawebstack.orm;
 
+import org.javawebstack.commons.inject.Injector;
 import org.javawebstack.orm.exception.ORMConfigurationException;
 import org.javawebstack.orm.mapper.DefaultMapper;
 import org.javawebstack.orm.mapper.TypeMapper;
@@ -15,6 +16,7 @@ public class ORMConfig {
     private boolean idAutoIncrement = true;
     private final List<TypeMapper> typeMappers = new ArrayList<>();
     private boolean preventUnnecessaryUpdates = true;
+    private Injector injector;
 
     public ORMConfig() {
         typeMappers.add(new DefaultMapper());
@@ -39,6 +41,8 @@ public ORMConfig setDefaultSize(int defaultSize) throws ORMConfigurationExceptio
     }
 
     public ORMConfig addTypeMapper(TypeMapper typeMapper) {
+        if(injector != null)
+            injector.inject(typeMapper);
         typeMappers.add(typeMapper);
         return this;
     }
@@ -112,4 +116,16 @@ public ORMConfig setPreventUnnecessaryUpdates(boolean preventUnnecessaryUpdates)
         this.preventUnnecessaryUpdates = preventUnnecessaryUpdates;
         return this;
     }
+
+    public ORMConfig setInjector(Injector injector) {
+        this.injector = injector;
+        if(injector != null)
+            typeMappers.forEach(injector::inject);
+        return this;
+    }
+
+    public Injector getInjector() {
+        return injector;
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package org.javawebstack.orm;
 
+import org.javawebstack.commons.inject.Injector;
 import org.javawebstack.orm.exception.ORMQueryException;
 import org.javawebstack.orm.mapper.DefaultMapper;
 import org.javawebstack.orm.mapper.TypeMapper;