Skip to content

Commit 8e3f784

Browse files
committed
Revert schema changes
1 parent 802e766 commit 8e3f784

File tree

6 files changed

+1
-28
lines changed

6 files changed

+1
-28
lines changed

.github/workflows/dev-pipeline.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ jobs:
2424
distribution: temurin
2525
cache: maven
2626

27-
- name: Run tests
28-
run: |
29-
mvn test -P prettierSkip
30-
3127
container-image:
3228
runs-on: ubuntu-latest
3329
needs:

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import graphql.relay.Relay;
66
import graphql.schema.DataFetcher;
77
import graphql.schema.DataFetchingEnvironment;
8-
import java.time.OffsetDateTime;
98
import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
109
import org.opentripplanner.service.vehiclerental.model.RentalVehicleFuel;
1110
import org.opentripplanner.service.vehiclerental.model.RentalVehicleType;
@@ -25,11 +24,6 @@ public DataFetcher<RentalVehicleFuel> fuel() {
2524
return environment -> getSource(environment).getFuel();
2625
}
2726

28-
@Override
29-
public DataFetcher<OffsetDateTime> availableUntil() {
30-
return environment -> getSource(environment).getAvailableUntil();
31-
}
32-
3327
@Override
3428
public DataFetcher<Relay.ResolvedGlobalId> id() {
3529
return environment ->

application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -916,8 +916,6 @@ public interface GraphQLRentalPlace extends TypeResolver {}
916916
public interface GraphQLRentalVehicle {
917917
public DataFetcher<Boolean> allowPickupNow();
918918

919-
public DataFetcher<OffsetDateTime> availableUntil();
920-
921919
public DataFetcher<RentalVehicleFuel> fuel();
922920

923921
public DataFetcher<graphql.relay.Relay.ResolvedGlobalId> id();

application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,12 @@ This is only worth it when the execution is long running, i.e. more than ~50 mil
1212
"""
1313
directive @async on FIELD_DEFINITION
1414

15-
"This directive allows results to be deferred during execution"
16-
directive @defer(
17-
"Deferred behaviour is controlled by this argument"
18-
if: Boolean! = true,
19-
"A unique label that represents the fragment being deferred"
20-
label: String
21-
) on FRAGMENT_SPREAD | INLINE_FRAGMENT
22-
2315
"Marks the field, argument, input field or enum value as deprecated"
2416
directive @deprecated(
2517
"The reason for the deprecation"
2618
reason: String! = "No longer supported"
2719
) on FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM_VALUE | INPUT_FIELD_DEFINITION
2820

29-
"This directive disables error propagation when a non nullable field returns null for the given operation."
30-
directive @experimental_disableErrorPropagation on QUERY | MUTATION | SUBSCRIPTION
31-
3221
"Directs the executor to include this field or fragment only when the `if` argument is true"
3322
directive @include(
3423
"Included when true."
@@ -1900,8 +1889,6 @@ type RealTimeEstimate {
19001889
type RentalVehicle implements Node & PlaceInterface {
19011890
"If true, vehicle is currently available for renting."
19021891
allowPickupNow: Boolean
1903-
"The vehicle should be returned before this deadline."
1904-
availableUntil: OffsetDateTime
19051892
"Fuel or battery status of the rental vehicle"
19061893
fuel: RentalVehicleFuel
19071894
"Global object ID provided by Relay. This value can be used to refetch this object using **node** query."

application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
"fuel": {
2020
"percent": 0.5,
2121
"range": 5501
22-
},
23-
"availableUntil": "2025-01-01T00:00:00Z"
22+
}
2423
}
2524
}
2625
}

application/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,5 @@
2323
percent
2424
range
2525
}
26-
availableUntil
2726
}
2827
}

0 commit comments

Comments
 (0)