Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
b4350a9d
Commit
b4350a9d
authored
Sep 02, 2019
by
dreis2211
Committed by
Stephane Nicoll
Sep 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unnecessary blank lines
See gh-18089
parent
9ed6b92e
Changes
33
Show whitespace changes
Inline
Side-by-side
Showing
33 changed files
with
0 additions
and
34 deletions
+0
-34
EndpointDiscoverer.java
.../boot/actuate/endpoint/annotation/EndpointDiscoverer.java
+0
-1
CompositeHealthContributorReactiveAdapter.java
...ate/health/CompositeHealthContributorReactiveAdapter.java
+0
-1
DispatcherHandlersMappingDescriptionProvider.java
...eactive/DispatcherHandlersMappingDescriptionProvider.java
+0
-1
WebEndpointDiscovererTests.java
...e/endpoint/web/annotation/WebEndpointDiscovererTests.java
+0
-1
WebEndpointTestInvocationContextProvider.java
...nt/web/test/WebEndpointTestInvocationContextProvider.java
+0
-1
JCacheCacheConfiguration.java
...rk/boot/autoconfigure/cache/JCacheCacheConfiguration.java
+0
-1
RedisCacheConfiguration.java
...ork/boot/autoconfigure/cache/RedisCacheConfiguration.java
+0
-1
FilteringSpringBootCondition.java
...autoconfigure/condition/FilteringSpringBootCondition.java
+0
-1
HibernateDefaultDdlAutoProvider.java
...utoconfigure/orm/jpa/HibernateDefaultDdlAutoProvider.java
+0
-1
QuartzAutoConfiguration.java
...rk/boot/autoconfigure/quartz/QuartzAutoConfiguration.java
+0
-1
JmsAutoConfigurationTests.java
...ork/boot/autoconfigure/jms/JmsAutoConfigurationTests.java
+0
-1
JooqExceptionTranslatorTests.java
...boot/autoconfigure/jooq/JooqExceptionTranslatorTests.java
+0
-1
WebMvcAutoConfigurationTests.java
...toconfigure/web/servlet/WebMvcAutoConfigurationTests.java
+0
-1
DependencyCustomizer.java
...ringframework/boot/cli/compiler/DependencyCustomizer.java
+0
-1
ClassLoaderFilesResourcePatternResolver.java
...ools/restart/ClassLoaderFilesResourcePatternResolver.java
+0
-1
ClassLoaderFileURLStreamHandler.java
.../restart/classloader/ClassLoaderFileURLStreamHandler.java
+0
-1
RestartServer.java
...framework/boot/devtools/restart/server/RestartServer.java
+0
-1
spring-boot-features.adoc
...ing-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+0
-1
HibernateSecondLevelCacheExample.java
...ework/boot/docs/jpa/HibernateSecondLevelCacheExample.java
+0
-1
TestEntityManager.java
...rk/boot/test/autoconfigure/orm/jpa/TestEntityManager.java
+0
-1
SpringBootMockMvcBuilderCustomizer.java
...igure/web/servlet/SpringBootMockMvcBuilderCustomizer.java
+0
-1
TestRestTemplate.java
...pringframework/boot/test/web/client/TestRestTemplate.java
+0
-1
SpringBootTestWebEnvironmentRandomPortTests.java
.../context/SpringBootTestWebEnvironmentRandomPortTests.java
+0
-1
JSONStringer.java
...mework/boot/configurationprocessor/json/JSONStringer.java
+0
-1
ModifiedClassPathClassLoader.java
...t/testsupport/classpath/ModifiedClassPathClassLoader.java
+0
-1
PropertyMapping.java
...ework/boot/context/properties/source/PropertyMapping.java
+0
-2
UnboundElementsSourceFilter.java
...ontext/properties/source/UnboundElementsSourceFilter.java
+0
-1
DatabaseDriver.java
...in/java/org/springframework/boot/jdbc/DatabaseDriver.java
+0
-1
LogbackLoggingSystem.java
...gframework/boot/logging/logback/LogbackLoggingSystem.java
+0
-1
NettyRSocketServerFactory.java
...amework/boot/rsocket/netty/NettyRSocketServerFactory.java
+0
-1
ErrorPageFilter.java
...ngframework/boot/web/servlet/support/ErrorPageFilter.java
+0
-1
ConfigurationPropertiesBindHandlerAdvisorTests.java
...rties/ConfigurationPropertiesBindHandlerAdvisorTests.java
+0
-1
AbstractReactiveWebServerFactoryTests.java
...eactive/server/AbstractReactiveWebServerFactoryTests.java
+0
-1
No files found.
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java
View file @
b4350a9d
...
@@ -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
isFilterMatch
(
instance
,
endpoint
);
}
}
return
false
;
return
false
;
}
}
private
boolean
isFilterMatch
(
EndpointFilter
<
E
>
filter
,
EndpointBean
endpointBean
)
{
private
boolean
isFilterMatch
(
EndpointFilter
<
E
>
filter
,
EndpointBean
endpointBean
)
{
...
...
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthContributorReactiveAdapter.java
View file @
b4350a9d
...
@@ -61,7 +61,6 @@ class CompositeHealthContributorReactiveAdapter implements CompositeReactiveHeal
...
@@ -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
;
}
}
}
}
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/DispatcherHandlersMappingDescriptionProvider.java
View file @
b4350a9d
...
@@ -81,7 +81,6 @@ public class DispatcherHandlersMappingDescriptionProvider implements MappingDesc
...
@@ -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
();
...
...
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscovererTests.java
View file @
b4350a9d
...
@@ -590,7 +590,6 @@ class WebEndpointDiscovererTests {
...
@@ -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"
)
...
...
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointTestInvocationContextProvider.java
View file @
b4350a9d
...
@@ -124,7 +124,6 @@ class WebEndpointTestInvocationContextProvider implements TestTemplateInvocation
...
@@ -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
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java
View file @
b4350a9d
...
@@ -164,7 +164,6 @@ class JCacheCacheConfiguration implements BeanClassLoaderAware {
...
@@ -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"
));
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/RedisCacheConfiguration.java
View file @
b4350a9d
...
@@ -72,7 +72,6 @@ class RedisCacheConfiguration {
...
@@ -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
(
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/FilteringSpringBootCondition.java
View file @
b4350a9d
...
@@ -108,7 +108,6 @@ abstract class FilteringSpringBootCondition extends SpringBootCondition
...
@@ -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
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateDefaultDdlAutoProvider.java
View file @
b4350a9d
...
@@ -47,7 +47,6 @@ class HibernateDefaultDdlAutoProvider implements SchemaManagementProvider {
...
@@ -47,7 +47,6 @@ class HibernateDefaultDdlAutoProvider implements SchemaManagementProvider {
return
"none"
;
return
"none"
;
}
}
return
"create-drop"
;
return
"create-drop"
;
}
}
@Override
@Override
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java
View file @
b4350a9d
...
@@ -129,7 +129,6 @@ public class QuartzAutoConfiguration {
...
@@ -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
);
}
}
/**
/**
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java
View file @
b4350a9d
...
@@ -517,7 +517,6 @@ class JmsAutoConfigurationTests {
...
@@ -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
;
}
}
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslatorTests.java
View file @
b4350a9d
...
@@ -71,7 +71,6 @@ class JooqExceptionTranslatorTests {
...
@@ -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
);
}
}
}
}
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java
View file @
b4350a9d
...
@@ -903,7 +903,6 @@ class WebMvcAutoConfigurationTests {
...
@@ -903,7 +903,6 @@ class WebMvcAutoConfigurationTests {
@Bean
@Bean
ConfigurableWebBindingInitializer
customConfigurableWebBindingInitializer
()
{
ConfigurableWebBindingInitializer
customConfigurableWebBindingInitializer
()
{
return
new
CustomWebBindingInitializer
();
return
new
CustomWebBindingInitializer
();
}
}
}
}
...
...
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java
View file @
b4350a9d
...
@@ -71,7 +71,6 @@ public class DependencyCustomizer {
...
@@ -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
)
{
...
...
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java
View file @
b4350a9d
...
@@ -243,7 +243,6 @@ final class ClassLoaderFilesResourcePatternResolver implements ResourcePatternRe
...
@@ -243,7 +243,6 @@ final class ClassLoaderFilesResourcePatternResolver implements ResourcePatternRe
copyProtocolResolvers
(
applicationContext
,
resourceLoader
);
copyProtocolResolvers
(
applicationContext
,
resourceLoader
);
}
}
return
new
ServletContextResourcePatternResolver
(
resourceLoader
);
return
new
ServletContextResourcePatternResolver
(
resourceLoader
);
}
}
}
}
...
...
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java
View file @
b4350a9d
...
@@ -60,7 +60,6 @@ public class ClassLoaderFileURLStreamHandler extends URLStreamHandler {
...
@@ -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
();
}
}
}
}
...
...
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/RestartServer.java
View file @
b4350a9d
...
@@ -144,7 +144,6 @@ public class RestartServer {
...
@@ -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
)
{
...
...
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
b4350a9d
...
@@ -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) {
public DetailsResp someWsCall(DetailsReq detailsReq) {
return (DetailsResp) this.webServiceTemplate.marshalSendAndReceive(detailsReq, new SoapActionCallback(ACTION));
return (DetailsResp) this.webServiceTemplate.marshalSendAndReceive(detailsReq, new SoapActionCallback(ACTION));
}
}
}
}
...
...
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jpa/HibernateSecondLevelCacheExample.java
View file @
b4350a9d
...
@@ -35,7 +35,6 @@ public class HibernateSecondLevelCacheExample {
...
@@ -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
());
}
}
}
}
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManager.java
View file @
b4350a9d
...
@@ -75,7 +75,6 @@ public class TestEntityManager {
...
@@ -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
);
}
}
/**
/**
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java
View file @
b4350a9d
...
@@ -104,7 +104,6 @@ public class SpringBootMockMvcBuilderCustomizer implements MockMvcBuilderCustomi
...
@@ -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
)
{
...
...
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
View file @
b4350a9d
...
@@ -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
{
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
);
}
}
/**
/**
...
...
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java
View file @
b4350a9d
...
@@ -54,7 +54,6 @@ class SpringBootTestWebEnvironmentRandomPortTests extends AbstractSpringBootTest
...
@@ -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
());
}
}
}
}
...
...
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONStringer.java
View file @
b4350a9d
...
@@ -242,7 +242,6 @@ public class JSONStringer {
...
@@ -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
);
...
...
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java
View file @
b4350a9d
...
@@ -205,7 +205,6 @@ final class ModifiedClassPathClassLoader extends URLClassLoader {
...
@@ -205,7 +205,6 @@ final class ModifiedClassPathClassLoader extends URLClassLoader {
}
}
catch
(
Exception
ignored
)
{
catch
(
Exception
ignored
)
{
return
Collections
.
emptyList
();
return
Collections
.
emptyList
();
}
}
}
}
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/PropertyMapping.java
View file @
b4350a9d
...
@@ -49,7 +49,6 @@ class PropertyMapping {
...
@@ -49,7 +49,6 @@ class PropertyMapping {
*/
*/
String
getPropertySourceName
()
{
String
getPropertySourceName
()
{
return
this
.
propertySourceName
;
return
this
.
propertySourceName
;
}
}
/**
/**
...
@@ -59,7 +58,6 @@ class PropertyMapping {
...
@@ -59,7 +58,6 @@ class PropertyMapping {
*/
*/
ConfigurationPropertyName
getConfigurationPropertyName
()
{
ConfigurationPropertyName
getConfigurationPropertyName
()
{
return
this
.
configurationPropertyName
;
return
this
.
configurationPropertyName
;
}
}
/**
/**
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/UnboundElementsSourceFilter.java
View file @
b4350a9d
...
@@ -46,7 +46,6 @@ public class UnboundElementsSourceFilter implements Function<ConfigurationProper
...
@@ -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
;
}
}
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
View file @
b4350a9d
...
@@ -126,7 +126,6 @@ public enum DatabaseDriver {
...
@@ -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
);
}
}
},
},
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
View file @
b4350a9d
...
@@ -272,7 +272,6 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem {
...
@@ -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
()
{
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java
View file @
b4350a9d
...
@@ -144,7 +144,6 @@ public class NettyRSocketServerFactory implements RSocketServerFactory, Configur
...
@@ -144,7 +144,6 @@ public class NettyRSocketServerFactory implements RSocketServerFactory, Configur
}
}
else
{
else
{
return
TcpServerTransport
.
create
(
getListenAddress
());
return
TcpServerTransport
.
create
(
getListenAddress
());
}
}
}
}
}
}
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java
View file @
b4350a9d
...
@@ -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
{
public
PrintWriter
getWriter
()
throws
IOException
{
sendErrorIfNecessary
();
sendErrorIfNecessary
();
return
super
.
getWriter
();
return
super
.
getWriter
();
}
}
@Override
@Override
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindHandlerAdvisorTests.java
View file @
b4350a9d
...
@@ -133,7 +133,6 @@ class ConfigurationPropertiesBindHandlerAdvisorTests {
...
@@ -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
)
{
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
View file @
b4350a9d
...
@@ -283,7 +283,6 @@ public abstract class AbstractReactiveWebServerFactoryTests {
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment