SQLQuery replaced with NativeQuery

persist/src/main/java/lcsb/mapviewer/persist/dao/ProjectDao.java

@@ -5,8 +5,8 @@ import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.hibernate.SQLQuery;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.query.NativeQuery;
 import org.springframework.stereotype.Repository;
 
 import lcsb.mapviewer.model.Project;
@@ -77,7 +77,7 @@ public class ProjectDao extends BaseDao<Project> {
 
   public long getNextId() {
     Dialect dialect = getDialect();
-    SQLQuery sqlQuery = getSession().createSQLQuery(dialect.getSequenceNextValString("project_sequence"));
+    NativeQuery<?> sqlQuery = getSession().createNativeQuery(dialect.getSequenceNextValString("project_sequence"));
 
     return ((BigInteger) sqlQuery.getResultList().get(0)).longValue();
 

persist/src/test/java/lcsb/mapviewer/persist/dao/ProjectDaoTest.java

@@ -2,14 +2,17 @@ package lcsb.mapviewer.persist.dao;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import org.apache.logging.log4j.*;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import lcsb.mapviewer.model.Project;
 import lcsb.mapviewer.model.map.OverviewImage;
@@ -24,16 +27,15 @@ import lcsb.mapviewer.model.map.species.Species;
 import lcsb.mapviewer.persist.PersistTestFunctions;
 
 public class ProjectDaoTest extends PersistTestFunctions {
-  Logger logger = LogManager.getLogger(ProjectDaoTest.class);
-  int identifierCounter = 0;
-  String projectId = "Some_id";
+
+  @Autowired
+  private ProjectDao projectDao;
+
+  private Logger logger = LogManager.getLogger(ProjectDaoTest.class);
+  private String projectId = "Some_id";
 
   @Before
   public void setUp() throws Exception {
-    Project project = projectDao.getProjectByProjectId(projectId);
-    if (project != null) {
-      projectDao.delete(project);
-    }
   }
 
   @After
@@ -302,4 +304,19 @@ public class ProjectDaoTest extends PersistTestFunctions {
     }
   }
 
+  @Test
+  public void testGetNextId() throws Exception {
+    try {
+      long id = projectDao.getNextId();
+      Project project = new Project(projectId);
+      projectDao.add(project);
+
+      long id2 = projectDao.getNextId();
+      assertNotEquals(id, id2);
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw e;
+    }
+  }
+
 }