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

Polish "Simplify code"

Browse Source 
See gh-18342
This commit is contained in:
Phillip Webb
2019-09-26 19:12:18 -07:00
parent 4d0da4b700
commit a13666d696
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchiveSupport.java
View File

@@ -143,8 +143,8 @@ class BootArchiveSupport {
}
private boolean isZip(InputStream inputStream) throws IOException {
for (byte b : ZIP_FILE_HEADER) {
if (inputStream.read() != b) {
for (byte headerByte : ZIP_FILE_HEADER) {
if (inputStream.read() != headerByte) {
return false;
}
}

3
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
View File

@@ -68,7 +68,6 @@ import org.mockito.InOrder;
import org.springframework.boot.testsupport.system.CapturedOutput;
import org.springframework.boot.web.server.PortInUseException;
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;
@@ -544,7 +543,7 @@ class TomcatServletWebServerFactoryTests extends AbstractServletWebServerFactory
@Test
void registerJspServletWithDefaultLoadOnStartup() {
TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(0);
factory.addInitializers(servletContext -> servletContext.addServlet("manually-registered-jsp-servlet", JspServlet.class));
factory.addInitializers((context) -> context.addServlet("manually-registered-jsp-servlet", JspServlet.class));
this.webServer = factory.getWebServer();
this.webServer.start();
}