-
Notifications
You must be signed in to change notification settings - Fork 21
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
Refactor directive IDs in the scheduler #1509
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JoelCourtney
force-pushed
the
refactor/scheduling-ids-joel
branch
from
August 1, 2024 00:05
5aec07b
to
34121eb
Compare
JoelCourtney
force-pushed
the
refactor/scheduling-ids-joel
branch
from
August 2, 2024 21:48
34121eb
to
2550b77
Compare
mattdailis
approved these changes
Aug 2, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A lot of very sensible changes here. Looks good to me based on visual inspection - if you can get the tests pass I'd say ship it
scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/model/SchedulingActivity.java
Show resolved
Hide resolved
scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/model/SchedulingActivity.java
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This contains a couple behavioral changes:
And several renames / trivial refactors:
SimulatedActivity[Id]
toActivityInstance[Id]
to better contrast withActivityDirective
.SchedulingActivityDirectiveId
and replaced all usages withActivityDirectiveId
.SchedulingActivityDirective
toSchedulingActivity
because it also holds instance information.MerlinService
and its implementors toMerlinDatabaseService
because merlin is not the database.Verification
All tests still pass. Please suggest any new tests you think would be helpful.
Documentation
I don't think we had any internal documentation of the ID maps, which is part of what made them so annoying. So none needs to be updated!
Future work