From 46677e30cfa95e8bf67f0db42a6c127d275f4fec Mon Sep 17 00:00:00 2001 From: fidel Date: Sat, 1 Jun 2019 18:11:31 +0900 Subject: [PATCH 1/2] Replace anonymous class with lambdas See gh-17040 --- .../TomcatServletWebServerFactoryTests.java | 29 +++++++---------- .../AbstractServletWebServerFactoryTests.java | 31 ++----------------- 2 files changed, 15 insertions(+), 45 deletions(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java index 7712498643..8574f86bf3 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java @@ -538,25 +538,20 @@ public class TomcatServletWebServerFactoryTests throws IOException, URISyntaxException { TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(0); AtomicReference servletContextReference = new AtomicReference<>(); - factory.addInitializers(new ServletContextInitializer() { + factory.addInitializers((ServletContextInitializer) servletContext -> { + servletContextReference.set(servletContext); + Dynamic servlet = servletContext.addServlet("upload", new HttpServlet() { - @Override - public void onStartup(ServletContext servletContext) throws ServletException { - servletContextReference.set(servletContext); - Dynamic servlet = servletContext.addServlet("upload", new HttpServlet() { - - @Override - protected void doPost(HttpServletRequest req, - HttpServletResponse resp) - throws ServletException, IOException { - req.getParts(); - } - - }); - servlet.addMapping("/upload"); - servlet.setMultipartConfig(new MultipartConfigElement((String) null)); - } + @Override + protected void doPost(HttpServletRequest req, + HttpServletResponse resp) + throws ServletException, IOException { + req.getParts(); + } + }); + servlet.addMapping("/upload"); + servlet.setMultipartConfig(new MultipartConfigElement((String) null)); }); this.webServer = factory.getWebServer(); this.webServer.start(); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java index 2356419472..69374bba78 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java @@ -503,16 +503,7 @@ public abstract class AbstractServletWebServerFactoryTests { new SSLContextBuilder() .loadTrustMaterial(null, new TrustSelfSignedStrategy()) .loadKeyMaterial(keyStore, "secret".toCharArray(), - new PrivateKeyStrategy() { - - @Override - public String chooseAlias( - Map aliases, - Socket socket) { - return "spring-boot"; - } - - }) + (aliases, socket) -> "spring-boot") .build()); HttpClient httpClient = HttpClients.custom().setSSLSocketFactory(socketFactory) .build(); @@ -538,15 +529,7 @@ public abstract class AbstractServletWebServerFactoryTests { new SSLContextBuilder() .loadTrustMaterial(null, new TrustSelfSignedStrategy()) .loadKeyMaterial(keyStore, "password".toCharArray(), - new PrivateKeyStrategy() { - - @Override - public String chooseAlias( - Map aliases, - Socket socket) { - return "spring-boot"; - } - }) + (aliases, socket) -> "spring-boot") .build()); HttpClient httpClient = HttpClients.custom().setSSLSocketFactory(socketFactory) .build(); @@ -639,15 +622,7 @@ public abstract class AbstractServletWebServerFactoryTests { new SSLContextBuilder() .loadTrustMaterial(null, new TrustSelfSignedStrategy()) .loadKeyMaterial(keyStore, "password".toCharArray(), - new PrivateKeyStrategy() { - - @Override - public String chooseAlias( - Map aliases, - Socket socket) { - return "spring-boot"; - } - }) + (aliases, socket) -> "spring-boot") .build()); HttpClient httpClient = HttpClients.custom().setSSLSocketFactory(socketFactory) .build(); From 114f9f950301ec399682f284005d77f940f0beed Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sat, 1 Jun 2019 13:07:29 -0700 Subject: [PATCH 2/2] Polish "Replace anonymous class with lambdas" See gh-17040 --- .../embedded/tomcat/TomcatServletWebServerFactoryTests.java | 6 ++---- .../server/AbstractServletWebServerFactoryTests.java | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java index 8574f86bf3..aa58b0b22d 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java @@ -68,7 +68,6 @@ import org.mockito.InOrder; import org.springframework.boot.testsupport.rule.OutputCapture; import org.springframework.boot.web.server.WebServerException; -import org.springframework.boot.web.servlet.ServletContextInitializer; import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory; import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactoryTests; import org.springframework.core.io.ByteArrayResource; @@ -538,13 +537,12 @@ public class TomcatServletWebServerFactoryTests throws IOException, URISyntaxException { TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(0); AtomicReference servletContextReference = new AtomicReference<>(); - factory.addInitializers((ServletContextInitializer) servletContext -> { + factory.addInitializers((servletContext) -> { servletContextReference.set(servletContext); Dynamic servlet = servletContext.addServlet("upload", new HttpServlet() { @Override - protected void doPost(HttpServletRequest req, - HttpServletResponse resp) + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { req.getParts(); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java index 69374bba78..b09b3b7fcb 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java @@ -25,7 +25,6 @@ import java.io.PrintWriter; import java.net.InetSocketAddress; import java.net.MalformedURLException; import java.net.ServerSocket; -import java.net.Socket; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; @@ -75,8 +74,6 @@ import org.apache.http.conn.ssl.TrustSelfSignedStrategy; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClients; import org.apache.http.protocol.HttpContext; -import org.apache.http.ssl.PrivateKeyDetails; -import org.apache.http.ssl.PrivateKeyStrategy; import org.apache.http.ssl.SSLContextBuilder; import org.apache.http.ssl.TrustStrategy; import org.apache.jasper.EmbeddedServletOptions;