Drop AbstractJettyServletWebServerFactoryTests
Drop `AbstractJettyServletWebServerFactoryTests` and merge the existing code into `JettyServletWebServerFactoryTests`.pull/28436/head
Phillip Webb
3 years ago
parent
cf9156e497
commit
ec79f14639
@ -1,122 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2020 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.jetty;
|
|
||||||
|
|
||||||
import java.nio.charset.Charset;
|
|
||||||
import java.util.Locale;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import org.apache.jasper.servlet.JspServlet;
|
|
||||||
import org.eclipse.jetty.server.Handler;
|
|
||||||
import org.eclipse.jetty.server.ServerConnector;
|
|
||||||
import org.eclipse.jetty.server.handler.HandlerWrapper;
|
|
||||||
import org.eclipse.jetty.servlet.ServletHolder;
|
|
||||||
import org.eclipse.jetty.webapp.WebAppContext;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
|
|
||||||
import org.springframework.boot.testsupport.system.CapturedOutput;
|
|
||||||
import org.springframework.boot.web.server.Compression;
|
|
||||||
import org.springframework.boot.web.server.PortInUseException;
|
|
||||||
import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory;
|
|
||||||
import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactoryTests;
|
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Abstract base class for {@link JettyServletWebServerFactory} tests.
|
|
||||||
*
|
|
||||||
* @author Phillip Webb
|
|
||||||
*/
|
|
||||||
abstract class AbstractJettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryTests {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected JettyServletWebServerFactory getFactory() {
|
|
||||||
return new JettyServletWebServerFactory(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void addConnector(int port, AbstractServletWebServerFactory factory) {
|
|
||||||
((JettyServletWebServerFactory) factory).addServerCustomizers((server) -> {
|
|
||||||
ServerConnector connector = new ServerConnector(server);
|
|
||||||
connector.setPort(port);
|
|
||||||
server.addConnector(connector);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected JspServlet getJspServlet() throws Exception {
|
|
||||||
WebAppContext context = findWebAppContext((JettyWebServer) this.webServer);
|
|
||||||
ServletHolder holder = context.getServletHandler().getServlet("jsp");
|
|
||||||
if (holder == null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
holder.start();
|
|
||||||
holder.initialize();
|
|
||||||
return (JspServlet) holder.getServlet();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Map<String, String> getActualMimeMappings() {
|
|
||||||
WebAppContext context = findWebAppContext((JettyWebServer) this.webServer);
|
|
||||||
return context.getMimeTypes().getMimeMap();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Charset getCharset(Locale locale) {
|
|
||||||
WebAppContext context = findWebAppContext((JettyWebServer) this.webServer);
|
|
||||||
String charsetName = context.getLocaleEncoding(locale);
|
|
||||||
return (charsetName != null) ? Charset.forName(charsetName) : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void handleExceptionCausedByBlockedPortOnPrimaryConnector(RuntimeException ex, int blockedPort) {
|
|
||||||
assertThat(ex).isInstanceOf(PortInUseException.class);
|
|
||||||
assertThat(((PortInUseException) ex).getPort()).isEqualTo(blockedPort);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void handleExceptionCausedByBlockedPortOnSecondaryConnector(RuntimeException ex, int blockedPort) {
|
|
||||||
handleExceptionCausedByBlockedPortOnPrimaryConnector(ex, blockedPort);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void contextPathIsLoggedOnStartupWhenCompressionIsEnabled(CapturedOutput output) {
|
|
||||||
AbstractServletWebServerFactory factory = getFactory();
|
|
||||||
factory.setContextPath("/custom");
|
|
||||||
Compression compression = new Compression();
|
|
||||||
compression.setEnabled(true);
|
|
||||||
factory.setCompression(compression);
|
|
||||||
this.webServer = factory.getWebServer(exampleServletRegistration());
|
|
||||||
this.webServer.start();
|
|
||||||
assertThat(output).containsOnlyOnce("with context path '/custom'");
|
|
||||||
}
|
|
||||||
|
|
||||||
protected WebAppContext findWebAppContext(JettyWebServer webServer) {
|
|
||||||
return findWebAppContext(webServer.getServer().getHandler());
|
|
||||||
}
|
|
||||||
|
|
||||||
private WebAppContext findWebAppContext(Handler handler) {
|
|
||||||
if (handler instanceof WebAppContext) {
|
|
||||||
return (WebAppContext) handler;
|
|
||||||
}
|
|
||||||
if (handler instanceof HandlerWrapper) {
|
|
||||||
return findWebAppContext(((HandlerWrapper) handler).getHandler());
|
|
||||||
}
|
|
||||||
throw new IllegalStateException("No WebAppContext found");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue