Browse Source

Remove unnecessary blank lines

See gh-18089
pull/18100/head
dreis2211 6 years ago committed by Stephane Nicoll
parent
commit
b4350a9d96
  1. 1
      spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java
  2. 1
      spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthContributorReactiveAdapter.java
  3. 1
      spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/DispatcherHandlersMappingDescriptionProvider.java
  4. 1
      spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscovererTests.java
  5. 1
      spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointTestInvocationContextProvider.java
  6. 1
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java
  7. 1
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/RedisCacheConfiguration.java
  8. 1
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/FilteringSpringBootCondition.java
  9. 1
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateDefaultDdlAutoProvider.java
  10. 1
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java
  11. 1
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java
  12. 1
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslatorTests.java
  13. 1
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java
  14. 1
      spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java
  15. 1
      spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java
  16. 1
      spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java
  17. 1
      spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/RestartServer.java
  18. 1
      spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
  19. 1
      spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jpa/HibernateSecondLevelCacheExample.java
  20. 1
      spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManager.java
  21. 1
      spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java
  22. 1
      spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
  23. 1
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java
  24. 1
      spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONStringer.java
  25. 1
      spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java
  26. 2
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/PropertyMapping.java
  27. 1
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/UnboundElementsSourceFilter.java
  28. 1
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
  29. 1
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
  30. 1
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java
  31. 1
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java
  32. 1
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindHandlerAdvisorTests.java
  33. 1
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java

1
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java

@ -284,7 +284,6 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten @@ -284,7 +284,6 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten
return isFilterMatch(instance, endpoint);
}
return false;
}
private boolean isFilterMatch(EndpointFilter<E> filter, EndpointBean endpointBean) {

1
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthContributorReactiveAdapter.java

@ -61,7 +61,6 @@ class CompositeHealthContributorReactiveAdapter implements CompositeReactiveHeal @@ -61,7 +61,6 @@ class CompositeHealthContributorReactiveAdapter implements CompositeReactiveHeal
public ReactiveHealthContributor getContributor(String name) {
HealthContributor contributor = this.delegate.getContributor(name);
return (contributor != null) ? ReactiveHealthContributor.adapt(contributor) : null;
}
}

1
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/DispatcherHandlersMappingDescriptionProvider.java

@ -81,7 +81,6 @@ public class DispatcherHandlersMappingDescriptionProvider implements MappingDesc @@ -81,7 +81,6 @@ public class DispatcherHandlersMappingDescriptionProvider implements MappingDesc
for (HandlerMappingDescriptionProvider<?> descriptionProvider : descriptionProviders) {
if (descriptionProvider.getMappingClass().isInstance(handlerMapping)) {
return ((HandlerMappingDescriptionProvider<T>) descriptionProvider).describe(handlerMapping).stream();
}
}
return Stream.empty();

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

