Transmodel GraphQL API - Clean code, cleanup TransmodelMappingUtil.

- Rename mapping methods to mapToApi, mapToDomain... - Move `getMonoOrMultiModalStation` method to Graph where this kind of functionality should be.
opentripplanner · Aug 10, 2020 · dc0a6c6 · dc0a6c6
1 parent ee76517
commit dc0a6c6
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 75 deletions.
diff --git a/src/ext/java/org/opentripplanner/ext/legacygraphqlapi/LegacyGraphQLAPI.java b/src/ext/java/org/opentripplanner/ext/legacygraphqlapi/LegacyGraphQLAPI.java
@@ -38,7 +38,7 @@
 public class LegacyGraphQLAPI {
 
   @SuppressWarnings("unused")
-  private static final Logger LOG = LoggerFactory.getLogger(org.opentripplanner.ext.transmodelapi.TransmodelIndexAPI.class);
+  private static final Logger LOG = LoggerFactory.getLogger(LegacyGraphQLAPI.class);
 
   private final Router router;
   private final ObjectMapper deserializer = new ObjectMapper();

diff --git a/src/ext/java/org/opentripplanner/ext/transmodelapi/TransmodelGraphQLPlanner.java b/src/ext/java/org/opentripplanner/ext/transmodelapi/TransmodelGraphQLPlanner.java
@@ -127,7 +127,7 @@ private GenericLocation toGenericLocation(Map<String, Object> m) {
         }
 
         String placeRef = (String) m.get("place");
-        FeedScopedId stopId = placeRef == null ? null : mappingUtil.fromIdString(placeRef);
+        FeedScopedId stopId = placeRef == null ? null : mappingUtil.mapIdToDomain(placeRef);
         String name = (String) m.get("name");
         name = name == null ? "" : name;
 
@@ -302,7 +302,7 @@ private RoutingRequest createRequest(DataFetchingEnvironment environment) {
     }
 
     private HashMap<FeedScopedId, BannedStopSet> toBannedTrips(Collection<String> serviceJourneyIds) {
-        Map<FeedScopedId, BannedStopSet> bannedTrips = serviceJourneyIds.stream().map(mappingUtil::fromIdString).collect(Collectors.toMap(Function.identity(), id -> BannedStopSet.ALL));
+        Map<FeedScopedId, BannedStopSet> bannedTrips = serviceJourneyIds.stream().map(mappingUtil::mapIdToDomain).collect(Collectors.toMap(Function.identity(), id -> BannedStopSet.ALL));
         return new HashMap<>(bannedTrips);
     }