Merge previously split strings

Merge some string lines that were previously split because of the
90 chars wide formatting.
This commit is contained in:
Phillip Webb
2019-07-14 19:39:18 +01:00
parent c3816bfe7b
commit 01933f9b06
173 changed files with 351 additions and 370 deletions

View File

@@ -113,7 +113,7 @@ class TokenTests {
@Test
void getExpiryWhenExpIsNullShouldThrowException() {
String header = "{\"alg\": \"RS256\", \"kid\": \"key-id\", \"typ\": \"JWT\"}";
String claims = "{\"iss\": \"http://localhost:8080/uaa/oauth/token\"" + "}";
String claims = "{\"iss\": \"http://localhost:8080/uaa/oauth/token\"}";
Token token = createToken(header, claims);
assertThatExceptionOfType(CloudFoundryAuthorizationException.class).isThrownBy(token::getExpiry)
.satisfies(reasonRequirement(Reason.INVALID_TOKEN));

View File

@@ -75,13 +75,14 @@ class AuditEventsEndpointDocumentationTests extends MockMvcEndpointDocumentation
.perform(get("/actuator/auditevents")
.param("principal", "alice").param("after", queryTimestamp).param("type", "logout"))
.andExpect(status().isOk())
.andDo(document("auditevents/filtered", requestParameters(
parameterWithName("after").description(
"Restricts the events to those that occurred " + "after the given time. Optional."),
parameterWithName("principal")
.description("Restricts the events to those with the given " + "principal. Optional."),
parameterWithName("type")
.description("Restricts the events to those with the given " + "type. Optional."))));
.andDo(document("auditevents/filtered",
requestParameters(
parameterWithName("after").description(
"Restricts the events to those that occurred after the given time. Optional."),
parameterWithName("principal").description(
"Restricts the events to those with the given principal. Optional."),
parameterWithName("type")
.description("Restricts the events to those with the given type. Optional."))));
verify(this.repository).find("alice", now.toInstant(), "logout");
}

View File

@@ -57,7 +57,7 @@ class CachesEndpointDocumentationTests extends MockMvcEndpointDocumentationTests
private static final List<ParameterDescriptor> requestParameters = Collections
.singletonList(parameterWithName("cacheManager").description(
"Name of the cacheManager to qualify the cache. May be " + "omitted if the cache name is unique.")
"Name of the cacheManager to qualify the cache. May be omitted if the cache name is unique.")
.optional());
@Test
@@ -66,7 +66,7 @@ class CachesEndpointDocumentationTests extends MockMvcEndpointDocumentationTests
.andDo(MockMvcRestDocumentation.document("caches/all",
responseFields(fieldWithPath("cacheManagers").description("Cache managers keyed by id."),
fieldWithPath("cacheManagers.*.caches")
.description("Caches in the application context keyed by " + "name."))
.description("Caches in the application context keyed by name."))
.andWithPrefix("cacheManagers.*.caches.*.", fieldWithPath("target")
.description("Fully qualified name of the native cache."))));
}

View File

