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
b423962c
Commit
b423962c
authored
Jan 24, 2019
by
Johnny Lim
Committed by
Andy Wilkinson
Feb 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use class for @ConditionalOnClass
See gh-15775
parent
5ae7aeff
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
8 deletions
+10
-8
BatchConfigurerConfiguration.java
...oot/autoconfigure/batch/BatchConfigurerConfiguration.java
+1
-1
DataSourceJmxConfiguration.java
...k/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java
+1
-1
JerseyAutoConfiguration.java
...rk/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
+2
-2
ArtemisEmbeddedServerConfiguration.java
...igure/jms/artemis/ArtemisEmbeddedServerConfiguration.java
+1
-1
ThymeleafAutoConfiguration.java
...t/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
+1
-1
WebSocketReactiveAutoConfiguration.java
...ebsocket/reactive/WebSocketReactiveAutoConfiguration.java
+2
-1
WebSocketServletAutoConfiguration.java
.../websocket/servlet/WebSocketServletAutoConfiguration.java
+2
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConfigurerConfiguration.java
View file @
b423962c
...
@@ -54,7 +54,7 @@ class BatchConfigurerConfiguration {
...
@@ -54,7 +54,7 @@ class BatchConfigurerConfiguration {
}
}
@Configuration
@Configuration
@ConditionalOnClass
(
name
=
"javax.persistence.EntityManagerFactory"
)
@ConditionalOnClass
(
EntityManagerFactory
.
class
)
@ConditionalOnBean
(
name
=
"entityManagerFactory"
)
@ConditionalOnBean
(
name
=
"entityManagerFactory"
)
static
class
JpaBatchConfiguration
{
static
class
JpaBatchConfiguration
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java
View file @
b423962c
...
@@ -75,7 +75,7 @@ class DataSourceJmxConfiguration {
...
@@ -75,7 +75,7 @@ class DataSourceJmxConfiguration {
@Configuration
@Configuration
@ConditionalOnProperty
(
prefix
=
"spring.datasource"
,
name
=
"jmx-enabled"
)
@ConditionalOnProperty
(
prefix
=
"spring.datasource"
,
name
=
"jmx-enabled"
)
@ConditionalOnClass
(
name
=
"org.apache.tomcat.jdbc.pool.DataSourceProxy"
)
@ConditionalOnClass
(
DataSourceProxy
.
class
)
@ConditionalOnSingleCandidate
(
DataSource
.
class
)
@ConditionalOnSingleCandidate
(
DataSource
.
class
)
static
class
TomcatDataSourceJmxConfiguration
{
static
class
TomcatDataSourceJmxConfiguration
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
View file @
b423962c
...
@@ -34,6 +34,7 @@ import org.apache.commons.logging.Log;
...
@@ -34,6 +34,7 @@ import org.apache.commons.logging.Log;
import
org.apache.commons.logging.LogFactory
;
import
org.apache.commons.logging.LogFactory
;
import
org.glassfish.jersey.jackson.JacksonFeature
;
import
org.glassfish.jersey.jackson.JacksonFeature
;
import
org.glassfish.jersey.server.ResourceConfig
;
import
org.glassfish.jersey.server.ResourceConfig
;
import
org.glassfish.jersey.server.spring.SpringComponentProvider
;
import
org.glassfish.jersey.servlet.ServletContainer
;
import
org.glassfish.jersey.servlet.ServletContainer
;
import
org.glassfish.jersey.servlet.ServletProperties
;
import
org.glassfish.jersey.servlet.ServletProperties
;
...
@@ -76,8 +77,7 @@ import org.springframework.web.filter.RequestContextFilter;
...
@@ -76,8 +77,7 @@ import org.springframework.web.filter.RequestContextFilter;
* @author Stephane Nicoll
* @author Stephane Nicoll
*/
*/
@Configuration
@Configuration
@ConditionalOnClass
(
name
=
{
"org.glassfish.jersey.server.spring.SpringComponentProvider"
,
@ConditionalOnClass
({
SpringComponentProvider
.
class
,
ServletRegistration
.
class
})
"javax.servlet.ServletRegistration"
})
@ConditionalOnBean
(
type
=
"org.glassfish.jersey.server.ResourceConfig"
)
@ConditionalOnBean
(
type
=
"org.glassfish.jersey.server.ResourceConfig"
)
@ConditionalOnWebApplication
(
type
=
Type
.
SERVLET
)
@ConditionalOnWebApplication
(
type
=
Type
.
SERVLET
)
@AutoConfigureOrder
(
Ordered
.
HIGHEST_PRECEDENCE
)
@AutoConfigureOrder
(
Ordered
.
HIGHEST_PRECEDENCE
)
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedServerConfiguration.java
View file @
b423962c
...
@@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration;
...
@@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration;
* @author Stephane Nicoll
* @author Stephane Nicoll
*/
*/
@Configuration
@Configuration
@ConditionalOnClass
(
name
=
ArtemisConnectionFactoryFactory
.
EMBEDDED_JMS_CLASS
)
@ConditionalOnClass
(
EmbeddedJMS
.
class
)
@ConditionalOnProperty
(
prefix
=
"spring.artemis.embedded"
,
name
=
"enabled"
,
havingValue
=
"true"
,
matchIfMissing
=
true
)
@ConditionalOnProperty
(
prefix
=
"spring.artemis.embedded"
,
name
=
"enabled"
,
havingValue
=
"true"
,
matchIfMissing
=
true
)
class
ArtemisEmbeddedServerConfiguration
{
class
ArtemisEmbeddedServerConfiguration
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
View file @
b423962c
...
@@ -307,7 +307,7 @@ public class ThymeleafAutoConfiguration {
...
@@ -307,7 +307,7 @@ public class ThymeleafAutoConfiguration {
}
}
@Configuration
@Configuration
@ConditionalOnClass
(
name
=
"nz.net.ultraq.thymeleaf.LayoutDialect"
)
@ConditionalOnClass
(
LayoutDialect
.
class
)
protected
static
class
ThymeleafWebLayoutConfiguration
{
protected
static
class
ThymeleafWebLayoutConfiguration
{
@Bean
@Bean
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java
View file @
b423962c
...
@@ -20,6 +20,7 @@ import javax.servlet.Servlet;
...
@@ -20,6 +20,7 @@ import javax.servlet.Servlet;
import
javax.websocket.server.ServerContainer
;
import
javax.websocket.server.ServerContainer
;
import
org.apache.catalina.startup.Tomcat
;
import
org.apache.catalina.startup.Tomcat
;
import
org.apache.tomcat.websocket.server.WsSci
;
import
org.springframework.boot.autoconfigure.AutoConfigureBefore
;
import
org.springframework.boot.autoconfigure.AutoConfigureBefore
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
...
@@ -47,7 +48,7 @@ import org.springframework.context.annotation.Configuration;
...
@@ -47,7 +48,7 @@ import org.springframework.context.annotation.Configuration;
public
class
WebSocketReactiveAutoConfiguration
{
public
class
WebSocketReactiveAutoConfiguration
{
@Configuration
@Configuration
@ConditionalOnClass
(
name
=
"org.apache.tomcat.websocket.server.WsSci"
,
value
=
Tomcat
.
class
)
@ConditionalOnClass
(
{
Tomcat
.
class
,
WsSci
.
class
}
)
static
class
TomcatWebSocketConfiguration
{
static
class
TomcatWebSocketConfiguration
{
@Bean
@Bean
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfiguration.java
View file @
b423962c
...
@@ -20,6 +20,7 @@ import javax.servlet.Servlet;
...
@@ -20,6 +20,7 @@ import javax.servlet.Servlet;
import
javax.websocket.server.ServerContainer
;
import
javax.websocket.server.ServerContainer
;
import
org.apache.catalina.startup.Tomcat
;
import
org.apache.catalina.startup.Tomcat
;
import
org.apache.tomcat.websocket.server.WsSci
;
import
org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer
;
import
org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer
;
import
org.springframework.boot.autoconfigure.AutoConfigureBefore
;
import
org.springframework.boot.autoconfigure.AutoConfigureBefore
;
...
@@ -58,7 +59,7 @@ import org.springframework.context.annotation.Configuration;
...
@@ -58,7 +59,7 @@ import org.springframework.context.annotation.Configuration;
public
class
WebSocketServletAutoConfiguration
{
public
class
WebSocketServletAutoConfiguration
{
@Configuration
@Configuration
@ConditionalOnClass
(
name
=
"org.apache.tomcat.websocket.server.WsSci"
,
value
=
Tomcat
.
class
)
@ConditionalOnClass
(
{
Tomcat
.
class
,
WsSci
.
class
}
)
static
class
TomcatWebSocketConfiguration
{
static
class
TomcatWebSocketConfiguration
{
@Bean
@Bean
...
...
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