Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge previously split strings

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/NonUniqueCacheException.java vendored
View File

@@ -32,7 +32,7 @@ public class NonUniqueCacheException extends RuntimeException {
private final Collection<String> cacheManagerNames;
public NonUniqueCacheException(String cacheName, Collection<String> cacheManagerNames) {
super(String.format("Multiple caches named %s found, specify the 'cacheManager' " + "to use: %s", cacheName,
super(String.format("Multiple caches named %s found, specify the 'cacheManager' to use: %s", cacheName,
cacheManagerNames));
this.cacheName = cacheName;
this.cacheManagerNames = Collections.unmodifiableCollection(cacheManagerNames);

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java
View File

@@ -326,7 +326,7 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext
catch (Exception ex) {
if (logger.isDebugEnabled()) {
logger.debug("Skipping '" + writer.getFullName() + "' on '" + pojo.getClass().getName()
+ "' as an exception " + "was thrown when retrieving its value", ex);
+ "' as an exception was thrown when retrieving its value", ex);
}
return;
}

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/MissingParametersException.java
View File

@@ -35,7 +35,7 @@ public final class MissingParametersException extends InvalidEndpointRequestExce
private final Set<OperationParameter> missingParameters;
public MissingParametersException(Set<OperationParameter> missingParameters) {
super("Failed to invoke operation because the following required " + "parameters were missing: "
super("Failed to invoke operation because the following required parameters were missing: "
+ StringUtils.collectionToCommaDelimitedString(missingParameters),
"Missing parameters: "
+ missingParameters.stream().map(OperationParameter::getName).collect(Collectors.joining(",")));

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/JmxEndpointExporter.java
View File

@@ -113,7 +113,7 @@ public class JmxEndpointExporter implements InitializingBean, DisposableBean, Be
private void unregister(ObjectName objectName) {
try {
if (logger.isDebugEnabled()) {
logger.debug("Unregister endpoint with ObjectName '" + objectName + "' " + "from the JMX domain");
logger.debug("Unregister endpoint with ObjectName '" + objectName + "' from the JMX domain");
}
this.mBeanServer.unregisterMBean(objectName);
}

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java
View File

@@ -272,7 +272,7 @@ public class MetricsEndpoint {
@Override
public String toString() {
return "MeasurementSample{" + "statistic=" + this.statistic + ", value=" + this.value + '}';
return "MeasurementSample{statistic=" + this.statistic + ", value=" + this.value + '}';
}
}

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/DiskSpaceHealthIndicator.java
View File

@@ -62,7 +62,7 @@ public class DiskSpaceHealthIndicator extends AbstractHealthIndicator {
builder.up();
}
else {
logger.warn(String.format("Free disk space below threshold. " + "Available: %d bytes (threshold: %s)",
logger.warn(String.format("Free disk space below threshold. Available: %d bytes (threshold: %s)",
diskFreeInBytes, this.threshold));
builder.down();
}

2
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchJestHealthIndicatorTests.java
View File

@@ -129,7 +129,7 @@ class ElasticsearchJestHealthIndicatorTests {
status);
}
else {
json = "{\n" + " \"error\": \"Server Error\",\n" + " \"status\": \"" + status + "\"\n" + "}";
json = "{\n \"error\": \"Server Error\",\n \"status\": \"" + status + "\"\n}";
}
searchResult.setJsonString(json);
searchResult.setJsonObject(new JsonParser().parse(json).getAsJsonObject());

2
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchRestHealthIndicatorTest.java
View File

@@ -137,7 +137,7 @@ class ElasticsearchRestHealthIndicatorTest {
+ "\"task_max_waiting_in_queue_millis\":0,\"active_shards_percent_as_number\":100.0}",
status);
}
return "{\n" + " \"error\": \"Server Error\",\n" + " \"status\": " + responseCode + "\n" + "}";
return "{\n \"error\": \"Server Error\",\n \"status\": " + responseCode + "\n}";
}
}

2
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscovererTests.java
View File

@@ -78,7 +78,7 @@ class WebEndpointDiscovererTests {
load(TestWebEndpointExtensionConfiguration.class,
(discoverer) -> assertThatIllegalStateException().isThrownBy(discoverer::getEndpoints)
.withMessageContaining(
"Invalid extension 'endpointExtension': no endpoint found with id '" + "test'"));
"Invalid extension 'endpointExtension': no endpoint found with id 'test'"));
}
@Test

2
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/CompositeHealthIndicatorTests.java
View File

@@ -82,7 +82,7 @@ class CompositeHealthIndicatorTests {
assertThat(mapper.writeValueAsString(result))
.isEqualTo("{\"status\":\"UNKNOWN\",\"details\":{\"db\":{\"status\":\"UNKNOWN\""
+ ",\"details\":{\"db1\":{\"status\":\"UNKNOWN\",\"details\""
+ ":{\"1\":\"1\"}},\"db2\":{\"status\":\"UNKNOWN\",\"details\"" + ":{\"2\":\"2\"}}}}}}");
+ ":{\"1\":\"1\"}},\"db2\":{\"status\":\"UNKNOWN\",\"details\":{\"2\":\"2\"}}}}}}");
}
}