@@ -66,15 +66,14 @@ class ConditionsReportEndpointDocumentationTests extends MockMvcEndpointDocument
@Test
void conditions() throws Exception {
List<FieldDescriptor> positiveMatchFields = Arrays.asList(
fieldWithPath("").description("Classes and methods with conditions that were " + "matched."),
fieldWithPath("").description("Classes and methods with conditions that were matched."),
fieldWithPath(".*.[].condition").description("Name of the condition."),
fieldWithPath(".*.[].message").description("Details of why the condition was matched."));
List<FieldDescriptor> negativeMatchFields = Arrays.asList(
fieldWithPath("").description("Classes and methods with conditions that " + "were not matched."),
fieldWithPath("").description("Classes and methods with conditions that were not matched."),
fieldWithPath(".*.notMatched").description("Conditions that were matched."),
fieldWithPath(".*.notMatched.[].condition").description("Name of the condition."),
fieldWithPath(".*.notMatched.[].message")
.description("Details of why the condition was" + " not matched."),
fieldWithPath(".*.notMatched.[].message").description("Details of why the condition was not matched."),
fieldWithPath(".*.matched").description("Conditions that were matched."),
fieldWithPath(".*.matched.[].condition").description("Name of the condition.")
.type(JsonFieldType.STRING).optional(),

View File

@@ -55,7 +55,7 @@ class FlywayEndpointDocumentationTests extends MockMvcEndpointDocumentationTests
.andDo(MockMvcRestDocumentation.document("flyway",
responseFields(fieldWithPath("contexts").description("Application contexts keyed by id"),
fieldWithPath("contexts.*.flywayBeans.*.migrations").description(
"Migrations performed by the Flyway instance, keyed by" + " Flyway bean name."))
"Migrations performed by the Flyway instance, keyed by Flyway bean name."))
.andWithPrefix("contexts.*.flywayBeans.*.migrations.[].",
migrationFieldDescriptors())
.and(parentIdField())));
@@ -69,9 +69,9 @@ class FlywayEndpointDocumentationTests extends MockMvcEndpointDocumentationTests
fieldWithPath("installedBy").description("User that installed the applied migration, if any.")
.optional(),
fieldWithPath("installedOn")
.description("Timestamp of when the applied migration was installed, " + "if any.").optional(),
.description("Timestamp of when the applied migration was installed, if any.").optional(),
fieldWithPath("installedRank")
.description("Rank of the applied migration, if any. Later migrations have " + "higher ranks.")
.description("Rank of the applied migration, if any. Later migrations have higher ranks.")
.optional(),
fieldWithPath("script").description("Name of the script used to execute the migration, if any.")
.optional(),
@@ -79,8 +79,8 @@ class FlywayEndpointDocumentationTests extends MockMvcEndpointDocumentationTests
.description("State of the migration. (" + describeEnumValues(MigrationState.class) + ")"),
fieldWithPath("type")
.description("Type of the migration. (" + describeEnumValues(MigrationType.class) + ")"),
fieldWithPath("version")
.description("Version of the database after applying the migration, " + "if any.").optional());
fieldWithPath("version").description("Version of the database after applying the migration, if any.")
.optional());
}
@Configuration(proxyBeanMethods = false)

View File

@@ -59,8 +59,7 @@ class HealthEndpointDocumentationTests extends MockMvcEndpointDocumentationTests
private static final List<FieldDescriptor> componentFields = Arrays.asList(
fieldWithPath("status").description("Status of a specific part of the application"),
subsectionWithPath("details")
.description("Details of the health of a specific part of the" + " application."));
subsectionWithPath("details").description("Details of the health of a specific part of the application."));
@Test
void health() throws Exception {
@@ -71,7 +70,7 @@ class HealthEndpointDocumentationTests extends MockMvcEndpointDocumentationTests
+ "`management.endpoint.health.show-details`)."),
fieldWithPath("details.*.status").description("Status of a specific part of the application."),
subsectionWithPath("details.*.details")
.description("Details of the health of a specific part of the" + " application."))));
.description("Details of the health of a specific part of the application."))));
}
@Test

View File

@@ -48,7 +48,7 @@ class LiquibaseEndpointDocumentationTests extends MockMvcEndpointDocumentationTe
@Test
void liquibase() throws Exception {
FieldDescriptor changeSetsField = fieldWithPath("contexts.*.liquibaseBeans.*.changeSets")
.description("Change sets made by the Liquibase beans, keyed by " + "bean name.");
.description("Change sets made by the Liquibase beans, keyed by bean name.");
this.mockMvc.perform(get("/actuator/liquibase")).andExpect(status().isOk())
.andDo(MockMvcRestDocumentation.document("liquibase",
responseFields(fieldWithPath("contexts").description("Application contexts keyed by id"),

View File

@@ -85,7 +85,7 @@ class LoggersEndpointDocumentationTests extends MockMvcEndpointDocumentationTest
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isNoContent())
.andDo(MockMvcRestDocumentation.document("loggers/set", requestFields(fieldWithPath("configuredLevel")
.description("Level for the logger. May be" + " omitted to clear the level.").optional())));
.description("Level for the logger. May be omitted to clear the level.").optional())));
verify(this.loggingSystem).setLogLevel("com.example", LogLevel.DEBUG);
}

