Merge branch '2.1.x'
This commit is contained in:
commit
08260388bf
|
|
@ -0,0 +1,99 @@
|
||||||
|
/*
|
||||||
|
* 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.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* 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.boot.web.embedded.tomcat;
|
||||||
|
|
||||||
|
import org.apache.catalina.connector.Connector;
|
||||||
|
import org.apache.coyote.http11.AbstractHttp11Protocol;
|
||||||
|
import org.apache.coyote.http2.Http2Protocol;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import org.springframework.boot.web.server.Compression;
|
||||||
|
import org.springframework.util.unit.DataSize;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests for {@link CompressionConnectorCustomizer}
|
||||||
|
*
|
||||||
|
* @author Rudy Adams
|
||||||
|
*/
|
||||||
|
public class CompressionConnectorCustomizerTests {
|
||||||
|
|
||||||
|
private static final int MIN_SIZE = 100;
|
||||||
|
|
||||||
|
private final String[] mimeTypes = { "text/html", "text/xml", "text/xhtml" };
|
||||||
|
|
||||||
|
private final String[] excludedUserAgents = { "SomeUserAgent", "AnotherUserAgent" };
|
||||||
|
|
||||||
|
private Compression compression;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setup() {
|
||||||
|
this.compression = new Compression();
|
||||||
|
this.compression.setEnabled(true);
|
||||||
|
this.compression.setMinResponseSize(DataSize.ofBytes(MIN_SIZE));
|
||||||
|
this.compression.setMimeTypes(this.mimeTypes);
|
||||||
|
this.compression.setExcludedUserAgents(this.excludedUserAgents);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void shouldCustomizeCompressionForHttp1AndHttp2Protocol() {
|
||||||
|
CompressionConnectorCustomizer compressionConnectorCustomizer = new CompressionConnectorCustomizer(
|
||||||
|
this.compression);
|
||||||
|
Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
|
||||||
|
connector.addUpgradeProtocol(new Http2Protocol());
|
||||||
|
compressionConnectorCustomizer.customize(connector);
|
||||||
|
AbstractHttp11Protocol abstractHttp11Protocol = (AbstractHttp11Protocol) connector
|
||||||
|
.getProtocolHandler();
|
||||||
|
verifyHttp1(abstractHttp11Protocol);
|
||||||
|
Http2Protocol http2Protocol = (Http2Protocol) connector.findUpgradeProtocols()[0];
|
||||||
|
verifyHttp2Upgrade(http2Protocol);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void verifyHttp1(AbstractHttp11Protocol protocol) {
|
||||||
|
compressionOn(protocol.getCompression());
|
||||||
|
minSize(protocol.getCompressionMinSize());
|
||||||
|
mimeType(protocol.getCompressibleMimeTypes());
|
||||||
|
excludedUserAgents(protocol.getNoCompressionUserAgents());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void verifyHttp2Upgrade(Http2Protocol protocol) {
|
||||||
|
compressionOn(protocol.getCompression());
|
||||||
|
minSize(protocol.getCompressionMinSize());
|
||||||
|
mimeType(protocol.getCompressibleMimeTypes());
|
||||||
|
excludedUserAgents(protocol.getNoCompressionUserAgents());
|
||||||
|
excludedUserAgents(protocol.getNoCompressionUserAgents());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void compressionOn(String compression) {
|
||||||
|
assertThat(compression).isEqualTo("on");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void minSize(int minSize) {
|
||||||
|
assertThat(minSize).isEqualTo(MIN_SIZE);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void mimeType(String[] mimeTypes) {
|
||||||
|
assertThat(mimeTypes).isEqualTo(mimeTypes);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void excludedUserAgents(String combinedUserAgents) {
|
||||||
|
assertThat(combinedUserAgents).isEqualTo("SomeUserAgent,AnotherUserAgent");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue