fix: edit addOrUpgradeById methods in DatabaseConnector.java and Hibe…

…rnateUtil.java
Panzer1119 · Aug 4, 2021 · 934e657 · 934e657
1 parent 955eea6
commit 934e657
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/src/main/java/de/codemakers/database/connectors/DatabaseConnector.java b/src/main/java/de/codemakers/database/connectors/DatabaseConnector.java
@@ -185,12 +185,16 @@ public <I, T extends IEntity<I, T>> Optional<T> addOrUpgradeById(T entity, Funct
         return HibernateUtil.addOrUpgradeById(this, entity, entityGetterFunction);
     }
 
-    public <I, T extends IEntity<I, T>> Optional<T> addOrUpgradeById(T entity, Function<I, Optional<T>> entityGetterFunction, Function<T, I> idGetterFunction) {
-        return HibernateUtil.addOrUpgradeById(this, entity, entityGetterFunction, idGetterFunction);
+    public <I, T extends IEntity<I, T>> Optional<T> addOrUpgradeById(T entity, Function<I, Optional<T>> entityGetterFunction, Class<I> idClazz) {
+        return HibernateUtil.addOrUpgradeById(this, entity, entityGetterFunction, idClazz);
     }
 
-    public <I, M, T extends IEntity<I, T>> Optional<T> addOrUpgrade(T entity, Function<M, Optional<T>> entityGetterFunction, Function<T, M> middleGetterFunction) {
-        return HibernateUtil.addOrUpgrade(this, entity, entityGetterFunction, middleGetterFunction);
+    public <I, T extends IEntity<I, T>> Optional<T> addOrUpgradeById(T entity, Function<I, Optional<T>> entityGetterFunction, Class<I> idClazz, Function<T, I> idGetterFunction) {
+        return HibernateUtil.addOrUpgradeById(this, entity, entityGetterFunction, idClazz, idGetterFunction);
+    }
+
+    public <I, M, T extends IEntity<I, T>> Optional<T> addOrUpgrade(T entity, Function<M, Optional<T>> entityGetterFunction, Class<M> middleClazz, Function<T, M> middleGetterFunction) {
+        return HibernateUtil.addOrUpgrade(this, entity, entityGetterFunction, middleGetterFunction, middleClazz);
     }
 
 }
diff --git a/src/main/java/de/codemakers/database/hibernate/HibernateUtil.java b/src/main/java/de/codemakers/database/hibernate/HibernateUtil.java
@@ -193,14 +193,18 @@ public static void delete(DatabaseConnector databaseConnector, Object object) {
     }
 
     public static synchronized <I, T extends IEntity<I, T>> Optional<T> addOrUpgradeById(DatabaseConnector databaseConnector, T entity, Function<I, Optional<T>> entityGetterFunction) {
-        return addOrUpgradeById(databaseConnector, entity, entityGetterFunction, IEntity::getId);
+        return addOrUpgradeById(databaseConnector, entity, entityGetterFunction, null);
     }
 
-    public static synchronized <I, T extends IEntity<I, T>> Optional<T> addOrUpgradeById(DatabaseConnector databaseConnector, T entity, Function<I, Optional<T>> entityGetterFunction, Function<T, I> idGetterFunction) {
-        return addOrUpgrade(databaseConnector, entity, entityGetterFunction, idGetterFunction);
+    public static synchronized <I, T extends IEntity<I, T>> Optional<T> addOrUpgradeById(DatabaseConnector databaseConnector, T entity, Function<I, Optional<T>> entityGetterFunction, Class<I> idClazz) {
+        return addOrUpgradeById(databaseConnector, entity, entityGetterFunction, idClazz, IEntity::getId);
     }
 
-    public static synchronized <I, M, T extends IEntity<I, T>> Optional<T> addOrUpgrade(DatabaseConnector databaseConnector, T entity, Function<M, Optional<T>> entityGetterFunction, Function<T, M> middleGetterFunction) {
+    public static synchronized <I, T extends IEntity<I, T>> Optional<T> addOrUpgradeById(DatabaseConnector databaseConnector, T entity, Function<I, Optional<T>> entityGetterFunction, Class<I> idClazz, Function<T, I> idGetterFunction) {
+        return addOrUpgrade(databaseConnector, entity, entityGetterFunction, idGetterFunction, idClazz);
+    }
+
+    public static synchronized <I, M, T extends IEntity<I, T>> Optional<T> addOrUpgrade(DatabaseConnector databaseConnector, T entity, Function<M, Optional<T>> entityGetterFunction, Function<T, M> middleGetterFunction, Class<M> middleClazz) {
         Objects.requireNonNull(entity, "entity may not be null");
         Objects.requireNonNull(entityGetterFunction, "entityGetterFunction may not be null");
         Objects.requireNonNull(middleGetterFunction, "middleGetterFunction may not be null");