View File

@@ -100,23 +100,23 @@ class MappingsEndpointReactiveDocumentationTests extends AbstractEndpointDocumen
requestMappingConditionField(".produces.[].negated").description("Whether the media type is negated."));
List<FieldDescriptor> handlerMethod = Arrays.asList(
fieldWithPath("*.[].details.handlerMethod").optional().type(JsonFieldType.OBJECT)
.description("Details of the method, if any, " + "that will handle requests to this mapping."),
.description("Details of the method, if any, that will handle requests to this mapping."),
fieldWithPath("*.[].details.handlerMethod.className").type(JsonFieldType.STRING)
.description("Fully qualified name of the class of the method."),
fieldWithPath("*.[].details.handlerMethod.name").type(JsonFieldType.STRING)
.description("Name of the method."),
fieldWithPath("*.[].details.handlerMethod.descriptor").type(JsonFieldType.STRING)
.description("Descriptor of the method as specified in the Java " + "Language Specification."));
.description("Descriptor of the method as specified in the Java Language Specification."));
List<FieldDescriptor> handlerFunction = Arrays.asList(
fieldWithPath("*.[].details.handlerFunction").optional().type(JsonFieldType.OBJECT).description(
"Details of the function, if any, that will handle " + "requests to this mapping."),
fieldWithPath("*.[].details.handlerFunction").optional().type(JsonFieldType.OBJECT)
.description("Details of the function, if any, that will handle requests to this mapping."),
fieldWithPath("*.[].details.handlerFunction.className").type(JsonFieldType.STRING)
.description("Fully qualified name of the class of the function."));
List<FieldDescriptor> dispatcherHandlerFields = new ArrayList<>(Arrays.asList(
fieldWithPath("*").description(
"Dispatcher handler mappings, if any, keyed by " + "dispatcher handler bean name."),
fieldWithPath("*")
.description("Dispatcher handler mappings, if any, keyed by dispatcher handler bean name."),
fieldWithPath("*.[].details").optional().type(JsonFieldType.OBJECT)
.description("Additional implementation-specific " + "details about the mapping. Optional."),
.description("Additional implementation-specific details about the mapping. Optional."),
fieldWithPath("*.[].handler").description("Handler for the mapping."),
fieldWithPath("*.[].predicate").description("Predicate for the mapping.")));
dispatcherHandlerFields.addAll(requestMappingConditions);

View File

@@ -89,10 +89,10 @@ class MappingsEndpointServletDocumentationTests extends AbstractEndpointDocument
.description("Dispatcher handler mappings, if any.").optional().type(JsonFieldType.OBJECT),
parentIdField());
List<FieldDescriptor> dispatcherServletFields = new ArrayList<>(Arrays.asList(
fieldWithPath("*").description(
"Dispatcher servlet mappings, if any, keyed by " + "dispatcher servlet bean name."),
fieldWithPath("*")
.description("Dispatcher servlet mappings, if any, keyed by dispatcher servlet bean name."),
fieldWithPath("*.[].details").optional().type(JsonFieldType.OBJECT)
.description("Additional implementation-specific " + "details about the mapping. Optional."),
.description("Additional implementation-specific details about the mapping. Optional."),
fieldWithPath("*.[].handler").description("Handler for the mapping."),
fieldWithPath("*.[].predicate").description("Predicate for the mapping.")));
List<FieldDescriptor> requestMappingConditions = Arrays.asList(
@@ -117,12 +117,12 @@ class MappingsEndpointServletDocumentationTests extends AbstractEndpointDocument
requestMappingConditionField(".produces.[].negated").description("Whether the media type is negated."));
List<FieldDescriptor> handlerMethod = Arrays.asList(
fieldWithPath("*.[].details.handlerMethod").optional().type(JsonFieldType.OBJECT)
.description("Details of the method, if any, " + "that will handle requests to this mapping."),
.description("Details of the method, if any, that will handle requests to this mapping."),
fieldWithPath("*.[].details.handlerMethod.className")
.description("Fully qualified name of the class of the method."),
fieldWithPath("*.[].details.handlerMethod.name").description("Name of the method."),
fieldWithPath("*.[].details.handlerMethod.descriptor")
.description("Descriptor of the method as specified in the Java " + "Language Specification."));
.description("Descriptor of the method as specified in the Java Language Specification."));
dispatcherServletFields.addAll(handlerMethod);
dispatcherServletFields.addAll(requestMappingConditions);
this.client.get().uri("/actuator/mappings").exchange().expectBody()

