Removed injector

Author: JanHolger

pom.xml

@@ -63,11 +63,6 @@
             <artifactId>reflections</artifactId>
             <version>0.9.12</version>
         </dependency>
-        <dependency>
-            <groupId>org.javawebstack</groupId>
-            <artifactId>Injector</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.javawebstack</groupId>
             <artifactId>AbstractData</artifactId>

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

@@ -1,6 +1,5 @@
 package org.javawebstack.orm;
 
-import org.javawebstack.injector.Injector;
 import org.javawebstack.orm.query.Query;
 
 import java.lang.reflect.Field;
@@ -22,7 +21,6 @@ public class Model {
     private static final Method refreshMethod;
 
     {
-        inject();
         updateOriginal();
     }
 
@@ -123,12 +121,6 @@ void setEntryExists(boolean exists) {
         this.internalEntryExists = exists;
     }
 
-    public void inject() {
-        Injector injector = Repo.get(getClass()).getInfo().getConfig().getInjector();
-        if (injector != null)
-            injector.inject(this);
-    }
-
     public void save() {
         try {
             saveMethod.invoke(ORM.repo(getClass()), this);

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

@@ -1,6 +1,5 @@
 package org.javawebstack.orm;
 
-import org.javawebstack.injector.Injector;
 import org.javawebstack.orm.exception.ORMConfigurationException;
 import org.javawebstack.orm.mapper.DefaultMapper;
 import org.javawebstack.orm.mapper.TypeMapper;
@@ -15,7 +14,6 @@ public class ORMConfig {
     private boolean idPrimaryKey = true;
     private boolean idAutoIncrement = true;
     private final List<TypeMapper> typeMappers = new ArrayList<>();
-    private Injector injector;
     private boolean preventUnnecessaryUpdates = true;
 
     public ORMConfig() {
@@ -55,11 +53,6 @@ public ORMConfig setIdAutoIncrement(boolean idAutoIncrement) {
         return this;
     }
 
-    public ORMConfig setInjector(Injector injector) {
-        this.injector = injector;
-        return this;
-    }
-
     public boolean isCamelToSnakeCase() {
         return camelToSnakeCase;
     }
@@ -84,10 +77,6 @@ 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

@@ -101,8 +101,6 @@ 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);
@@ -224,8 +222,6 @@ public Object getId(Object entity) {
     }
 
     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,6 +1,5 @@
 package org.javawebstack.orm;
 
-import org.javawebstack.injector.Injector;
 import org.javawebstack.orm.exception.ORMQueryException;
 import org.javawebstack.orm.mapper.TypeMapper;
 
@@ -28,14 +27,9 @@ 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));