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

Polish

Browse Source 
Closes gh-10636
This commit is contained in:
Johnny Lim
2017-10-14 01:39:03 +09:00
committed by Stephane Nicoll
parent 0af4536316
commit 5aa32b3d0f
18 changed files with 28 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java
View File

@@ -37,12 +37,12 @@ public class OAuth2ClientProperties {
/**
* OAuth provider details.
*/
private Map<String, Provider> provider = new HashMap<>();
private final Map<String, Provider> provider = new HashMap<>();
/**
* OAuth client registrations.
*/
private Map<String, Registration> registration = new HashMap<>();
private final Map<String, Registration> registration = new HashMap<>();
public Map<String, Provider> getProvider() {
return this.provider;
@@ -92,28 +92,28 @@ public class OAuth2ClientProperties {
private String clientSecret;
/**
* Client authentication method. May be left bank then using a pre-defined
* Client authentication method. May be left blank then using a pre-defined
* provider.
*/
private String clientAuthenticationMethod;
/**
* Authorization grant type. May be left bank then using a pre-defined provider.
* Authorization grant type. May be left blank then using a pre-defined provider.
*/
private String authorizationGrantType;
/**
* Redirect URI. May be left bank then using a pre-defined provider.
* Redirect URI. May be left blank then using a pre-defined provider.
*/
private String redirectUri;
/**
* Authorization scopes. May be left bank then using a pre-defined provider.
* Authorization scopes. May be left blank then using a pre-defined provider.
*/
private Set<String> scope;
/**
* Client name. May be left bank then using a pre-defined provider.
* Client name. May be left blank then using a pre-defined provider.
*/
private String clientName;

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NonUniqueSessionRepositoryFailureAnalyzer.java
View File

@@ -20,7 +20,7 @@ import org.springframework.boot.diagnostics.AbstractFailureAnalyzer;
import org.springframework.boot.diagnostics.FailureAnalysis;
/**
* A {@link AbstractFailureAnalyzer} for {@link NonUniqueSessionRepositoryException}.
* An {@link AbstractFailureAnalyzer} for {@link NonUniqueSessionRepositoryException}.
*
* @author Stephane Nicoll
*/

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java
View File

@@ -29,9 +29,7 @@ import org.apache.tomcat.jdbc.pool.DataSource;
import org.apache.tomcat.jdbc.pool.DataSourceProxy;
import org.apache.tomcat.jdbc.pool.jmx.ConnectionPool;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
import org.springframework.boot.test.util.TestPropertyValues;
@@ -47,9 +45,6 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class DataSourceJmxConfigurationTests {
@Rule
public ExpectedException thrown = ExpectedException.none();
private ConfigurableApplicationContext context;
@After

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactoryTests.java
View File

@@ -23,9 +23,7 @@ import com.mongodb.MongoCredential;
import com.mongodb.ServerAddress;
import com.mongodb.connection.Cluster;
import com.mongodb.connection.ClusterSettings;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@@ -45,9 +43,6 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class MongoClientFactoryTests {
@Rule
public ExpectedException thrown = ExpectedException.none();
private MockEnvironment environment = new MockEnvironment();
@Test

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

@@ -48,7 +48,7 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests {
provider.setAuthorizationUri("http://example.com/auth");
provider.setTokenUri("http://example.com/token");
provider.setUserInfoUri("http://example.com/info");
provider.setJwkSetUri("http://example.com/jkw");
provider.setJwkSetUri("http://example.com/jwk");
Registration registration = new Registration();
registration.setProvider("provider");
registration.setClientId("clientId");
@@ -69,7 +69,7 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests {
assertThat(adaptedProvider.getTokenUri()).isEqualTo("http://example.com/token");
assertThat(adaptedProvider.getUserInfoEndpoint().getUri())
.isEqualTo("http://example.com/info");
assertThat(adaptedProvider.getJwkSetUri()).isEqualTo("http://example.com/jkw");
assertThat(adaptedProvider.getJwkSetUri()).isEqualTo("http://example.com/jwk");
assertThat(adapted.getRegistrationId()).isEqualTo("registration");
assertThat(adapted.getClientId()).isEqualTo("clientId");
assertThat(adapted.getClientSecret()).isEqualTo("clientSecret");