Skip to content

Commit 01933f9

Browse files
philwebbphilwebb
committed
Merge previously split strings
Merge some string lines that were previously split because of the 90 chars wide formatting.
1 parent c3816bf commit 01933f9

File tree

173 files changed

+351
-370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+351
-370
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/HttpClientMetricsAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public class HttpClientMetricsAutoConfiguration {
5454
@Order(0)
5555
public MeterFilter metricsHttpClientUriTagFilter(MetricsProperties properties) {
5656
String metricName = properties.getWeb().getClient().getRequest().getMetricName();
57-
MeterFilter denyFilter = new OnlyOnceLoggingDenyMeterFilter(() -> String.format(
58-
"Reached the maximum number of URI tags for '%s'. Are you using " + "'uriVariables'?", metricName));
57+
MeterFilter denyFilter = new OnlyOnceLoggingDenyMeterFilter(() -> String
58+
.format("Reached the maximum number of URI tags for '%s'. Are you using 'uriVariables'?", metricName));
5959
return MeterFilter.maximumAllowableTags(metricName, "uri", properties.getWeb().getClient().getMaxUriTags(),
6060
denyFilter);
6161
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private Class<?> determineReactiveWebServerFactoryClass(ApplicationContext paren
7070
Class<?> factoryClass = parent.getBean(ReactiveWebServerFactory.class).getClass();
7171
if (cannotBeInstantiated(factoryClass)) {
7272
throw new FatalBeanException("ReactiveWebServerFactory implementation " + factoryClass.getName()
73-
+ " cannot be instantiated. " + "To allow a separate management port to be used, a top-level class "
73+
+ " cannot be instantiated. To allow a separate management port to be used, a top-level class "
7474
+ "or static inner class should be used instead");
7575
}
7676
return factoryClass;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementContextFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private Class<?> determineServletWebServerFactoryClass(ApplicationContext parent
7373
Class<?> factoryClass = parent.getBean(ServletWebServerFactory.class).getClass();
7474
if (cannotBeInstantiated(factoryClass)) {
7575
throw new FatalBeanException("ServletWebServerFactory implementation " + factoryClass.getName()
76-
+ " cannot be instantiated. " + "To allow a separate management port to be used, a top-level class "
76+
+ " cannot be instantiated. To allow a separate management port to be used, a top-level class "
7777
+ "or static inner class should be used instead");
7878
}
7979
return factoryClass;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/TokenTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ void getKidWhenKidIsNullShouldThrowException() {
113113
@Test
114114
void getExpiryWhenExpIsNullShouldThrowException() {
115115
String header = "{\"alg\": \"RS256\", \"kid\": \"key-id\", \"typ\": \"JWT\"}";
116-
String claims = "{\"iss\": \"http://localhost:8080/uaa/oauth/token\"" + "}";
116+
String claims = "{\"iss\": \"http://localhost:8080/uaa/oauth/token\"}";
117117
Token token = createToken(header, claims);
118118
assertThatExceptionOfType(CloudFoundryAuthorizationException.class).isThrownBy(token::getExpiry)
119119
.satisfies(reasonRequirement(Reason.INVALID_TOKEN));

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AuditEventsEndpointDocumentationTests.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,14 @@ void filteredAuditEvents() throws Exception {
7575
.perform(get("/actuator/auditevents")
7676
.param("principal", "alice").param("after", queryTimestamp).param("type", "logout"))
7777
.andExpect(status().isOk())
78-
.andDo(document("auditevents/filtered", requestParameters(
79-
parameterWithName("after").description(
80-
"Restricts the events to those that occurred " + "after the given time. Optional."),
81-
parameterWithName("principal")
82-
.description("Restricts the events to those with the given " + "principal. Optional."),
83-
parameterWithName("type")
84-
.description("Restricts the events to those with the given " + "type. Optional."))));
78+
.andDo(document("auditevents/filtered",
79+
requestParameters(
80+
parameterWithName("after").description(
81+
"Restricts the events to those that occurred after the given time. Optional."),
82+
parameterWithName("principal").description(
83+
"Restricts the events to those with the given principal. Optional."),
84+
parameterWithName("type")
85+
.description("Restricts the events to those with the given type. Optional."))));
8586
verify(this.repository).find("alice", now.toInstant(), "logout");
8687
}
8788

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/CachesEndpointDocumentationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class CachesEndpointDocumentationTests extends MockMvcEndpointDocumentationTests
5757

5858
private static final List<ParameterDescriptor> requestParameters = Collections
5959
.singletonList(parameterWithName("cacheManager").description(
60-
"Name of the cacheManager to qualify the cache. May be " + "omitted if the cache name is unique.")
60+
"Name of the cacheManager to qualify the cache. May be omitted if the cache name is unique.")
6161
.optional());
6262

6363
@Test
@@ -66,7 +66,7 @@ void allCaches() throws Exception {
6666
.andDo(MockMvcRestDocumentation.document("caches/all",
6767
responseFields(fieldWithPath("cacheManagers").description("Cache managers keyed by id."),
6868
fieldWithPath("cacheManagers.*.caches")
69-
.description("Caches in the application context keyed by " + "name."))
69+
.description("Caches in the application context keyed by name."))
7070
.andWithPrefix("cacheManagers.*.caches.*.", fieldWithPath("target")
7171
.description("Fully qualified name of the native cache."))));
7272
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConditionsReportEndpointDocumentationTests.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,14 @@ void setup(RestDocumentationContextProvider restDocumentation) {
6666
@Test
6767
void conditions() throws Exception {
6868
List<FieldDescriptor> positiveMatchFields = Arrays.asList(
69-
fieldWithPath("").description("Classes and methods with conditions that were " + "matched."),
69+
fieldWithPath("").description("Classes and methods with conditions that were matched."),
7070
fieldWithPath(".*.[].condition").description("Name of the condition."),
7171
fieldWithPath(".*.[].message").description("Details of why the condition was matched."));
7272
List<FieldDescriptor> negativeMatchFields = Arrays.asList(
73-
fieldWithPath("").description("Classes and methods with conditions that " + "were not matched."),
73+
fieldWithPath("").description("Classes and methods with conditions that were not matched."),
7474
fieldWithPath(".*.notMatched").description("Conditions that were matched."),
7575
fieldWithPath(".*.notMatched.[].condition").description("Name of the condition."),
76-
fieldWithPath(".*.notMatched.[].message")
77-
.description("Details of why the condition was" + " not matched."),
76+
fieldWithPath(".*.notMatched.[].message").description("Details of why the condition was not matched."),
7877
fieldWithPath(".*.matched").description("Conditions that were matched."),
7978
fieldWithPath(".*.matched.[].condition").description("Name of the condition.")
8079
.type(JsonFieldType.STRING).optional(),

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/FlywayEndpointDocumentationTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void flyway() throws Exception {
5555
.andDo(MockMvcRestDocumentation.document("flyway",
5656
responseFields(fieldWithPath("contexts").description("Application contexts keyed by id"),
5757
fieldWithPath("contexts.*.flywayBeans.*.migrations").description(
58-
"Migrations performed by the Flyway instance, keyed by" + " Flyway bean name."))
58+
"Migrations performed by the Flyway instance, keyed by Flyway bean name."))
5959
.andWithPrefix("contexts.*.flywayBeans.*.migrations.[].",
6060
migrationFieldDescriptors())
6161
.and(parentIdField())));
@@ -69,18 +69,18 @@ private List<FieldDescriptor> migrationFieldDescriptors() {
6969
fieldWithPath("installedBy").description("User that installed the applied migration, if any.")
7070
.optional(),
7171
fieldWithPath("installedOn")
72-
.description("Timestamp of when the applied migration was installed, " + "if any.").optional(),
72+
.description("Timestamp of when the applied migration was installed, if any.").optional(),
7373
fieldWithPath("installedRank")
74-
.description("Rank of the applied migration, if any. Later migrations have " + "higher ranks.")
74+
.description("Rank of the applied migration, if any. Later migrations have higher ranks.")
7575
.optional(),
7676
fieldWithPath("script").description("Name of the script used to execute the migration, if any.")
7777
.optional(),
7878
fieldWithPath("state")
7979
.description("State of the migration. (" + describeEnumValues(MigrationState.class) + ")"),
8080
fieldWithPath("type")
8181
.description("Type of the migration. (" + describeEnumValues(MigrationType.class) + ")"),
82-
fieldWithPath("version")
83-
.description("Version of the database after applying the migration, " + "if any.").optional());
82+
fieldWithPath("version").description("Version of the database after applying the migration, if any.")
83+
.optional());
8484
}
8585

8686
@Configuration(proxyBeanMethods = false)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ class HealthEndpointDocumentationTests extends MockMvcEndpointDocumentationTests
5959

6060
private static final List<FieldDescriptor> componentFields = Arrays.asList(
6161
fieldWithPath("status").description("Status of a specific part of the application"),
62-
subsectionWithPath("details")
63-
.description("Details of the health of a specific part of the" + " application."));
62+
subsectionWithPath("details").description("Details of the health of a specific part of the application."));
6463

6564
@Test
6665
void health() throws Exception {
@@ -71,7 +70,7 @@ void health() throws Exception {
7170
+ "`management.endpoint.health.show-details`)."),
7271
fieldWithPath("details.*.status").description("Status of a specific part of the application."),
7372
subsectionWithPath("details.*.details")
74-
.description("Details of the health of a specific part of the" + " application."))));
73+
.description("Details of the health of a specific part of the application."))));
7574
}
7675

