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
ab87b2a3
Commit
ab87b2a3
authored
Aug 19, 2019
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
af38dddd
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
11 deletions
+11
-11
RedisHealthIndicator.java
...ingframework/boot/actuate/redis/RedisHealthIndicator.java
+1
-1
LogFileWebEndpointWebIntegrationTests.java
...ctuate/logging/LogFileWebEndpointWebIntegrationTests.java
+0
-3
BatchAutoConfiguration.java
...work/boot/autoconfigure/batch/BatchAutoConfiguration.java
+1
-0
LiquibaseAutoConfiguration.java
...t/autoconfigure/liquibase/LiquibaseAutoConfiguration.java
+1
-5
RabbitAutoConfigurationTests.java
...boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
+2
-0
SimpleFactoryBean.java
...ramework/boot/test/web/client/scan/SimpleFactoryBean.java
+3
-0
UpperBoundGenericPojo.java
...ot/configurationsample/generic/UpperBoundGenericPojo.java
+1
-0
CompressionConnectorCustomizerTests.java
.../embedded/tomcat/CompressionConnectorCustomizerTests.java
+2
-2
No files found.
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisHealthIndicator.java
View file @
ab87b2a3
...
@@ -66,7 +66,7 @@ public class RedisHealthIndicator extends AbstractHealthIndicator {
...
@@ -66,7 +66,7 @@ public class RedisHealthIndicator extends AbstractHealthIndicator {
}
}
}
}
finally
{
finally
{
RedisConnectionUtils
.
releaseConnection
(
connection
,
this
.
redisConnectionFactory
);
RedisConnectionUtils
.
releaseConnection
(
connection
,
this
.
redisConnectionFactory
,
false
);
}
}
}
}
...
...
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java
View file @
ab87b2a3
...
@@ -25,7 +25,6 @@ import org.junit.runner.RunWith;
...
@@ -25,7 +25,6 @@ import org.junit.runner.RunWith;
import
org.springframework.boot.actuate.endpoint.web.test.WebEndpointRunners
;
import
org.springframework.boot.actuate.endpoint.web.test.WebEndpointRunners
;
import
org.springframework.boot.logging.LogFile
;
import
org.springframework.boot.logging.LogFile
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.http.MediaType
;
import
org.springframework.http.MediaType
;
...
@@ -42,8 +41,6 @@ import org.springframework.util.FileCopyUtils;
...
@@ -42,8 +41,6 @@ import org.springframework.util.FileCopyUtils;
@RunWith
(
WebEndpointRunners
.
class
)
@RunWith
(
WebEndpointRunners
.
class
)
public
class
LogFileWebEndpointWebIntegrationTests
{
public
class
LogFileWebEndpointWebIntegrationTests
{
private
static
ConfigurableApplicationContext
context
;
private
static
WebTestClient
client
;
private
static
WebTestClient
client
;
@ClassRule
@ClassRule
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java
View file @
ab87b2a3
...
@@ -100,6 +100,7 @@ public class BatchAutoConfiguration {
...
@@ -100,6 +100,7 @@ public class BatchAutoConfiguration {
return
factory
;
return
factory
;
}
}
@Configuration
@ConditionalOnBean
(
DataSource
.
class
)
@ConditionalOnBean
(
DataSource
.
class
)
@ConditionalOnClass
(
DatabasePopulator
.
class
)
@ConditionalOnClass
(
DatabasePopulator
.
class
)
static
class
DataSourceInitializerConfiguration
{
static
class
DataSourceInitializerConfiguration
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java
View file @
ab87b2a3
...
@@ -42,7 +42,6 @@ import org.springframework.boot.jdbc.DataSourceBuilder;
...
@@ -42,7 +42,6 @@ import org.springframework.boot.jdbc.DataSourceBuilder;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Import
;
import
org.springframework.context.annotation.Import
;
import
org.springframework.core.io.ResourceLoader
;
import
org.springframework.jdbc.core.JdbcOperations
;
import
org.springframework.jdbc.core.JdbcOperations
;
import
org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations
;
import
org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations
;
import
org.springframework.orm.jpa.AbstractEntityManagerFactoryBean
;
import
org.springframework.orm.jpa.AbstractEntityManagerFactoryBean
;
...
@@ -84,18 +83,15 @@ public class LiquibaseAutoConfiguration {
...
@@ -84,18 +83,15 @@ public class LiquibaseAutoConfiguration {
private
final
DataSourceProperties
dataSourceProperties
;
private
final
DataSourceProperties
dataSourceProperties
;
private
final
ResourceLoader
resourceLoader
;
private
final
DataSource
dataSource
;
private
final
DataSource
dataSource
;
private
final
DataSource
liquibaseDataSource
;
private
final
DataSource
liquibaseDataSource
;
public
LiquibaseConfiguration
(
LiquibaseProperties
properties
,
DataSourceProperties
dataSourceProperties
,
public
LiquibaseConfiguration
(
LiquibaseProperties
properties
,
DataSourceProperties
dataSourceProperties
,
ResourceLoader
resourceLoader
,
ObjectProvider
<
DataSource
>
dataSource
,
ObjectProvider
<
DataSource
>
dataSource
,
@LiquibaseDataSource
ObjectProvider
<
DataSource
>
liquibaseDataSource
)
{
@LiquibaseDataSource
ObjectProvider
<
DataSource
>
liquibaseDataSource
)
{
this
.
properties
=
properties
;
this
.
properties
=
properties
;
this
.
dataSourceProperties
=
dataSourceProperties
;
this
.
dataSourceProperties
=
dataSourceProperties
;
this
.
resourceLoader
=
resourceLoader
;
this
.
dataSource
=
dataSource
.
getIfUnique
();
this
.
dataSource
=
dataSource
.
getIfUnique
();
this
.
liquibaseDataSource
=
liquibaseDataSource
.
getIfAvailable
();
this
.
liquibaseDataSource
=
liquibaseDataSource
.
getIfAvailable
();
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
View file @
ab87b2a3
...
@@ -126,6 +126,7 @@ public class RabbitAutoConfigurationTests {
...
@@ -126,6 +126,7 @@ public class RabbitAutoConfigurationTests {
}
}
@Test
@Test
@SuppressWarnings
(
"unchecked"
)
public
void
testConnectionFactoryWithOverrides
()
{
public
void
testConnectionFactoryWithOverrides
()
{
this
.
contextRunner
.
withUserConfiguration
(
TestConfiguration
.
class
)
this
.
contextRunner
.
withUserConfiguration
(
TestConfiguration
.
class
)
.
withPropertyValues
(
"spring.rabbitmq.host:remote-server"
,
"spring.rabbitmq.port:9000"
,
.
withPropertyValues
(
"spring.rabbitmq.host:remote-server"
,
"spring.rabbitmq.port:9000"
,
...
@@ -143,6 +144,7 @@ public class RabbitAutoConfigurationTests {
...
@@ -143,6 +144,7 @@ public class RabbitAutoConfigurationTests {
}
}
@Test
@Test
@SuppressWarnings
(
"unchecked"
)
public
void
testConnectionFactoryWithCustomConnectionNameStrategy
()
{
public
void
testConnectionFactoryWithCustomConnectionNameStrategy
()
{
this
.
contextRunner
.
withUserConfiguration
(
ConnectionNameStrategyConfiguration
.
class
).
run
((
context
)
->
{
this
.
contextRunner
.
withUserConfiguration
(
ConnectionNameStrategyConfiguration
.
class
).
run
((
context
)
->
{
CachingConnectionFactory
connectionFactory
=
context
.
getBean
(
CachingConnectionFactory
.
class
);
CachingConnectionFactory
connectionFactory
=
context
.
getBean
(
CachingConnectionFactory
.
class
);
...
...
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/scan/SimpleFactoryBean.java
View file @
ab87b2a3
...
@@ -24,6 +24,7 @@ import org.springframework.stereotype.Component;
...
@@ -24,6 +24,7 @@ import org.springframework.stereotype.Component;
* @author Madhura Bhave
* @author Madhura Bhave
*/
*/
@Component
@Component
@SuppressWarnings
(
"rawtypes"
)
public
class
SimpleFactoryBean
implements
FactoryBean
{
public
class
SimpleFactoryBean
implements
FactoryBean
{
private
static
boolean
isInitializedEarly
=
false
;
private
static
boolean
isInitializedEarly
=
false
;
...
@@ -40,10 +41,12 @@ public class SimpleFactoryBean implements FactoryBean {
...
@@ -40,10 +41,12 @@ public class SimpleFactoryBean implements FactoryBean {
}
}
}
}
@Override
public
Object
getObject
()
{
public
Object
getObject
()
{
return
new
Object
();
return
new
Object
();
}
}
@Override
public
Class
<?>
getObjectType
()
{
public
Class
<?>
getObjectType
()
{
return
Object
.
class
;
return
Object
.
class
;
}
}
...
...
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UpperBoundGenericPojo.java
View file @
ab87b2a3
...
@@ -22,6 +22,7 @@ import java.util.Map;
...
@@ -22,6 +22,7 @@ import java.util.Map;
/**
/**
* A pojo with a complex generic signature.
* A pojo with a complex generic signature.
*
*
* @param <T> the generic type
* @author Stephane Nicoll
* @author Stephane Nicoll
*/
*/
public
class
UpperBoundGenericPojo
<
T
extends
Enum
<
T
>>
{
public
class
UpperBoundGenericPojo
<
T
extends
Enum
<
T
>>
{
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/CompressionConnectorCustomizerTests.java
View file @
ab87b2a3
...
@@ -58,13 +58,13 @@ public class CompressionConnectorCustomizerTests {
...
@@ -58,13 +58,13 @@ public class CompressionConnectorCustomizerTests {
Connector
connector
=
new
Connector
(
"org.apache.coyote.http11.Http11NioProtocol"
);
Connector
connector
=
new
Connector
(
"org.apache.coyote.http11.Http11NioProtocol"
);
connector
.
addUpgradeProtocol
(
new
Http2Protocol
());
connector
.
addUpgradeProtocol
(
new
Http2Protocol
());
compressionConnectorCustomizer
.
customize
(
connector
);
compressionConnectorCustomizer
.
customize
(
connector
);
AbstractHttp11Protocol
abstractHttp11Protocol
=
(
AbstractHttp11Protocol
)
connector
.
getProtocolHandler
();
AbstractHttp11Protocol
<?>
abstractHttp11Protocol
=
(
AbstractHttp11Protocol
<?>
)
connector
.
getProtocolHandler
();
verifyHttp1
(
abstractHttp11Protocol
);
verifyHttp1
(
abstractHttp11Protocol
);
Http2Protocol
http2Protocol
=
(
Http2Protocol
)
connector
.
findUpgradeProtocols
()[
0
];
Http2Protocol
http2Protocol
=
(
Http2Protocol
)
connector
.
findUpgradeProtocols
()[
0
];
verifyHttp2Upgrade
(
http2Protocol
);
verifyHttp2Upgrade
(
http2Protocol
);
}
}
private
void
verifyHttp1
(
AbstractHttp11Protocol
protocol
)
{
private
void
verifyHttp1
(
AbstractHttp11Protocol
<?>
protocol
)
{
compressionOn
(
protocol
.
getCompression
());
compressionOn
(
protocol
.
getCompression
());
minSize
(
protocol
.
getCompressionMinSize
());
minSize
(
protocol
.
getCompressionMinSize
());
mimeType
(
protocol
.
getCompressibleMimeTypes
());
mimeType
(
protocol
.
getCompressibleMimeTypes
());
...
...
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