View File

@@ -52,27 +52,27 @@ class ScheduledTasksEndpointDocumentationTests extends MockMvcEndpointDocumentat
@Test
void scheduledTasks() throws Exception {
this.mockMvc.perform(get("/actuator/scheduledtasks")).andExpect(status().isOk()).andDo(document(
"scheduled-tasks",
preprocessResponse(replacePattern(
Pattern.compile("org.*\\.ScheduledTasksEndpointDocumentationTests\\$" + "TestConfiguration"),
"com.example.Processor")),
responseFields(fieldWithPath("cron").description("Cron tasks, if any."),
targetFieldWithPrefix("cron.[]."),
fieldWithPath("cron.[].expression").description("Cron expression."),
fieldWithPath("fixedDelay").description("Fixed delay tasks, if any."),
targetFieldWithPrefix("fixedDelay.[]."), initialDelayWithPrefix("fixedDelay.[]."),
fieldWithPath("fixedDelay.[].interval")
.description("Interval, in milliseconds, between the end of the last"
+ " execution and the start of the next."),
fieldWithPath("fixedRate").description("Fixed rate tasks, if any."),
targetFieldWithPrefix("fixedRate.[]."),
fieldWithPath("fixedRate.[].interval")
.description("Interval, in milliseconds, between the start of each execution."),
initialDelayWithPrefix("fixedRate.[]."),
fieldWithPath("custom").description("Tasks with custom triggers, if any."),
targetFieldWithPrefix("custom.[]."),
fieldWithPath("custom.[].trigger").description("Trigger for the task."))))
this.mockMvc.perform(get("/actuator/scheduledtasks")).andExpect(status().isOk())
.andDo(document("scheduled-tasks",
preprocessResponse(replacePattern(
Pattern.compile("org.*\\.ScheduledTasksEndpointDocumentationTests\\$TestConfiguration"),
"com.example.Processor")),
responseFields(fieldWithPath("cron").description("Cron tasks, if any."),
targetFieldWithPrefix("cron.[]."),
fieldWithPath("cron.[].expression").description("Cron expression."),
fieldWithPath("fixedDelay").description("Fixed delay tasks, if any."),
targetFieldWithPrefix("fixedDelay.[]."), initialDelayWithPrefix("fixedDelay.[]."),
fieldWithPath("fixedDelay.[].interval")
.description("Interval, in milliseconds, between the end of the last"
+ " execution and the start of the next."),
fieldWithPath("fixedRate").description("Fixed rate tasks, if any."),
targetFieldWithPrefix("fixedRate.[]."),
fieldWithPath("fixedRate.[].interval")
.description("Interval, in milliseconds, between the start of each execution."),
initialDelayWithPrefix("fixedRate.[]."),
fieldWithPath("custom").description("Tasks with custom triggers, if any."),
targetFieldWithPrefix("custom.[]."),
fieldWithPath("custom.[].trigger").description("Trigger for the task."))))
.andDo(MockMvcResultHandlers.print());
}

View File

@@ -70,8 +70,8 @@ class SessionsEndpointDocumentationTests extends MockMvcEndpointDocumentationTes
fieldWithPath("attributeNames").description("Names of the attributes stored in the session."),
fieldWithPath("creationTime").description("Timestamp of when the session was created."),
fieldWithPath("lastAccessedTime").description("Timestamp of when the session was last accessed."),
fieldWithPath("maxInactiveInterval").description(
"Maximum permitted period of inactivity, in seconds, " + "before the session will expire."),
fieldWithPath("maxInactiveInterval")
.description("Maximum permitted period of inactivity, in seconds, before the session will expire."),
fieldWithPath("expired").description("Whether the session has expired."));
@MockBean

