Merge pull request #11242 from izeye:polish-20171202

* pr/11242:
  Polish
This commit is contained in:
Stephane Nicoll 2017-12-02 09:04:15 +01:00
commit 32b817e78d
12 changed files with 29 additions and 29 deletions

View File

@ -74,7 +74,7 @@ public class ServerProperties {
private String displayName = "application"; private String displayName = "application";
@NestedConfigurationProperty @NestedConfigurationProperty
private ErrorProperties error = new ErrorProperties(); private final ErrorProperties error = new ErrorProperties();
/** /**
* Whether X-Forwarded-* headers should be applied to the HttpRequest. * Whether X-Forwarded-* headers should be applied to the HttpRequest.
@ -104,10 +104,10 @@ public class ServerProperties {
private Ssl ssl; private Ssl ssl;
@NestedConfigurationProperty @NestedConfigurationProperty
private Compression compression = new Compression(); private final Compression compression = new Compression();
@NestedConfigurationProperty @NestedConfigurationProperty
private Http2 http2 = new Http2(); private final Http2 http2 = new Http2();
private Servlet servlet = new Servlet(); private Servlet servlet = new Servlet();

View File

@ -43,8 +43,8 @@ import org.springframework.core.Ordered;
* dependencies in the BOM (and its transitives) will be added to the dependency * dependencies in the BOM (and its transitives) will be added to the dependency
* management lookup, so an app can use just the artifact id (e.g. "spring-jdbc") in a * management lookup, so an app can use just the artifact id (e.g. "spring-jdbc") in a
* {@code @Grab}. To install, implement the missing methods and list the class in * {@code @Grab}. To install, implement the missing methods and list the class in
* {@code META-INF/services/org.springframework.boot.cli.compiler.SpringBootAstTransformation} * {@code META-INF/services/org.springframework.boot.cli.compiler.SpringBootAstTransformation}.
* . The {@link #getOrder()} value needs to be before * The {@link #getOrder()} value needs to be before
* {@link DependencyManagementBomTransformation#ORDER}. * {@link DependencyManagementBomTransformation#ORDER}.
* *
* @author Dave Syer * @author Dave Syer

View File

@ -40,7 +40,7 @@ public class DevToolsProperties {
private Livereload livereload = new Livereload(); private Livereload livereload = new Livereload();
@NestedConfigurationProperty @NestedConfigurationProperty
private RemoteDevToolsProperties remote = new RemoteDevToolsProperties(); private final RemoteDevToolsProperties remote = new RemoteDevToolsProperties();
public Restart getRestart() { public Restart getRestart() {
return this.restart; return this.restart;

View File

@ -46,9 +46,9 @@ content into your application. Rather, pick only the properties that you need.
logging.level.*= # Log levels severity mapping. For instance, `logging.level.org.springframework=DEBUG` logging.level.*= # Log levels severity mapping. For instance, `logging.level.org.springframework=DEBUG`
logging.path= # Location of the log file. For instance, `/var/log` logging.path= # Location of the log file. For instance, `/var/log`
logging.pattern.console= # Appender pattern for output to the console. Supported only with the default Logback setup. logging.pattern.console= # Appender pattern for output to the console. Supported only with the default Logback setup.
logging.pattern.dateformat= # Appender pattern for log dateformat (default yyyy-MM-dd HH:mm:ss.SSS). Only supported with the default logback setup.
logging.pattern.file= # Appender pattern for output to a file. Supported only with the default Logback setup. logging.pattern.file= # Appender pattern for output to a file. Supported only with the default Logback setup.
logging.pattern.level= # Appender pattern for log level (default: %5p). Supported only with the default Logback setup. logging.pattern.level= # Appender pattern for log level (default: %5p). Supported only with the default Logback setup.
logging.pattern.dateformat= # Appender pattern for log dateformat (default yyyy-MM-dd HH:mm:ss.SSS). Only supported with the default logback setup.
logging.register-shutdown-hook=false # Register a shutdown hook for the logging system when it is initialized. logging.register-shutdown-hook=false # Register a shutdown hook for the logging system when it is initialized.
# AOP # AOP
@ -170,7 +170,7 @@ content into your application. Rather, pick only the properties that you need.
server.error.include-stacktrace=never # When to include a "stacktrace" attribute. server.error.include-stacktrace=never # When to include a "stacktrace" attribute.
server.error.path=/error # Path of the error controller. server.error.path=/error # Path of the error controller.
server.error.whitelabel.enabled=true # Enable the default error page displayed in browsers in case of a server error. server.error.whitelabel.enabled=true # Enable the default error page displayed in browsers in case of a server error.
server.http2.enabled=true # Whether to enable HTTP/2 support, if the current environment supports it. server.http2.enabled=false # Whether to enable HTTP/2 support, if the current environment supports it.
server.jetty.acceptors= # Number of acceptor threads to use. server.jetty.acceptors= # Number of acceptor threads to use.
server.jetty.accesslog.append=false # Append to log. server.jetty.accesslog.append=false # Append to log.
server.jetty.accesslog.date-format=dd/MMM/yyyy:HH:mm:ss Z # Timestamp format of the request log. server.jetty.accesslog.date-format=dd/MMM/yyyy:HH:mm:ss Z # Timestamp format of the request log.

View File

@ -729,7 +729,7 @@ out-of-the-box by JDK8.
[NOTE] [NOTE]
==== ====
Spring Boot does not support `h2c`, the cleartext version of the HTTP/2 protocol. So you Spring Boot does not support `h2c`, the cleartext version of the HTTP/2 protocol. So you
must configure <<howto-configure-ssl, configure SSL first>>. must <<howto-configure-ssl, configure SSL first>>.
==== ====
Currently, only Undertow and Tomcat are supported with this configuration key. Currently, only Undertow and Tomcat are supported with this configuration key.

View File

@ -228,8 +228,8 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac
} }
/** /**
* Set {@link LifecycleListener}s that should be applied to the Tomcat {@link Context} * Set {@link LifecycleListener}s that should be applied to the Tomcat {@link Context}.
* . Calling this method will replace any existing listeners. * Calling this method will replace any existing listeners.
* @param contextLifecycleListeners the listeners to set * @param contextLifecycleListeners the listeners to set
*/ */
public void setContextLifecycleListeners( public void setContextLifecycleListeners(

View File

@ -522,8 +522,8 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
} }
/** /**
* Set {@link LifecycleListener}s that should be applied to the Tomcat {@link Context} * Set {@link LifecycleListener}s that should be applied to the Tomcat {@link Context}.
* . Calling this method will replace any existing listeners. * Calling this method will replace any existing listeners.
* @param contextLifecycleListeners the listeners to set * @param contextLifecycleListeners the listeners to set
*/ */
public void setContextLifecycleListeners( public void setContextLifecycleListeners(

View File

@ -25,7 +25,7 @@ package org.springframework.boot.web.server;
public class Http2 { public class Http2 {
/** /**
* If HTTP/2 protocol is enabled. * Whether to enable HTTP/2 support, if the current environment supports it.
*/ */
private boolean enabled = false; private boolean enabled = false;