mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Merge branch '3.2.x'
Closes gh-40976
This commit is contained in:
commit
550433e6c3
@ -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
|
||||
*/
|
||||
|
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user