Remove Optional.of() with regards to new overloading constructor

Author: claraadora

src/main/java/seedu/address/logic/commands/meeting/EditCommand.java

@@ -94,8 +94,8 @@ private static Meeting createEditedMeeting(Meeting meetingToEdit, EditMeetingDes
         // String updatedLocation = editMeetingDescriptor.getLocation().orElse(meetingToEdit.getLocation());
 
         // return new Meeting(updatedTitle, updatedDesc, updatedFrom, updatedTo, updatedContacts, updatedLocation);
-        return new Meeting(new Title("A"), new OptionalDescription(Optional.of("B")), new From("2"),
-                new To("3"), new Contacts(Optional.of("1,2,3")), new Location(Optional.of("SG")));
+        return new Meeting(new Title("A"), new OptionalDescription("B"), new From("2"),
+                new To("3"), new Contacts("1,2,3"), new Location("SG"));
     }
 
     @Override

src/main/java/seedu/address/logic/parser/meeting/AddCommandParser.java

@@ -16,6 +16,7 @@
 import seedu.address.logic.parser.Parser;
 import seedu.address.logic.parser.Prefix;
 import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.logic.parser.util.ParserCommon;
 import seedu.address.model.meeting.meeting.From;
 import seedu.address.model.meeting.meeting.Location;
 import seedu.address.model.meeting.meeting.Meeting;
@@ -44,11 +45,11 @@ public AddCommand parse(String args) throws ParseException {
         }
 
         Title title = ParserUtil.parseTitle(argMultimap.getValue(PREFIX_TITLE).get());
-        OptionalDescription description = ParserUtil.parseDescription(argMultimap.getValue(PREFIX_DESCRIPTION));
+        OptionalDescription description = ParserCommon.parseDescription(argMultimap.getValue(PREFIX_DESCRIPTION));
         From from = ParserUtil.parseFrom(argMultimap.getValue(PREFIX_FROM).get());
         To to = ParserUtil.parseTo(argMultimap.getValue(PREFIX_TO).get());
         Location location = ParserUtil.parseLocation(argMultimap.getValue(PREFIX_LOCATION));
-        Contacts contacts = ParserUtil.parseContacts(argMultimap.getValue(PREFIX_CONTACTS));
+        Contacts contacts = ParserCommon.parseContacts(argMultimap.getValue(PREFIX_CONTACTS));
         Meeting meeting = new Meeting(title, description, from, to, contacts, location);
 
         return new AddCommand(meeting);

src/main/java/seedu/address/logic/parser/meeting/ParserUtil.java

@@ -10,8 +10,6 @@
 import seedu.address.model.meeting.meeting.From;
 import seedu.address.model.meeting.meeting.Location;
 import seedu.address.model.meeting.meeting.To;
-import seedu.address.model.util.Contacts;
-import seedu.address.model.util.OptionalDescription;
 import seedu.address.model.util.Title;
 
 /**
@@ -48,23 +46,6 @@ public static Title parseTitle(String title) throws ParseException {
         return new Title(trimmedTitle);
     }
 
-    /**
-     * Parses a {@code String phone} into a {@code Phone}.
-     * Leading and trailing whitespaces will be trimmed.
-     *
-     * @throws ParseException if the given {@code phone} is invalid.
-     */
-    public static OptionalDescription parseDescription(Optional<String> description) throws ParseException {
-        if (description.isEmpty()) {
-            return new OptionalDescription(description);
-        }
-        String trimmedDescription = description.get().trim();
-        if (!OptionalDescription.isValidDescription(trimmedDescription)) {
-            throw new ParseException(Title.MESSAGE_CONSTRAINTS);
-        }
-        return new OptionalDescription(Optional.ofNullable(trimmedDescription));
-    }
-
     /**
      * Parses a {@code String address} into an {@code Address}.
      * Leading and trailing whitespaces will be trimmed.
@@ -95,23 +76,6 @@ public static From parseFrom(String from) throws ParseException {
         return new From(trimmedFrom);
     }
 
-    /**
-     * Parses a {@code String address} into an {@code Address}.
-     * Leading and trailing whitespaces will be trimmed.
-     *
-     * @throws ParseException if the given {@code address} is invalid.
-     */
-    public static Contacts parseContacts(Optional<String> contacts) throws ParseException {
-        if (contacts.isEmpty()) {
-            return new Contacts(contacts);
-        }
-        String trimmedContacts = contacts.get().trim();
-        if (!Contacts.isValidContacts(trimmedContacts)) {
-            throw new ParseException(Contacts.MESSAGE_CONSTRAINTS);
-        }
-        return new Contacts(Optional.ofNullable(trimmedContacts));
-    }
-
     /**
      * Parses a {@code String address} into an {@code Address}.
      * Leading and trailing whitespaces will be trimmed.
@@ -126,6 +90,6 @@ public static Location parseLocation(Optional<String> location) throws ParseExce
         if (!Location.isValidLocation(trimmedLocation)) {
             throw new ParseException(Location.MESSAGE_CONSTRAINTS);
         }
-        return new Location(Optional.ofNullable(trimmedLocation));
+        return new Location(trimmedLocation);
     }
 }

…ddress/logic/parser/util/ParserUtil.java …ress/logic/parser/util/ParserCommon.javasrc/main/java/seedu/address/logic/parser/util/ParserUtil.java renamed to src/main/java/seedu/address/logic/parser/util/ParserCommon.java src/main/java/seedu/address/logic/parser/util/ParserUtil.java renamed to src/main/java/seedu/address/logic/parser/util/ParserCommon.java

@@ -10,7 +10,7 @@
 /**
  * Contains utility methods used for parsing strings in the various *Parser classes.
  */
