root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2016-01-13 09:02:19 +00:00
parent 57b99f0b63
commit d2fed8bb07
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/WebSocketAutoConfiguration.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -25,6 +25,7 @@ import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainer
import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnJava; import org.springframework.boot.autoconfigure.condition.ConditionalOnJava;
import org.springframework.boot.autoconfigure.condition.ConditionalOnJava.JavaVersion;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
@ -63,7 +64,7 @@ public class WebSocketAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(name = "websocketContainerCustomizer") @ConditionalOnMissingBean(name = "websocketContainerCustomizer")
@ConditionalOnJava(ConditionalOnJava.JavaVersion.SEVEN) @ConditionalOnJava(JavaVersion.SEVEN)
public TomcatWebSocketContainerCustomizer websocketContainerCustomizer() { public TomcatWebSocketContainerCustomizer websocketContainerCustomizer() {
return new TomcatWebSocketContainerCustomizer(); return new TomcatWebSocketContainerCustomizer();
} }

20
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -661,9 +661,9 @@ public class TomcatEmbeddedServletContainerFactory
private static class TomcatErrorPage { private static class TomcatErrorPage {
private static final String ERROR_PAGE_TOMCAT7 = "org.apache.catalina.deploy.ErrorPage"; private static final String ERROR_PAGE_CLASS = "org.apache.tomcat.util.descriptor.web.ErrorPage";
private static final String ERROR_PAGE_TOMCAT = "org.apache.tomcat.util.descriptor.web.ErrorPage"; private static final String LEGACY_ERROR_PAGE_CLASS = "org.apache.catalina.deploy.ErrorPage";
private final String location; private final String location;
@ -683,13 +683,13 @@ public class TomcatEmbeddedServletContainerFactory
private Object createNativePage(ErrorPage errorPage) { private Object createNativePage(ErrorPage errorPage) {
Object nativePage = null; Object nativePage = null;
try { try {
if (ClassUtils.isPresent(ERROR_PAGE_TOMCAT, null)) { if (ClassUtils.isPresent(ERROR_PAGE_CLASS, null)) {
nativePage = BeanUtils.instantiate(ClassUtils nativePage = BeanUtils
.forName(ERROR_PAGE_TOMCAT, null)); .instantiate(ClassUtils.forName(ERROR_PAGE_CLASS, null));
} }
else if (ClassUtils.isPresent(ERROR_PAGE_TOMCAT7, null)) { else if (ClassUtils.isPresent(LEGACY_ERROR_PAGE_CLASS, null)) {
nativePage = BeanUtils.instantiate(ClassUtils nativePage = BeanUtils.instantiate(
.forName(ERROR_PAGE_TOMCAT7, null)); ClassUtils.forName(LEGACY_ERROR_PAGE_CLASS, null));
} }
} }
catch (ClassNotFoundException ex) { catch (ClassNotFoundException ex) {
@ -704,7 +704,7 @@ public class TomcatEmbeddedServletContainerFactory
public void addToContext(Context context) { public void addToContext(Context context) {
Assert.state(this.nativePage != null, Assert.state(this.nativePage != null,
"Neither Tomcat 7 nor 8 detected so no native error page exists"); "Neither Tomcat 7 nor 8 detected so no native error page exists");
if (ClassUtils.isPresent(ERROR_PAGE_TOMCAT, null)) { if (ClassUtils.isPresent(ERROR_PAGE_CLASS, null)) {
org.apache.tomcat.util.descriptor.web.ErrorPage errorPage = (org.apache.tomcat.util.descriptor.web.ErrorPage) this.nativePage; org.apache.tomcat.util.descriptor.web.ErrorPage errorPage = (org.apache.tomcat.util.descriptor.web.ErrorPage) this.nativePage;
errorPage.setLocation(this.location); errorPage.setLocation(this.location);
errorPage.setErrorCode(this.errorCode); errorPage.setErrorCode(this.errorCode);

6
spring-boot/src/test/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializerTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2014 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -142,8 +142,8 @@ public class ConfigurationWarningsApplicationContextInitializerTests {
} }
/** /**
* Testable ComponentScanPackageCheck that doesn't need to use the default * Testable ComponentScanPackageCheck that doesn't need to use the default or
* or {@code org.springframework} package. * {@code org.springframework} package.
*/ */
static class TestComponentScanPackageCheck extends ComponentScanPackageCheck { static class TestComponentScanPackageCheck extends ComponentScanPackageCheck {

5
spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -194,8 +194,7 @@ public class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests {
@Test @Test
public void springConfigLocations() throws Exception { public void springConfigLocations() throws Exception {
String[] locations = getSpringConfigLocations(this.loggingSystem); String[] locations = getSpringConfigLocations(this.loggingSystem);
assertThat(locations, assertThat(locations, equalTo(new String[] { "log4j2-spring.xml" }));
equalTo(new String[] { "log4j2-spring.xml" }));
} }
@Test @Test