Merge pull request #10109 from izeye:polish-20170830
* pr/10109: Polish "Polish" Polish
This commit is contained in:
Stephane Nicoll
commit
75edca6e55
|
|
@ -125,7 +125,7 @@ public final class Health {
|
|||
}
|
||||
|
||||
/**
|
||||
* Create a new {@link Builder} instance with an {@link Status#DOWN} status an the
|
||||
* Create a new {@link Builder} instance with an {@link Status#DOWN} status and the
|
||||
* specified exception details.
|
||||
* @param ex the exception
|
||||
* @return a new {@link Builder} instance
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ public class ActiveMQProperties {
|
|||
private int maximumActiveSessionPerConnection = 500;
|
||||
|
||||
/**
|
||||
* Reset the connection when a "JMXException" occurs.
|
||||
* Reset the connection when a "JMSException" occurs.
|
||||
*/
|
||||
private boolean reconnectOnException = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -76,8 +76,8 @@ public class SessionAutoConfigurationJdbcTests
|
|||
this.context.getBean(JdbcSessionProperties.class).getInitializeSchema())
|
||||
.isEqualTo(DatabaseInitializationMode.NEVER);
|
||||
this.thrown.expect(BadSqlGrammarException.class);
|
||||
assertThat(this.context.getBean(JdbcOperations.class)
|
||||
.queryForList("select * from SPRING_SESSION")).isEmpty();
|
||||
this.context.getBean(JdbcOperations.class)
|
||||
.queryForList("select * from SPRING_SESSION");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
|||
|
|
@ -414,16 +414,22 @@ content into your application; rather pick only the properties that you need.
|
|||
spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/ # Locations of static resources.
|
||||
|
||||
# SPRING SESSION ({sc-spring-boot-autoconfigure}/session/SessionProperties.{sc-ext}[SessionProperties])
|
||||
spring.session.store-type= # Session store type.
|
||||
spring.session.servlet.filter-order=-2147483598 # Session repository filter order.
|
||||
spring.session.servlet.filter-dispatcher-types=ASYNC,ERROR,REQUEST # Session repository filter dispatcher types.
|
||||
|
||||
# SPRING SESSION HAZELCAST ({sc-spring-boot-autoconfigure}/session/HazelcastSessionProperties.{sc-ext}[HazelcastSessionProperties])
|
||||
spring.session.hazelcast.flush-mode=on-save # Sessions flush mode.
|
||||
spring.session.hazelcast.map-name=spring:session:sessions # Name of the map used to store sessions.
|
||||
|
||||
# SPRING SESSION JDBC ({sc-spring-boot-autoconfigure}/session/JdbcSessionProperties.{sc-ext}[JdbcSessionProperties])
|
||||
spring.session.jdbc.initialize-schema=embedded # Database schema initialization mode.
|
||||
spring.session.jdbc.schema=classpath:org/springframework/session/jdbc/schema-@@platform@@.sql # Path to the SQL file to use to initialize the database schema.
|
||||
spring.session.jdbc.table-name=SPRING_SESSION # Name of database table used to store sessions.
|
||||
|
||||
# SPRING SESSION REDIS ({sc-spring-boot-autoconfigure}/session/RedisSessionProperties.{sc-ext}[RedisSessionProperties])
|
||||
spring.session.redis.flush-mode=on-save # Sessions flush mode.
|
||||
spring.session.redis.namespace= # Namespace for keys used to store sessions.
|
||||
spring.session.servlet.filter-order=-2147483598 # Session repository filter order.
|
||||
spring.session.servlet.filter-dispatcher-types=ASYNC,ERROR,REQUEST # Session repository filter dispatcher types.
|
||||
spring.session.store-type= # Session store type.
|
||||
|
||||
# SPRING SOCIAL ({sc-spring-boot-autoconfigure}/social/SocialWebAutoConfiguration.{sc-ext}[SocialWebAutoConfiguration])
|
||||
spring.social.auto-connection-views=false # Enable the connection status view for supported providers.
|
||||
|
|
@ -924,7 +930,7 @@ content into your application; rather pick only the properties that you need.
|
|||
spring.activemq.pool.idle-timeout=30000 # Connection idle timeout in milliseconds.
|
||||
spring.activemq.pool.max-connections=1 # Maximum number of pooled connections.
|
||||
spring.activemq.pool.maximum-active-session-per-connection=500 # Maximum number of active sessions per connection.
|
||||
spring.activemq.pool.reconnect-on-exception=true # Reset the connection when a "JMXException" occurs.
|
||||
spring.activemq.pool.reconnect-on-exception=true # Reset the connection when a "JMSException" occurs.
|
||||
spring.activemq.pool.time-between-expiration-check=-1 # Time to sleep, in milliseconds, between runs of the idle connection eviction thread. When negative, no idle connection eviction thread runs.
|
||||
spring.activemq.pool.use-anonymous-producers=true # Use only one anonymous "MessageProducer" instance. Set it to false to create one "MessageProducer" every time one is required.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2012-2015 the original author or authors.
|
||||
* Copyright 2012-2017 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.
|
||||
|
|
@ -24,7 +24,7 @@ public class Message {
|
|||
|
||||
private Long id;
|
||||
|
||||
@NotEmpty(message = "Message is required.")
|
||||
@NotEmpty(message = "Text is required.")
|
||||
private String text;
|
||||
|
||||
@NotEmpty(message = "Summary is required.")
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
/*
|
||||
* Copyright 2012-2015 the original author or authors.
|
||||
* Copyright 2012-2017 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
|
||||
* 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
|
||||
*
|
||||
* http://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.
|
||||
* 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 sample.web.ui;
|
||||
|
|
@ -24,7 +27,7 @@ public class Message {
|
|||
|
||||
private Long id;
|
||||
|
||||
@NotEmpty(message = "Message is required.")
|
||||
@NotEmpty(message = "Text is required.")
|
||||
private String text;
|
||||
|
||||
@NotEmpty(message = "Summary is required.")
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
-----
|
||||
|
||||
By default, both the <<<repackage>>> and the <<<run>>> goals will include any <<<provided>>>
|
||||
dependencies that are defined in the project. A boot-based project should consider
|
||||
dependencies that are defined in the project. A Spring Boot project should consider
|
||||
<<<provided>>> dependencies as <<container>> dependencies that are required to run
|
||||
the application.
|
||||
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ public abstract class AbstractFailureAnalyzer<T extends Throwable>
|
|||
}
|
||||
|
||||
/**
|
||||
* Returns an analysis of the given {@code failure}, or {@code null} if no analysis
|
||||
* was possible.
|
||||
* Returns an analysis of the given {@code rootFailure}, or {@code null} if no
|
||||
* analysis was possible.
|
||||
* @param rootFailure the root failure passed to the analyzer
|
||||
* @param cause the actual found cause
|
||||
* @return the analysis or {@code null}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2012-2016 the original author or authors.
|
||||
* Copyright 2012-2017 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.
|
||||
|
|
@ -106,8 +106,8 @@ public abstract class AbstractInjectionFailureAnalyzer<T extends Throwable>
|
|||
}
|
||||
|
||||
/**
|
||||
* Returns an analysis of the given {@code failure}, or {@code null} if no analysis
|
||||
* was possible.
|
||||
* Returns an analysis of the given {@code rootFailure}, or {@code null} if no
|
||||
* analysis was possible.
|
||||
* @param rootFailure the root failure passed to the analyzer
|
||||
* @param cause the actual found cause
|
||||
* @param description the description of the injection point or {@code null}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2012-2016 the original author or authors.
|
||||
* Copyright 2012-2017 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.
|
||||
|
|
@ -77,7 +77,7 @@ public class SpringPhysicalNamingStrategy implements PhysicalNamingStrategy {
|
|||
}
|
||||
|
||||
/**
|
||||
* Get an the identifier for the specified details. By default this method will return
|
||||
* Get an identifier for the specified details. By default this method will return
|
||||
* an identifier with the name adapted based on the result of
|
||||
* {@link #isCaseInsensitive(JdbcEnvironment)}
|
||||
* @param name the name of the identifier
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ import org.springframework.util.StringUtils;
|
|||
* Can be initialized using Spring's {@link ServletContextInitializer}s or Jetty
|
||||
* {@link Configuration}s.
|
||||
* <p>
|
||||
* Unless explicitly configured otherwise this factory will created servers that listens
|
||||
* Unless explicitly configured otherwise this factory will create servers that listen
|
||||
* for HTTP requests on port 8080.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
|
|
@ -527,7 +527,7 @@ public class JettyServletWebServerFactory extends AbstractServletWebServerFactor
|
|||
}
|
||||
|
||||
/**
|
||||
* Post process the Jetty {@link WebAppContext} before it used with the Jetty Server.
|
||||
* Post process the Jetty {@link WebAppContext} before it's used with the Jetty Server.
|
||||
* Subclasses can override this method to apply additional processing to the
|
||||
* {@link WebAppContext}.
|
||||
* @param webAppContext the Jetty {@link WebAppContext}
|
||||
|
|
|
|||
|
|
@ -89,8 +89,8 @@ import org.springframework.util.StringUtils;
|
|||
* {@link TomcatWebServer}s. Can be initialized using Spring's
|
||||
* {@link ServletContextInitializer}s or Tomcat {@link LifecycleListener}s.
|
||||
* <p>
|
||||
* Unless explicitly configured otherwise this factory will created containers that
|
||||
* listens for HTTP requests on port 8080.
|
||||
* Unless explicitly configured otherwise this factory will create containers that
|
||||
* listen for HTTP requests on port 8080.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Dave Syer
|
||||
|
|
@ -508,7 +508,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
|
|||
}
|
||||
|
||||
/**
|
||||
* Post process the Tomcat {@link Context} before it used with the Tomcat Server.
|
||||
* Post process the Tomcat {@link Context} before it's used with the Tomcat Server.
|
||||
* Subclasses can override this method to apply additional processing to the
|
||||
* {@link Context}.
|
||||
* @param context the Tomcat {@link Context}
|
||||
|
|
@ -591,7 +591,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
|
|||
/**
|
||||
* Returns a mutable collection of the {@link Valve}s that will be applied to the
|
||||
* Tomcat {@link Engine}.
|
||||
* @return the engineValves the valves that will be applied
|
||||
* @return the engine valves that will be applied
|
||||
*/
|
||||
public Collection<Valve> getEngineValves() {
|
||||
return this.engineValves;
|
||||
|
|
@ -619,7 +619,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
|
|||
/**
|
||||
* Returns a mutable collection of the {@link Valve}s that will be applied to the
|
||||
* Tomcat {@link Context}.
|
||||
* @return the contextValves the valves that will be applied
|
||||
* @return the context valves that will be applied
|
||||
* @see #getEngineValves()
|
||||
*/
|
||||
public Collection<Valve> getContextValves() {
|
||||
|
|
@ -650,7 +650,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
|
|||
/**
|
||||
* Returns a mutable collection of the {@link LifecycleListener}s that will be applied
|
||||
* to the Tomcat {@link Context} .
|
||||
* @return the contextLifecycleListeners the listeners that will be applied
|
||||
* @return the context lifecycle listeners that will be applied
|
||||
*/
|
||||
public Collection<LifecycleListener> getContextLifecycleListeners() {
|
||||
return this.contextLifecycleListeners;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ import org.springframework.context.ApplicationContext;
|
|||
import org.springframework.web.filter.OncePerRequestFilter;
|
||||
|
||||
/**
|
||||
* {@link OncePerRequestFilter} to add a {@literal X-Application-Context} header that
|
||||
* {@link OncePerRequestFilter} to add an {@literal X-Application-Context} header that
|
||||
* contains the {@link ApplicationContext#getId() ApplicationContext ID}.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
|
|
|
|||
Loading…
Reference in New Issue