Skip to content

Commit 2e14159

Browse files
luparilupari
committed
CSCEXAM-000 Fix linting issues
1 parent e8f280c commit 2e14159

File tree

13 files changed

+66
-81
lines changed

13 files changed

+66
-81
lines changed

‎app/controllers/admin/ReportController.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,9 @@ public Result getExamParticipations(Optional<String> dept, Optional<String> star
112112
if (!roomMap.containsKey(key)) {
113113
roomMap.put(key, new ArrayList<>());
114114
}
115-
DateTime examStart =
116-
enrolment.getExternalExam() != null
117-
? enrolment.getExternalExam().getStarted()
118-
: enrolment.getExam().getCreated();
115+
DateTime examStart = enrolment.getExternalExam() != null
116+
? enrolment.getExternalExam().getStarted()
117+
: enrolment.getExam().getCreated();
119118
roomMap.get(key).add(new Participation(examStart));
120119
}
121120
// Fill in the rooms that have no associated participations

‎app/controllers/admin/StatisticsController.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,7 @@ public Result getTeacherExamsByDate(Long uid, String from, String to) throws IOE
173173
case REVIEW, REVIEW_STARTED -> inReview++;
174174
case GRADED -> graded++;
175175
case GRADED_LOGGED -> logged++;
176-
default -> {
177-
}
176+
default -> {}
178177
}
179178
}
180179
String[] data = new String[10];
@@ -224,10 +223,9 @@ public Result getExamEnrollments(Long id) throws IOException {
224223
data[0] = String.format("%s %s", e.getUser().getFirstName(), e.getUser().getLastName());
225224
data[1] = forceNotNull(e.getUser().getIdentifier());
226225
data[2] = e.getUser().getEppn();
227-
data[3] =
228-
e.getReservation() == null
229-
? ""
230-
: ISODateTimeFormat.dateTimeNoMillis().print(new DateTime(e.getReservation().getStartAt()));
226+
data[3] = e.getReservation() == null
227+
? ""
228+
: ISODateTimeFormat.dateTimeNoMillis().print(new DateTime(e.getReservation().getStartAt()));
231229
data[4] = ISODateTimeFormat.dateTimeNoMillis().print(new DateTime(e.getEnrolledOn()));
232230
Row dataRow = sheet.createRow(proto.getExamEnrolments().indexOf(e) + 1);
233231
for (int i = 0; i < data.length; ++i) {

‎app/controllers/enrolment/ExaminationEventController.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,12 @@ public Result removeExaminationEvent(Long eid, Long eeid) {
248248

249249
private void encryptSettingsPassword(ExaminationEventConfiguration eec, String password, String quitPassword) {
250250
try {
251-
String oldPwd =
252-
eec.getEncryptedSettingsPassword() != null
253-
? byodConfigHandler.getPlaintextPassword(
254-
eec.getEncryptedSettingsPassword(),
255-
eec.getSettingsPasswordSalt()
256-
)
257-
: null;
251+
String oldPwd = eec.getEncryptedSettingsPassword() != null
252+
? byodConfigHandler.getPlaintextPassword(
253+
eec.getEncryptedSettingsPassword(),
254+
eec.getSettingsPasswordSalt()
255+
)
256+
: null;
258257

259258
if (!password.equals(oldPwd)) {
260259
String newSalt = UUID.randomUUID().toString();
@@ -271,10 +270,9 @@ private void encryptSettingsPassword(ExaminationEventConfiguration eec, String p
271270

272271
private void encryptQuitPassword(ExaminationEventConfiguration eec, String password) {
273272
try {
274-
String oldPwd =
275-
eec.getEncryptedQuitPassword() != null
276-
? byodConfigHandler.getPlaintextPassword(eec.getEncryptedQuitPassword(), eec.getQuitPasswordSalt())
277-
: null;
273+
String oldPwd = eec.getEncryptedQuitPassword() != null
274+
? byodConfigHandler.getPlaintextPassword(eec.getEncryptedQuitPassword(), eec.getQuitPasswordSalt())
275+
: null;
278276

279277
if (!password.equals(oldPwd)) {
280278
String newSalt = UUID.randomUUID().toString();

‎app/controllers/examination/ExaminationController.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -425,10 +425,9 @@ private void setDurations(ExamParticipation ep) {
425425
if (ep.getExam().getImplementation() != Exam.Implementation.AQUARIUM) {
426426
now = DateTime.now();
427427
} else {
428-
now =
429-
ep.getReservation() == null
430-
? dateTimeHandler.adjustDST(DateTime.now())
431-
: dateTimeHandler.adjustDST(DateTime.now(), ep.getReservation().getMachine().getRoom());
428+
now = ep.getReservation() == null
429+
? dateTimeHandler.adjustDST(DateTime.now())
430+
: dateTimeHandler.adjustDST(DateTime.now(), ep.getReservation().getMachine().getRoom());
432431
}
433432
ep.setEnded(now);
434433
ep.setDuration(new DateTime(ep.getEnded().getMillis() - ep.getStarted().getMillis()));

‎app/controllers/iop/collaboration/impl/CollaborativeAttachmentController.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333

3434
public class CollaborativeAttachmentController
3535
extends CollaborationController
36-
implements CollaborativeAttachmentInterface<Long, CollaborativeExam>
37-
{
36+
implements CollaborativeAttachmentInterface<Long, CollaborativeExam> {
3837

3938
@Inject
4039
private WSClient wsClient;

‎app/controllers/iop/transfer/impl/ExternalCalendarController.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,9 @@ private Set<CalendarHandler.TimeSlot> getExamSlots(
476476
private LocalDate parseSearchDate(String day, String startDate, String endDate, ExamRoom room)
477477
throws IllegalArgumentException {
478478
int windowSize = calendarHandler.getReservationWindowSize();
479-
DateTimeZone zone =
480-
room != null ? DateTimeZone.forID(room.getLocalTimezone()) : configReader.getDefaultTimeZone();
479+
DateTimeZone zone = room != null
480+
? DateTimeZone.forID(room.getLocalTimezone())
481+
: configReader.getDefaultTimeZone();
481482
LocalDate now = DateTime.now().withZone(zone).toLocalDate();
482483
LocalDate reservationWindowDate = now.plusDays(windowSize);
483484
LocalDate examEndDate = DateTime.parse(endDate, ISODateTimeFormat.dateTimeParser())

‎app/impl/CalendarHandlerImpl.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,9 @@ public boolean isDoable(Reservation reservation, Collection<Integer> aids) {
176176
@Override
177177
public LocalDate parseSearchDate(String day, Exam exam, ExamRoom room) throws IllegalArgumentException {
178178
int windowSize = getReservationWindowSize();
179-
DateTimeZone dtz =
180-
room != null ? DateTimeZone.forID(room.getLocalTimezone()) : configReader.getDefaultTimeZone();
179+
DateTimeZone dtz = room != null
180+
? DateTimeZone.forID(room.getLocalTimezone())
181+
: configReader.getDefaultTimeZone();
181182
int startOffset = dtz.getOffset((exam.getPeriodStart()));
182183
int offset = dtz.getOffset(DateTime.now());
183184
LocalDate now = DateTime.now().plusMillis(offset).toLocalDate();
@@ -305,10 +306,9 @@ public Set<TimeSlot> handleReservations(
305306
if (concernsAnotherExam.isPresent()) {
306307
// User has a reservation to another exam, do not allow making overlapping reservations
307308
Reservation reservation = concernsAnotherExam.get();
308-
String conflictingExam =
309-
reservation.getEnrolment().getExam() != null
310-
? reservation.getEnrolment().getExam().getName()
311-
: reservation.getEnrolment().getCollaborativeExam().getName();
309+
String conflictingExam = reservation.getEnrolment().getExam() != null
310+
? reservation.getEnrolment().getExam().getName()
311+
: reservation.getEnrolment().getCollaborativeExam().getName();
312312
results.add(new TimeSlot(reservation.toInterval(), -1, conflictingExam));
313313
continue;
314314
} else {

‎app/miscellaneous/datetime/DateTimeHandlerImpl.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,9 @@ private DateTime doAdjustDST(DateTime dateTime, ExamRoom room) {
216216

217217
@Override
218218
public DateTime normalize(DateTime dateTime, Reservation reservation) {
219-
DateTimeZone dtz =
220-
reservation.getMachine() == null
221-
? configReader.getDefaultTimeZone()
222-
: DateTimeZone.forID(reservation.getMachine().getRoom().getLocalTimezone());
219+
DateTimeZone dtz = reservation.getMachine() == null
220+
? configReader.getDefaultTimeZone()
221+
: DateTimeZone.forID(reservation.getMachine().getRoom().getLocalTimezone());
223222
return !dtz.isStandardOffset(dateTime.getMillis()) ? dateTime.minusHours(1) : dateTime;
224223
}
225224

‎app/repository/EnrolmentRepository.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -343,14 +343,14 @@ private void handleUpcomingEnrolment(
343343
}
344344

345345
private boolean isInsideBounds(ExamEnrolment ee, int minutesToFuture) {
346-
DateTime earliest =
347-
ee.getExaminationEventConfiguration() == null ? dateTimeHandler.adjustDST(new DateTime()) : DateTime.now();
346+
DateTime earliest = ee.getExaminationEventConfiguration() == null
347+
? dateTimeHandler.adjustDST(new DateTime())
348+
: DateTime.now();
348349
DateTime latest = earliest.plusMinutes(minutesToFuture);
349350
Reservation reservation = ee.getReservation();
350-
ExaminationEvent event =
351-
ee.getExaminationEventConfiguration() != null
352-
? ee.getExaminationEventConfiguration().getExaminationEvent()
353-
: null;
351+
ExaminationEvent event = ee.getExaminationEventConfiguration() != null
352+
? ee.getExaminationEventConfiguration().getExaminationEvent()
353+
: null;
354354
int delay = ee.getDelay();
355355
return (
356356
(reservation != null &&

‎app/repository/ExaminationRepository.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ private Optional<Exam> doCreateExam(Exam prototype, User user, ExamEnrolment enr
6363
boolean isCollaborative = enrolment.getCollaborativeExam() != null;
6464
Reservation reservation = enrolment.getReservation();
6565
// TODO: support for optional sections in BYOD exams
66-
Set<Long> ids =
67-
reservation == null
68-
? Collections.emptySet()
69-
: enrolment.getOptionalSections().stream().map(ExamSection::getId).collect(Collectors.toSet());
66+
Set<Long> ids = reservation == null
67+
? Collections.emptySet()
68+
: enrolment.getOptionalSections().stream().map(ExamSection::getId).collect(Collectors.toSet());
7069
ExamCopyContext context = isCollaborative
7170
? ExamCopyContext.forCollaborativeExam(user).withSelectedSections(ids).build()
7271
: ExamCopyContext.forStudentExam(user).withSelectedSections(ids).build();
@@ -128,13 +127,12 @@ public CompletionStage<Exam> createFinalExam(Exam clone, User user, ExamEnrolmen
128127
}
129128
DateTime now = DateTime.now();
130129
if (enrolment.getExaminationEventConfiguration() == null) {
131-
now =
132-
reservation == null
133-
? dateTimeHandler.adjustDST(DateTime.now())
134-
: dateTimeHandler.adjustDST(
135-
DateTime.now(),
136-
enrolment.getReservation().getMachine().getRoom()
137-
);
130+
now = reservation == null
131+
? dateTimeHandler.adjustDST(DateTime.now())
132+
: dateTimeHandler.adjustDST(
133+
DateTime.now(),
134+
enrolment.getReservation().getMachine().getRoom()
135+
);
138136
}
139137
examParticipation.setStarted(now);
140138
db.save(examParticipation);
@@ -210,8 +208,9 @@ private Query<Exam> createQuery(PathProperties pp) {
210208
}
211209

212210
private boolean isInEffect(ExamEnrolment ee) {
213-
DateTime now =
214-
ee.getExaminationEventConfiguration() == null ? dateTimeHandler.adjustDST(DateTime.now()) : DateTime.now();
211+
DateTime now = ee.getExaminationEventConfiguration() == null
212+
? dateTimeHandler.adjustDST(DateTime.now())
213+
: DateTime.now();
215214
if (ee.getReservation() != null) {
216215
return (ee.getReservation().getStartAt().isBefore(now) && ee.getReservation().getEndAt().isAfter(now));
217216
} else if (ee.getExaminationEventConfiguration() != null) {

0 commit comments

Comments
 (0)