Merge branch 'master' of https://git.bukova.info/repos/git/isspst

src/main/java/info/bukova/isspst/dao/jpa/AddressDaoJPA.java

@@ -4,10 +4,4 @@ import info.bukova.isspst.dao.AddressDao;
 import info.bukova.isspst.data.Address;
 
 public class AddressDaoJPA extends BaseDaoJPA<Address> implements AddressDao {
-
-	@Override
-	public String getEntityName() {
-		return Address.class.getSimpleName();
-	}
-
 }

src/main/java/info/bukova/isspst/dao/jpa/BaseDaoJPA.java

@@ -4,11 +4,27 @@ import java.util.List;
 
 import org.hibernate.Query;
 import org.hibernate.SessionFactory;
+import org.springframework.core.GenericTypeResolver;
 
 import info.bukova.isspst.dao.BaseDao;
 
 public abstract class BaseDaoJPA<T> implements BaseDao<T> {
 
+	protected Class<T> classTypeResolver;
+	
+	@SuppressWarnings("unchecked")
+	public BaseDaoJPA()
+	{
+		this.classTypeResolver = (Class<T>) GenericTypeResolver.resolveTypeArgument(getClass(), BaseDaoJPA.class);
+	}
+	
+	@Override
+	public String getEntityName() {
+		String className = classTypeResolver.getSimpleName();
+		return className;
+	}
+
+	
 	private SessionFactory sessionFactory;
 	
 	public void setSessionFactory(SessionFactory factory) {

src/main/java/info/bukova/isspst/dao/jpa/BuildingDaoJPA.java

@@ -4,9 +4,4 @@ import info.bukova.isspst.dao.BuildingDao;
 import info.bukova.isspst.data.Building;
 
 public class BuildingDaoJPA extends BaseDaoJPA<Building> implements BuildingDao {
-
-	@Override
-	public String getEntityName() {
-		return "Building";
-	}
 }

src/main/java/info/bukova/isspst/dao/jpa/MUnitDaoJPA.java

@@ -4,9 +4,4 @@ import info.bukova.isspst.dao.MUnitDao;
 import info.bukova.isspst.data.MUnit;
 
 public class MUnitDaoJPA extends BaseDaoJPA<MUnit> implements MUnitDao {
-
-	@Override
-	public String getEntityName() {
-		return "MUnit";
-	}
 }

src/main/java/info/bukova/isspst/dao/jpa/MaterialDaoJPA.java

@@ -4,11 +4,4 @@ import info.bukova.isspst.dao.MaterialDao;
 import info.bukova.isspst.data.Material;
 
 public class MaterialDaoJPA extends BaseDaoJPA<Material> implements MaterialDao {
-
-	@Override
-	public String getEntityName() {
-		return Material.class.getSimpleName();
-	}
-
-
 }

src/main/java/info/bukova/isspst/dao/jpa/PermissionDaoJPA.java

@@ -4,10 +4,4 @@ import info.bukova.isspst.dao.PermissionDao;
 import info.bukova.isspst.data.Permission;
 
 public class PermissionDaoJPA extends BaseDaoJPA<Permission> implements PermissionDao {
-
-	@Override
-	public String getEntityName() {
-		return Permission.class.getSimpleName();
-	}
-
 }

src/main/java/info/bukova/isspst/dao/jpa/RoleDaoJPA.java

@@ -4,10 +4,4 @@ import info.bukova.isspst.dao.RoleDao;
 import info.bukova.isspst.data.Role;
 
 public class RoleDaoJPA extends BaseDaoJPA<Role> implements RoleDao {
-
-	@Override
-	public String getEntityName() {
-		return "Role";
-	}
-
 }

src/main/java/info/bukova/isspst/dao/jpa/UserDaoJPA.java

@@ -4,11 +4,4 @@ import info.bukova.isspst.dao.UserDao;
 import info.bukova.isspst.data.User;
 
 public class UserDaoJPA extends BaseDaoJPA<User> implements UserDao {
-
-
-	@Override
-	public String getEntityName() {
-		return "User";
-	}
-
 }