Merge branch '4.1.x' into 4.2.x

spring-cloud · Jan 27, 2025 · 296b461 · 296b461
2 parents 018560f + 64c36c4
commit 296b461
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...rg/springframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessor.java b/...rg/springframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessor.java
@@ -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 @@
 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

diff --git a/...ringframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessorTests.java b/...ringframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessorTests.java
@@ -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 @@ void multipartEnabledByUser() {
 		Boolean multipartEnabled = environment.getProperty(MULTIPART_ENABLED_PROPERTY, Boolean.class);
 		assertThat(multipartEnabled).isTrue();
 	}
+
 }