Fix db compatibility issues with Opencast 13 #607
Merged
Conversation
This file contains hidden or 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
Opencast 13 reworked some of their common db classes (in PR opencast#3903), which we also use in the Annotation Tool, thus breaking it. This commit attempts to fix the breaking changes by using the new classes introduced in Opencast 13. From a user perspective, this should change exactly nothing. There is also no DB migration, as the db entries themselves have not changed. This commit is based on groundwork by @KatrinIhler, massive thanks to her.
JulianKniephoff
requested changes
Jul 19, 2023
Member
JulianKniephoff
left a comment
JulianKniephoff
left a comment
There was a problem hiding this comment.
Overall this is fine, but I do have a few questions and nitpicks.
Oh and as a general note, I don't think lol and lel are appropriate variable names. ;D
...tion-impl/src/main/java/org/opencast/annotation/endpoint/ExtendedAnnotationsRestService.java
Show resolved
Hide resolved
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Show resolved
Hide resolved
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Outdated
Show resolved
Hide resolved
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Outdated
Show resolved
Hide resolved
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Outdated
Show resolved
Hide resolved
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Outdated
Show resolved
Hide resolved
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Outdated
Show resolved
Hide resolved
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Outdated
Show resolved
Hide resolved
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Outdated
Show resolved
Hide resolved
Fix various small oversights from temporary development code
There were two functionally very similar `findById` functions. Now there is only one.
Minimum version is now Opencast 13.
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Show resolved
Hide resolved
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Show resolved
Hide resolved
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Show resolved
Hide resolved
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Outdated
Show resolved
Hide resolved
Apparently if you set parameters on a namedQuery directly, there are some shenanigans that can happen when it comes to dates. Opencast has a function called `configureQuery` https://github.com/opencast/opencast/blob/develop/modules/common/src/main/java/org/opencastproject/db/Queries.java#L58 to handle this, but does not grant anyone access to it. In my plight I just copied it over.
…g our own. Co-authored-by: Julian Kniephoff <me@juliankniephoff.com>
Make every caller pass their preferred type instead of doing a cast.
Arnei
force-pushed
the
fix-db-rework-issues-oc-13
branch
from
30561e8 to
4816134
Compare
JulianKniephoff
requested changes
Jul 24, 2023
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Outdated
Show resolved
Hide resolved
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Outdated
Show resolved
Hide resolved
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Outdated
Show resolved
Hide resolved
...src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Julian Kniephoff <me@juliankniephoff.com>
Co-authored-by: Julian Kniephoff <me@juliankniephoff.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Opencast 13 reworked some of their common db classes (in PR opencast#3903), which we also use in the Annotation Tool, thus breaking it.
This commit attempts to fix the breaking changes by using the new classes introduced in Opencast 13. From a user perspective, this should change exactly nothing. There is also no DB migration, as the db entries themselves have not changed.
This commit is based on groundwork by @KatrinIhler, massive thanks to her.
Should fix #595, and supersede #606