Merge pull request #18089 from dreis2211

* pr/18089:
  Remove unnecessary blank lines

Closes gh-18089
pull/18100/head
Stephane Nicoll 5 years ago
commit b90d3a87d8

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save