Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.5.x'

Browse Source
This commit is contained in:
Dave Syer
2016-12-20 13:00:03 +00:00
parent 0b6778754c 6ccd858fc0
commit 5fa507a477
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java
View File

@@ -200,7 +200,7 @@ public class OAuth2RestOperationsConfiguration {
static class ClientCredentialsCondition extends AnyNestedCondition {
public ClientCredentialsCondition() {
ClientCredentialsCondition() {
super(ConfigurationPhase.PARSE_CONFIGURATION);
}
@@ -215,7 +215,7 @@ public class OAuth2RestOperationsConfiguration {
static class NotClientCredentialsCondition extends NoneNestedConditions {
public NotClientCredentialsCondition() {
NotClientCredentialsCondition() {
super(ConfigurationPhase.PARSE_CONFIGURATION);
}

4
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java
View File

@@ -196,7 +196,7 @@ public class OAuth2AutoConfigurationTests {
"security.oauth2.client.clientId=client",
"security.oauth2.client.grantType=client_credentials");
this.context.refresh();
assertThat(context.getBean(OAuth2ClientContext.class).getAccessTokenRequest())
assertThat(this.context.getBean(OAuth2ClientContext.class).getAccessTokenRequest())
.isNotNull();
assertThat(countBeans(ClientCredentialsResourceDetails.class)).isEqualTo(1);
assertThat(countBeans(OAuth2ClientContext.class)).isEqualTo(1);
@@ -212,7 +212,7 @@ public class OAuth2AutoConfigurationTests {
"security.oauth2.client.grantType=client_credentials");
this.context.refresh();
// Thr primary context is fine (not session scoped):
assertThat(context.getBean(OAuth2ClientContext.class).getAccessTokenRequest())
assertThat(this.context.getBean(OAuth2ClientContext.class).getAccessTokenRequest())
.isNotNull();
assertThat(countBeans(ClientCredentialsResourceDetails.class)).isEqualTo(1);
/*