Upgrading to Spring Boot 3 #568
Conversation
src/main/java/org/commonwl/view/workflow/QueuedWorkflowRepository.java
Outdated
Show resolved
Hide resolved
| @@ -214,7 +214,7 @@ public ModelAndView getWorkflow( | |||
| * @param branch The branch of the repository | |||
| * @return The workflow view with the workflow as a model | |||
| */ | |||
| @GetMapping(value = "/workflows/**/*.git/{branch}/**") | |||
| @GetMapping(value = "/workflows/*/*.git/{branch}/**") | |||
There was a problem hiding this comment.
This needs to be well tested.
Now Spring Web doesn't allow any content after the /**. I found an issue or blog that suggested to test with /*/bla instead. Trying to get the tests and build to pass in order to verify it in the browser.
| @@ -9,7 +9,7 @@ | |||
| class="ch.qos.logback.core.ConsoleAppender"> | |||
| <layout class="ch.qos.logback.classic.PatternLayout"> | |||
| <Pattern> | |||
| %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%C{1.}): %msg%n%throwable | |||
| %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%C{1}): %msg%n%throwable | |||
There was a problem hiding this comment.
Was getting a NumberFormatException for 1., during the logback startup. This was the only place where I found the 1.. Changing it the build didn't fail in the same place, but will have to confirm what was the 1., and if the 1 alone will act the same way.
|
Fixed one broken test today, three more to go. Two I know the reason, but not the solution. The other we had during the migration mongo->postgres, so I just need to find the notes about how to debug that one (need to look at the query executed during the unit test...) |
kinow
force-pushed
the
spring3
branch
2 times, most recently
from
94d3c25 to
44b90a3
Compare
|
The last test failing is due to Hibernate/Postgres. At least the others were fixed (at least locally, waiting for GH Actions). Time to search for issues/SO's/etc now 😬 |
| // mapping library we use, with what was the fix for our issue (ran | ||
| // out of ideas, so started testing everything found online): | ||
| // Use `new JsonType(GitDetails.class)`. That finally solved it. | ||
| // Ref: https://github.com/common-workflow-language/cwlviewer/pull/568 |
There was a problem hiding this comment.
The fix, finally ☝️
Works on my computer™, but pending tests with some workflows to confirm it's working.
|
Finally had some time to give it another try, and managed to get all tests passing. Still a couple of points pending, and I will try to do some manual tests using existing CWL workflows. But feel free to review or test it if you have time -- I will test it next time I have a chance, but at least we now have a working build with updated Spring Boot and dependencies 👋 |
src/test/java/org/commonwl/view/workflow/QueuedWorkflowRepositoryTest.java
Outdated
Show resolved
Hide resolved
|
@kinow Shall I merge? |
Let me rebase, and then do some quick tests with Docker locally. Then it should be ready to go! 💥 |
… well, fixing tests.
|
@mr-c rebased, GH Actions passed, then checked out latest commit, ran |
|
Huzzah! |
Description
Upgrading to Spring Boot 3
Motivation and Context
#566 (comment)
Closes #576
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: