Merge branch '5.3.x'

This commit is contained in:
Juergen Hoeller
2022-04-13 00:28:22 +02:00
3 changed files with 15 additions and 13 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 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.
@@ -2248,6 +2248,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
assertThat(response.getContentAsString()).isEqualTo("foo-body");
}
@Controller
static class ControllerWithEmptyValueMapping {
@@ -3585,7 +3586,6 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
assertThat(headers.getContentType()).as("Invalid Content-Type").isEqualTo(new MediaType("text", "html"));
multiValueMap(headers, writer);
}
}
@Controller