Move StepEntity classes

src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java

@@ -58,6 +58,7 @@
 import org.opentripplanner.apis.gtfs.datafetchers.RouteImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RouteTypeImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RoutingErrorImpl;
+import org.opentripplanner.apis.gtfs.datafetchers.StepEntityTypeResolver;
 import org.opentripplanner.apis.gtfs.datafetchers.StopGeometriesImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.StopImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.StopOnRouteImpl;
@@ -81,7 +82,6 @@
 import org.opentripplanner.apis.gtfs.datafetchers.serviceTimeRangeImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.stepImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.stopAtDistanceImpl;
-import org.opentripplanner.apis.gtfs.model.StepEntity;
 import org.opentripplanner.apis.gtfs.model.StopPosition;
 import org.opentripplanner.apis.support.graphql.LoggingDataFetcherExceptionHandler;
 import org.opentripplanner.ext.actuator.MicrometerGraphQLInstrumentation;
@@ -125,7 +125,7 @@ protected static GraphQLSchema buildSchema() {
         .type("Node", type -> type.typeResolver(new NodeTypeResolver()))
         .type("PlaceInterface", type -> type.typeResolver(new PlaceInterfaceTypeResolver()))
         .type("StopPosition", type -> type.typeResolver(new StopPosition() {}))
-        .type("StepEntity", type -> type.typeResolver(new StepEntity() {}))
+        .type("StepEntity", type -> type.typeResolver(new StepEntityTypeResolver()))
         .type("FareProduct", type -> type.typeResolver(new FareProductTypeResolver()))
         .type("AlertEntity", type -> type.typeResolver(new AlertEntityTypeResolver()))
         .type(typeWiring.build(AgencyImpl.class))

src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StepEntityTypeResolver.java

@@ -0,0 +1,30 @@
+package org.opentripplanner.apis.gtfs.datafetchers;
+
+import graphql.TypeResolutionEnvironment;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLSchema;
+import graphql.schema.TypeResolver;
+import org.opentripplanner.apis.gtfs.model.RouteTypeModel;
+import org.opentripplanner.apis.gtfs.model.StopOnRouteModel;
+import org.opentripplanner.apis.gtfs.model.StopOnTripModel;
+import org.opentripplanner.apis.gtfs.model.UnknownModel;
+import org.opentripplanner.model.plan.Entrance;
+import org.opentripplanner.transit.model.network.Route;
+import org.opentripplanner.transit.model.network.TripPattern;
+import org.opentripplanner.transit.model.organization.Agency;
+import org.opentripplanner.transit.model.site.RegularStop;
+import org.opentripplanner.transit.model.timetable.Trip;
+
+public class StepEntityTypeResolver implements TypeResolver {
+
+  @Override
+  public GraphQLObjectType getType(TypeResolutionEnvironment environment) {
+    Object o = environment.getObject();
+    GraphQLSchema schema = environment.getSchema();
+
+    if (o instanceof Entrance) {
+      return schema.getObjectType("Entrance");
+    }
+    return null;
+  }
+}

src/main/java/org/opentripplanner/model/plan/Entrance.java

@@ -0,0 +1,18 @@
+package org.opentripplanner.model.plan;
+
+public final class Entrance extends StepEntity {
+
+  private final String code;
+  private final String gtfsId;
+  private final String name;
+
+  public Entrance(String code, String gtfsId, String name) {
+    this.code = code;
+    this.gtfsId = gtfsId;
+    this.name = name;
+  }
+
+  public static Entrance withCode(String code) {
+    return new Entrance(code, null, null);
+  }
+}

src/main/java/org/opentripplanner/model/plan/StepEntity.java

@@ -0,0 +1,3 @@
+package org.opentripplanner.model.plan;
+
+public abstract class StepEntity {}

src/main/java/org/opentripplanner/model/plan/WalkStep.java

@@ -4,11 +4,11 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import org.opentripplanner.apis.gtfs.model.StepEntity;
 import org.opentripplanner.framework.geometry.WgsCoordinate;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.framework.lang.DoubleUtils;
 import org.opentripplanner.framework.tostring.ToStringBuilder;
+import org.opentripplanner.model.plan.StepEntity;
 import org.opentripplanner.street.model.edge.Edge;
 import org.opentripplanner.street.model.note.StreetNote;
 

src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java

@@ -5,12 +5,12 @@
 import java.util.List;
 import java.util.Set;
 import javax.annotation.Nullable;
-import org.opentripplanner.apis.gtfs.model.StepEntity;
-import org.opentripplanner.apis.gtfs.model.StepEntity.Entrance;
 import org.opentripplanner.framework.geometry.WgsCoordinate;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.framework.lang.DoubleUtils;
 import org.opentripplanner.framework.lang.IntUtils;
+import org.opentripplanner.model.plan.Entrance;
+import org.opentripplanner.model.plan.StepEntity;
 import org.opentripplanner.street.model.edge.Edge;
 import org.opentripplanner.street.model.note.StreetNote;
 

src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java

@@ -10,11 +10,11 @@
 import javax.annotation.Nonnull;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Geometry;
-import org.opentripplanner.apis.gtfs.model.StepEntity;
 import org.opentripplanner.framework.geometry.DirectionUtils;
 import org.opentripplanner.framework.geometry.WgsCoordinate;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.model.plan.ElevationProfile;
+import org.opentripplanner.model.plan.Entrance;
 import org.opentripplanner.model.plan.RelativeDirection;
 import org.opentripplanner.model.plan.WalkStep;
 import org.opentripplanner.model.plan.WalkStepBuilder;
@@ -396,9 +396,7 @@ private void setStationEntrance(State backState) {
     }
     if (entranceState.getVertex() instanceof StationEntranceVertex) {
       current.withEntrance(
-        StepEntity.Entrance.withCode(
-          ((StationEntranceVertex) entranceState.getVertex()).getEntranceName()
-        )
+        Entrance.withCode(((StationEntranceVertex) entranceState.getVertex()).getEntranceName())
       );
     }
   }