Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
Closes gh-40976
This commit is contained in:
Moritz Halbritter 2024-06-03 14:13:43 +02:00
commit 550433e6c3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SanitizableData.java
View File

@ -76,7 +76,7 @@ public final class SanitizableData {
}
/**
* Return a new {@link SanitizableData} instance with sanatized value.
* Return a new {@link SanitizableData} instance with sanitized value.
* @return a new sanitizable data instance.
* @since 3.1.0
*/

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationMethod.java
View File

@ -44,11 +44,11 @@ public class DiscoveredOperationMethod extends OperationMethod {
Assert.notNull(annotationAttributes, "AnnotationAttributes must not be null");
List<String> producesMediaTypes = new ArrayList<>();
producesMediaTypes.addAll(Arrays.asList(annotationAttributes.getStringArray("produces")));
producesMediaTypes.addAll(getProducesFromProducable(annotationAttributes));
producesMediaTypes.addAll(getProducesFromProducible(annotationAttributes));
this.producesMediaTypes = Collections.unmodifiableList(producesMediaTypes);
}
private <E extends Enum<E> & Producible<E>> List<String> getProducesFromProducable(
private <E extends Enum<E> & Producible<E>> List<String> getProducesFromProducible(
AnnotationAttributes annotationAttributes) {
Class<?> type = getProducesFrom(annotationAttributes);
if (type == Producible.class) {