Skip to content

Commit da16d6d

Browse files
izeyesnicoll
authored andcommitted
Polishing
Closes spring-projectsgh-4503
1 parent d4a7c09 commit da16d6d

File tree

15 files changed

+28
-28
lines changed

15 files changed

+28
-28
lines changed

spring-boot-actuator-docs/src/main/asciidoc/health.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ Example HTTP response:
1717
include::{generated}/health/http-response.adoc[]
1818

1919
Example HTTP response with `endpoints.health.sensitive=false`:
20-
include::{generated}/health/unsensitive/http-response.adoc[]
20+
include::{generated}/health/insensitive/http-response.adoc[]

spring-boot-actuator-docs/src/main/asciidoc/index.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ include::{generated}/logfile/http-response.adoc[]
3737

3838

3939
=== /docs
40-
This endpoint (if available) contains HTML documemtation for the other endpoints. Its path
40+
This endpoint (if available) contains HTML documentation for the other endpoints. Its path
4141
can be "/docs" (if there is an existing home page) or "/" (otherwise, including if the
4242
HAL browser is not active).
4343

spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void setUp() {
6464
@Test
6565
public void health() throws Exception {
6666
this.mockMvc.perform(get("/health").accept(MediaType.APPLICATION_JSON))
67-
.andExpect(status().isOk()).andDo(document("health/unsensitive"));
67+
.andExpect(status().isOk()).andDo(document("health/insensitive"));
6868
}
6969

7070
}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* A {@link RichGaugeReader} that works by reading metric values from a
2727
* {@link MultiMetricRepository} where the group name is the RichGauge name. The format
28-
* used matches that in he RichGaugeExporter, so this reader can be used on a store that
28+
* used matches that in the RichGaugeExporter, so this reader can be used on a store that
2929
* has been populated using that exporter.
3030
*
3131
* @author Dave Syer

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ public void notRabbitHealthIndicator() {
286286
}
287287