View File

@@ -69,14 +69,14 @@ class ThreadDumpEndpointDocumentationTests extends MockMvcEndpointDocumentationT
.document("threaddump/json", preprocessResponse(limit("threads")),
responseFields(fieldWithPath("threads").description("JVM's threads."),
fieldWithPath("threads.[].blockedCount").description(
"Total number of times that the thread has been " + "blocked."),
"Total number of times that the thread has been blocked."),
fieldWithPath("threads.[].blockedTime").description(
"Time in milliseconds that the thread has spent "
+ "blocked. -1 if thread contention "
+ "monitoring is disabled."),
fieldWithPath("threads.[].daemon")
.description("Whether the thread is a daemon "
+ "thread. Only available on Java 9 or " + "later.")
+ "thread. Only available on Java 9 or later.")
.optional().type(JsonFieldType.BOOLEAN),
fieldWithPath("threads.[].inNative")
.description("Whether the thread is executing native code."),
@@ -85,12 +85,10 @@ class ThreadDumpEndpointDocumentationTests extends MockMvcEndpointDocumentationT
+ "thread is blocked, if any.")
.optional().type(JsonFieldType.STRING),
fieldWithPath("threads.[].lockInfo")
.description(
"Object for which the thread is blocked " + "waiting.")
.description("Object for which the thread is blocked waiting.")
.optional().type(JsonFieldType.OBJECT),
fieldWithPath("threads.[].lockInfo.className")
.description(
"Fully qualified class name of the lock" + " object.")
.description("Fully qualified class name of the lock object.")
.optional().type(JsonFieldType.STRING),
fieldWithPath("threads.[].lockInfo.identityHashCode")
.description("Identity hash code of the lock object.")
@@ -101,22 +99,21 @@ class ThreadDumpEndpointDocumentationTests extends MockMvcEndpointDocumentationT
.description("Class name of the lock object.").optional()
.type(JsonFieldType.STRING),
fieldWithPath("threads.[].lockedMonitors.[].identityHashCode")
.description("Identity hash code of the lock " + "object.")
.description("Identity hash code of the lock object.")
.optional().type(JsonFieldType.NUMBER),
fieldWithPath("threads.[].lockedMonitors.[].lockedStackDepth")
.description("Stack depth where the monitor " + "was locked.")
.description("Stack depth where the monitor was locked.")
.optional().type(JsonFieldType.NUMBER),
subsectionWithPath("threads.[].lockedMonitors.[].lockedStackFrame")
.description("Stack frame that locked the " + "monitor.")
.optional().type(JsonFieldType.OBJECT),
.description("Stack frame that locked the monitor.").optional()
.type(JsonFieldType.OBJECT),
fieldWithPath("threads.[].lockedSynchronizers")
.description("Synchronizers locked by this thread."),
fieldWithPath("threads.[].lockedSynchronizers.[].className")
.description("Class name of the locked " + "synchronizer.")
.description("Class name of the locked synchronizer.")
.optional().type(JsonFieldType.STRING),
fieldWithPath("threads.[].lockedSynchronizers.[].identityHashCode")
.description(
"Identity hash code of the locked " + "synchronizer.")
.description("Identity hash code of the locked synchronizer.")
.optional().type(JsonFieldType.NUMBER),
fieldWithPath("threads.[].lockOwnerId")
.description("ID of the thread that owns the object on which "
@@ -124,7 +121,7 @@ class ThreadDumpEndpointDocumentationTests extends MockMvcEndpointDocumentationT
+ "thread is not blocked."),
fieldWithPath("threads.[].lockOwnerName")
.description("Name of the thread that owns the "
+ "object on which the thread is " + "blocked, if any.")
+ "object on which the thread is blocked, if any.")
.optional().type(JsonFieldType.STRING),
fieldWithPath("threads.[].priority")
.description("Priority of the thread. Only "
@@ -136,11 +133,11 @@ class ThreadDumpEndpointDocumentationTests extends MockMvcEndpointDocumentationT
.description("Name of the class loader of the "
+ "class that contains the execution "
+ "point identified by this entry, if "
+ "any. Only available on Java 9 or " + "later.")
+ "any. Only available on Java 9 or later.")
.optional().type(JsonFieldType.STRING),
fieldWithPath("threads.[].stackTrace.[].className")
.description("Name of the class that contains the "
+ "execution point identified " + "by this entry."),
+ "execution point identified by this entry."),
fieldWithPath("threads.[].stackTrace.[].fileName")
.description("Name of the source file that "
+ "contains the execution point "
@@ -164,8 +161,8 @@ class ThreadDumpEndpointDocumentationTests extends MockMvcEndpointDocumentationT
+ "identified by this entry, if any. "
+ "Only available on Java 9 or later.")
.optional().type(JsonFieldType.STRING),
fieldWithPath("threads.[].stackTrace.[].nativeMethod").description(
"Whether the execution point is a native " + "method."),
fieldWithPath("threads.[].stackTrace.[].nativeMethod")
.description("Whether the execution point is a native method."),
fieldWithPath("threads.[].suspended")
.description("Whether the thread is suspended."),
fieldWithPath("threads.[].threadId").description("ID of the thread."),

