Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2019-04-19 16:31:34 +02:00
parent d55d6b35d9 6774cc5119
commit e9447b0dbf
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/CompressionCustomizer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 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.
@@ -17,7 +17,9 @@
package org.springframework.boot.web.embedded.netty;
import java.util.Arrays;
import java.util.List;
import java.util.function.BiPredicate;
import java.util.stream.Collectors;
import io.netty.handler.codec.http.HttpHeaderNames;
import io.netty.handler.codec.http.HttpHeaders;
@@ -63,10 +65,12 @@ final class CompressionCustomizer implements NettyServerCustomizer {
return server;
}
private CompressionPredicate getMimeTypesPredicate(String[] mimeTypes) {
if (ObjectUtils.isEmpty(mimeTypes)) {
private CompressionPredicate getMimeTypesPredicate(String[] mimeTypeIds) {
if (ObjectUtils.isEmpty(mimeTypeIds)) {
return ALWAYS_COMPRESS;
}
List<MimeType> mimeTypes = Arrays.stream(mimeTypeIds)
.map(MimeTypeUtils::parseMimeType).collect(Collectors.toList());
return (request, response) -> {
String contentType = response.responseHeaders()
.get(HttpHeaderNames.CONTENT_TYPE);
@@ -74,7 +78,7 @@ final class CompressionCustomizer implements NettyServerCustomizer {
return false;
}
MimeType contentMimeType = MimeTypeUtils.parseMimeType(contentType);
return Arrays.stream(mimeTypes).map(MimeTypeUtils::parseMimeType)
return mimeTypes.stream()
.anyMatch((candidate) -> candidate.isCompatibleWith(contentMimeType));
};
}