7776
@Test

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LiquibaseEndpointDocumentationTests.java

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

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LoggersEndpointDocumentationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void setLogLevel() throws Exception {
8585
.contentType(MediaType.APPLICATION_JSON))
8686
.andExpect(status().isNoContent())
8787
.andDo(MockMvcRestDocumentation.document("loggers/set", requestFields(fieldWithPath("configuredLevel")
88-
.description("Level for the logger. May be" + " omitted to clear the level.").optional())));
88+
.description("Level for the logger. May be omitted to clear the level.").optional())));
8989
verify(this.loggingSystem).setLogLevel("com.example", LogLevel.DEBUG);
9090
}
9191

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -100,23 +100,23 @@ void mappings() throws Exception {
100100
requestMappingConditionField(".produces.[].negated").description("Whether the media type is negated."));
101101
List<FieldDescriptor> handlerMethod = Arrays.asList(
102102
fieldWithPath("*.[].details.handlerMethod").optional().type(JsonFieldType.OBJECT)
103-
.description("Details of the method, if any, " + "that will handle requests to this mapping."),
103+
.description("Details of the method, if any, that will handle requests to this mapping."),
104104
fieldWithPath("*.[].details.handlerMethod.className").type(JsonFieldType.STRING)
105105
.description("Fully qualified name of the class of the method."),
106106
fieldWithPath("*.[].details.handlerMethod.name").type(JsonFieldType.STRING)
107107
.description("Name of the method."),
108108
fieldWithPath("*.[].details.handlerMethod.descriptor").type(JsonFieldType.STRING)
109-
.description("Descriptor of the method as specified in the Java " + "Language Specification."));
109+
.description("Descriptor of the method as specified in the Java Language Specification."));
110110
List<FieldDescriptor> handlerFunction = Arrays.asList(
111-
fieldWithPath("*.[].details.handlerFunction").optional().type(JsonFieldType.OBJECT).description(
112-
"Details of the function, if any, that will handle " + "requests to this mapping."),
111+
fieldWithPath("*.[].details.handlerFunction").optional().type(JsonFieldType.OBJECT)
112+
.description("Details of the function, if any, that will handle requests to this mapping."),
113113
fieldWithPath("*.[].details.handlerFunction.className").type(JsonFieldType.STRING)
114114
.description("Fully qualified name of the class of the function."));
115115
List<FieldDescriptor> dispatcherHandlerFields = new ArrayList<>(Arrays.asList(
116-
fieldWithPath("*").description(
117-
"Dispatcher handler mappings, if any, keyed by " + "dispatcher handler bean name."),
116+
fieldWithPath("*")
117+
.description("Dispatcher handler mappings, if any, keyed by dispatcher handler bean name."),
118118
fieldWithPath("*.[].details").optional().type(JsonFieldType.OBJECT)
119-
.description("Additional implementation-specific " + "details about the mapping. Optional."),
119+
.description("Additional implementation-specific details about the mapping. Optional."),
120120
fieldWithPath("*.[].handler").description("Handler for the mapping."),
121121
fieldWithPath("*.[].predicate").description("Predicate for the mapping.")));
122122
dispatcherHandlerFields.addAll(requestMappingConditions);

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ void mappings() throws Exception {
8989
.description("Dispatcher handler mappings, if any.").optional().type(JsonFieldType.OBJECT),
9090
parentIdField());
9191
List<FieldDescriptor> dispatcherServletFields = new ArrayList<>(Arrays.asList(
92-
fieldWithPath("*").description(
93-
"Dispatcher servlet mappings, if any, keyed by " + "dispatcher servlet bean name."),
92+
fieldWithPath("*")
93+
.description("Dispatcher servlet mappings, if any, keyed by dispatcher servlet bean name."),
9494
fieldWithPath("*.[].details").optional().type(JsonFieldType.OBJECT)
95-
.description("Additional implementation-specific " + "details about the mapping. Optional."),
95+
.description("Additional implementation-specific details about the mapping. Optional."),
9696
fieldWithPath("*.[].handler").description("Handler for the mapping."),
9797
fieldWithPath("*.[].predicate").description("Predicate for the mapping.")));
9898
List<FieldDescriptor> requestMappingConditions = Arrays.asList(
@@ -117,12 +117,12 @@ void mappings() throws Exception {
117117
requestMappingConditionField(".produces.[].negated").description("Whether the media type is negated."));
118118
List<FieldDescriptor> handlerMethod = Arrays.asList(
119119
fieldWithPath("*.[].details.handlerMethod").optional().type(JsonFieldType.OBJECT)
120-
.description("Details of the method, if any, " + "that will handle requests to this mapping."),
120+
.description("Details of the method, if any, that will handle requests to this mapping."),
121121
fieldWithPath("*.[].details.handlerMethod.className")
122122
.description("Fully qualified name of the class of the method."),
123123
fieldWithPath("*.[].details.handlerMethod.name").description("Name of the method."),
124124
fieldWithPath("*.[].details.handlerMethod.descriptor")
125-
.description("Descriptor of the method as specified in the Java " + "Language Specification."));
125+
.description("Descriptor of the method as specified in the Java Language Specification."));
126126
dispatcherServletFields.addAll(handlerMethod);
127127
dispatcherServletFields.addAll(requestMappingConditions);
128128
this.client.get().uri("/actuator/mappings").exchange().expectBody()

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ScheduledTasksEndpointDocumentationTests.java

