Merge pull request #19 from JavaWebStack/maintenance

Maintenance

Author: JanHolger

.github/workflows/maven-test.yml

@@ -0,0 +1,34 @@
+name: Maven Test
+on:
+  push:
+    branches:
+      - '**'
+      - '!master'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mariadb:latest
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: test
+          MYSQL_USER: test
+          MYSQL_PASSWORD: test
+          MYSQL_RANDOM_ROOT_PASSWORD: yes
+        ports:
+          - 3306
+        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Test
+        run: mvn -B test
+        env:
+          MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
+          MYSQL_USERNAME: test
+          MYSQL_PASSWORD: test

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();
     }
 
@@ -41,6 +39,7 @@ public class Model {
     private transient boolean internalEntryExists = false;
     private transient final Map<Class<? extends Model>, Object> internalJoinedModels = new HashMap<>();
     private transient Map<String, Object> internalOriginalValues = new HashMap<>();
+    private transient Map<String, Object> internalExtraFields = new HashMap<>();
 
     void internalAddJoinedModel(Class<? extends Model> type, Object entity) {
         internalJoinedModels.put(type, entity);
@@ -62,6 +61,14 @@ public Map<String, Object> getFieldValues() {
         return values;
     }
 
+    public Map<String, Object> getExtraFields() {
+        return internalExtraFields;
+    }
+
+    public <T> T getExtraField(String key) {
+        return (T) internalExtraFields.get(key);
+    }
+
     public Map<String, Object> getOriginalValues() {
         return internalOriginalValues;
     }
@@ -114,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

@@ -7,6 +7,7 @@
 import org.javawebstack.orm.migration.AutoMigrator;
 import org.javawebstack.orm.query.Query;
 import org.javawebstack.orm.wrapper.SQL;
+import org.javawebstack.orm.wrapper.builder.SQLQueryString;
 
 import java.lang.reflect.Field;
 import java.sql.SQLException;
@@ -100,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);
@@ -124,28 +123,14 @@ private void executeCreate(T entry) {
                 if (field.get(entry) == null)
                     field.set(entry, UUID.randomUUID());
             }
-            List<Object> params = new ArrayList<>();
-            StringBuilder sb = new StringBuilder("INSERT INTO `");
-            sb.append(info.getTableName());
-            sb.append("` (");
-            List<String> cols = new ArrayList<>();
-            List<String> values = new ArrayList<>();
             Map<String, Object> map = SQLMapper.map(this, entry);
             if (info.isAutoIncrement()) {
                 String idCol = info.getColumnName(info.getIdField());
                 if (map.containsKey(idCol) && map.get(idCol) == null)
                     map.remove(idCol);
             }
-            for (String columnName : map.keySet()) {
-                cols.add("`" + columnName + "`");
-                values.add("?");
-                params.add(map.get(columnName));
-            }
-            sb.append(String.join(",", cols));
-            sb.append(") VALUES (");
-            sb.append(String.join(",", values));
-            sb.append(");");
-            int id = connection.write(sb.toString(), params.toArray());
+            SQLQueryString qs = getConnection().builder().buildInsert(info, map);
+            int id = connection.write(qs.getQuery(), qs.getParameters().toArray());
             if (info.isAutoIncrement())
                 info.getField(info.getIdField()).set(entry, id);
             entry.setEntryExists(true);
@@ -237,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.DefaultMapper;
 import org.javawebstack.orm.mapper.TypeMapper;
@@ -27,14 +26,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));