View File

@@ -177,7 +177,7 @@ class WebMvcEndpointExposureIntegrationTests {
return false;
}
throw new IllegalStateException(
String.format("Unexpected %s HTTP status for " + "endpoint %s", result.getStatus(), path));
String.format("Unexpected %s HTTP status for endpoint %s", result.getStatus(), path));
}
@RestControllerEndpoint(id = "custommvc")

View File

@@ -91,7 +91,7 @@ class LiquibaseEndpointAutoConfigurationTests {
public void setCloseDataSourceOnceMigrated(boolean closeDataSourceOnceMigrated) {
if (this.propertiesSet) {
throw new IllegalStateException(
"setCloseDataSourceOnceMigrated " + "invoked after afterPropertiesSet");
"setCloseDataSourceOnceMigrated invoked after afterPropertiesSet");
}
super.setCloseDataSourceOnceMigrated(closeDataSourceOnceMigrated);
}

View File

@@ -89,8 +89,7 @@ class RestTemplateMetricsConfigurationTests {
this.contextRunner.withPropertyValues("management.metrics.web.client.max-uri-tags=5").run((context) -> {
MeterRegistry registry = getInitializedMeterRegistry(context);
assertThat(registry.get("http.client.requests").meters()).hasSize(3);
assertThat(output)
.doesNotContain("Reached the maximum number of URI tags for 'http.client.requests'.")
assertThat(output).doesNotContain("Reached the maximum number of URI tags for 'http.client.requests'.")
.doesNotContain("Are you using 'uriVariables'?");
});
}

View File

@@ -88,8 +88,7 @@ class WebClientMetricsConfigurationTests {
this.contextRunner.withPropertyValues("management.metrics.web.client.max-uri-tags=5").run((context) -> {
MeterRegistry registry = getInitializedMeterRegistry(context);
assertThat(registry.get("http.client.requests").meters()).hasSize(3);
assertThat(output)
.doesNotContain("Reached the maximum number of URI tags for 'http.client.requests'.")
assertThat(output).doesNotContain("Reached the maximum number of URI tags for 'http.client.requests'.")
.doesNotContain("Are you using 'uriVariables'?");
});
}

View File

@@ -122,7 +122,7 @@ class WebMvcMetricsAutoConfigurationTests {
MeterRegistry registry = getInitializedMeterRegistry(context);
assertThat(registry.get("http.server.requests").meters()).hasSize(3);
assertThat(output)
.doesNotContain("Reached the maximum number of URI tags " + "for 'http.server.requests'");
.doesNotContain("Reached the maximum number of URI tags for 'http.server.requests'");
});
}