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

hyk001 · Dec 20, 2016 · 5fa507a · 5fa507a
2 parents 0b67787 + 6ccd858
commit 5fa507a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...ramework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java b/...ramework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java
@@ -200,7 +200,7 @@ public ConditionOutcome getMatchOutcome(ConditionContext context,
 
 	static class ClientCredentialsCondition extends AnyNestedCondition {
 
-		public ClientCredentialsCondition() {
+		ClientCredentialsCondition() {
 			super(ConfigurationPhase.PARSE_CONFIGURATION);
 		}
 
@@ -215,7 +215,7 @@ static class NoWebApplication {
 
 	static class NotClientCredentialsCondition extends NoneNestedConditions {
 
-		public NotClientCredentialsCondition() {
+		NotClientCredentialsCondition() {
 			super(ConfigurationPhase.PARSE_CONFIGURATION);
 		}
 

diff --git a/.../org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java b/.../org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java
@@ -196,7 +196,7 @@ public void testCanUseClientCredentials() {
 				"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 void testCanUseClientCredentialsWithEnableOAuth2Client() {
 				"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);
 		/*