zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code cleanup

Browse source
This commit is contained in:
anhefti 2022-11-10 10:36:20 +01:00
parent 019f9e1421
commit bcedeaf5d5
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamConfigUpdateServiceImpl.java
View file

@ -29,7 +29,6 @@ import ch.ethz.seb.sebserver.gbl.util.Result;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ConfigurationDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ConfigurationDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamConfigurationMapDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamConfigurationMapDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.exam.ExamAdminService;
import ch.ethz.seb.sebserver.webservice.servicelayer.session.ExamConfigUpdateService; import ch.ethz.seb.sebserver.webservice.servicelayer.session.ExamConfigUpdateService;
import ch.ethz.seb.sebserver.webservice.servicelayer.session.ExamSessionService; import ch.ethz.seb.sebserver.webservice.servicelayer.session.ExamSessionService;
@ -45,22 +44,19 @@ public class ExamConfigUpdateServiceImpl implements ExamConfigUpdateService {
private final ExamConfigurationMapDAO examConfigurationMapDAO; private final ExamConfigurationMapDAO examConfigurationMapDAO;
private final ExamSessionService examSessionService; private final ExamSessionService examSessionService;
private final ExamUpdateHandler examUpdateHandler; private final ExamUpdateHandler examUpdateHandler;
private final ExamAdminService examAdminService;
protected ExamConfigUpdateServiceImpl( protected ExamConfigUpdateServiceImpl(
final ExamDAO examDAO, final ExamDAO examDAO,
final ConfigurationDAO configurationDAO, final ConfigurationDAO configurationDAO,
final ExamConfigurationMapDAO examConfigurationMapDAO, final ExamConfigurationMapDAO examConfigurationMapDAO,
final ExamSessionService examSessionService, final ExamSessionService examSessionService,
final ExamUpdateHandler examUpdateHandler, final ExamUpdateHandler examUpdateHandler) {
final ExamAdminService examAdminService) {
this.examDAO = examDAO; this.examDAO = examDAO;
this.configurationDAO = configurationDAO; this.configurationDAO = configurationDAO;
this.examConfigurationMapDAO = examConfigurationMapDAO; this.examConfigurationMapDAO = examConfigurationMapDAO;
this.examSessionService = examSessionService; this.examSessionService = examSessionService;
this.examUpdateHandler = examUpdateHandler; this.examUpdateHandler = examUpdateHandler;
this.examAdminService = examAdminService;
} }
// processing: // processing:

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamUpdateHandler.java
View file

@ -338,7 +338,7 @@ class ExamUpdateHandler {
} }
private boolean hasChanges(final Exam exam, final QuizData quizData) { private boolean hasChanges(final Exam exam, final QuizData quizData) {
if (!Objects.equals(exam.name, quizData.name) || if (Utils.isEqualsWithEmptyCheck(exam.name, quizData.name) ||
!Objects.equals(exam.startTime, quizData.startTime) || !Objects.equals(exam.startTime, quizData.startTime) ||
!Objects.equals(exam.endTime, quizData.endTime) || !Objects.equals(exam.endTime, quizData.endTime) ||
!Utils.isEqualsWithEmptyCheck(exam.getDescription(), quizData.description) || !Utils.isEqualsWithEmptyCheck(exam.getDescription(), quizData.description) ||