Skip to content

Commit f9574c0

Browse files
Clean up and docs
1 parent 0e8b755 commit f9574c0

File tree

10 files changed

+16
-10
lines changed

10 files changed

+16
-10
lines changed

application/src/ext-test/java/org/opentripplanner/ext/vdv/ojp/OjpServiceTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.junit.jupiter.api.Test;
2121
import org.opentripplanner._support.time.ZoneIds;
2222
import org.opentripplanner.ext.vdv.id.UseFeedIdResolver;
23+
import org.opentripplanner.ext.vdv.ojp.mapping.StopEventResponseMapper;
2324
import org.opentripplanner.transit.model.framework.FeedScopedId;
2425
import org.rutebanken.time.XmlDateTime;
2526

application/src/ext-test/java/org/opentripplanner/ext/vdv/trias/OjpMapperTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.opentripplanner._support.time.ZoneIds;
2121
import org.opentripplanner.ext.vdv.CallAtStop;
2222
import org.opentripplanner.ext.vdv.id.UseFeedIdResolver;
23-
import org.opentripplanner.ext.vdv.ojp.StopEventResponseMapper;
23+
import org.opentripplanner.ext.vdv.ojp.mapping.StopEventResponseMapper;
2424
import org.opentripplanner.model.TripTimeOnDate;
2525
import org.opentripplanner.transit.model._data.TimetableRepositoryForTest;
2626
import org.opentripplanner.transit.model.framework.Deduplicator;

application/src/ext-test/java/org/opentripplanner/ext/vdv/trias/OjpToTriasTransformerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.junit.jupiter.api.Test;
1616
import org.junit.jupiter.params.ParameterizedTest;
1717
import org.junit.jupiter.params.provider.ValueSource;
18-
import org.opentripplanner.ext.vdv.ojp.ErrorMapper;
18+
import org.opentripplanner.ext.vdv.ojp.mapping.ErrorMapper;
1919
import org.opentripplanner.test.support.ResourceLoader;
2020

2121
class OjpToTriasTransformerTest {

application/src/ext/java/org/opentripplanner/ext/vdv/id/IdResolver.java

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
import org.opentripplanner.transit.model.framework.FeedScopedId;
44

5+
/**
6+
* Handles mapping from external IDs into feed-scoped ones.
7+
*/
58
public interface IdResolver {
69
FeedScopedId parse(String id);
710

application/src/ext/java/org/opentripplanner/ext/vdv/ojp/OjpService.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.opentripplanner.ext.vdv.ojp;
22

33
import static java.lang.Boolean.TRUE;
4-
import static org.opentripplanner.ext.vdv.ojp.StopEventResponseMapper.OptionalFeature.ONWARD_CALLS;
5-
import static org.opentripplanner.ext.vdv.ojp.StopEventResponseMapper.OptionalFeature.PREVIOUS_CALLS;
4+
import static org.opentripplanner.ext.vdv.ojp.mapping.StopEventResponseMapper.OptionalFeature.ONWARD_CALLS;
5+
import static org.opentripplanner.ext.vdv.ojp.mapping.StopEventResponseMapper.OptionalFeature.PREVIOUS_CALLS;
66

77
import de.vdv.ojp20.LineDirectionFilterStructure;
88
import de.vdv.ojp20.ModeFilterStructure;
@@ -26,6 +26,8 @@
2626
import org.opentripplanner.ext.vdv.CallAtStop;
2727
import org.opentripplanner.ext.vdv.VdvService;
2828
import org.opentripplanner.ext.vdv.id.IdResolver;
29+
import org.opentripplanner.ext.vdv.ojp.mapping.PtModeMapper;
30+
import org.opentripplanner.ext.vdv.ojp.mapping.StopEventResponseMapper;
2931
import org.opentripplanner.framework.geometry.WgsCoordinate;
3032
import org.opentripplanner.routing.stoptimes.ArrivalDeparture;
3133
import org.opentripplanner.transit.model.basic.TransitMode;

application/src/ext/java/org/opentripplanner/ext/vdv/ojp/ErrorMapper.java application/src/ext/java/org/opentripplanner/ext/vdv/ojp/mapping/ErrorMapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.opentripplanner.ext.vdv.ojp;
1+
package org.opentripplanner.ext.vdv.ojp.mapping;
22

33
import de.vdv.ojp20.OJP;
44
import de.vdv.ojp20.OJPResponseStructure;

application/src/ext/java/org/opentripplanner/ext/vdv/ojp/PtModeMapper.java application/src/ext/java/org/opentripplanner/ext/vdv/ojp/mapping/PtModeMapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.opentripplanner.ext.vdv.ojp;
1+
package org.opentripplanner.ext.vdv.ojp.mapping;
22

33
import de.vdv.ojp20.siri.VehicleModesOfTransportEnumeration;
44
import org.opentripplanner.transit.model.basic.TransitMode;

application/src/ext/java/org/opentripplanner/ext/vdv/ojp/ServiceDeliveryMapper.java application/src/ext/java/org/opentripplanner/ext/vdv/ojp/mapping/ServiceDeliveryMapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.opentripplanner.ext.vdv.ojp;
1+
package org.opentripplanner.ext.vdv.ojp.mapping;
22

33
import de.vdv.ojp20.siri.ParticipantRefStructure;
44
import de.vdv.ojp20.siri.ServiceDelivery;

application/src/ext/java/org/opentripplanner/ext/vdv/ojp/StopEventResponseMapper.java application/src/ext/java/org/opentripplanner/ext/vdv/ojp/mapping/StopEventResponseMapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.opentripplanner.ext.vdv.ojp;
1+
package org.opentripplanner.ext.vdv.ojp.mapping;
22

33
import de.vdv.ojp20.CallAtNearStopStructure;
44
import de.vdv.ojp20.CallAtStopStructure;

application/src/ext/java/org/opentripplanner/ext/vdv/trias/TriasResource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import org.opentripplanner.ext.vdv.id.HideFeedIdResolver;
2727
import org.opentripplanner.ext.vdv.id.IdResolver;
2828
import org.opentripplanner.ext.vdv.id.UseFeedIdResolver;
29-
import org.opentripplanner.ext.vdv.ojp.ErrorMapper;
3029
import org.opentripplanner.ext.vdv.ojp.OjpService;
31-
import org.opentripplanner.ext.vdv.ojp.StopEventResponseMapper;
30+
import org.opentripplanner.ext.vdv.ojp.mapping.ErrorMapper;
31+
import org.opentripplanner.ext.vdv.ojp.mapping.StopEventResponseMapper;
3232
import org.opentripplanner.model.FeedInfo;
3333
import org.opentripplanner.routing.error.RoutingValidationException;
3434
import org.opentripplanner.standalone.api.OtpServerRequestContext;

0 commit comments

Comments
 (0)