+21-21
Original file line numberDiff line numberDiff line change
@@ -52,27 +52,27 @@ class ScheduledTasksEndpointDocumentationTests extends MockMvcEndpointDocumentat
5252

5353
@Test
5454
void scheduledTasks() throws Exception {
55-
this.mockMvc.perform(get("/actuator/scheduledtasks")).andExpect(status().isOk()).andDo(document(
56-
"scheduled-tasks",
57-
preprocessResponse(replacePattern(
58-
Pattern.compile("org.*\\.ScheduledTasksEndpointDocumentationTests\\$" + "TestConfiguration"),
59-
"com.example.Processor")),
60-
responseFields(fieldWithPath("cron").description("Cron tasks, if any."),
61-
targetFieldWithPrefix("cron.[]."),
62-
fieldWithPath("cron.[].expression").description("Cron expression."),
63-
fieldWithPath("fixedDelay").description("Fixed delay tasks, if any."),
64-
targetFieldWithPrefix("fixedDelay.[]."), initialDelayWithPrefix("fixedDelay.[]."),
65-
fieldWithPath("fixedDelay.[].interval")
66-
.description("Interval, in milliseconds, between the end of the last"
67-
+ " execution and the start of the next."),
68-
fieldWithPath("fixedRate").description("Fixed rate tasks, if any."),
69-
targetFieldWithPrefix("fixedRate.[]."),
70-
fieldWithPath("fixedRate.[].interval")
71-
.description("Interval, in milliseconds, between the start of each execution."),
72-
initialDelayWithPrefix("fixedRate.[]."),
73-
fieldWithPath("custom").description("Tasks with custom triggers, if any."),
74-
targetFieldWithPrefix("custom.[]."),
75-
fieldWithPath("custom.[].trigger").description("Trigger for the task."))))
55+
this.mockMvc.perform(get("/actuator/scheduledtasks")).andExpect(status().isOk())
56+
.andDo(document("scheduled-tasks",
57+
preprocessResponse(replacePattern(
58+
Pattern.compile("org.*\\.ScheduledTasksEndpointDocumentationTests\\$TestConfiguration"),
59+
"com.example.Processor")),
60+
responseFields(fieldWithPath("cron").description("Cron tasks, if any."),
61+
targetFieldWithPrefix("cron.[]."),
62+
fieldWithPath("cron.[].expression").description("Cron expression."),
63+
fieldWithPath("fixedDelay").description("Fixed delay tasks, if any."),
64+
targetFieldWithPrefix("fixedDelay.[]."), initialDelayWithPrefix("fixedDelay.[]."),
65+
fieldWithPath("fixedDelay.[].interval")
66+
.description("Interval, in milliseconds, between the end of the last"
67+
+ " execution and the start of the next."),
68+
fieldWithPath("fixedRate").description("Fixed rate tasks, if any."),
69+
targetFieldWithPrefix("fixedRate.[]."),
70+
fieldWithPath("fixedRate.[].interval")
71+
.description("Interval, in milliseconds, between the start of each execution."),
72+
initialDelayWithPrefix("fixedRate.[]."),
73+
fieldWithPath("custom").description("Tasks with custom triggers, if any."),
74+
targetFieldWithPrefix("custom.[]."),
75+
fieldWithPath("custom.[].trigger").description("Trigger for the task."))))
7676
.andDo(MockMvcResultHandlers.print());
7777
}
7878

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ class SessionsEndpointDocumentationTests extends MockMvcEndpointDocumentationTes
7070
fieldWithPath("attributeNames").description("Names of the attributes stored in the session."),
7171
fieldWithPath("creationTime").description("Timestamp of when the session was created."),
7272
fieldWithPath("lastAccessedTime").description("Timestamp of when the session was last accessed."),
73-
fieldWithPath("maxInactiveInterval").description(
74-
"Maximum permitted period of inactivity, in seconds, " + "before the session will expire."),
73+
fieldWithPath("maxInactiveInterval")
74+
.description("Maximum permitted period of inactivity, in seconds, before the session will expire."),
7575
fieldWithPath("expired").description("Whether the session has expired."));
7676

7777
@MockBean

0 commit comments

Comments
 (0)