Apply review feedback

opentripplanner · Jan 22, 2025 · 5b5937d · 5b5937d
1 parent aa84c15
commit 5b5937d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java
@@ -57,6 +57,13 @@ public class FlexibleTransitLeg implements TransitLeg {
     this.fareProducts = List.copyOf(builder.fareProducts());
   }
 
+  /**
+   * Return an empty builder for {@link FlexibleTransitLeg}.
+   */
+  public static FlexibleTransitLegBuilder of() {
+    return new FlexibleTransitLegBuilder();
+  }
+
   @Override
   public Agency getAgency() {
     return getTrip().getRoute().getAgency();

diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLegBuilder.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLegBuilder.java
@@ -18,9 +18,9 @@ public class FlexibleTransitLegBuilder {
   private Set<TransitAlert> transitAlerts = new HashSet<>();
   private List<FareProductUse> fareProducts = new ArrayList<>();
 
-  public FlexibleTransitLegBuilder() {}
+  FlexibleTransitLegBuilder() {}
 
-  public FlexibleTransitLegBuilder(FlexibleTransitLeg original) {
+  FlexibleTransitLegBuilder(FlexibleTransitLeg original) {
     flexTripEdge = original.flexTripEdge();
     startTime = original.getStartTime();
     endTime = original.getEndTime();

diff --git a/...c/main/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapper.java b/...c/main/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapper.java
@@ -13,7 +13,7 @@
 import org.locationtech.jts.geom.LineString;
 import org.locationtech.jts.geom.impl.PackedCoordinateSequence;
 import org.opentripplanner.astar.model.GraphPath;
-import org.opentripplanner.ext.flex.FlexibleTransitLegBuilder;
+import org.opentripplanner.ext.flex.FlexibleTransitLeg;
 import org.opentripplanner.ext.flex.edgetype.FlexTripEdge;
 import org.opentripplanner.framework.application.OTPFeature;
 import org.opentripplanner.framework.geometry.GeometryUtils;
@@ -336,7 +336,8 @@ private Leg generateFlexLeg(List<State> states) {
     ZonedDateTime endTime = toState.getTime().atZone(timeZone);
     int generalizedCost = (int) (toState.getWeight() - fromState.getWeight());
 
-    return new FlexibleTransitLegBuilder()
+    return FlexibleTransitLeg
+      .of()
       .withFlexTripEdge(flexEdge)
       .withStartTime(startTime)
       .withEndTime(endTime)

diff --git a/application/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java b/application/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java
@@ -15,7 +15,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.opentripplanner.ext.flex.FlexibleTransitLeg;
-import org.opentripplanner.ext.flex.FlexibleTransitLegBuilder;
 import org.opentripplanner.ext.flex.edgetype.FlexTripEdge;
 import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator;
 import org.opentripplanner.ext.flex.trip.UnscheduledTrip;
@@ -247,7 +246,8 @@ public TestItineraryBuilder flex(int start, int end, Place to) {
       flexPath
     );
 
-    FlexibleTransitLeg leg = new FlexibleTransitLegBuilder()
+    FlexibleTransitLeg leg = FlexibleTransitLeg
+      .of()
       .withFlexTripEdge(edge)
       .withStartTime(newTime(start))
       .withEndTime(newTime(end))