chore: upgrade to spring 6 #18314
chore: upgrade to spring 6 #18314
Conversation
| @@ -0,0 +1 @@ | |||
| ALTER TABLE programruleaction ALTER COLUMN notificationtemplateid TYPE BIGINT; | |||
There was a problem hiding this comment.
new jpa schema validator complain about this column has type integer in database but long in Java
| </dependency> | ||
| <dependency> | ||
| <groupId>com.vladmihalcea</groupId> | ||
| <artifactId>hibernate-types-52</artifactId> | ||
| <version>${hibernate-types.version}</version> |
There was a problem hiding this comment.
com.vladmihalcea is replaced by io.hypersistence
| @@ -453,7 +452,7 @@ private void configureCspFilter( | |||
| } | |||
|
|
|||
| private void configureCorsFilter(HttpSecurity http) { | |||
| http.addFilterBefore(CorsFilter.get(), BasicAuthenticationFilter.class); | |||
| http.addFilterBefore(DhisCorsFilter.get(), BasicAuthenticationFilter.class); | |||
There was a problem hiding this comment.
Fix below error. Basically Spring 6 complains about our custom object has same name with the default object.
Bean named 'corsFilter' is expected to be of type
'org.springframework.web.filter.CorsFilter' but was actually of type org.hisp.dhis.webapi.filter.CorsFilter
| @@ -419,7 +419,6 @@ public <O extends BasicAuthenticationFilter> O postProcess(O filter) { | |||
| .and() | |||
| //////////////////// | |||
| .sessionManagement() | |||
| .requireExplicitAuthenticationStrategy(true) | |||
There was a problem hiding this comment.
Fix below error
Caused by: java.lang.IllegalStateException: Invalid configuration that explicitly sets requireExplicitAuthenticationStrategy to true but implicitly requires it due to the following properties being set: [sessionCreationPolicy = ALWAYS, maximumSessions = 10]
at org.spr
| @@ -175,6 +175,8 @@ public interface JobConfigurationStore extends GenericDimensionalObjectStore<Job | |||
| */ | |||
| boolean tryRevertNow(@Nonnull String jobId); | |||
|
|
|||
| boolean executeNow(@Nonnull String jobId); | |||
There was a problem hiding this comment.
This should not exist as there is already a method with that exact task (we look at that later)
| @@ -287,6 +287,23 @@ public boolean tryExecuteNow(@Nonnull String jobId) { | |||
| return nativeSynchronizedQuery(sql).setParameter("id", jobId).executeUpdate() > 0; | |||
| } | |||
|
|
|||
| @Override | |||
| public boolean executeNow(@Nonnull String jobId) { | |||
There was a problem hiding this comment.
I guess this is a copy of tryExecuteNow without the @Transactional annotation which we should try to remove anyhow as we usually don't want them on store level.
|
|
||
| default List<OutboundMessage> getAllMessages() { | ||
| return List.of(); | ||
| } |
There was a problem hiding this comment.
wondering what these new default methods are for? are they used anywhere?
should a MessageSender just send messages, or get messages as well? :)
There was a problem hiding this comment.
i've seen it used in the FakeMessageSender while looking through the rest of the PR. This seems like a code smell if it's only used for tests.
There was a problem hiding this comment.
This is currently a workaround for fixing the issue of overriding a bean in test environment. As @Qualifer doesn't work for that purpose. I can give an explanation in next week meeting.
Basically in test we have FakeMessageSender SmsMessageSender and EmailMessageSender.
We want the FakeMessageSender to override both SmsMessageSender and EmailMessageSender.
But FakeMessageSender has specific methods getAllMessages(), which then can't be casted back to the others messageSenders.
There was a problem hiding this comment.
In Spring 5 you can override a bean by declaring same bean name.
But in spring 6, it doesn't work anymore. Need to implement same interface.
|
Goal
Notes
SocketUtilsis removed from spring utils package. So I copied the class to our project as a temporary solution.org.apache.httpcomponents.client5:httpclient5Response.getStatusCode()return the interfaceHttpStatusCodeinstead of enumHttpStatuslike before. This breaks many existing codes.WebhookHandlerthe methodhttpClient.setTimeOut()has been removed. Need to replace by settingSocketConfig.setSoTimeout@EventListenerstop working.MultipartResolverchanged from usingCommonsMultipartResolvertoStandardServletMultipartResolver(change already included by Viet)FileStoreTest#shouldStoreFileResourceInExternalStorepassing400with messageRequired part 'file' is not present.. The servlet could not recognise that there was a file submitted as part of the multipart request.dhis2_home/files/iconSpring-security changes
builder.clientAuthenticationMethod(ClientAuthenticationMethod.BASIC);->builder.clientAuthenticationMethod(ClientAuthenticationMethod.CLIENT_SECRET_BASIC);