Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Start version 6.4

Browse Source 
* Move `whats-new` to `changes-6.2-6.3.adoc`
* Upgrade dependency to the latest (including Gradle)
* Move Spring dependencies to based on SF-6.2
* Fix some deprecations and incompatibility
This commit is contained in:
Artem Bilan
2024-05-28 20:07:35 -04:00
parent dc96ff6a2d
commit 8b2da4f996
18 changed files with 150 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-http/src/main/java/org/springframework/integration/http/converter/MultipartAwareFormHttpMessageConverter.java
View File

@@ -96,12 +96,13 @@ public class MultipartAwareFormHttpMessageConverter implements HttpMessageConver
}
@Override
@SuppressWarnings("unchecked")
public MultiValueMap<String, ?> read(Class<? extends MultiValueMap<String, ?>> clazz,
HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException {
MediaType contentType = inputMessage.getHeaders().getContentType();
if (!MediaType.MULTIPART_FORM_DATA.includes(contentType)) {
return this.wrappedConverter.read(clazz, inputMessage);
return (MultiValueMap<String, ?>) this.wrappedConverter.read(clazz, inputMessage);
}
Assert.state(inputMessage instanceof MultipartHttpInputMessage,
"A request with 'multipart/form-data' Content-Type must be a MultipartHttpInputMessage. "

4
spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2022 the original author or authors.
* Copyright 2015-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -175,7 +175,7 @@ public class CrossOriginTests {
private CorsConfiguration getCorsConfiguration(HandlerExecutionChain chain, boolean isPreFlightRequest) {
if (isPreFlightRequest) {
Object handler = chain.getHandler();
assertThat(handler.getClass().getSimpleName().equals("PreFlightHandler")).isTrue();
assertThat(handler.getClass().getSimpleName().equals("PreFlightHttpRequestHandler")).isTrue();
return TestUtils.getPropertyValue(handler, "config", CorsConfiguration.class);
}
else {

2
spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java
View File

@@ -764,7 +764,7 @@ public class HttpRequestExecutingMessageHandlerTests {
.isThrownBy(() -> handler.handleMessage(new GenericMessage<>("queues/%2f/si.test.queue?foo#bar")));
assertThat(restTemplate.actualUrl.get())
.isEqualTo("https://my.RabbitMQ.com/api/queues/%2f/si.test.queue?foo#bar");
.isEqualTo("https://my.rabbitmq.com/api/queues/%2f/si.test.queue?foo#bar");
}
@Test