Split method chaining

Sanghou · Mar 1, 2023 · 155cf3d · 155cf3d
1 parent 32d0bde
commit 155cf3d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/subway/sections/Sections.java b/src/main/java/subway/sections/Sections.java
@@ -61,9 +61,9 @@ public boolean isStationContained(Station station) {
       return false;
     }
 
-    if (Objects.equals(station.getId(), getDownStation().getId())) {
+    if (getDownStation().equals(station)) {
       return true;
     }
-    return sections.stream().anyMatch(s -> Objects.equals(s.getUpStation().getId(), station.getId()));
+    return sections.stream().anyMatch(s -> s.getUpStation().equals(station));
   }
 }
diff --git a/src/main/java/subway/sections/SectionsValidator.java b/src/main/java/subway/sections/SectionsValidator.java
@@ -25,14 +25,14 @@ static void validateRemoveSection(Sections sections, Station station) {
   }
 
   private static boolean isUpStationNotMatchesLastDownStation(Sections sections,Section section) {
-    return sections.getSize() != 0 && !Objects.equals(sections.getDownStation().getId(), section.getUpStation().getId());
+    return sections.getSize() != 0 && !sections.getDownStation().equals(section.getUpStation());
   }
 
   private static boolean isAlreadyAddedSection(Sections sections, Section section) {
     return sections.isStationContained(section.getDownStation()) && isStationNotLastDownStation(sections, section.getDownStation());
   }
 
   private static boolean isStationNotLastDownStation(Sections sections, Station station) {
-    return !Objects.equals(sections.getDownStation().getId(), station.getId());
+    return !sections.getDownStation().equals(station);
   }
 }
diff --git a/src/main/java/subway/station/Station.java b/src/main/java/subway/station/Station.java
@@ -35,6 +35,10 @@ public String getName() {
         return name;
     }
 
+    public boolean equals(Station station) {
+        return station != null && id.equals(station.getId());
+    }
+
     @Override
     public String toString() {
         return "id : " + id + ", name : " + name;