Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TEST DON'T MERGE Ci schema validation #385

Closed
wants to merge 141 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
1d19a05
Add subway station entrances to walk steps
HenrikSundell Sep 18, 2024
67f4b1b
Add entity to walk steps
HenrikSundell Oct 2, 2024
9d18269
Add more parameters to Entrance
HenrikSundell Oct 3, 2024
3b88288
Move StepEntity classes
HenrikSundell Oct 7, 2024
0a62bf8
Remove default name for subway station entrances
HenrikSundell Oct 16, 2024
528ab55
Add option to turn on osm subway entrances in osmDefaults
HenrikSundell Oct 18, 2024
3e4ae96
Merge remote-tracking branch 'otp/dev-2.x' into station-entrances
HenrikSundell Oct 19, 2024
401a405
Fix walk step generation
HenrikSundell Oct 21, 2024
438bc31
Add step entity to graphql tests
HenrikSundell Oct 23, 2024
97c2de6
Rename variables to match with graphql
HenrikSundell Oct 25, 2024
d844561
Rename variables
HenrikSundell Oct 25, 2024
02a07ea
Rename function
HenrikSundell Oct 27, 2024
5dc74dd
Fix comments
HenrikSundell Oct 28, 2024
5d55646
Remove println
HenrikSundell Oct 28, 2024
d1067c6
Remove unnecessary imports
HenrikSundell Oct 28, 2024
5c97ad1
Add accessibilty information to entrances
HenrikSundell Oct 28, 2024
e10e0a2
Use existing entrance class for walk steps
HenrikSundell Nov 7, 2024
34761fe
Fix EntranceImpl
HenrikSundell Nov 7, 2024
c84b7cf
Add id to walk step entrances
HenrikSundell Nov 8, 2024
2ea8a52
Remove old file
HenrikSundell Nov 8, 2024
39b0db3
Fix otp version
HenrikSundell Nov 8, 2024
3b6bf3f
Remove unused import
HenrikSundell Nov 8, 2024
36be3dc
Merge remote-tracking branch 'otp/dev-2.x' into station-entrances
HenrikSundell Nov 8, 2024
c9df52d
Require entranceId
HenrikSundell Nov 10, 2024
7a9a8f6
Rename methods
HenrikSundell Nov 10, 2024
c9139e3
Update dosumentation
HenrikSundell Nov 11, 2024
7b21024
Update documentation
HenrikSundell Nov 11, 2024
ce7719c
Remove redundant null check
HenrikSundell Nov 11, 2024
f7ed65d
add Platform and PlatformEdge into the graph
miklcct Nov 11, 2024
2d423a8
link linear platforms to stops
miklcct Nov 11, 2024
89b3ac7
render PlatformEdge on debug layer
miklcct Nov 11, 2024
b737411
Add feature union to steps
HenrikSundell Nov 14, 2024
f547e07
Return feature based on relativeDirection
HenrikSundell Nov 14, 2024
18b84f0
Remove StepFeature class
HenrikSundell Nov 14, 2024
12b4995
make all polling updater wait for graph update finish
miklcct Nov 19, 2024
363dedc
Merge branch 'dev-2.x' into boarding-locations
miklcct Nov 26, 2024
5edfd73
Merge branch 'dev-2.x' into fix-update-lag
miklcct Nov 26, 2024
364c401
fix test after merge
miklcct Nov 27, 2024
ed778da
Merge branch 'dev-2.x' into fix-update-lag
miklcct Nov 27, 2024
b445ab8
Merge branch 'dev-2.x' into boarding-locations
miklcct Dec 4, 2024
c74c9e5
Merge branch 'dev-2.x' into fix-update-lag
miklcct Dec 4, 2024
0944921
extract future handling logic to a new method
miklcct Dec 12, 2024
4df65a1
add feature flag
miklcct Dec 12, 2024
d8a34dd
refactor update graph logic to PollingGraphUpdater
miklcct Dec 12, 2024
69ac485
add test for desired feature flag
miklcct Dec 12, 2024
0037b5a
implement feature flag
miklcct Dec 12, 2024
3825a02
feature: Create a repository to store OSM info for other graph build …
t2gran Dec 17, 2024
2ce1a6d
Merge branch 'dev-2.x' into fix-update-lag
miklcct Dec 17, 2024
0771f0f
Merge branch 'dev-2.x' into boarding-locations
miklcct Dec 17, 2024
fd0b1fe
Update protobuf, OSM parser and Google cloud tools
leonardehrenfried Dec 17, 2024
a327594
Merge remote-tracking branch 'upstream/dev-2.x' into station-entrances
leonardehrenfried Dec 17, 2024
04d35b7
Clean up code a little
leonardehrenfried Dec 17, 2024
c4d665d
Reformat code and schema
leonardehrenfried Dec 17, 2024
bf89f49
Fix tests
leonardehrenfried Dec 17, 2024
2eb0e7b
Add documentation
leonardehrenfried Dec 18, 2024
4fd0f68
Merge remote-tracking branch 'upstream/dev-2.x' into station-entrances
leonardehrenfried Dec 18, 2024
977d8eb
Clean up
leonardehrenfried Dec 18, 2024
b7cc6fd
Remove enum mapper test for REST API
leonardehrenfried Dec 18, 2024
e473061
Fix highway exits
leonardehrenfried Dec 18, 2024
12e5eb2
Merge commit '3825a024000a7bc576ab2f5a19b44bb1dd333822' into boarding…
miklcct Dec 19, 2024
d40d0b3
use a service to store platform data
miklcct Dec 19, 2024
271f305
move Herrenberg data into the test method
miklcct Dec 19, 2024
5cc6812
Specify version in parent pom
leonardehrenfried Dec 19, 2024
eaafc68
add test for linear platform
miklcct Dec 19, 2024
133cc8a
refactor: Extract TextVariablesSubstitution from EnvironmentVariableR…
t2gran Dec 20, 2024
1c8bf7b
feature: Add the ability to load custom documentation from a properti…
t2gran Jan 2, 2025
85e124f
feature: Make a GraphQL schema visitor to inject custom documentation
t2gran Jan 2, 2025
d2fd01b
feature: Make the API documentation profile configurable
t2gran Jan 2, 2025
90ac6d2
feature: Inject custom documentation in Transmodel API
t2gran Jan 2, 2025
0bf3c72
test: Ignore white-space when comparing text
t2gran Jan 2, 2025
f2406e7
refactor: Cleanup test and make test run on Windows OS
t2gran Jan 2, 2025
713143b
Use three states for accessibility
leonardehrenfried Jan 2, 2025
0b6a74a
Update documentation
leonardehrenfried Jan 2, 2025
1518e38
Apply review feedback
leonardehrenfried Jan 3, 2025
249b01b
Update list of GTFS Fares v2 classes
leonardehrenfried Jan 3, 2025
21f15bd
Update to latest OBA
leonardehrenfried Jan 3, 2025
5b12c7f
Update docs
leonardehrenfried Jan 6, 2025
8c6fda4
Extract entrance from transit link
leonardehrenfried Jan 6, 2025
bd94b13
Add test for extracting entrance from pathway data
leonardehrenfried Jan 6, 2025
74106b5
Update schema docs
leonardehrenfried Jan 6, 2025
c0f7a3f
Merge branch 'dev-2.x' into fix-update-lag
miklcct Jan 7, 2025
f3ed454
Merge remote-tracking branch 'upstream/dev-2.x' into upgrade-protobuf
leonardehrenfried Jan 7, 2025
fb9bad6
Merge remote-tracking branch 'upstream/dev-2.x' into upgrade-protobuf
leonardehrenfried Jan 7, 2025
51080a8
fix(deps): update dependency com.google.guava:guava to v33.4.0-jre
renovate[bot] Jan 7, 2025
628bf95
Rename 'code' to 'publicCode'
leonardehrenfried Jan 7, 2025
8771d5c
apply review suggestion
miklcct Jan 8, 2025
c174928
add Javadoc
miklcct Jan 8, 2025
cbe125a
Merge remote-tracking branch 'origin/boarding-locations' into boardin…
miklcct Jan 8, 2025
1bfc833
Fix ScheduledTransitAlertBuilder
leonardehrenfried Jan 8, 2025
665a2d2
Merge remote-tracking branch 'upstream/dev-2.x' into upgrade-protobuf
leonardehrenfried Jan 9, 2025
3c9055d
Merge branch 'dev-2.x' into boarding-locations
miklcct Jan 9, 2025
74241bd
Merge branch 'dev-2.x' into fix-update-lag
miklcct Jan 9, 2025
e439f87
Merge pull request #6366 from opentripplanner/renovate/guava-monorepo
vpaturet Jan 9, 2025
b0b8661
Merge pull request #6262 from Jnction/fix-update-lag
t2gran Jan 9, 2025
7163f6a
Add changelog entry for #6262 [ci skip]
Jan 9, 2025
be21661
Merge pull request #6358 from leonardehrenfried/faresv2-classes
leonardehrenfried Jan 9, 2025
2bf1fde
Merge remote-tracking branch 'upstream/dev-2.x' into upgrade-protobuf
leonardehrenfried Jan 9, 2025
98d8fd8
Remove unused import
leonardehrenfried Jan 9, 2025
f53245f
Fix formatting
leonardehrenfried Jan 9, 2025
0b8b82b
Merge pull request #6342 from leonardehrenfried/upgrade-protobuf
leonardehrenfried Jan 9, 2025
81d6c9b
fix(deps): update jersey monorepo to v3.1.10
renovate[bot] Jan 9, 2025
ffa99ab
Automerge patch version of jersey [ci skip]
leonardehrenfried Jan 9, 2025
969fb44
Merge pull request #6369 from opentripplanner/renovate/jersey-monorepo
leonardehrenfried Jan 9, 2025
edc3a7f
Automerge protobuf only once a month [ci skip]
leonardehrenfried Jan 9, 2025
c5d1183
Move TestDataFetcherDecorator to correct package path
cedarbaum Jan 10, 2025
872dbb3
Add explicit cast when calling createFromDocumentedEnum
cedarbaum Jan 10, 2025
e23144b
Add type annotation to OccupancyStatus instead of explicit cast
cedarbaum Jan 10, 2025
025e4c4
Merge pull request #6374 from cedarbaum/fix_lsp_errors
leonardehrenfried Jan 10, 2025
6a540d1
Remove testower from reviewers of jersey [ci skip]
leonardehrenfried Jan 10, 2025
1eb0556
chore(deps): update dependency jsdom to v26
renovate[bot] Jan 10, 2025
953d6c0
Merge pull request #6376 from opentripplanner/renovate/jsdom-26.x
leonardehrenfried Jan 10, 2025
4248ffe
Fix mapping in Transmodel API
leonardehrenfried Jan 10, 2025
77e2908
fix(deps): update debug ui dependencies (non-major)
renovate[bot] Jan 10, 2025
b297d9a
Merge pull request #6359 from opentripplanner/renovate/debug-ui-depen…
leonardehrenfried Jan 11, 2025
71bb5fa
Upgrade debug client to version 2025/01/2025-01-11T19:23
Jan 11, 2025
3fcd54f
fix(deps): update google.dagger.version to v2.54
renovate[bot] Jan 13, 2025
521c87a
Update GraphiQL, add headers to UI
leonardehrenfried Jan 10, 2025
ed16268
Get merged headers from URL
leonardehrenfried Jan 11, 2025
5d02122
Merge pull request #6368 from leonardehrenfried/fix-alerts
leonardehrenfried Jan 13, 2025
0312487
Add changelog entry for #6368 [ci skip]
Jan 13, 2025
bba0903
Apply suggestions from code review
t2gran Jan 13, 2025
3dd1efe
refactor: Cleanup names in InjectCustomDocumentation as requested in …
t2gran Jan 13, 2025
106ab13
refactor: Fix char encoding for reading property file.
t2gran Jan 13, 2025
b243d10
Improve handling of null values in argument lists to the serviceJourn…
eibakke Jan 14, 2025
d9398b6
Automatically merge patch versions of trusted dependencies [ci]
leonardehrenfried Jan 14, 2025
a5e829d
Merge pull request #6379 from opentripplanner/renovate/google.dagger.…
leonardehrenfried Jan 14, 2025
09fb9d8
fix: The bookWhen field is null in the Transmodel API #6384
t2gran Jan 14, 2025
ce6fc7a
Merge pull request #6380 from leonardehrenfried/graphiql-headers
leonardehrenfried Jan 15, 2025
6e43b71
extract method
miklcct Jan 15, 2025
35f8b5d
split methods to connect transit vertex to node, way and area boardin…
miklcct Jan 15, 2025
e61f455
Merge pull request #6247 from Jnction/boarding-locations
leonardehrenfried Jan 15, 2025
73c9672
Add changelog entry for #6247 [ci skip]
Jan 15, 2025
7dc8617
Merge pull request #6385 from entur/fix_bug_book_when_is_null
t2gran Jan 15, 2025
ca784e2
Add changelog entry for #6385 [ci skip]
Jan 15, 2025
4c3983b
Disable BikelyUpdaterTest and MoneyTest, test fails in CI pipline at …
t2gran Jan 16, 2025
d50c6b0
Merge pull request #6355 from entur/custom-doc-transmodel-api
tkalvas Jan 16, 2025
88e5252
Add changelog entry for #6355 [ci skip]
Jan 16, 2025
2691404
Merge pull request #6343 from leonardehrenfried/station-entrances
leonardehrenfried Jan 16, 2025
dd5e23d
Add changelog entry for #6343 [ci skip]
Jan 16, 2025
1030408
Bump serialization version id for #6343
Jan 16, 2025
9f0e313
Add ci workflow for validating schema changes
optionsome Jan 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: Cleanup names in InjectCustomDocumentation as requested in …
…review.
t2gran committed Jan 13, 2025
commit 3dd1efeeb09dbcf6f01ccf635d9eec686c4ea245
Original file line number Diff line number Diff line change
@@ -158,15 +158,15 @@ private <T extends GraphQLNamedSchemaElement> TraversalControl fieldDoc(
var fieldName = field.getName();
var typeName = parent.getName();

Optional<T> f1 = customDocumentation
Optional<T> withDescription = customDocumentation
.fieldDescription(typeName, fieldName, field.getDescription())
.map(doc -> setDescription.apply(field, doc));

Optional<T> f2 = customDocumentation
Optional<T> withDeprecated = customDocumentation
.fieldDeprecatedReason(typeName, fieldName, originalDeprecatedReason)
.map(doc -> setDeprecatedReason.apply(f1.orElse(field), doc));
.map(doc -> setDeprecatedReason.apply(withDescription.orElse(field), doc));

f2.or(() -> f1).ifPresent(f -> changeNode(context, f));
withDeprecated.or(() -> withDescription).ifPresent(f -> changeNode(context, f));

return CONTINUE;
}