288288
@Test
289-
public void solrHeathIndicator() {
289+
public void solrHealthIndicator() {
290290
this.context.register(SolrAutoConfiguration.class,
291291
ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class);
292292
EnvironmentTestUtils.addEnvironment(this.context,
@@ -300,7 +300,7 @@ public void solrHeathIndicator() {
300300
}
301301

302302
@Test
303-
public void notSolrHeathIndicator() {
303+
public void notSolrHealthIndicator() {
304304
this.context.register(SolrAutoConfiguration.class,
305305
ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class);
306306
EnvironmentTestUtils.addEnvironment(this.context,

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ShellPropertiesTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ public void testBindingSimple() {
270270
}
271271

272272
@Test
273-
public void testDefaultPasswordAutogeneratedIfUnresolovedPlaceholder() {
273+
public void testDefaultPasswordAutogeneratedIfUnresolvedPlaceholder() {
274274
SimpleAuthenticationProperties security = new SimpleAuthenticationProperties();
275275
RelaxedDataBinder binder = new RelaxedDataBinder(security, "security");
276276
binder.bind(new MutablePropertyValues(Collections

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ public void testSkipRegistrationOfDisabledEndpoint() throws Exception {
8888
this.context = new GenericApplicationContext();
8989
this.context.registerBeanDefinition("endpointMbeanExporter",
9090
new RootBeanDefinition(EndpointMBeanExporter.class));
91-
MutablePropertyValues mvp = new MutablePropertyValues();
92-
mvp.add("enabled", Boolean.FALSE);
91+
MutablePropertyValues mpv = new MutablePropertyValues();
92+
mpv.add("enabled", Boolean.FALSE);
9393
this.context.registerBeanDefinition("endpoint1",
94-
new RootBeanDefinition(TestEndpoint.class, null, mvp));
94+
new RootBeanDefinition(TestEndpoint.class, null, mpv));
9595
this.context.refresh();
9696
MBeanExporter mbeanExporter = this.context.getBean(EndpointMBeanExporter.class);
9797
assertFalse(mbeanExporter.getServer()
@@ -103,10 +103,10 @@ public void testRegistrationOfEnabledEndpoint() throws Exception {
103103
this.context = new GenericApplicationContext();
104104
this.context.registerBeanDefinition("endpointMbeanExporter",
105105
new RootBeanDefinition(EndpointMBeanExporter.class));
106-
MutablePropertyValues mvp = new MutablePropertyValues();
107-
mvp.add("enabled", Boolean.TRUE);
106+
MutablePropertyValues mpv = new MutablePropertyValues();
107+
mpv.add("enabled", Boolean.TRUE);
108108
this.context.registerBeanDefinition("endpoint1",
109-
new RootBeanDefinition(TestEndpoint.class, null, mvp));
109+
new RootBeanDefinition(TestEndpoint.class, null, mpv));
110110
this.context.refresh();
111111
MBeanExporter mbeanExporter = this.context.getBean(EndpointMBeanExporter.class);
112112
assertTrue(mbeanExporter.getServer()

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public void healthIsCached() {
168168
}
169169

170170
@Test
171-
public void unsecureAnonymousAccessUnrestricted() {
171+
public void insecureAnonymousAccessUnrestricted() {
172172
this.mvc = new HealthMvcEndpoint(this.endpoint, false);
173173
this.mvc.setEnvironment(this.environment);
174174
given(this.endpoint.invoke())
@@ -180,7 +180,7 @@ public void unsecureAnonymousAccessUnrestricted() {
180180
}
181181

182182
@Test
183-
public void unsensitiveAnonymousAccessRestricted() {
183+
public void insensitiveAnonymousAccessRestricted() {
184184
this.environment.getPropertySources().addLast(NON_SENSITIVE);
185185
given(this.endpoint.invoke())
186186
.willReturn(new Health.Builder().up().withDetail("foo", "bar").build());
@@ -191,7 +191,7 @@ public void unsensitiveAnonymousAccessRestricted() {
191191
}
192192

193193
@Test
194-
public void unsecureUnsensitiveAnonymousAccessUnrestricted() {
194+
public void insecureInsensitiveAnonymousAccessUnrestricted() {
195195
this.mvc = new HealthMvcEndpoint(this.endpoint, false);
196196
this.mvc.setEnvironment(this.environment);
197197
this.environment.getPropertySources().addLast(NON_SENSITIVE);

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MailHealthIndicatorTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ public void smtpIsDown() throws MessagingException {
8585

8686
public static class SuccessTransport extends Transport {
8787

88-
public SuccessTransport(Session session, URLName urlname) {
89-
super(session, urlname);
88+
public SuccessTransport(Session session, URLName urlName) {
89+
super(session, urlName);
9090
}
9191

9292
@Override

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ public void setGauge() {
7272
}
7373

7474
@Test
75-
public void setPredfinedTimer() {
75+
public void setPredefinedTimer() {
7676
this.writer.submit("timer.foo", 200);
7777
this.writer.submit("timer.foo", 300);
7878
assertEquals(2, this.registry.timer("timer.foo").getCount());
7979
}
8080

8181
@Test
82-
public void setPredfinedHistogram() {
82+
public void setPredefinedHistogram() {
8383
this.writer.submit("histogram.foo", 2.1);
8484
this.writer.submit("histogram.foo", 2.3);
8585
assertEquals(2, this.registry.histogram("histogram.foo").getCount());
@@ -94,7 +94,7 @@ public void setPredfinedHistogram() {
9494
* @throws Exception if an error occurs
9595
*/
9696
@Test
97-
public void testParallism() throws Exception {
97+
public void testParallelism() throws Exception {
9898
List<WriterThread> threads = new ArrayList<WriterThread>();
9999
ThreadGroup group = new ThreadGroup("threads");
100100
for (int i = 0; i < 10; i++) {
@@ -139,9 +139,9 @@ public void run() {
139139
this.writer.submit("histogram.test.service", this.index);
140140
this.writer.submit("gauge.test.service", this.index);
141141
}
142-
catch (IllegalArgumentException iae) {
142+
catch (IllegalArgumentException ex) {
143143
this.failed = true;
144-
throw iae;
144+
throw ex;
145145
}
146146
}
147147
}

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriterTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void postSuccessfullyOnFlush() {
6060
}
6161

6262
@Test
63-
public void flushAutomaticlly() {
63+
public void flushAutomatically() {
6464
given(this.restTemplate.postForEntity(anyString(), any(Object.class), anyMap()))
6565
.willReturn(emptyResponse());
6666
this.writer.setBufferSize(0);

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void nullPrefix() throws Exception {
9090
}
9191

9292
@Test
93-
public void perioPrefix() throws Exception {
93+
public void periodPrefix() throws Exception {
9494
this.writer = new StatsdMetricWriter("my.", "localhost", this.port);
9595
this.writer.set(new Metric<Long>("gauge.foo", 3L));
9696
this.server.waitForMessage();

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterServiceTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void incrementWithExistingCounter() {
4949
}
5050

5151
@Test
52-
public void incrementWithExistingNearlyCounter() {
52+
public void incrementWithExistingNearCounter() {
5353
this.service.increment("counter-foo");
5454
verify(this.repository).increment(this.captor.capture());
5555
assertEquals("counter.counter-foo", this.captor.getValue().getName());

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void testBindingIgnoredMultiValuedList() {
9292
}
9393

9494
@Test
95-
public void testDefaultPasswordAutogeneratedIfUnresolovedPlaceholder() {
95+
public void testDefaultPasswordAutogeneratedIfUnresolvedPlaceholder() {
9696
this.binder.bind(new MutablePropertyValues(
9797
Collections.singletonMap("security.user.password", "${ADMIN_PASSWORD}")));
9898
assertFalse(this.binder.getBindingResult().hasErrors());

spring-boot-cli/samples/integration.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class SpringIntegrationExample implements CommandLineRunner {
2121
* Since this is a simple application that we want to exit right away,
2222
* close the context. For an active integration application, with pollers
2323
* etc, you can either suspend the main thread here (e.g. with System.in.read()),
24-
* or exit the run() method without closing he context, and stop the
24+
* or exit the run() method without closing the context, and stop the
2525
* application later using some other technique (kill, JMX etc).
2626
*/
2727
context.close()

0 commit comments

Comments
 (0)