Browse Source

Polish

Closes gh-7552
pull/7655/head
Johnny Lim 9 years ago committed by Stephane Nicoll
parent
commit
6d1b752ffe
  1. 10
      spring-boot-actuator-docs/src/main/asciidoc/loggers.adoc
  2. 2
      spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java
  3. 4
      spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/DevToolsIntegrationTests.java
  4. 2
      spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/JvmLauncher.java
  5. 2
      spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryCallback.java
  6. 2
      spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java

10
spring-boot-actuator-docs/src/main/asciidoc/loggers.adoc

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
This endpoint allows you to view and modify the log levels for the loggers in your
application. It builds on top of the `LoggingSystem` abstraction and supports the same
logging frameworks. The logging levels are defined by the `LogLevel` enumeration and
consists of the following values (although not all logging systems support the full set):
consist of the following values (although not all logging systems support the full set):
* `TRACE`
* `DEBUG`
@ -25,7 +25,7 @@ configuration defined. @@ -25,7 +25,7 @@ configuration defined.
Example curl request:
include::{generated}/loggers/curl-request.adoc[]
Example HTTP request: [small]##link:../health[icon:external-link[role="silver"]]##
Example HTTP request: [small]##link:../loggers[icon:external-link[role="silver"]]##
include::{generated}/loggers/http-request.adoc[]
Example HTTP response:
@ -37,7 +37,7 @@ include::{generated}/loggers/http-response.adoc[] @@ -37,7 +37,7 @@ include::{generated}/loggers/http-response.adoc[]
Example curl request:
include::{generated}/single-logger/curl-request.adoc[]
Example HTTP request: [small]##link:../health[icon:external-link[role="silver"]]##
Example HTTP request: [small]##link:../loggers[icon:external-link[role="silver"]]##
include::{generated}/single-logger/http-request.adoc[]
Example HTTP response:
@ -49,12 +49,12 @@ include::{generated}/single-logger/http-response.adoc[] @@ -49,12 +49,12 @@ include::{generated}/single-logger/http-response.adoc[]
Setting the `configuredLevel` of a logger requires `POSTing` a partial payload to the
resource. The `configuredLevel` property must contain a string representation of the
enumeration described above. `null` indicates that the log level should be unset,
allowing it to inherit configuration from it's parent.
allowing it to inherit configuration from its parent.
Example curl request:
include::{generated}/set-logger/curl-request.adoc[]
Example HTTP request: [small]##link:../health[icon:external-link[role="silver"]]##
Example HTTP request: [small]##link:../loggers[icon:external-link[role="silver"]]##
include::{generated}/set-logger/http-request.adoc[]
Example HTTP response:

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

@ -145,7 +145,7 @@ public class MetricFilterAutoConfigurationTests { @@ -145,7 +145,7 @@ public class MetricFilterAutoConfigurationTests {
}
@Test
public void recordsHttpInteractionsWithWilcardMapping() throws Exception {
public void recordsHttpInteractionsWithWildcardMapping() throws Exception {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
Config.class, MetricFilterAutoConfiguration.class);
Filter filter = context.getBean(Filter.class);

4
spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/DevToolsIntegrationTests.java

@ -85,7 +85,7 @@ public class DevToolsIntegrationTests { @@ -85,7 +85,7 @@ public class DevToolsIntegrationTests {
@Test
public void addARequestMappingToAnExistingController() throws Exception {
TestRestTemplate template = new TestRestTemplate();
String urlBase = "http://localhost:" + awaitServerPort() + "/";
String urlBase = "http://localhost:" + awaitServerPort();
assertThat(template.getForObject(urlBase + "/one", String.class))
.isEqualTo("one");
assertThat(template.getForEntity(urlBase + "/two", String.class).getStatusCode())
@ -111,7 +111,7 @@ public class DevToolsIntegrationTests { @@ -111,7 +111,7 @@ public class DevToolsIntegrationTests {
@Test
public void createAController() throws Exception {
TestRestTemplate template = new TestRestTemplate();
String urlBase = "http://localhost:" + awaitServerPort() + "/";
String urlBase = "http://localhost:" + awaitServerPort();
assertThat(template.getForObject(urlBase + "/one", String.class))
.isEqualTo("one");
assertThat(template.getForEntity(urlBase + "/two", String.class).getStatusCode())

2
spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/JvmLauncher.java

@ -38,7 +38,7 @@ class JvmLauncher implements TestRule { @@ -38,7 +38,7 @@ class JvmLauncher implements TestRule {
@Override
public Statement apply(Statement base, Description description) {
this.outputDirectory = new File("target/output/" + "/"
this.outputDirectory = new File("target/output/"
+ description.getMethodName().replaceAll("[^A-Za-z]+", ""));
this.outputDirectory.mkdirs();
return base;

2
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryCallback.java

@ -27,7 +27,7 @@ import java.io.IOException; @@ -27,7 +27,7 @@ import java.io.IOException;
public interface LibraryCallback {
/**
* Callback to for a single library backed by a {@link File}.
* Callback for a single library backed by a {@link File}.
* @param library the library
* @throws IOException if the operation fails
*/

2
spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java

@ -48,7 +48,7 @@ public abstract class LoggingSystem { @@ -48,7 +48,7 @@ public abstract class LoggingSystem {
public static final String NONE = "none";
/**
* The name used to for the root logger. LoggingSystem implementations should ensure
* The name used for the root logger. LoggingSystem implementations should ensure
* that this is the name used to represent the root logger, regardless of the
* underlying implementation.
*/

Loading…
Cancel
Save