diff --git a/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java b/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java
index c0bf261d70..7845f3c38e 100644
--- a/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java
+++ b/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java
@@ -1,15 +1,10 @@
package se.su.dsv.scipro.springdata.serviceimpls;
-import com.mysema.query.jpa.impl.JPAQuery;
-import com.mysema.query.types.*;
-import com.mysema.query.types.expr.BooleanExpression;
-import org.hibernate.hql.ast.tree.OrderByClause;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import se.su.dsv.scipro.data.dataobjects.Employee;
-import se.su.dsv.scipro.data.dataobjects.QEmployee;
import se.su.dsv.scipro.springdata.repos.SupervisorRepo;
import se.su.dsv.scipro.springdata.services.SupervisorService;
@@ -73,6 +68,7 @@ public class SupervisorServiceImpl extends AbstractQueryService<Employee, Long>
"count(keywords_id) " + sortOrder + ", user.lastName asc ";
List<BigInteger> dBlist= new ArrayList<BigInteger>();
+ //noinspection unchecked
dBlist.addAll(em.createNativeQuery(nativeSQL).getResultList());
List<Long> employeeIDs = new ArrayList<Long>();
diff --git a/src/test/java/se/su/dsv/scipro/springdata/TestSupervisor.java b/src/test/java/se/su/dsv/scipro/springdata/TestSupervisor.java
index d558ec4088..257ff5f918 100644
--- a/src/test/java/se/su/dsv/scipro/springdata/TestSupervisor.java
+++ b/src/test/java/se/su/dsv/scipro/springdata/TestSupervisor.java
@@ -52,12 +52,12 @@ public class TestSupervisor {
keywordTypeWord = keywordTypeDao.save(new KeywordType(KeywordTypeDao.TYPE.REGULAR.toDbName()));
}
- private Employee getEmployee(final String firstName, final String lastName, final String email, final Date dateCreated) {
+ private Employee getEmployee(final String firstName, final String lastName, final String email) {
User user = new User();
user.setFirstName(firstName);
user.setLastName(lastName);
user.setEmailAddress(email);
- user.setDateCreated(dateCreated);
+ user.setDateCreated(null);
user = userDao.save(user);
assertNotNull(user);
Employee employee = new Employee();
@@ -66,13 +66,13 @@ public class TestSupervisor {
}
- private void createAndAddKeyword(Employee employee, final KeywordType keyWordType , final String keyWordName, final boolean deleted) {
+ private void createAndAddKeyword(Employee employee, final KeywordType keyWordType, final String keyWordName) {
Keyword keyword = keywordDao.getKeywordByNameAndType(keyWordName, keyWordType);
if(keyword == null) {
keyword = new Keyword();
keyword.setType(keyWordType);
keyword.setKeyword(keyWordName);
- keyword.setDeleted(deleted);
+ keyword.setDeleted(false);
}
employee.getKeywords().getAll().add(keywordDao.save(keyword));
}
@@ -85,12 +85,12 @@ public class TestSupervisor {
@Rollback
public void findSupervisorLastNameAscDirection() {
List<Employee> employeeList = new ArrayList<Employee>();
- Employee larsson = getEmployee("Ken", "Larsson", "kenlars@dsv.su.se", null);
- Employee hallberg = getEmployee("David", "Hallberg", "dhallb@dsv.su.se", null);
- Employee tholerus = getEmployee("Torgny", "Tholerus", "torgny@dsv.su.se", null);
- Employee moattar = getEmployee("Golrokh", "Moattar", "goli@dsv.su.se", null);
- Employee friis = getEmployee("Fredrik", "Friis", "fre-fri@dsv.su.se", null);
- Employee herder = getEmployee("Niklas", "Herder", "herder@dsv.su.se", null);
+ @SuppressWarnings("UnusedAssignment") Employee larsson = getEmployee("Ken", "Larsson", "kenlars@dsv.su.se");
+ @SuppressWarnings("UnusedAssignment") Employee hallberg = getEmployee("David", "Hallberg", "dhallb@dsv.su.se");
+ Employee tholerus = getEmployee("Torgny", "Tholerus", "torgny@dsv.su.se");
+ @SuppressWarnings("UnusedAssignment") Employee moattar = getEmployee("Golrokh", "Moattar", "goli@dsv.su.se");
+ Employee friis = getEmployee("Fredrik", "Friis", "fre-fri@dsv.su.se");
+ @SuppressWarnings("UnusedAssignment") Employee herder = getEmployee("Niklas", "Herder", "herder@dsv.su.se");
Sort sortOrder = new Sort(org.springframework.data.domain.Sort.Direction.ASC, "user.lastName");
employeeList.addAll(supervisorService.findAllEmployees(sortOrder));
assertFalse(employeeList.isEmpty());
@@ -106,12 +106,12 @@ public class TestSupervisor {
@Rollback
public void findSupervisorLastNameDescDirection() {
List<Employee> employeeList = new ArrayList<Employee>();
- Employee larsson = getEmployee("Ken", "Larsson", "kenlars@dsv.su.se", null);
- Employee hallberg = getEmployee("David", "Hallberg", "dhallb@dsv.su.se", null);
- Employee tholerus = getEmployee("Torgny", "Tholerus", "torgny@dsv.su.se", null);
- Employee moattar = getEmployee("Golrokh", "Moattar", "goli@dsv.su.se", null);
- Employee friis = getEmployee("Fredrik", "Friis", "fre-fri@dsv.su.se", null);
- Employee herder = getEmployee("Niklas", "Herder", "herder@dsv.su.se", null);
+ @SuppressWarnings("UnusedAssignment") Employee larsson = getEmployee("Ken", "Larsson", "kenlars@dsv.su.se");
+ @SuppressWarnings("UnusedAssignment") Employee hallberg = getEmployee("David", "Hallberg", "dhallb@dsv.su.se");
+ Employee tholerus = getEmployee("Torgny", "Tholerus", "torgny@dsv.su.se");
+ @SuppressWarnings("UnusedAssignment") Employee moattar = getEmployee("Golrokh", "Moattar", "goli@dsv.su.se");
+ Employee friis = getEmployee("Fredrik", "Friis", "fre-fri@dsv.su.se");
+ @SuppressWarnings("UnusedAssignment") Employee herder = getEmployee("Niklas", "Herder", "herder@dsv.su.se");
Sort sortOrder = new Sort(org.springframework.data.domain.Sort.Direction.DESC, "user.lastName");
employeeList.addAll(supervisorService.findAllEmployees(sortOrder));
assertFalse(employeeList.isEmpty());
@@ -127,18 +127,18 @@ public class TestSupervisor {
@Rollback
public void findSupervisorAreaKeywords() {
List<Employee> employeeList = new ArrayList<Employee>();
- Employee larsson = getEmployee("Ken", "Larsson", "kenlars@dsv.su.se", null);
- Employee tholerus = getEmployee("Torgny", "Tholerus", "torgny@dsv.su.se", null);
- Employee herder = getEmployee("Niklas", "Herder", "herder@dsv.su.se", null);
+ Employee larsson = getEmployee("Ken", "Larsson", "kenlars@dsv.su.se");
+ Employee tholerus = getEmployee("Torgny", "Tholerus", "torgny@dsv.su.se");
+ Employee herder = getEmployee("Niklas", "Herder", "herder@dsv.su.se");
- createAndAddKeyword(herder, keywordTypeWord, "JUnit", false);
- createAndAddKeyword(herder, keywordTypeWord, "Maven", false);
- createAndAddKeyword(tholerus, keywordTypeWord, "JUnit", false);
- createAndAddKeyword(tholerus, keywordTypeWord, "Maven", false);
- createAndAddKeyword(tholerus, keywordTypeWord, "Java", false);
- createAndAddKeyword(larsson, keywordTypeArea, "Area1", false);
- createAndAddKeyword(larsson, keywordTypeArea, "Area2", false);
- createAndAddKeyword(larsson, keywordTypeArea, "Area3", false);
+ createAndAddKeyword(herder, keywordTypeWord, "JUnit");
+ createAndAddKeyword(herder, keywordTypeWord, "Maven");
+ createAndAddKeyword(tholerus, keywordTypeWord, "JUnit");
+ createAndAddKeyword(tholerus, keywordTypeWord, "Maven");
+ createAndAddKeyword(tholerus, keywordTypeWord, "Java");
+ createAndAddKeyword(larsson, keywordTypeArea, "Area1");
+ createAndAddKeyword(larsson, keywordTypeArea, "Area2");
+ createAndAddKeyword(larsson, keywordTypeArea, "Area3");
for(Employee employee : supervisorService.findSupervisorDescDirection(keywordTypeArea.getName())) {
if(!employeeList.contains(employee)) {