Merge branch '4.1.x' into 4.2.x

This commit is contained in:
spencergibb
2025-01-27 12:58:37 -05:00
2 changed files with 3 additions and 4 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2025 the original author or authors.
* Copyright 2012-2025 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.
@@ -12,7 +12,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.springframework.cloud.gateway.server.mvc.common;
@@ -28,6 +27,7 @@ import org.springframework.util.StringUtils;
public class MultipartEnvironmentPostProcessor implements EnvironmentPostProcessor {
/* for testing */ static final String MULTIPART_ENABLED_PROPERTY = "spring.servlet.multipart.enabled";
/* for testing */ static final String MULTIPART_PROPERTY_SOURCE_NAME = "gatewayServerWebmvcMultipartPropertySource";
@Override

View File

@@ -12,10 +12,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.springframework.cloud.gateway.server.mvc.common;
import org.junit.jupiter.api.Test;
@@ -52,4 +50,5 @@ public class MultipartEnvironmentPostProcessorTests {
Boolean multipartEnabled = environment.getProperty(MULTIPART_ENABLED_PROPERTY, Boolean.class);
assertThat(multipartEnabled).isTrue();
}
}