Merge branch 'master' into update-guides

src/main/java/loanbook/logic/commands/AddCommand.java

@@ -1,7 +1,6 @@
 package loanbook.logic.commands;
 
 import static java.util.Objects.requireNonNull;
-import static loanbook.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static loanbook.logic.parser.CliSyntax.PREFIX_BIKE;
 import static loanbook.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static loanbook.logic.parser.CliSyntax.PREFIX_LOANRATE;
@@ -31,7 +30,6 @@ public class AddCommand extends Command {
             + PREFIX_NRIC + "NRIC "
             + PREFIX_PHONE + "PHONE "
             + PREFIX_EMAIL + "EMAIL "
-            + PREFIX_ADDRESS + "ADDRESS "
             + PREFIX_BIKE + "BIKE "
             + PREFIX_LOANRATE + "LOANRATE "
             + "[" + PREFIX_TAG + "TAG]...\n"
@@ -40,7 +38,6 @@ public class AddCommand extends Command {
             + PREFIX_NRIC + "T0248272F "
             + PREFIX_PHONE + "98765432 "
             + PREFIX_EMAIL + "johnd@example.com "
-            + PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
             + PREFIX_BIKE + "Bike001 "
             + PREFIX_LOANRATE + "3.5 "
             + PREFIX_TAG + "friends "

src/main/java/loanbook/logic/commands/EditCommand.java

@@ -1,7 +1,6 @@
 package loanbook.logic.commands;
 
 import static java.util.Objects.requireNonNull;
-import static loanbook.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static loanbook.logic.parser.CliSyntax.PREFIX_BIKE;
 import static loanbook.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static loanbook.logic.parser.CliSyntax.PREFIX_LOANRATE;
@@ -24,7 +23,6 @@
 import loanbook.logic.commands.exceptions.CommandException;
 import loanbook.model.Model;
 import loanbook.model.bike.Bike;
-import loanbook.model.loan.Address;
 import loanbook.model.loan.Email;
 import loanbook.model.loan.Loan;
 import loanbook.model.loan.LoanRate;
@@ -50,7 +48,6 @@ public class EditCommand extends Command {
             + "[" + PREFIX_NRIC + "NRIC] "
             + "[" + PREFIX_PHONE + "PHONE] "
             + "[" + PREFIX_EMAIL + "EMAIL] "
-            + "[" + PREFIX_ADDRESS + "ADDRESS] "
             + "[" + PREFIX_BIKE + "BIKE] "
             + "[" + PREFIX_LOANRATE + "LOANRATE] "
             + "[" + PREFIX_TAG + "TAG]...\n"
@@ -110,7 +107,6 @@ private static Loan createEditedLoan(Loan loanToEdit, EditLoanDescriptor editLoa
         Nric updatedNric = editLoanDescriptor.getNric().orElse(loanToEdit.getNric());
         Phone updatedPhone = editLoanDescriptor.getPhone().orElse(loanToEdit.getPhone());
         Email updatedEmail = editLoanDescriptor.getEmail().orElse(loanToEdit.getEmail());
-        Address updatedAddress = editLoanDescriptor.getAddress().orElse(loanToEdit.getAddress());
         Bike updatedBike = editLoanDescriptor.getBike().orElse(loanToEdit.getBike());
         LoanRate updatedRate = editLoanDescriptor.getLoanRate().orElse(loanToEdit.getLoanRate());
         LoanTime updatedStartTime = editLoanDescriptor.getLoanStartTime().orElse(loanToEdit.getLoanStartTime());
@@ -122,7 +118,6 @@ private static Loan createEditedLoan(Loan loanToEdit, EditLoanDescriptor editLoa
                 updatedNric,
                 updatedPhone,
                 updatedEmail,
-                updatedAddress,
                 updatedBike,
                 updatedRate,
                 updatedStartTime,
@@ -159,7 +154,6 @@ public static class EditLoanDescriptor {
         private Nric nric;
         private Phone phone;
         private Email email;
-        private Address address;
         private Bike bike;
         private LoanRate rate;
         private LoanTime startTime;
@@ -178,7 +172,6 @@ public EditLoanDescriptor(EditLoanDescriptor toCopy) {
             setNric(toCopy.nric);
             setPhone(toCopy.phone);
             setEmail(toCopy.email);
-            setAddress(toCopy.address);
             setBike(toCopy.bike);
             setLoanRate(toCopy.rate);
             setLoanStartTime(toCopy.startTime);
@@ -191,7 +184,7 @@ public EditLoanDescriptor(EditLoanDescriptor toCopy) {
          * Returns true if at least one field is edited.
          */
         public boolean isAnyFieldEdited() {
-            return CollectionUtil.isAnyNonNull(name, phone, email, address, tags);
+            return CollectionUtil.isAnyNonNull(name, phone, email, tags);
         }
 
         public void setName(Name name) {
@@ -226,14 +219,6 @@ public Optional<Email> getEmail() {
             return Optional.ofNullable(email);
         }
 
-        public void setAddress(Address address) {
-            this.address = address;
-        }
-
-        public Optional<Address> getAddress() {
-            return Optional.ofNullable(address);
-        }
-
         public void setBike(Bike bike) {
             this.bike = bike;
         }
@@ -310,7 +295,6 @@ public boolean equals(Object other) {
                     && getNric().equals(e.getNric())
                     && getPhone().equals(e.getPhone())
                     && getEmail().equals(e.getEmail())
-                    && getAddress().equals(e.getAddress())
                     && getBike().equals(e.getBike())
                     && getLoanRate().equals(e.getLoanRate())
                     && getTags().equals(e.getTags());

src/main/java/loanbook/logic/parser/AddCommandParser.java

@@ -1,7 +1,6 @@
 package loanbook.logic.parser;
 
 import static loanbook.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static loanbook.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static loanbook.logic.parser.CliSyntax.PREFIX_BIKE;
 import static loanbook.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static loanbook.logic.parser.CliSyntax.PREFIX_LOANRATE;
@@ -16,7 +15,6 @@
 import loanbook.logic.commands.AddCommand;
 import loanbook.logic.parser.exceptions.ParseException;
 import loanbook.model.bike.Bike;
-import loanbook.model.loan.Address;
 import loanbook.model.loan.Email;
 import loanbook.model.loan.Loan;
 import loanbook.model.loan.LoanRate;
@@ -42,7 +40,6 @@ public AddCommand parse(String args) throws ParseException {
                         PREFIX_NRIC,
                         PREFIX_PHONE,
                         PREFIX_EMAIL,
-                        PREFIX_ADDRESS,
                         PREFIX_BIKE,
                         PREFIX_LOANRATE,
                         PREFIX_TAG);
@@ -52,7 +49,6 @@ public AddCommand parse(String args) throws ParseException {
                 PREFIX_NRIC,
                 PREFIX_PHONE,
                 PREFIX_EMAIL,
-                PREFIX_ADDRESS,
                 PREFIX_BIKE,
                 PREFIX_LOANRATE)
                 || !argMultimap.getPreamble().isEmpty()) {
@@ -63,12 +59,11 @@ public AddCommand parse(String args) throws ParseException {
         Nric nric = ParserUtil.parseNric(argMultimap.getValue(PREFIX_NRIC).get());
         Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
         Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
-        Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
         Bike bike = ParserUtil.parseBike(argMultimap.getValue(PREFIX_BIKE).get());
         LoanRate rate = ParserUtil.parseLoanRate(argMultimap.getValue(PREFIX_LOANRATE).get());
         Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
 
-        Loan loan = new Loan(name, nric, phone, email, address, bike, rate, tagList);
+        Loan loan = new Loan(name, nric, phone, email, bike, rate, tagList);
 
         return new AddCommand(loan);
     }

src/main/java/loanbook/logic/parser/CliSyntax.java

@@ -12,7 +12,6 @@ public class CliSyntax {
     public static final Prefix PREFIX_PASSWORD = new Prefix("x/");
     public static final Prefix PREFIX_PHONE = new Prefix("p/");
     public static final Prefix PREFIX_EMAIL = new Prefix("e/");
-    public static final Prefix PREFIX_ADDRESS = new Prefix("a/");
     public static final Prefix PREFIX_BIKE = new Prefix("b/");
     public static final Prefix PREFIX_LOANRATE = new Prefix("lr/");
     public static final Prefix PREFIX_TAG = new Prefix("t/");

src/main/java/loanbook/logic/parser/EditCommandParser.java

@@ -2,7 +2,6 @@
 
 import static java.util.Objects.requireNonNull;
 import static loanbook.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static loanbook.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static loanbook.logic.parser.CliSyntax.PREFIX_BIKE;
 import static loanbook.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static loanbook.logic.parser.CliSyntax.PREFIX_LOANRATE;
@@ -35,7 +34,7 @@ public class EditCommandParser implements Parser<EditCommand> {
     public EditCommand parse(String args) throws ParseException {
         requireNonNull(args);
         ArgumentMultimap argMultimap =
-                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_NRIC, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS,
+                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_NRIC, PREFIX_PHONE, PREFIX_EMAIL,
                         PREFIX_BIKE, PREFIX_LOANRATE, PREFIX_TAG);
 
         Index index;
@@ -59,9 +58,6 @@ public EditCommand parse(String args) throws ParseException {
         if (argMultimap.getValue(PREFIX_EMAIL).isPresent()) {
             editLoanDescriptor.setEmail(ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get()));
         }
-        if (argMultimap.getValue(PREFIX_ADDRESS).isPresent()) {
-            editLoanDescriptor.setAddress(ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get()));
-        }
         if (argMultimap.getValue(PREFIX_BIKE).isPresent()) {
             editLoanDescriptor.setBike(ParserUtil.parseBike(argMultimap.getValue(PREFIX_BIKE).get()));
         }

src/main/java/loanbook/logic/parser/ParserUtil.java

@@ -11,7 +11,6 @@
 import loanbook.logic.parser.exceptions.ParseException;
 import loanbook.model.Password;
 import loanbook.model.bike.Bike;
-import loanbook.model.loan.Address;
 import loanbook.model.loan.Email;
 import loanbook.model.loan.LoanRate;
 import loanbook.model.loan.LoanTime;
@@ -100,21 +99,6 @@ public static Password parsePass(String pass) throws ParseException {
         return new Password(trimmedPass);
     }
 
-    /**
-     * 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 Address parseAddress(String address) throws ParseException {
-        requireNonNull(address);
-        String trimmedAddress = address.trim();
-        if (!Address.isValidAddress(trimmedAddress)) {
-            throw new ParseException(Address.MESSAGE_ADDRESS_CONSTRAINTS);
-        }
-        return new Address(trimmedAddress);
-    }
-
     /**
      * Parses a {@code String email} into an {@code Email}.
      * Leading and trailing whitespaces will be trimmed.

src/main/java/loanbook/model/loan/Loan.java

@@ -31,7 +31,6 @@ public class Loan implements UniqueListItem<Loan> {
     private final LoanTime endTime; // Note that endTime can be null
     private final Phone phone;
     private final Email email;
-    private final Address address;
     private final Set<Tag> tags = new HashSet<>();
     private LoanStatus loanStatus;
 
@@ -43,20 +42,18 @@ public Loan(Name name,
                 Nric nric,
                 Phone phone,
                 Email email,
-                Address address,
                 Bike bike,
                 LoanRate rate,
                 LoanTime startTime,
                 LoanTime endTime,
                 LoanStatus loanStatus,
                 Set<Tag> tags) {
 
-        requireAllNonNull(name, nric, phone, email, address, bike, rate, startTime, loanStatus, tags);
+        requireAllNonNull(name, nric, phone, email, bike, rate, startTime, loanStatus, tags);
         this.name = name;
         this.nric = nric;
         this.phone = phone;
         this.email = email;
-        this.address = address;
         this.bike = bike;
         this.rate = rate;
         this.startTime = startTime;
@@ -73,13 +70,12 @@ public Loan(Name name,
                 Nric nric,
                 Phone phone,
                 Email email,
-                Address address,
                 Bike bike,
                 LoanRate rate,
                 Set<Tag> tags) {
 
         // Initialise the loan to be ongoing.
-        this(name, nric, phone, email, address, bike, rate,
+        this(name, nric, phone, email, bike, rate,
                 new LoanTime(), null, LoanStatus.ONGOING, tags);
     }
 
@@ -92,14 +88,13 @@ public Loan(Name name,
                 Nric nric,
                 Phone phone,
                 Email email,
-                Address address,
                 Bike bike,
                 LoanRate rate,
                 LoanTime startTime,
                 LoanTime endTime,
                 Set<Tag> tags) {
 
-        this(name, nric, phone, email, address, bike, rate,
+        this(name, nric, phone, email, bike, rate,
                 startTime, endTime, LoanStatus.RETURNED, tags);
     }
 
@@ -112,7 +107,6 @@ public Loan(Loan other, Bike bike) {
             other.nric,
             other.phone,
             other.email,
-            other.address,
             bike,
             other.rate,
             other.startTime,
@@ -133,10 +127,6 @@ public Email getEmail() {
         return email;
     }
 
-    public Address getAddress() {
-        return address;
-    }
-
     public LoanStatus getLoanStatus() {
         return loanStatus;
     }
@@ -221,7 +211,6 @@ public boolean equals(Object other) {
                 && otherLoan.getNric().equals(getNric())
                 && otherLoan.getPhone().equals(getPhone())
                 && otherLoan.getEmail().equals(getEmail())
-                && otherLoan.getAddress().equals(getAddress())
                 && otherLoan.getLoanStatus().equals(getLoanStatus())
                 && otherLoan.getBike().equals(getBike())
                 && otherLoan.getLoanRate().equals(getLoanRate())
@@ -231,7 +220,7 @@ public boolean equals(Object other) {
     @Override
     public int hashCode() {
         // use this method for custom fields hashing instead of implementing your own
-        return Objects.hash(name, nric, phone, email, address, bike, rate, startTime, endTime, loanStatus, tags);
+        return Objects.hash(name, nric, phone, email, bike, rate, startTime, endTime, loanStatus, tags);
     }
 
     @Override
@@ -244,8 +233,6 @@ public String toString() {
                 .append(getPhone())
                 .append(" Email: ")
                 .append(getEmail())
-                .append(" Address: ")
-                .append(getAddress())
                 .append(" Status: ")
                 .append(getLoanStatus())
                 .append(" Bike: ")