-
Notifications
You must be signed in to change notification settings - Fork 0
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
Upgrade to Spring Boot 3.4.0 #4488
base: main
Are you sure you want to change the base?
Conversation
Bumps the minor group with 5 updates: | Package | From | To | | --- | --- | --- | | [org.springframework.boot](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.0` | | software.amazon.awssdk:aws-query-protocol | `2.29.15` | `2.29.20` | | software.amazon.awssdk:sts | `2.29.15` | `2.29.20` | | [com.microsoft.graph:microsoft-graph](https://github.com/microsoftgraph/msgraph-sdk-java) | `6.20.0` | `6.21.0` | | [org.springdoc:springdoc-openapi-starter-webmvc-ui](https://github.com/springdoc/springdoc-openapi) | `2.6.0` | `2.7.0` | Updates `org.springframework.boot` from 3.3.5 to 3.4.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.3.5...v3.4.0) Updates `software.amazon.awssdk:aws-query-protocol` from 2.29.15 to 2.29.20 Updates `software.amazon.awssdk:sts` from 2.29.15 to 2.29.20 Updates `com.microsoft.graph:microsoft-graph` from 6.20.0 to 6.21.0 - [Release notes](https://github.com/microsoftgraph/msgraph-sdk-java/releases) - [Changelog](https://github.com/microsoftgraph/msgraph-sdk-java/blob/main/CHANGELOG.md) - [Commits](microsoftgraph/msgraph-sdk-java@v6.20.0...v6.21.0) Updates `org.springdoc:springdoc-openapi-starter-webmvc-ui` from 2.6.0 to 2.7.0 - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](springdoc/springdoc-openapi@v2.6.0...v2.7.0) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: software.amazon.awssdk:aws-query-protocol dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor - dependency-name: software.amazon.awssdk:sts dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor - dependency-name: com.microsoft.graph:microsoft-graph dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: org.springdoc:springdoc-openapi-starter-webmvc-ui dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor ... Signed-off-by: dependabot[bot] <[email protected]>
…en tests are run as whole, rather than individually.
…ce.nextval. Also, move some test data creation to fix optimistic lock error when tests run in a suite.
…ce.nextval. Also, move some test data creation to fix optimistic lock error when tests run in a suite.
…luded, generated sql is escape ''. This does not return required data against h2 database.
…luded, generated sql is escape ''. This does not return required data against h2 database.
…tryofjustice/hmpps-probation-integration-services into dependabot/gradle/minor-4e1fa6339b
… of LOW - LOW is the default one, NULL values are considered as smaller than other values during sorting.
…ger.merge to resolve issue with detached entities.
…tryofjustice/hmpps-probation-integration-services into dependabot/gradle/minor-4e1fa6339b
…9b' into dependabot/gradle/minor-4e1fa6339b
Is there a reason all the run files (to run the services in inteliij) have changed? |
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.
Mostly looks good - couple of recurring themes - please see the comments. Will continue to review later as there are a lot of file changes.
libs/dev-tools/src/test/kotlin/uk/gov/justice/digital/hmpps/wiremock/WireMockInitialiserTest.kt
Show resolved
Hide resolved
projects/accredited-programmes-and-oasys/src/main/resources/application.yml
Show resolved
Hide resolved
@PersistenceContext | ||
private lateinit var entityManager: EntityManager | ||
|
||
var personAddressId: Long? = null |
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.
is there a reason we have fields on this that are then shared rather than just having the entities in the generators?
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.
Following the upgrade to springboot 3.4, a few tests were failing due to an optimistic locking error when tests are run as whole, rather than individually. I added a new class EntityManagerDataLoader to handle this error. I put the new fields in the generators initially, then moved it to the class.
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.
I think having the data loader separate is fine - the reason we use the generators for storing the entities though (and thus why I think it should remain) is because then you can use them using
SomeGenerator.SOME_ENTITY (ie statically) ...
with your way we have to inject the data loader (which means you need to have the spring context inject it etc)
Personally I think I prefer it in the generators - but maybe something to run by the rest of the team if you think there's a good reason to not use static (or equivalent) references.
No description provided.