From da16d6d306198b7ca5822ecbeecffdf315200587 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Mon, 16 Nov 2015 13:56:14 +0900 Subject: [PATCH] Polishing Closes gh-4503 --- .../src/main/asciidoc/health.adoc | 2 +- .../src/main/asciidoc/index.adoc | 2 +- .../hypermedia/HealthEndpointDocumentation.java | 2 +- .../metrics/rich/MultiMetricRichGaugeReader.java | 2 +- .../HealthIndicatorAutoConfigurationTests.java | 4 ++-- .../actuate/autoconfigure/ShellPropertiesTests.java | 2 +- .../endpoint/jmx/EndpointMBeanExporterTests.java | 12 ++++++------ .../actuate/endpoint/mvc/HealthMvcEndpointTests.java | 6 +++--- .../actuate/health/MailHealthIndicatorTests.java | 4 ++-- .../dropwizard/DropwizardMetricServicesTests.java | 10 +++++----- .../metrics/opentsdb/OpenTsdbGaugeWriterTests.java | 2 +- .../metrics/statsd/StatsdMetricWriterTests.java | 2 +- .../metrics/writer/DefaultCounterServiceTests.java | 2 +- .../security/SecurityPropertiesTests.java | 2 +- spring-boot-cli/samples/integration.groovy | 2 +- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/spring-boot-actuator-docs/src/main/asciidoc/health.adoc b/spring-boot-actuator-docs/src/main/asciidoc/health.adoc index 9b68455d65..d7ad4dc1b7 100644 --- a/spring-boot-actuator-docs/src/main/asciidoc/health.adoc +++ b/spring-boot-actuator-docs/src/main/asciidoc/health.adoc @@ -17,4 +17,4 @@ Example HTTP response: include::{generated}/health/http-response.adoc[] Example HTTP response with `endpoints.health.sensitive=false`: -include::{generated}/health/unsensitive/http-response.adoc[] +include::{generated}/health/insensitive/http-response.adoc[] diff --git a/spring-boot-actuator-docs/src/main/asciidoc/index.adoc b/spring-boot-actuator-docs/src/main/asciidoc/index.adoc index c5ba4024a2..3b4534e3b2 100644 --- a/spring-boot-actuator-docs/src/main/asciidoc/index.adoc +++ b/spring-boot-actuator-docs/src/main/asciidoc/index.adoc @@ -37,7 +37,7 @@ include::{generated}/logfile/http-response.adoc[] === /docs -This endpoint (if available) contains HTML documemtation for the other endpoints. Its path +This endpoint (if available) contains HTML documentation for the other endpoints. Its path can be "/docs" (if there is an existing home page) or "/" (otherwise, including if the HAL browser is not active). diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java index 8028e98fb5..492ef7e004 100644 --- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java +++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java @@ -64,7 +64,7 @@ public class HealthEndpointDocumentation { @Test public void health() throws Exception { this.mockMvc.perform(get("/health").accept(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(document("health/unsensitive")); + .andExpect(status().isOk()).andDo(document("health/insensitive")); } } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReader.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReader.java index 40d4dbf19c..4ae9360075 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReader.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReader.java @@ -25,7 +25,7 @@ import org.springframework.boot.actuate.metrics.repository.MultiMetricRepository /** * A {@link RichGaugeReader} that works by reading metric values from a * {@link MultiMetricRepository} where the group name is the RichGauge name. The format - * used matches that in he RichGaugeExporter, so this reader can be used on a store that + * used matches that in the RichGaugeExporter, so this reader can be used on a store that * has been populated using that exporter. * * @author Dave Syer diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java index e96589840f..08a3aaebca 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java @@ -286,7 +286,7 @@ public class HealthIndicatorAutoConfigurationTests { } @Test - public void solrHeathIndicator() { + public void solrHealthIndicator() { this.context.register(SolrAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); EnvironmentTestUtils.addEnvironment(this.context, @@ -300,7 +300,7 @@ public class HealthIndicatorAutoConfigurationTests { } @Test - public void notSolrHeathIndicator() { + public void notSolrHealthIndicator() { this.context.register(SolrAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); EnvironmentTestUtils.addEnvironment(this.context, diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ShellPropertiesTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ShellPropertiesTests.java index 48d83d6104..d442f92f5c 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ShellPropertiesTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ShellPropertiesTests.java @@ -270,7 +270,7 @@ public class ShellPropertiesTests { } @Test - public void testDefaultPasswordAutogeneratedIfUnresolovedPlaceholder() { + public void testDefaultPasswordAutogeneratedIfUnresolvedPlaceholder() { SimpleAuthenticationProperties security = new SimpleAuthenticationProperties(); RelaxedDataBinder binder = new RelaxedDataBinder(security, "security"); binder.bind(new MutablePropertyValues(Collections diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java index a24419e023..99b36bc610 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java @@ -88,10 +88,10 @@ public class EndpointMBeanExporterTests { this.context = new GenericApplicationContext(); this.context.registerBeanDefinition("endpointMbeanExporter", new RootBeanDefinition(EndpointMBeanExporter.class)); - MutablePropertyValues mvp = new MutablePropertyValues(); - mvp.add("enabled", Boolean.FALSE); + MutablePropertyValues mpv = new MutablePropertyValues(); + mpv.add("enabled", Boolean.FALSE); this.context.registerBeanDefinition("endpoint1", - new RootBeanDefinition(TestEndpoint.class, null, mvp)); + new RootBeanDefinition(TestEndpoint.class, null, mpv)); this.context.refresh(); MBeanExporter mbeanExporter = this.context.getBean(EndpointMBeanExporter.class); assertFalse(mbeanExporter.getServer() @@ -103,10 +103,10 @@ public class EndpointMBeanExporterTests { this.context = new GenericApplicationContext(); this.context.registerBeanDefinition("endpointMbeanExporter", new RootBeanDefinition(EndpointMBeanExporter.class)); - MutablePropertyValues mvp = new MutablePropertyValues(); - mvp.add("enabled", Boolean.TRUE); + MutablePropertyValues mpv = new MutablePropertyValues(); + mpv.add("enabled", Boolean.TRUE); this.context.registerBeanDefinition("endpoint1", - new RootBeanDefinition(TestEndpoint.class, null, mvp)); + new RootBeanDefinition(TestEndpoint.class, null, mpv)); this.context.refresh(); MBeanExporter mbeanExporter = this.context.getBean(EndpointMBeanExporter.class); assertTrue(mbeanExporter.getServer() diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java index 97b5333ea8..72b4c8d652 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java @@ -168,7 +168,7 @@ public class HealthMvcEndpointTests { } @Test - public void unsecureAnonymousAccessUnrestricted() { + public void insecureAnonymousAccessUnrestricted() { this.mvc = new HealthMvcEndpoint(this.endpoint, false); this.mvc.setEnvironment(this.environment); given(this.endpoint.invoke()) @@ -180,7 +180,7 @@ public class HealthMvcEndpointTests { } @Test - public void unsensitiveAnonymousAccessRestricted() { + public void insensitiveAnonymousAccessRestricted() { this.environment.getPropertySources().addLast(NON_SENSITIVE); given(this.endpoint.invoke()) .willReturn(new Health.Builder().up().withDetail("foo", "bar").build()); @@ -191,7 +191,7 @@ public class HealthMvcEndpointTests { } @Test - public void unsecureUnsensitiveAnonymousAccessUnrestricted() { + public void insecureInsensitiveAnonymousAccessUnrestricted() { this.mvc = new HealthMvcEndpoint(this.endpoint, false); this.mvc.setEnvironment(this.environment); this.environment.getPropertySources().addLast(NON_SENSITIVE); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTests.java index 27503ed774..6383289605 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTests.java @@ -85,8 +85,8 @@ public class MailHealthIndicatorTests { public static class SuccessTransport extends Transport { - public SuccessTransport(Session session, URLName urlname) { - super(session, urlname); + public SuccessTransport(Session session, URLName urlName) { + super(session, urlName); } @Override diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java index d8c5cc55b7..530ad69412 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java @@ -72,14 +72,14 @@ public class DropwizardMetricServicesTests { } @Test - public void setPredfinedTimer() { + public void setPredefinedTimer() { this.writer.submit("timer.foo", 200); this.writer.submit("timer.foo", 300); assertEquals(2, this.registry.timer("timer.foo").getCount()); } @Test - public void setPredfinedHistogram() { + public void setPredefinedHistogram() { this.writer.submit("histogram.foo", 2.1); this.writer.submit("histogram.foo", 2.3); assertEquals(2, this.registry.histogram("histogram.foo").getCount()); @@ -94,7 +94,7 @@ public class DropwizardMetricServicesTests { * @throws Exception if an error occurs */ @Test - public void testParallism() throws Exception { + public void testParallelism() throws Exception { List threads = new ArrayList(); ThreadGroup group = new ThreadGroup("threads"); for (int i = 0; i < 10; i++) { @@ -139,9 +139,9 @@ public class DropwizardMetricServicesTests { this.writer.submit("histogram.test.service", this.index); this.writer.submit("gauge.test.service", this.index); } - catch (IllegalArgumentException iae) { + catch (IllegalArgumentException ex) { this.failed = true; - throw iae; + throw ex; } } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriterTests.java index 4e0bbcfa33..967ed706ad 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriterTests.java @@ -60,7 +60,7 @@ public class OpenTsdbGaugeWriterTests { } @Test - public void flushAutomaticlly() { + public void flushAutomatically() { given(this.restTemplate.postForEntity(anyString(), any(Object.class), anyMap())) .willReturn(emptyResponse()); this.writer.setBufferSize(0); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java index b4243e3418..12362919cb 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java @@ -90,7 +90,7 @@ public class StatsdMetricWriterTests { } @Test - public void perioPrefix() throws Exception { + public void periodPrefix() throws Exception { this.writer = new StatsdMetricWriter("my.", "localhost", this.port); this.writer.set(new Metric("gauge.foo", 3L)); this.server.waitForMessage(); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterServiceTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterServiceTests.java index a2d4268efe..b41f910d29 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterServiceTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterServiceTests.java @@ -49,7 +49,7 @@ public class DefaultCounterServiceTests { } @Test - public void incrementWithExistingNearlyCounter() { + public void incrementWithExistingNearCounter() { this.service.increment("counter-foo"); verify(this.repository).increment(this.captor.capture()); assertEquals("counter.counter-foo", this.captor.getValue().getName()); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java index a6ff81e6f4..ea57ccc357 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java @@ -92,7 +92,7 @@ public class SecurityPropertiesTests { } @Test - public void testDefaultPasswordAutogeneratedIfUnresolovedPlaceholder() { + public void testDefaultPasswordAutogeneratedIfUnresolvedPlaceholder() { this.binder.bind(new MutablePropertyValues( Collections.singletonMap("security.user.password", "${ADMIN_PASSWORD}"))); assertFalse(this.binder.getBindingResult().hasErrors()); diff --git a/spring-boot-cli/samples/integration.groovy b/spring-boot-cli/samples/integration.groovy index a914bdf52a..8c361ba7da 100644 --- a/spring-boot-cli/samples/integration.groovy +++ b/spring-boot-cli/samples/integration.groovy @@ -21,7 +21,7 @@ class SpringIntegrationExample implements CommandLineRunner { * Since this is a simple application that we want to exit right away, * close the context. For an active integration application, with pollers * etc, you can either suspend the main thread here (e.g. with System.in.read()), - * or exit the run() method without closing he context, and stop the + * or exit the run() method without closing the context, and stop the * application later using some other technique (kill, JMX etc). */ context.close()