Skip to content

Commit 296b461

Browse files
committed
Merge branch '4.1.x' into 4.2.x
2 parents 018560f + 64c36c4 commit 296b461

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2025 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
1212
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
15-
*
1615
*/
1716

1817
package org.springframework.cloud.gateway.server.mvc.common;
@@ -28,6 +27,7 @@
2827
public class MultipartEnvironmentPostProcessor implements EnvironmentPostProcessor {
2928

3029
/* for testing */ static final String MULTIPART_ENABLED_PROPERTY = "spring.servlet.multipart.enabled";
30+
3131
/* for testing */ static final String MULTIPART_PROPERTY_SOURCE_NAME = "gatewayServerWebmvcMultipartPropertySource";
3232

3333
@Override

spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessorTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
15-
*
1615
*/
1716

18-
1917
package org.springframework.cloud.gateway.server.mvc.common;
2018

2119
import org.junit.jupiter.api.Test;
@@ -52,4 +50,5 @@ void multipartEnabledByUser() {
5250
Boolean multipartEnabled = environment.getProperty(MULTIPART_ENABLED_PROPERTY, Boolean.class);
5351
assertThat(multipartEnabled).isTrue();
5452
}
53+
5554
}

0 commit comments

Comments
 (0)