-public class ParserUtil {
+public class ParserCommon {
 
     /**
      * Parses a {@code Optional<String> description} into a {@code Description}.
@@ -26,7 +26,7 @@ public static OptionalDescription parseDescription(Optional<String> description)
         if (!OptionalDescription.isValidDescription(trimmedDescription)) {
             throw new ParseException(Title.MESSAGE_CONSTRAINTS);
         }
-        return new OptionalDescription(Optional.ofNullable(trimmedDescription));
+        return new OptionalDescription(trimmedDescription);
     }
 
     /**
@@ -43,6 +43,6 @@ public static Contacts parseContacts(Optional<String> contacts) throws ParseExce
         if (!Contacts.isValidContacts(trimmedContacts)) {
             throw new ParseException(Contacts.MESSAGE_CONSTRAINTS);
         }
-        return new Contacts(Optional.ofNullable(trimmedContacts));
+        return new Contacts(trimmedContacts);
     }
 }

src/main/java/seedu/address/model/util/SampleDataUtil.java

@@ -1,7 +1,6 @@
 package seedu.address.model.util;
 
 import java.util.Arrays;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -65,16 +64,16 @@ public static Deliverable[] getSampleDeliverables() {
 
     public static Meeting[] getSampleMeetings() {
         return new Meeting[] {
-            new Meeting(new Title("Meeting 1"), new OptionalDescription(Optional.of("With business associates")),
+            new Meeting(new Title("Meeting 1"), new OptionalDescription("With business associates"),
                 new From("01-01-2020 12:00"),
                 new To("01-01-2020 14:00"),
-                new Contacts(Optional.of("1,2,3")),
-                new Location(Optional.of("Singapore"))),
-            new Meeting(new Title("Meeting 2"), new OptionalDescription(Optional.of("With product designers")),
+                new Contacts("1,2,3"),
+                new Location("Singapore")),
+            new Meeting(new Title("Meeting 2"), new OptionalDescription("With product designers"),
                 new From("02-01-2020 12:00"),
                 new To("02-01-2020 14:00"),
-                new Contacts(Optional.of("4,5,6")),
-                new Location(Optional.of("Jakarta")))
+                new Contacts("4,5,6"),
+                new Location("Jakarta"))
         };
     }
 

src/test/java/seedu/address/testutil/MeetingBuilder.java

@@ -1,7 +1,5 @@
 package seedu.address.testutil;
 
-import java.util.Optional;
-
 import seedu.address.model.meeting.meeting.From;
 import seedu.address.model.meeting.meeting.Location;
 import seedu.address.model.meeting.meeting.Meeting;
@@ -10,17 +8,15 @@
 import seedu.address.model.util.OptionalDescription;
 import seedu.address.model.util.Title;
 
-
-
 public class MeetingBuilder {
 
     public static final String DEFAULT_TITLE = "Test";
-    public static final Optional<String> DEFAULT_DESCRIPTION = Optional.of("Refine functional requirements"
-            + "with business associates");
+    public static final String DEFAULT_DESCRIPTION = "Refine functional requirements"
+            + "with business associates";
     public static final String DEFAULT_FROM = "12-12-2020 08:00";
     public static final String DEFAULT_TO = "12-12-2020 09:00";
-    public static final Optional<String> DEFAULT_CONTACTS = Optional.of("3,6,9");
-    public static final Optional<String> DEFAULT_LOCATION = Optional.of("Singapore");
+    public static final String DEFAULT_CONTACTS = "3,6,9";
+    public static final String DEFAULT_LOCATION = "Singapore";
 
     private Title title;
     private OptionalDescription description;
@@ -67,7 +63,7 @@ public MeetingBuilder withTitle(String title) {
      * Sets the {@code Description} of the {@code Meeting} that we are building.
      */
     public MeetingBuilder withDescription(String description) {
-        this.description = new OptionalDescription(Optional.ofNullable(description));
+        this.description = new OptionalDescription(description);
         return this;
     }
 
@@ -91,15 +87,15 @@ public MeetingBuilder withTo(String to) {
      * Sets the {@code Contacts} of the {@code Meeting} that we are building.
      */
     public MeetingBuilder withContacts(String contacts) {
-        this.contacts = new Contacts(Optional.ofNullable(contacts));
+        this.contacts = new Contacts(contacts);
         return this;
     }
 
     /**
      * Sets the {@code Location} of the {@code Meeting} that we are building.
      */
     public MeetingBuilder withLocation(String location) {
-        this.location = new Location(Optional.ofNullable(location));
+        this.location = new Location(location);
         return this;
     }