Closes gh-5798
pull/5782/merge
Johnny Lim 9 years ago committed by Stephane Nicoll
parent 34e3e3c820
commit db2092e27d

@ -9,7 +9,7 @@ working as you expect it to, on Stack Overflow using the spring-boot tag.
Bug report
Please provide details of the problem, including the version of Spring Boot that you
are using. If possible, please provide a testcase or sample application that reproduces
are using. If possible, please provide a test case or sample application that reproduces
the problem. This makes it much easier for us to diagnose the problem and to verify that
we have fixed it.

@ -143,7 +143,7 @@ public class EnableAutoConfigurationImportSelector
List<String> configurations = SpringFactoriesLoader.loadFactoryNames(
getSpringFactoriesLoaderFactoryClass(), getBeanClassLoader());
Assert.notEmpty(configurations,
"No auto configuration classes found in META-INF/spring.factories. If you"
"No auto configuration classes found in META-INF/spring.factories. If you "
+ "are using a custom packaging, make sure that file is correct.");
return configurations;
}

@ -115,12 +115,12 @@ public class CouchbaseProperties {
public static class Endpoints {
/**
* Number of sockets per node against the Key/value service.
* Number of sockets per node against the key/value service.
*/
private int keyValue = 1;
/**
* Number of sockets per node against the Query (N1QL) service.
* Number of sockets per node against the query (N1QL) service.
*/
private int query = 1;

@ -792,9 +792,9 @@ content into your application; rather pick only the properties that you need.
spring.activemq.in-memory=true # Specify if the default broker URL should be in memory. Ignored if an explicit broker has been specified.
spring.activemq.password= # Login password of the broker.
spring.activemq.user= # Login user of the broker.
spring.activemq.packages.trust-all=false # Trust all packages
spring.activemq.packages.trust-all=false # Trust all packages.
spring.activemq.packages.trusted= # Comma-separated list of specific packages to trust (when not trusting all packages).
spring.activemq.pool.configuration.*= # See PooledConnectionFactory
spring.activemq.pool.configuration.*= # See PooledConnectionFactory.
spring.activemq.pool.enabled=false # Whether a PooledConnectionFactory should be created instead of a regular ConnectionFactory.
spring.activemq.pool.expiry-timeout=0 # Connection expiration timeout in milliseconds.
spring.activemq.pool.idle-timeout=30000 # Connection idle timeout in milliseconds.

@ -237,7 +237,7 @@ creating a bean of type `MvcEndpoint`. Your `MvcEndpoint` is not a `@Controller`
can use `@RequestMapping` (and `@Managed*`) to expose resources.
TIP: If you are doing this as a library feature consider adding a configuration class
annoated with `@ManagementContextConfiguration` to `/META-INF/spring.factories` under the
annotated with `@ManagementContextConfiguration` to `/META-INF/spring.factories` under the
key `org.springframework.boot.actuate.autoconfigure.ManagementContextConfiguration`. If
you do that then the endpoint will move to a child context with all the other MVC
endpoints if your users ask for a separate management port or address. A configuration

@ -3374,7 +3374,7 @@ control over the whole configuration.
====
It is also possible to customize some of the `CouchbaseEnvironment` settings. For instance
the following configuration changes the timeout to use to open a new `Bucket` and enable
the following configuration changes the timeout to use to open a new `Bucket` and enables
SSL support:
[source,properties,indent=0]

@ -525,7 +525,7 @@ configuration to replace specific parts of the auto-configuration. For example,
you add your own `DataSource` bean, the default embedded database support will back away.
If you need to find out what auto-configuration is currently being applied, and why,
start your application with the `--debug` switch. This will enables debug logs for a
start your application with the `--debug` switch. This will enable debug logs for a
selection of core loggers and log an auto-configuration report to the console.

@ -41,23 +41,23 @@ public class InfoProperties implements Iterable<InfoProperties.Entry> {
* @param entries the information to expose
*/
public InfoProperties(Properties entries) {
Assert.notNull(entries, "Properties must not be null");
Assert.notNull(entries, "Entries must not be null");
this.entries = copy(entries);
}
/**
* Return the value of the specified property or {@code null}.
* @param property the id of the property
* @param key the key of the property
* @return the property value
*/
public String get(String property) {
return this.entries.getProperty(property);
public String get(String key) {
return this.entries.getProperty(key);
}
/**
* Return the value of the specified property as a {@link Date} or {@code null} if the
* value is not a valid {@link Long} representation of an epoch time.
* @param key the id of the property
* @param key the key of the property
* @return the property value
*/
public Date getDate(String key) {

@ -539,7 +539,7 @@ public class ConfigFileApplicationListenerTests {
}
@Test
public void yamlSetsMultiProfilesWithWithespace() throws Exception {
public void yamlSetsMultiProfilesWithWhitespace() throws Exception {
this.initializer.setSearchNames("testsetmultiprofileswhitespace");
this.initializer.postProcessEnvironment(this.environment, this.application);
assertThat(this.environment.getActiveProfiles()).containsExactly("dev",

Loading…
Cancel
Save