Remove association to BaseJpaEntity in BaseDao

antelopesystems · Aug 4, 2021 · 18df0e1 · 18df0e1
1 parent 4eea6fa
commit 18df0e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...te5-connector/src/main/java/com/antelopesystem/crudframework/jpa/dao/AbstractBaseDao.java b/...te5-connector/src/main/java/com/antelopesystem/crudframework/jpa/dao/AbstractBaseDao.java
@@ -1,7 +1,7 @@
 package com.antelopesystem.crudframework.jpa.dao;
 
 import com.antelopesystem.crudframework.jpa.annotation.CrudJoinType;
-import com.antelopesystem.crudframework.jpa.model.BaseJpaEntity;
+import com.antelopesystem.crudframework.model.BaseCrudEntity;
 import com.antelopesystem.crudframework.model.PersistentEntity;
 import com.antelopesystem.crudframework.modelfilter.*;
 import com.antelopesystem.crudframework.modelfilter.enums.FilterFieldOperation;
@@ -65,7 +65,7 @@ public <T> List<T> findAll(Class<T> clazz) {
 	 * @param id unique identificator
 	 * @return entity with given class and UUID.
 	 */
-	public <T extends BaseJpaEntity> T findObject(Class<T> clazz, Serializable id) {
+	public <T extends BaseCrudEntity<?>> T findObject(Class<T> clazz, Serializable id) {
 		return (T) getCurrentSession().get(clazz, id);
 	}
 
@@ -76,7 +76,7 @@ public <T extends BaseJpaEntity> T findObject(Class<T> clazz, Serializable id) {
 	 * @param ids a list of UUIDs
 	 * @return a list of entities with given class and matching UUID
 	 */
-	public <T extends BaseJpaEntity> List<T> findObjectByIds(Class<T> clazz, Serializable ids[]) {
+	public <T extends BaseCrudEntity<?>> List<T> findObjectByIds(Class<T> clazz, Serializable ids[]) {
 		return (List<T>) getCurrentSession().createCriteria(clazz).add(Restrictions.in("id", ids)).list();
 	}
 

diff --git a/...-hibernate5-connector/src/main/java/com/antelopesystem/crudframework/jpa/dao/BaseDao.java b/...-hibernate5-connector/src/main/java/com/antelopesystem/crudframework/jpa/dao/BaseDao.java
@@ -1,6 +1,6 @@
 package com.antelopesystem.crudframework.jpa.dao;
 
-import com.antelopesystem.crudframework.jpa.model.BaseJpaEntity;
+import com.antelopesystem.crudframework.model.BaseCrudEntity;
 
 import java.io.Serializable;
 
@@ -16,7 +16,7 @@ public interface BaseDao {
 	 * @param id UID of entity.
 	 * @return found entity
 	 */
-	<T extends BaseJpaEntity> T findObject(Class<T> clazz, Serializable id);
+	<T extends BaseCrudEntity<?>> T findObject(Class<T> clazz, Serializable id);
 
 	/**
 	 * Persist entity to DB.