@ -590,7 +590,6 @@ class WebEndpointDiscovererTests { @@ -590,7 +590,6 @@ class WebEndpointDiscovererTests {
@WriteOperation(produces = { "a/b", "c/d" })
String write() {
return "write";
}
@DeleteOperation(produces = "text/plain")

1
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointTestInvocationContextProvider.java

@ -124,7 +124,6 @@ class WebEndpointTestInvocationContextProvider implements TestTemplateInvocation @@ -124,7 +124,6 @@ class WebEndpointTestInvocationContextProvider implements TestTemplateInvocation
context.register(ClassUtils.toClassArray(classes));
context.refresh();
return context;
}
static class WebEndpointsInvocationContext

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java vendored

@ -164,7 +164,6 @@ class JCacheCacheConfiguration implements BeanClassLoaderAware { @@ -164,7 +164,6 @@ class JCacheCacheConfiguration implements BeanClassLoaderAware {
providers.next();
if (providers.hasNext()) {
return ConditionOutcome.noMatch(message.foundExactly("multiple JSR-107 providers"));
}
return ConditionOutcome.match(message.foundExactly("single JSR-107 provider"));
}

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/RedisCacheConfiguration.java vendored

@ -72,7 +72,6 @@ class RedisCacheConfiguration { @@ -72,7 +72,6 @@ class RedisCacheConfiguration {
ObjectProvider<org.springframework.data.redis.cache.RedisCacheConfiguration> redisCacheConfiguration,
ClassLoader classLoader) {
return redisCacheConfiguration.getIfAvailable(() -> createConfiguration(cacheProperties, classLoader));
}
private org.springframework.data.redis.cache.RedisCacheConfiguration createConfiguration(

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/FilteringSpringBootCondition.java

@ -108,7 +108,6 @@ abstract class FilteringSpringBootCondition extends SpringBootCondition @@ -108,7 +108,6 @@ abstract class FilteringSpringBootCondition extends SpringBootCondition
return classLoader.loadClass(className);
}
return Class.forName(className);
}
protected enum ClassNameFilter {

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateDefaultDdlAutoProvider.java

@ -47,7 +47,6 @@ class HibernateDefaultDdlAutoProvider implements SchemaManagementProvider { @@ -47,7 +47,6 @@ class HibernateDefaultDdlAutoProvider implements SchemaManagementProvider {
return "none";
}
return "create-drop";
}
@Override

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java

@ -129,7 +129,6 @@ public class QuartzAutoConfiguration { @@ -129,7 +129,6 @@ public class QuartzAutoConfiguration {
QuartzProperties properties) {
DataSource dataSourceToUse = getDataSource(dataSource, quartzDataSource);
return new QuartzDataSourceInitializer(dataSourceToUse, resourceLoader, properties);
}
/**

1
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java

@ -517,7 +517,6 @@ class JmsAutoConfigurationTests { @@ -517,7 +517,6 @@ class JmsAutoConfigurationTests {
configurer.configure(factory, connectionFactory);
factory.setCacheLevel(DefaultMessageListenerContainer.CACHE_CONSUMER);
return factory;
}
}

1
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslatorTests.java

@ -71,7 +71,6 @@ class JooqExceptionTranslatorTests { @@ -71,7 +71,6 @@ class JooqExceptionTranslatorTests {
private static SQLException sqlException(int vendorCode) {
return new SQLException(null, null, vendorCode);
}
}

1
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java

@ -903,7 +903,6 @@ class WebMvcAutoConfigurationTests { @@ -903,7 +903,6 @@ class WebMvcAutoConfigurationTests {
@Bean
ConfigurableWebBindingInitializer customConfigurableWebBindingInitializer() {
return new CustomWebBindingInitializer();
}
}

1
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java

@ -71,7 +71,6 @@ public class DependencyCustomizer { @@ -71,7 +71,6 @@ public class DependencyCustomizer {
public String getVersion(String artifactId) {
return getVersion(artifactId, "");
}
public String getVersion(String artifactId, String defaultVersion) {

1
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java

@ -243,7 +243,6 @@ final class ClassLoaderFilesResourcePatternResolver implements ResourcePatternRe @@ -243,7 +243,6 @@ final class ClassLoaderFilesResourcePatternResolver implements ResourcePatternRe
copyProtocolResolvers(applicationContext, resourceLoader);
}
return new ServletContextResourcePatternResolver(resourceLoader);
}
}

1
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java

@ -60,7 +60,6 @@ public class ClassLoaderFileURLStreamHandler extends URLStreamHandler { @@ -60,7 +60,6 @@ public class ClassLoaderFileURLStreamHandler extends URLStreamHandler {
@Override
public long getLastModified() {
return ClassLoaderFileURLStreamHandler.this.file.getLastModified();
}
}

1
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/RestartServer.java

@ -144,7 +144,6 @@ public class RestartServer { @@ -144,7 +144,6 @@ public class RestartServer {
classLoader = classLoader.getParent();
}
return urls;
}
private void updateTimeStamp(Iterable<URL> urls) {

1
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@ -7094,7 +7094,6 @@ The following code shows a typical example: @@ -7094,7 +7094,6 @@ The following code shows a typical example:
public DetailsResp someWsCall(DetailsReq detailsReq) {
return (DetailsResp) this.webServiceTemplate.marshalSendAndReceive(detailsReq, new SoapActionCallback(ACTION));
}
}

1
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jpa/HibernateSecondLevelCacheExample.java

@ -35,7 +35,6 @@ public class HibernateSecondLevelCacheExample { @@ -35,7 +35,6 @@ public class HibernateSecondLevelCacheExample {
@Bean
public HibernatePropertiesCustomizer hibernateSecondLevelCacheCustomizer(JCacheCacheManager cacheManager) {
return (properties) -> properties.put(ConfigSettings.CACHE_MANAGER, cacheManager.getCacheManager());
}
}

1
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManager.java

@ -75,7 +75,6 @@ public class TestEntityManager { @@ -75,7 +75,6 @@ public class TestEntityManager {
public <T> T persistAndGetId(Object entity, Class<T> idType) {
persist(entity);
return getId(entity, idType);
}
/**

1
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java

@ -104,7 +104,6 @@ public class SpringBootMockMvcBuilderCustomizer implements MockMvcBuilderCustomi @@ -104,7 +104,6 @@ public class SpringBootMockMvcBuilderCustomizer implements MockMvcBuilderCustomi
return new LoggingLinesWriter();
}
return new SystemLinesWriter(this.print);
}
private void addFilters(ConfigurableMockMvcBuilder<?> builder) {

1
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java

@ -615,7 +615,6 @@ public class TestRestTemplate { @@ -615,7 +615,6 @@ public class TestRestTemplate {
*/
public <T> T patchForObject(URI url, Object request, Class<T> responseType) throws RestClientException {
return this.restTemplate.patchForObject(applyRootUriIfNecessary(url), request, responseType);
}
/**

1
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java

@ -54,7 +54,6 @@ class SpringBootTestWebEnvironmentRandomPortTests extends AbstractSpringBootTest @@ -54,7 +54,6 @@ class SpringBootTestWebEnvironmentRandomPortTests extends AbstractSpringBootTest
@Bean
RestTemplateBuilder restTemplateBuilder() {
return new RestTemplateBuilder().additionalMessageConverters(new MyConverter());
}
}

1
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONStringer.java

@ -242,7 +242,6 @@ public class JSONStringer { @@ -242,7 +242,6 @@ public class JSONStringer {
if (value instanceof JSONArray) {
((JSONArray) value).writeTo(this);
return this;
}
else if (value instanceof JSONObject) {
((JSONObject) value).writeTo(this);

1
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java

@ -205,7 +205,6 @@ final class ModifiedClassPathClassLoader extends URLClassLoader { @@ -205,7 +205,6 @@ final class ModifiedClassPathClassLoader extends URLClassLoader {
}
catch (Exception ignored) {
return Collections.emptyList();
}
}

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/PropertyMapping.java

@ -49,7 +49,6 @@ class PropertyMapping { @@ -49,7 +49,6 @@ class PropertyMapping {
*/
String getPropertySourceName() {
return this.propertySourceName;
}
/**
@ -59,7 +58,6 @@ class PropertyMapping { @@ -59,7 +58,6 @@ class PropertyMapping {
*/
ConfigurationPropertyName getConfigurationPropertyName() {
return this.configurationPropertyName;
}
/**

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/UnboundElementsSourceFilter.java

@ -46,7 +46,6 @@ public class UnboundElementsSourceFilter implements Function<ConfigurationProper @@ -46,7 +46,6 @@ public class UnboundElementsSourceFilter implements Function<ConfigurationProper
if (underlyingSource instanceof PropertySource) {
String name = ((PropertySource<?>) underlyingSource).getName();
return !BENIGN_PROPERTY_SOURCE_NAMES.contains(name);
}
return true;
}

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java

@ -126,7 +126,6 @@ public enum DatabaseDriver { @@ -126,7 +126,6 @@ public enum DatabaseDriver {
@Override
protected boolean matchProductName(String productName) {
return super.matchProductName(productName) || "SQL SERVER".equalsIgnoreCase(productName);
}
},

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java

@ -272,7 +272,6 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem { @@ -272,7 +272,6 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem {
name = Logger.ROOT_LOGGER_NAME;
}
return factory.getLogger(name);
}
private LoggerContext getLoggerContext() {

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java

@ -144,7 +144,6 @@ public class NettyRSocketServerFactory implements RSocketServerFactory, Configur @@ -144,7 +144,6 @@ public class NettyRSocketServerFactory implements RSocketServerFactory, Configur
}
else {
return TcpServerTransport.create(getListenAddress());
}
}
}

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java

@ -362,7 +362,6 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry { @@ -362,7 +362,6 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry {
public PrintWriter getWriter() throws IOException {
sendErrorIfNecessary();
return super.getWriter();
}
@Override

1
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindHandlerAdvisorTests.java

@ -133,7 +133,6 @@ class ConfigurationPropertiesBindHandlerAdvisorTests { @@ -133,7 +133,6 @@ class ConfigurationPropertiesBindHandlerAdvisorTests {
}
}
return super.onStart(name, target, context);
}
private ConfigurationPropertyName getDefaultName(ConfigurationPropertyName name) {

1
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java

@ -283,7 +283,6 @@ public abstract class AbstractReactiveWebServerFactoryTests { @@ -283,7 +283,6 @@ public abstract class AbstractReactiveWebServerFactoryTests {
Compression compression = new Compression();
compression.setEnabled(true);
return prepareCompressionTest(compression);
}
protected WebClient prepareCompressionTest(Compression compression) {

Loading…
Cancel
Save