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
9fdb563d
Commit
9fdb563d
authored
Nov 28, 2016
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
2be55445
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
17 deletions
+12
-17
ValidationAutoConfiguration.java
...autoconfigure/validation/ValidationAutoConfiguration.java
+2
-2
CassandraAutoConfigurationTests.java
...oconfigure/cassandra/CassandraAutoConfigurationTests.java
+2
-2
SessionAutoConfigurationHazelcastTests.java
...igure/session/SessionAutoConfigurationHazelcastTests.java
+3
-2
SessionAutoConfigurationTests.java
.../autoconfigure/session/SessionAutoConfigurationTests.java
+0
-2
ValidationAutoConfigurationTests.java
...onfigure/validation/ValidationAutoConfigurationTests.java
+3
-1
ValidationAutoConfigurationWithHibernateValidatorMissingElImplTests.java
...onfigurationWithHibernateValidatorMissingElImplTests.java
+2
-2
ServerPropertiesTests.java
...amework/boot/autoconfigure/web/ServerPropertiesTests.java
+0
-6
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java
View file @
9fdb563d
...
...
@@ -58,8 +58,8 @@ public class ValidationAutoConfiguration {
@Override
public
ConditionOutcome
getMatchOutcome
(
ConditionContext
context
,
AnnotatedTypeMetadata
metadata
)
{
ConditionMessage
.
Builder
message
=
ConditionMessage
.
forCondition
(
getClass
().
getName
());
ConditionMessage
.
Builder
message
=
ConditionMessage
.
forCondition
(
getClass
().
getName
());
try
{
Validation
.
buildDefaultValidatorFactory
().
getValidator
();
return
ConditionOutcome
.
match
(
message
.
available
(
"JSR-303 provider"
));
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java
View file @
9fdb563d
...
...
@@ -66,7 +66,8 @@ public class CassandraAutoConfigurationTests {
public
void
createCustomizeCluster
()
{
load
(
ClusterConfig
.
class
);
assertThat
(
this
.
context
.
getBeanNamesForType
(
Cluster
.
class
).
length
).
isEqualTo
(
1
);
assertThat
(
this
.
context
.
getBeanNamesForType
(
ClusterCustomizer
.
class
).
length
).
isEqualTo
(
1
);
assertThat
(
this
.
context
.
getBeanNamesForType
(
ClusterCustomizer
.
class
).
length
)
.
isEqualTo
(
1
);
}
private
void
load
(
String
...
environment
)
{
...
...
@@ -85,7 +86,6 @@ public class CassandraAutoConfigurationTests {
this
.
context
=
ctx
;
}
@Configuration
static
class
ClusterConfig
{
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java
View file @
9fdb563d
...
...
@@ -70,8 +70,9 @@ public class SessionAutoConfigurationHazelcastTests
"spring.session.hazelcast.flush-mode=immediate"
);
HazelcastSessionRepository
repository
=
validateSessionRepository
(
HazelcastSessionRepository
.
class
);
assertThat
(
new
DirectFieldAccessor
(
repository
).
getPropertyValue
(
"hazelcastFlushMode"
)).
isEqualTo
(
HazelcastFlushMode
.
IMMEDIATE
);
assertThat
(
new
DirectFieldAccessor
(
repository
)
.
getPropertyValue
(
"hazelcastFlushMode"
))
.
isEqualTo
(
HazelcastFlushMode
.
IMMEDIATE
);
}
@Configuration
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java
View file @
9fdb563d
...
...
@@ -97,7 +97,6 @@ public class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurat
}
@Test
@SuppressWarnings
(
"unchecked"
)
public
void
mongoSessionStore
()
{
load
(
Arrays
.
asList
(
EmbeddedMongoAutoConfiguration
.
class
,
MongoAutoConfiguration
.
class
,
MongoDataAutoConfiguration
.
class
),
...
...
@@ -106,7 +105,6 @@ public class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurat
}
@Test
@SuppressWarnings
(
"unchecked"
)
public
void
mongoSessionStoreWithCustomizations
()
{
load
(
Arrays
.
asList
(
EmbeddedMongoAutoConfiguration
.
class
,
MongoAutoConfiguration
.
class
,
MongoDataAutoConfiguration
.
class
),
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java
View file @
9fdb563d
...
...
@@ -65,7 +65,8 @@ public class ValidationAutoConfigurationTests {
load
(
SampleConfiguration
.
class
);
assertThat
(
this
.
context
.
getBean
(
MethodValidationPostProcessor
.
class
))
.
isSameAs
(
this
.
context
.
getBean
(
"testMethodValidationPostProcessor"
));
assertThat
(
this
.
context
.
getBeansOfType
(
MethodValidationPostProcessor
.
class
)).
hasSize
(
1
);
assertThat
(
this
.
context
.
getBeansOfType
(
MethodValidationPostProcessor
.
class
))
.
hasSize
(
1
);
}
public
void
load
(
Class
<?>
config
)
{
...
...
@@ -84,6 +85,7 @@ public class ValidationAutoConfigurationTests {
public
void
doSomething
(
@Size
(
min
=
3
,
max
=
10
)
String
name
)
{
}
}
@Configuration
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationWithHibernateValidatorMissingElImplTests.java
View file @
9fdb563d
...
...
@@ -28,8 +28,8 @@ import org.springframework.validation.beanvalidation.MethodValidationPostProcess
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
/**
* Test for {
{@link ValidationAutoConfiguration} when Hibernate validator is present
*
but no
EL implementation is available.
* Test for {
@link ValidationAutoConfiguration} when Hibernate validator is present but no
* EL implementation is available.
*
* @author Stephane Nicoll
*/
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java
View file @
9fdb563d
...
...
@@ -435,10 +435,8 @@ public class ServerPropertiesTests {
map
.
put
(
"server.tomcat.port-header"
,
"x-my-forward-port"
);
map
.
put
(
"server.tomcat.protocol-header-https-value"
,
"On"
);
bindProperties
(
map
);
TomcatEmbeddedServletContainerFactory
container
=
new
TomcatEmbeddedServletContainerFactory
();
this
.
properties
.
customize
(
container
);
assertThat
(
container
.
getEngineValves
()).
hasSize
(
1
);
Valve
valve
=
container
.
getEngineValves
().
iterator
().
next
();
assertThat
(
valve
).
isInstanceOf
(
RemoteIpValve
.
class
);
...
...
@@ -455,7 +453,6 @@ public class ServerPropertiesTests {
Map
<
String
,
String
>
map
=
new
HashMap
<
String
,
String
>();
map
.
put
(
"server.tomcat.accept-count"
,
"10"
);
bindProperties
(
map
);
TomcatEmbeddedServletContainerFactory
container
=
new
TomcatEmbeddedServletContainerFactory
();
this
.
properties
.
customize
(
container
);
TomcatEmbeddedServletContainer
embeddedContainer
=
(
TomcatEmbeddedServletContainer
)
container
...
...
@@ -469,7 +466,6 @@ public class ServerPropertiesTests {
Map
<
String
,
String
>
map
=
new
HashMap
<
String
,
String
>();
map
.
put
(
"server.tomcat.max-connections"
,
"5"
);
bindProperties
(
map
);
TomcatEmbeddedServletContainerFactory
container
=
new
TomcatEmbeddedServletContainerFactory
();
this
.
properties
.
customize
(
container
);
TomcatEmbeddedServletContainer
embeddedContainer
=
(
TomcatEmbeddedServletContainer
)
container
...
...
@@ -483,7 +479,6 @@ public class ServerPropertiesTests {
Map
<
String
,
String
>
map
=
new
HashMap
<
String
,
String
>();
map
.
put
(
"server.tomcat.max-http-post-size"
,
"10000"
);
bindProperties
(
map
);
TomcatEmbeddedServletContainerFactory
container
=
new
TomcatEmbeddedServletContainerFactory
();
this
.
properties
.
customize
(
container
);
TomcatEmbeddedServletContainer
embeddedContainer
=
(
TomcatEmbeddedServletContainer
)
container
...
...
@@ -498,7 +493,6 @@ public class ServerPropertiesTests {
Map
<
String
,
String
>
map
=
new
HashMap
<
String
,
String
>();
map
.
put
(
"server.max-http-post-size"
,
"2000"
);
bindProperties
(
map
);
TomcatEmbeddedServletContainerFactory
container
=
new
TomcatEmbeddedServletContainerFactory
();
this
.
properties
.
customize
(
container
);
TomcatEmbeddedServletContainer
embeddedContainer
=
(
TomcatEmbeddedServletContainer
)
container
...
...
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