diff --git a/src/main/java/seedu/address/logic/parser/AddCommandParser.java b/src/main/java/seedu/address/logic/parser/AddCommandParser.java index 0ed49a129ca..8e1da336925 100644 --- a/src/main/java/seedu/address/logic/parser/AddCommandParser.java +++ b/src/main/java/seedu/address/logic/parser/AddCommandParser.java @@ -13,7 +13,6 @@ import static seedu.address.logic.parser.CliSyntax.PREFIX_SALARY; import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; -import java.util.Optional; import java.util.Set; import java.util.stream.Stream; diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java index 8a93c57c077..0d4c520219f 100644 --- a/src/main/java/seedu/address/logic/parser/ParserUtil.java +++ b/src/main/java/seedu/address/logic/parser/ParserUtil.java @@ -156,8 +156,7 @@ public static Tag parseTag(String tag) throws ParseException { public static InterviewTime parseInterviewTime(String dateTime) throws ParseException { if (dateTime == null) { return new InterviewTime(null); - } - else { + } else { String trimmedDateTime = dateTime.trim(); if (!InterviewTime.isValidInterviewTime(trimmedDateTime)) { throw new ParseException(InterviewTime.MESSAGE_CONSTRAINTS); diff --git a/src/main/java/seedu/address/model/person/InterviewTime.java b/src/main/java/seedu/address/model/person/InterviewTime.java index 85baff00e07..701605dd6a3 100644 --- a/src/main/java/seedu/address/model/person/InterviewTime.java +++ b/src/main/java/seedu/address/model/person/InterviewTime.java @@ -1,6 +1,5 @@ package seedu.address.model.person; -import static java.util.Objects.requireNonNull; import static seedu.address.commons.util.AppUtil.checkArgument; import java.time.LocalDateTime; @@ -34,8 +33,7 @@ public class InterviewTime { public InterviewTime(String dateTime) { if (dateTime == null) { this.dateTime = null; - } - else { + } else { checkArgument(isValidInterviewTime(dateTime), MESSAGE_CONSTRAINTS); this.dateTime = LocalDateTime.parse(dateTime, formatter); //set format } @@ -49,13 +47,11 @@ public InterviewTime(String dateTime) { public static boolean isValidInterviewTime(String test) { if (test == null) { return true; - } - else { + } else { try { LocalDateTime.parse(test, formatter); return true; - } - catch (DateTimeParseException e) { + } catch (DateTimeParseException e) { return false; } } @@ -97,8 +93,7 @@ public boolean isBefore(InterviewTime date) { public String toString() { if (dateTime == null) { return "No Interviews set"; - } - else { + } else { DateTimeFormatter beautify = DateTimeFormatter.ofPattern("MMMM dd, yyyy hh:mm a", Locale.ENGLISH); return dateTime.format(beautify); } @@ -116,8 +111,8 @@ public boolean equals(Object other) { } InterviewTime otherDateTime = (InterviewTime) other; - return (dateTime == null && otherDateTime.dateTime == null) || - (dateTime != null && dateTime.equals(otherDateTime.dateTime)); + return (dateTime == null && otherDateTime.dateTime == null) + || (dateTime != null && dateTime.equals(otherDateTime.dateTime)); } @Override diff --git a/src/main/java/seedu/address/model/person/Person.java b/src/main/java/seedu/address/model/person/Person.java index cb32dd9df0b..b34a59bd161 100644 --- a/src/main/java/seedu/address/model/person/Person.java +++ b/src/main/java/seedu/address/model/person/Person.java @@ -47,7 +47,6 @@ public Person( this.email = email; this.address = address; this.dateTime = dateTime; - System.out.println("REACHED HERE"); this.salary = salary; this.info = info; this.tags.addAll(tags); diff --git a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java b/src/main/java/seedu/address/storage/JsonAdaptedPerson.java index da8db136d19..3161324cc6c 100644 --- a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java +++ b/src/main/java/seedu/address/storage/JsonAdaptedPerson.java @@ -81,8 +81,7 @@ public JsonAdaptedPerson(Person source) { address = source.getAddress().value; if (source.getDateTime() == null) { dateTime = null; - } - else { + } else { dateTime = source.getDateTime().rawToString(); } salary = source.getSalary().toString(); diff --git a/src/test/java/seedu/address/model/person/InterviewTimeTest.java b/src/test/java/seedu/address/model/person/InterviewTimeTest.java index 350a19aacd8..e3b82fa48e8 100644 --- a/src/test/java/seedu/address/model/person/InterviewTimeTest.java +++ b/src/test/java/seedu/address/model/person/InterviewTimeTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static seedu.address.testutil.Assert.assertThrows; @@ -12,8 +13,9 @@ public class InterviewTimeTest { @Test - public void constructor_null_throwsNullPointerException() { - assertThrows(NullPointerException.class, () -> new InterviewTime(null)); + public void constructor_null_doesNotThrowException() { + InterviewTime interviewTime = new InterviewTime(null); + assertNull(interviewTime.getDateTime()); } @Test