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

Merge pull request #3809 from izeye/typo-20150822 

* pr/3809:
  Fix typos
This commit is contained in:
Stephane Nicoll 2015-08-23 09:26:23 +02:00
parent 69fcae6b44 e2119d3329
commit e7bf415427
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ConditionalOnEnablednHealthIndicator.java → spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ConditionalOnEnabledHealthIndicator.java
View File

@ -27,7 +27,7 @@ import org.springframework.context.annotation.Conditional;
/**
* {@link Conditional} that checks whether or not a default health indicator is enabled.
* Matches if the value of the {@code management.health.<name>.enabled} property is
* {@code true}. Otherwise , matches if the value of the
* {@code true}. Otherwise, matches if the value of the
* {@code management.health.defaults.enabled} property is {@code true} or if it is not
* configured.
*
@ -38,7 +38,7 @@ import org.springframework.context.annotation.Conditional;
@Target({ ElementType.TYPE, ElementType.METHOD })
@Documented
@Conditional(OnEnabledHealthIndicatorCondition.class)
public @interface ConditionalOnEnablednHealthIndicator {
public @interface ConditionalOnEnabledHealthIndicator {
/**
* The name of the health indicator.

18
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
View File

@ -153,7 +153,7 @@ public class HealthIndicatorAutoConfiguration {
@Configuration
@ConditionalOnClass(JdbcTemplate.class)
@ConditionalOnBean(DataSource.class)
@ConditionalOnEnablednHealthIndicator("db")
@ConditionalOnEnabledHealthIndicator("db")
public static class DataSourcesHealthIndicatorConfiguration extends
CompositeHealthIndicatorConfiguration<DataSourceHealthIndicator, DataSource>
implements InitializingBean {
@ -193,7 +193,7 @@ public class HealthIndicatorAutoConfiguration {
@Configuration
@ConditionalOnBean(MongoTemplate.class)
@ConditionalOnEnablednHealthIndicator("mongo")
@ConditionalOnEnabledHealthIndicator("mongo")
public static class MongoHealthIndicatorConfiguration extends
CompositeHealthIndicatorConfiguration<MongoHealthIndicator, MongoTemplate> {
@ -210,7 +210,7 @@ public class HealthIndicatorAutoConfiguration {
@Configuration
@ConditionalOnBean(RedisConnectionFactory.class)
@ConditionalOnEnablednHealthIndicator("redis")
@ConditionalOnEnabledHealthIndicator("redis")
public static class RedisHealthIndicatorConfiguration
extends
CompositeHealthIndicatorConfiguration<RedisHealthIndicator, RedisConnectionFactory> {
@ -228,7 +228,7 @@ public class HealthIndicatorAutoConfiguration {
@Configuration
@ConditionalOnBean(RabbitTemplate.class)
@ConditionalOnEnablednHealthIndicator("rabbit")
@ConditionalOnEnabledHealthIndicator("rabbit")
public static class RabbitHealthIndicatorConfiguration extends
CompositeHealthIndicatorConfiguration<RabbitHealthIndicator, RabbitTemplate> {
@ -245,7 +245,7 @@ public class HealthIndicatorAutoConfiguration {
@Configuration
@ConditionalOnBean(SolrServer.class)
@ConditionalOnEnablednHealthIndicator("solr")
@ConditionalOnEnabledHealthIndicator("solr")
public static class SolrHealthIndicatorConfiguration extends
CompositeHealthIndicatorConfiguration<SolrHealthIndicator, SolrServer> {
@ -261,7 +261,7 @@ public class HealthIndicatorAutoConfiguration {
}
@Configuration
@ConditionalOnEnablednHealthIndicator("diskspace")
@ConditionalOnEnabledHealthIndicator("diskspace")
public static class DiskSpaceHealthIndicatorConfiguration {
@Bean
@ -280,7 +280,7 @@ public class HealthIndicatorAutoConfiguration {
@Configuration
@ConditionalOnBean(JavaMailSenderImpl.class)
@ConditionalOnEnablednHealthIndicator("mail")
@ConditionalOnEnabledHealthIndicator("mail")
public static class MailHealthIndicatorConfiguration
extends
CompositeHealthIndicatorConfiguration<MailHealthIndicator, JavaMailSenderImpl> {
@ -298,7 +298,7 @@ public class HealthIndicatorAutoConfiguration {
@Configuration
@ConditionalOnBean(ConnectionFactory.class)
@ConditionalOnEnablednHealthIndicator("jms")
@ConditionalOnEnabledHealthIndicator("jms")
public static class JmsHealthIndicatorConfiguration extends
CompositeHealthIndicatorConfiguration<JmsHealthIndicator, ConnectionFactory> {
@ -315,7 +315,7 @@ public class HealthIndicatorAutoConfiguration {
@Configuration
@ConditionalOnBean(Client.class)
@ConditionalOnEnablednHealthIndicator("elasticsearch")
@ConditionalOnEnabledHealthIndicator("elasticsearch")
@EnableConfigurationProperties(ElasticsearchHealthIndicatorProperties.class)
public static class ElasticsearchHealthIndicatorConfiguration extends
CompositeHealthIndicatorConfiguration<ElasticsearchHealthIndicator, Client> {

2
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEnabledHealthIndicatorCondition.java
View File

@ -31,7 +31,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
*/
class OnEnabledHealthIndicatorCondition extends SpringBootCondition {
private static final String ANNOTATION_CLASS = ConditionalOnEnablednHealthIndicator.class
private static final String ANNOTATION_CLASS = ConditionalOnEnabledHealthIndicator.class
.getName();
@Override

2
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java
View File

@ -122,7 +122,7 @@ public class HealthIndicatorAutoConfigurationTests {
this.context.register(HealthIndicatorAutoConfiguration.class,
ManagementServerProperties.class);
EnvironmentTestUtils.addEnvironment(this.context,
"management.health.enabled:false",
"management.health.defaults.enabled:false",
"management.health.diskspace.enabled:true");
this.context.refresh();
Map<String, HealthIndicator> beans = this.context

2
spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java
View File

@ -114,7 +114,7 @@ public abstract class AbstractConfigurableEmbeddedServletContainer implements
}
if (!contextPath.startsWith("/") || contextPath.endsWith("/")) {
throw new IllegalArgumentException(
"ContextPath must start with '/ and not end with '/'");
"ContextPath must start with '/' and not end with '/'");
}
}
}

4
spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
View File

@ -245,14 +245,14 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
@Test
public void contextPathMustStartWithSlash() throws Exception {
this.thrown.expect(IllegalArgumentException.class);
this.thrown.expectMessage("ContextPath must start with '/ and not end with '/'");
this.thrown.expectMessage("ContextPath must start with '/' and not end with '/'");
getFactory().setContextPath("missingslash");
}
@Test
public void contextPathMustNotEndWithSlash() throws Exception {
this.thrown.expect(IllegalArgumentException.class);
this.thrown.expectMessage("ContextPath must start with '/ and not end with '/'");
this.thrown.expectMessage("ContextPath must start with '/' and not end with '/'");
getFactory().setContextPath("extraslash/");
}