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
a256602c
Commit
a256602c
authored
Oct 24, 2017
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
7065a417
Changes
23
Show whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
78 additions
and
62 deletions
+78
-62
CloudFoundryActuatorAutoConfiguration.java
...e/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java
+2
-2
CloudFoundryActuatorAutoConfigurationTests.java
...udfoundry/CloudFoundryActuatorAutoConfigurationTests.java
+4
-2
AnnotationEndpointDiscoverer.java
...ate/endpoint/annotation/AnnotationEndpointDiscoverer.java
+4
-2
LettuceConnectionConfiguration.java
...oconfigure/data/redis/LettuceConnectionConfiguration.java
+2
-2
SecurityAutoConfiguration.java
...oot/autoconfigure/security/SecurityAutoConfiguration.java
+1
-2
OAuth2ClientPropertiesRegistrationAdapter.java
...th2/client/OAuth2ClientPropertiesRegistrationAdapter.java
+10
-5
CustomHibernateJpaAutoConfigurationTests.java
...ure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java
+15
-15
HibernateJpaAutoConfigurationTests.java
...configure/orm/jpa/HibernateJpaAutoConfigurationTests.java
+1
-2
OAuth2ClientPropertiesRegistrationAdapterTests.java
...lient/OAuth2ClientPropertiesRegistrationAdapterTests.java
+2
-1
OAuth2WebSecurityConfigurationTests.java
...ty/oauth2/client/OAuth2WebSecurityConfigurationTests.java
+2
-1
ReactiveSecurityAutoConfigurationTests.java
...rity/reactive/ReactiveSecurityAutoConfigurationTests.java
+2
-2
CommandLineInvoker.java
...framework/boot/cli/infrastructure/CommandLineInvoker.java
+3
-2
WebTestClientSpringBootTestIntegrationTests.java
...ebclient/WebTestClientSpringBootTestIntegrationTests.java
+5
-3
DefinitionsParser.java
...ngframework/boot/test/mock/mockito/DefinitionsParser.java
+2
-2
BootRun.java
...va/org/springframework/boot/gradle/tasks/run/BootRun.java
+4
-2
PackagingDocumentationTests.java
...amework/boot/gradle/docs/PackagingDocumentationTests.java
+3
-3
RunningDocumentationTests.java
...framework/boot/gradle/docs/RunningDocumentationTests.java
+1
-1
AbstractBootArchiveIntegrationTests.java
...e/tasks/bundling/AbstractBootArchiveIntegrationTests.java
+2
-2
GradleBuild.java
.../org/springframework/boot/gradle/testkit/GradleBuild.java
+2
-1
RunArgumentsTests.java
...ava/org/springframework/boot/maven/RunArgumentsTests.java
+2
-2
ApplicationTemp.java
...c/main/java/org/springframework/boot/ApplicationTemp.java
+2
-2
ConfigurationPropertiesBindingPostProcessor.java
...operties/ConfigurationPropertiesBindingPostProcessor.java
+3
-3
EntityManagerFactoryBuilder.java
...ngframework/boot/orm/jpa/EntityManagerFactoryBuilder.java
+4
-3
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java
View file @
a256602c
...
@@ -85,8 +85,8 @@ public class CloudFoundryActuatorAutoConfiguration {
...
@@ -85,8 +85,8 @@ public class CloudFoundryActuatorAutoConfiguration {
endpointMediaTypes
);
endpointMediaTypes
);
return
new
CloudFoundryWebEndpointServletHandlerMapping
(
return
new
CloudFoundryWebEndpointServletHandlerMapping
(
new
EndpointMapping
(
"/cloudfoundryapplication"
),
new
EndpointMapping
(
"/cloudfoundryapplication"
),
endpointDiscoverer
.
discoverEndpoints
(),
endpointMediaTypes
,
getCorsConfiguration
(),
endpointDiscoverer
.
discoverEndpoints
(),
endpointMediaTypes
,
getSecurityInterceptor
(
builder
,
environment
));
get
CorsConfiguration
(),
get
SecurityInterceptor
(
builder
,
environment
));
}
}
private
CloudFoundrySecurityInterceptor
getSecurityInterceptor
(
private
CloudFoundrySecurityInterceptor
getSecurityInterceptor
(
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java
View file @
a256602c
...
@@ -208,11 +208,13 @@ public class CloudFoundryActuatorAutoConfigurationTests {
...
@@ -208,11 +208,13 @@ public class CloudFoundryActuatorAutoConfigurationTests {
}
}
@Test
@Test
public
void
allEndpointsAvailableUnderCloudFoundryWithoutEnablingWeb
()
throws
Exception
{
public
void
allEndpointsAvailableUnderCloudFoundryWithoutEnablingWeb
()
throws
Exception
{
this
.
context
.
register
(
TestConfiguration
.
class
);
this
.
context
.
register
(
TestConfiguration
.
class
);
this
.
context
.
refresh
();
this
.
context
.
refresh
();
CloudFoundryWebEndpointServletHandlerMapping
handlerMapping
=
getHandlerMapping
();
CloudFoundryWebEndpointServletHandlerMapping
handlerMapping
=
getHandlerMapping
();
List
<
EndpointInfo
<
WebEndpointOperation
>>
endpoints
=
(
List
<
EndpointInfo
<
WebEndpointOperation
>>)
handlerMapping
.
getEndpoints
();
List
<
EndpointInfo
<
WebEndpointOperation
>>
endpoints
=
(
List
<
EndpointInfo
<
WebEndpointOperation
>>)
handlerMapping
.
getEndpoints
();
assertThat
(
endpoints
.
size
()).
isEqualTo
(
1
);
assertThat
(
endpoints
.
size
()).
isEqualTo
(
1
);
assertThat
(
endpoints
.
get
(
0
).
getId
()).
isEqualTo
(
"test"
);
assertThat
(
endpoints
.
get
(
0
).
getId
()).
isEqualTo
(
"test"
);
}
}
...
...
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/AnnotationEndpointDiscoverer.java
View file @
a256602c
...
@@ -163,8 +163,10 @@ public abstract class AnnotationEndpointDiscoverer<T extends Operation, K>
...
@@ -163,8 +163,10 @@ public abstract class AnnotationEndpointDiscoverer<T extends Operation, K>
private
EndpointInfo
<
T
>
getEndpointInfo
(
Map
<
Class
<?>,
EndpointInfo
<
T
>>
endpoints
,
private
EndpointInfo
<
T
>
getEndpointInfo
(
Map
<
Class
<?>,
EndpointInfo
<
T
>>
endpoints
,
Class
<?>
beanType
,
Class
<?>
endpointClass
)
{
Class
<?>
beanType
,
Class
<?>
endpointClass
)
{
EndpointInfo
<
T
>
endpoint
=
endpoints
.
get
(
endpointClass
);
EndpointInfo
<
T
>
endpoint
=
endpoints
.
get
(
endpointClass
);
Assert
.
state
(
endpoint
!=
null
,
()
->
"Invalid extension '"
+
beanType
.
getName
()
Assert
.
state
(
endpoint
!=
null
,
+
"': no endpoint found with type '"
+
endpointClass
.
getName
()
+
"'"
);
()
->
"Invalid extension '"
+
beanType
.
getName
()
+
"': no endpoint found with type '"
+
endpointClass
.
getName
()
+
"'"
);
return
endpoint
;
return
endpoint
;
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java
View file @
a256602c
...
@@ -75,8 +75,8 @@ class LettuceConnectionConfiguration extends RedisConnectionConfiguration {
...
@@ -75,8 +75,8 @@ class LettuceConnectionConfiguration extends RedisConnectionConfiguration {
@ConditionalOnMissingBean
(
RedisConnectionFactory
.
class
)
@ConditionalOnMissingBean
(
RedisConnectionFactory
.
class
)
public
LettuceConnectionFactory
redisConnectionFactory
(
public
LettuceConnectionFactory
redisConnectionFactory
(
ClientResources
clientResources
)
throws
UnknownHostException
{
ClientResources
clientResources
)
throws
UnknownHostException
{
LettuceClientConfiguration
clientConfig
=
getLettuceClientConfiguration
(
clientResources
,
LettuceClientConfiguration
clientConfig
=
getLettuceClientConfiguration
(
this
.
properties
.
getLettuce
().
getPool
());
clientResources
,
this
.
properties
.
getLettuce
().
getPool
());
return
createLettuceConnectionFactory
(
clientConfig
);
return
createLettuceConnectionFactory
(
clientConfig
);
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java
View file @
a256602c
...
@@ -41,8 +41,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager;
...
@@ -41,8 +41,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager;
* @author Madhura Bhave
* @author Madhura Bhave
*/
*/
@Configuration
@Configuration
@ConditionalOnClass
({
AuthenticationManager
.
class
,
@ConditionalOnClass
({
AuthenticationManager
.
class
,
EnableWebSecurity
.
class
})
EnableWebSecurity
.
class
})
@EnableConfigurationProperties
(
SecurityProperties
.
class
)
@EnableConfigurationProperties
(
SecurityProperties
.
class
)
@Import
({
SpringBootWebSecurityConfiguration
.
class
,
WebSecurityEnablerConfiguration
.
class
,
@Import
({
SpringBootWebSecurityConfiguration
.
class
,
WebSecurityEnablerConfiguration
.
class
,
AuthenticationManagerConfiguration
.
class
,
SecurityDataConfiguration
.
class
})
AuthenticationManagerConfiguration
.
class
,
SecurityDataConfiguration
.
class
})
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java
View file @
a256602c
...
@@ -70,10 +70,12 @@ final class OAuth2ClientPropertiesRegistrationAdapter {
...
@@ -70,10 +70,12 @@ final class OAuth2ClientPropertiesRegistrationAdapter {
private
static
Builder
getBuilder
(
String
registrationId
,
String
configuredProviderId
,
private
static
Builder
getBuilder
(
String
registrationId
,
String
configuredProviderId
,
Map
<
String
,
Provider
>
providers
)
{
Map
<
String
,
Provider
>
providers
)
{
String
providerId
=
(
configuredProviderId
==
null
?
registrationId
:
configuredProviderId
);
String
providerId
=
(
configuredProviderId
==
null
?
registrationId
:
configuredProviderId
);
CommonOAuth2Provider
provider
=
getCommonProvider
(
providerId
);
CommonOAuth2Provider
provider
=
getCommonProvider
(
providerId
);
if
(
provider
==
null
&&
!
providers
.
containsKey
(
providerId
))
{
if
(
provider
==
null
&&
!
providers
.
containsKey
(
providerId
))
{
throw
new
IllegalStateException
(
getErrorMessage
(
configuredProviderId
,
registrationId
));
throw
new
IllegalStateException
(
getErrorMessage
(
configuredProviderId
,
registrationId
));
}
}
Builder
builder
=
(
provider
!=
null
?
provider
.
getBuilder
(
registrationId
)
Builder
builder
=
(
provider
!=
null
?
provider
.
getBuilder
(
registrationId
)
:
ClientRegistration
.
withRegistrationId
(
registrationId
));
:
ClientRegistration
.
withRegistrationId
(
registrationId
));
...
@@ -83,9 +85,12 @@ final class OAuth2ClientPropertiesRegistrationAdapter {
...
@@ -83,9 +85,12 @@ final class OAuth2ClientPropertiesRegistrationAdapter {
return
builder
;
return
builder
;
}
}
private
static
String
getErrorMessage
(
String
configuredProviderId
,
String
registrationId
)
{
private
static
String
getErrorMessage
(
String
configuredProviderId
,
return
(
configuredProviderId
==
null
?
"Provider ID must be specified for client registration '"
+
registrationId
+
"'"
:
String
registrationId
)
{
"Unknown provider ID '"
+
configuredProviderId
+
"'"
);
return
(
configuredProviderId
==
null
?
"Provider ID must be specified for client registration '"
+
registrationId
+
"'"
:
"Unknown provider ID '"
+
configuredProviderId
+
"'"
);
}
}
private
static
Builder
getBuilder
(
Builder
builder
,
Provider
provider
)
{
private
static
Builder
getBuilder
(
Builder
builder
,
Provider
provider
)
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java
View file @
a256602c
...
@@ -55,29 +55,29 @@ public class CustomHibernateJpaAutoConfigurationTests {
...
@@ -55,29 +55,29 @@ public class CustomHibernateJpaAutoConfigurationTests {
.
withConfiguration
(
AutoConfigurations
.
of
(
DataSourceAutoConfiguration
.
class
,
.
withConfiguration
(
AutoConfigurations
.
of
(
DataSourceAutoConfiguration
.
class
,
HibernateJpaAutoConfiguration
.
class
));
HibernateJpaAutoConfiguration
.
class
));
@Test
@Test
public
void
namingStrategyDelegatorTakesPrecedence
()
{
public
void
namingStrategyDelegatorTakesPrecedence
()
{
this
.
contextRunner
this
.
contextRunner
.
withPropertyValues
(
.
withPropertyValues
(
"spring.jpa.properties.hibernate.ejb.naming_strategy_delegator:"
"spring.jpa.properties.hibernate.ejb.naming_strategy_delegator:"
+
"org.hibernate.cfg.naming.ImprovedNamingStrategyDelegator"
+
"org.hibernate.cfg.naming.ImprovedNamingStrategyDelegator"
)
)
.
run
((
context
)
->
{
.
run
((
context
)
->
{
JpaProperties
bean
=
context
.
getBean
(
JpaProperties
.
class
);
JpaProperties
bean
=
context
.
getBean
(
JpaProperties
.
class
);
Map
<
String
,
String
>
hibernateProperties
=
bean
Map
<
String
,
String
>
hibernateProperties
=
bean
.
getHibernateProperties
(
"create-drop"
);
.
getHibernateProperties
(
"create-drop"
);
assertThat
(
hibernateProperties
.
get
(
"hibernate.ejb.naming_strategy"
)).
isNull
();
assertThat
(
hibernateProperties
.
get
(
"hibernate.ejb.naming_strategy"
))
.
isNull
();
});
});
}
}
@Test
@Test
public
void
defaultDatabaseForH2
()
{
public
void
defaultDatabaseForH2
()
{
this
.
contextRunner
.
withPropertyValues
(
this
.
contextRunner
.
withPropertyValues
(
"spring.datasource.url:jdbc:h2:mem:testdb"
,
"spring.datasource.url:jdbc:h2:mem:testdb"
,
"spring.datasource.initialize:false"
).
run
((
context
)
->
{
"spring.datasource.initialize:false"
).
run
((
context
)
->
{
HibernateJpaVendorAdapter
bean
=
context
HibernateJpaVendorAdapter
bean
=
context
.
getBean
(
HibernateJpaVendorAdapter
.
class
);
.
getBean
(
HibernateJpaVendorAdapter
.
class
);
Database
database
=
(
Database
)
ReflectionTestUtils
.
getField
(
bean
,
"database"
);
Database
database
=
(
Database
)
ReflectionTestUtils
.
getField
(
bean
,
"database"
);
assertThat
(
database
).
isEqualTo
(
Database
.
H2
);
assertThat
(
database
).
isEqualTo
(
Database
.
H2
);
});
});
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
View file @
a256602c
...
@@ -258,8 +258,7 @@ public class HibernateJpaAutoConfigurationTests
...
@@ -258,8 +258,7 @@ public class HibernateJpaAutoConfigurationTests
@Test
@Test
public
void
customResourceMapping
()
{
public
void
customResourceMapping
()
{
contextRunner
()
contextRunner
().
withClassLoader
(
new
HideDataScriptClassLoader
())
.
withClassLoader
(
new
HideDataScriptClassLoader
())
.
withPropertyValues
(
.
withPropertyValues
(
"spring.datasource.data:classpath:/db/non-annotated-data.sql"
,
"spring.datasource.data:classpath:/db/non-annotated-data.sql"
,
"spring.jpa.mapping-resources=META-INF/mappings/non-annotated.xml"
)
"spring.jpa.mapping-resources=META-INF/mappings/non-annotated.xml"
)
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java
View file @
a256602c
...
@@ -208,7 +208,8 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests {
...
@@ -208,7 +208,8 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests {
Registration
registration
=
new
Registration
();
Registration
registration
=
new
Registration
();
properties
.
getRegistration
().
put
(
"missing"
,
registration
);
properties
.
getRegistration
().
put
(
"missing"
,
registration
);
this
.
thrown
.
expect
(
IllegalStateException
.
class
);
this
.
thrown
.
expect
(
IllegalStateException
.
class
);
this
.
thrown
.
expectMessage
(
"Provider ID must be specified for client registration 'missing'"
);
this
.
thrown
.
expectMessage
(
"Provider ID must be specified for client registration 'missing'"
);
OAuth2ClientPropertiesRegistrationAdapter
.
getClientRegistrations
(
properties
);
OAuth2ClientPropertiesRegistrationAdapter
.
getClientRegistrations
(
properties
);
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java
View file @
a256602c
...
@@ -154,7 +154,8 @@ public class OAuth2WebSecurityConfigurationTests {
...
@@ -154,7 +154,8 @@ public class OAuth2WebSecurityConfigurationTests {
}
}
private
ClientRegistration
getClientRegistration
(
String
id
,
String
userInfoUri
)
{
private
ClientRegistration
getClientRegistration
(
String
id
,
String
userInfoUri
)
{
ClientRegistration
.
Builder
builder
=
ClientRegistration
.
withRegistrationId
(
id
);
ClientRegistration
.
Builder
builder
=
ClientRegistration
.
withRegistrationId
(
id
);
builder
.
clientName
(
"foo"
).
clientId
(
"foo"
)
builder
.
clientName
(
"foo"
).
clientId
(
"foo"
)
.
clientAuthenticationMethod
(
.
clientAuthenticationMethod
(
org
.
springframework
.
security
.
oauth2
.
core
.
ClientAuthenticationMethod
.
BASIC
)
org
.
springframework
.
security
.
oauth2
.
core
.
ClientAuthenticationMethod
.
BASIC
)
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java
View file @
a256602c
...
@@ -103,8 +103,8 @@ public class ReactiveSecurityAutoConfigurationTests {
...
@@ -103,8 +103,8 @@ public class ReactiveSecurityAutoConfigurationTests {
TestConfig
.
class
)
TestConfig
.
class
)
.
withConfiguration
(
.
withConfiguration
(
AutoConfigurations
.
of
(
ReactiveSecurityAutoConfiguration
.
class
))
AutoConfigurations
.
of
(
ReactiveSecurityAutoConfiguration
.
class
))
.
run
((
context
)
->
assertThat
(
context
)
.
getBean
(
ReactiveUserDetailsService
.
class
)
.
run
((
context
)
->
assertThat
(
context
)
.
isNull
());
.
getBean
(
ReactiveUserDetailsService
.
class
).
isNull
());
}
}
@Configuration
@Configuration
...
...
spring-boot-project/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java
View file @
a256602c
...
@@ -93,8 +93,9 @@ public final class CommandLineInvoker {
...
@@ -93,8 +93,9 @@ public final class CommandLineInvoker {
}
}
File
bin
=
new
File
(
unpacked
.
listFiles
()[
0
],
"bin"
);
File
bin
=
new
File
(
unpacked
.
listFiles
()[
0
],
"bin"
);
File
launchScript
=
new
File
(
bin
,
isWindows
()
?
"spring.bat"
:
"spring"
);
File
launchScript
=
new
File
(
bin
,
isWindows
()
?
"spring.bat"
:
"spring"
);
Assert
.
state
(
launchScript
.
exists
()
&&
launchScript
.
isFile
(),
()
->
Assert
.
state
(
launchScript
.
exists
()
&&
launchScript
.
isFile
(),
"Could not find CLI launch script "
+
launchScript
.
getAbsolutePath
());
()
->
"Could not find CLI launch script "
+
launchScript
.
getAbsolutePath
());
return
launchScript
;
return
launchScript
;
}
}
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/webclient/WebTestClientSpringBootTestIntegrationTests.java
View file @
a256602c
...
@@ -39,8 +39,9 @@ import static org.assertj.core.api.Assertions.assertThat;
...
@@ -39,8 +39,9 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Stephane Nicoll
* @author Stephane Nicoll
*/
*/
@RunWith
(
SpringRunner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
(
properties
=
"spring.main.web-application-type=reactive"
,
classes
=
{
WebTestClientSpringBootTestIntegrationTests
.
TestConfiguration
.
class
,
@SpringBootTest
(
properties
=
"spring.main.web-application-type=reactive"
,
classes
=
{
ExampleWebFluxApplication
.
class
})
WebTestClientSpringBootTestIntegrationTests
.
TestConfiguration
.
class
,
ExampleWebFluxApplication
.
class
})
@AutoConfigureWebTestClient
@AutoConfigureWebTestClient
public
class
WebTestClientSpringBootTestIntegrationTests
{
public
class
WebTestClientSpringBootTestIntegrationTests
{
...
@@ -71,7 +72,8 @@ public class WebTestClientSpringBootTestIntegrationTests {
...
@@ -71,7 +72,8 @@ public class WebTestClientSpringBootTestIntegrationTests {
@Configuration
@Configuration
static
class
TestConfiguration
{
static
class
TestConfiguration
{
@Bean
@Bean
public
SecurityWebFilterChain
springSecurityFilterChain
(
ServerHttpSecurity
http
)
throws
Exception
{
public
SecurityWebFilterChain
springSecurityFilterChain
(
ServerHttpSecurity
http
)
throws
Exception
{
http
.
authorizeExchange
().
anyExchange
().
permitAll
();
http
.
authorizeExchange
().
anyExchange
().
permitAll
();
return
http
.
build
();
return
http
.
build
();
}
}
...
...
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java
View file @
a256602c
...
@@ -109,8 +109,8 @@ class DefinitionsParser {
...
@@ -109,8 +109,8 @@ class DefinitionsParser {
private
void
addDefinition
(
AnnotatedElement
element
,
Definition
definition
,
private
void
addDefinition
(
AnnotatedElement
element
,
Definition
definition
,
String
type
)
{
String
type
)
{
boolean
isNewDefinition
=
this
.
definitions
.
add
(
definition
);
boolean
isNewDefinition
=
this
.
definitions
.
add
(
definition
);
Assert
.
state
(
isNewDefinition
,
()
->
Assert
.
state
(
isNewDefinition
,
"Duplicate "
+
type
+
" definition "
+
definition
);
()
->
"Duplicate "
+
type
+
" definition "
+
definition
);
if
(
element
instanceof
Field
)
{
if
(
element
instanceof
Field
)
{
Field
field
=
(
Field
)
element
;
Field
field
=
(
Field
)
element
;
this
.
definitionFields
.
put
(
definition
,
field
);
this
.
definitionFields
.
put
(
definition
,
field
);
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/run/BootRun.java
View file @
a256602c
...
@@ -40,7 +40,8 @@ import org.gradle.process.JavaExecSpec;
...
@@ -40,7 +40,8 @@ import org.gradle.process.JavaExecSpec;
*/
*/
public
class
BootRun
extends
DefaultTask
{
public
class
BootRun
extends
DefaultTask
{
private
final
PropertyState
<
String
>
mainClassName
=
getProject
().
property
(
String
.
class
);
private
final
PropertyState
<
String
>
mainClassName
=
getProject
()
.
property
(
String
.
class
);
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
private
final
PropertyState
<
List
<
String
>>
jvmArgs
=
(
PropertyState
<
List
<
String
>>)
(
Object
)
getProject
()
private
final
PropertyState
<
List
<
String
>>
jvmArgs
=
(
PropertyState
<
List
<
String
>>)
(
Object
)
getProject
()
...
@@ -90,7 +91,8 @@ public class BootRun extends DefaultTask {
...
@@ -90,7 +91,8 @@ public class BootRun extends DefaultTask {
}
}
/**
/**
* Sets the name of the main class to be executed using the given {@code mainClassNameProvider}.
* Sets the name of the main class to be executed using the given
* {@code mainClassNameProvider}.
*
*
* @param mainClassNameProvider provider of the main class name
* @param mainClassNameProvider provider of the main class name
*/
*/
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java
View file @
a256602c
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java
View file @
a256602c
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java
View file @
a256602c
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java
View file @
a256602c
...
@@ -196,7 +196,8 @@ public class GradleBuild implements TestRule {
...
@@ -196,7 +196,8 @@ public class GradleBuild implements TestRule {
XPathFactory
xPathFactory
=
XPathFactory
.
newInstance
();
XPathFactory
xPathFactory
=
XPathFactory
.
newInstance
();
XPath
xpath
=
xPathFactory
.
newXPath
();
XPath
xpath
=
xPathFactory
.
newXPath
();
XPathExpression
expr
=
xpath
.
compile
(
expression
);
XPathExpression
expr
=
xpath
.
compile
(
expression
);
String
version
=
expr
.
evaluate
(
new
InputSource
(
new
FileReader
(
".flattened-pom.xml"
)));
String
version
=
expr
.
evaluate
(
new
InputSource
(
new
FileReader
(
".flattened-pom.xml"
)));
return
version
;
return
version
;
}
}
catch
(
Exception
ex
)
{
catch
(
Exception
ex
)
{
...
...
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/RunArgumentsTests.java
View file @
a256602c
...
@@ -43,14 +43,14 @@ public class RunArgumentsTests {
...
@@ -43,14 +43,14 @@ public class RunArgumentsTests {
@Test
@Test
public
void
parseArrayContainingNullValue
()
{
public
void
parseArrayContainingNullValue
()
{
String
[]
args
=
new
RunArguments
(
new
String
[]
{
"foo"
,
null
,
"bar"
}).
asArray
();
String
[]
args
=
new
RunArguments
(
new
String
[]
{
"foo"
,
null
,
"bar"
}).
asArray
();
assertThat
(
args
).
isNotNull
();
assertThat
(
args
).
isNotNull
();
assertThat
(
args
).
containsOnly
(
"foo"
,
"bar"
);
assertThat
(
args
).
containsOnly
(
"foo"
,
"bar"
);
}
}
@Test
@Test
public
void
parseArrayContainingEmptyValue
()
{
public
void
parseArrayContainingEmptyValue
()
{
String
[]
args
=
new
RunArguments
(
new
String
[]
{
"foo"
,
""
,
"bar"
}).
asArray
();
String
[]
args
=
new
RunArguments
(
new
String
[]
{
"foo"
,
""
,
"bar"
}).
asArray
();
assertThat
(
args
).
isNotNull
();
assertThat
(
args
).
isNotNull
();
assertThat
(
args
).
containsOnly
(
"foo"
,
""
,
"bar"
);
assertThat
(
args
).
containsOnly
(
"foo"
,
""
,
"bar"
);
}
}
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationTemp.java
View file @
a256602c
...
@@ -91,8 +91,8 @@ public class ApplicationTemp {
...
@@ -91,8 +91,8 @@ public class ApplicationTemp {
Assert
.
state
(
StringUtils
.
hasLength
(
property
),
"No 'java.io.tmpdir' property set"
);
Assert
.
state
(
StringUtils
.
hasLength
(
property
),
"No 'java.io.tmpdir' property set"
);
File
file
=
new
File
(
property
);
File
file
=
new
File
(
property
);
Assert
.
state
(
file
.
exists
(),
()
->
"Temp directory"
+
file
+
" does not exist"
);
Assert
.
state
(
file
.
exists
(),
()
->
"Temp directory"
+
file
+
" does not exist"
);
Assert
.
state
(
file
.
isDirectory
(),
()
->
"Temp location "
+
file
Assert
.
state
(
file
.
isDirectory
(),
+
" is not a directory"
);
()
->
"Temp location "
+
file
+
" is not a directory"
);
return
file
;
return
file
;
}
}
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
View file @
a256602c
...
@@ -53,9 +53,9 @@ import org.springframework.validation.Validator;
...
@@ -53,9 +53,9 @@ import org.springframework.validation.Validator;
* @author Stephane Nicoll
* @author Stephane Nicoll
* @author Madhura Bhave
* @author Madhura Bhave
*/
*/
public
class
ConfigurationPropertiesBindingPostProcessor
implements
BeanPostProcessor
,
public
class
ConfigurationPropertiesBindingPostProcessor
BeanFactoryAware
,
EnvironmentAware
,
ApplicationContextAware
,
InitializingBean
,
implements
BeanPostProcessor
,
BeanFactoryAware
,
EnvironmentAware
,
PriorityOrdered
{
ApplicationContextAware
,
InitializingBean
,
PriorityOrdered
{
private
static
final
Log
logger
=
LogFactory
private
static
final
Log
logger
=
LogFactory
.
getLog
(
ConfigurationPropertiesBindingPostProcessor
.
class
);
.
getLog
(
ConfigurationPropertiesBindingPostProcessor
.
class
);
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java
View file @
a256602c
...
@@ -171,9 +171,10 @@ public class EntityManagerFactoryBuilder {
...
@@ -171,9 +171,10 @@ public class EntityManagerFactoryBuilder {
/**
/**
* The mapping resources (equivalent to {@code <mapping-file>} entries in
* The mapping resources (equivalent to {@code <mapping-file>} entries in
* {@code persistence.xml}) for the persistence unit.
* {@code persistence.xml}) for the persistence unit.
* <p>Note that mapping resources must be relative to the classpath root,
* <p>
* e.g. "META-INF/mappings.xml" or "com/mycompany/repository/mappings.xml",
* Note that mapping resources must be relative to the classpath root, e.g.
* so that they can be loaded through {@code ClassLoader.getResource}.
* "META-INF/mappings.xml" or "com/mycompany/repository/mappings.xml", so that
* they can be loaded through {@code ClassLoader.getResource}.
* @param mappingResources the mapping resources to use
* @param mappingResources the mapping resources to use
* @return the builder for fluent usage
* @return the builder for fluent usage
*/
*/
...
...
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