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

Align with spring-javaformat 0.0.15

Browse Source
This commit is contained in:
Vedran Pavic
2019-09-27 13:23:08 +02:00
parent ec82336477
commit bd36e115a8
53 changed files with 140 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/AbstractContainerJdbcIndexedSessionRepositoryITests.java
View File

@@ -36,7 +36,7 @@ abstract class AbstractContainerJdbcIndexedSessionRepositoryITests extends Abstr
static class BaseContainerConfig extends BaseConfig {
@Bean
public HikariDataSource dataSource(JdbcDatabaseContainer databaseContainer) {
HikariDataSource dataSource(JdbcDatabaseContainer databaseContainer) {
HikariDataSource dataSource = new HikariDataSource();
dataSource.setJdbcUrl(databaseContainer.getJdbcUrl());
dataSource.setUsername(databaseContainer.getUsername());
@@ -45,7 +45,7 @@ abstract class AbstractContainerJdbcIndexedSessionRepositoryITests extends Abstr
}
@Bean
public DataSourceInitializer dataSourceInitializer(DataSource dataSource, DatabasePopulator databasePopulator) {
DataSourceInitializer dataSourceInitializer(DataSource dataSource, DatabasePopulator databasePopulator) {
DataSourceInitializer initializer = new DataSourceInitializer();
initializer.setDataSource(dataSource);
initializer.setDatabasePopulator(databasePopulator);

2
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcIndexedSessionRepositoryITests.java
View File

@@ -771,7 +771,7 @@ abstract class AbstractJdbcIndexedSessionRepositoryITests {
static class BaseConfig {
@Bean
public PlatformTransactionManager transactionManager(DataSource dataSource) {
PlatformTransactionManager transactionManager(DataSource dataSource) {
return new DataSourceTransactionManager(dataSource);
}

4
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/Db211JdbcIndexedSessionRepositoryITests.java
View File

@@ -40,14 +40,14 @@ class Db211JdbcIndexedSessionRepositoryITests extends AbstractContainerJdbcIndex
static class Config extends BaseContainerConfig {
@Bean
public Db2Container databaseContainer() {
Db2Container databaseContainer() {
Db2Container databaseContainer = DatabaseContainers.db211();
databaseContainer.start();
return databaseContainer;
}
@Bean
public ResourceDatabasePopulator databasePopulator() {
ResourceDatabasePopulator databasePopulator() {
return DatabasePopulators.db2();
}

2
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DerbyJdbcIndexedSessionRepositoryITests.java
View File

@@ -41,7 +41,7 @@ class DerbyJdbcIndexedSessionRepositoryITests extends AbstractJdbcIndexedSession
static class Config extends BaseConfig {
@Bean
public EmbeddedDatabase dataSource() {
EmbeddedDatabase dataSource() {
return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.DERBY)
.addScript("org/springframework/session/jdbc/schema-derby.sql").build();
}

2
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/H2JdbcIndexedSessionRepositoryITests.java
View File

@@ -41,7 +41,7 @@ class H2JdbcIndexedSessionRepositoryITests extends AbstractJdbcIndexedSessionRep
static class Config extends BaseConfig {
@Bean
public EmbeddedDatabase dataSource() {
EmbeddedDatabase dataSource() {
return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2)
.addScript("org/springframework/session/jdbc/schema-h2.sql").build();
}

2
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/HsqldbJdbcIndexedSessionRepositoryITests.java
View File

@@ -41,7 +41,7 @@ class HsqldbJdbcIndexedSessionRepositoryITests extends AbstractJdbcIndexedSessio
static class Config extends BaseConfig {
@Bean
public EmbeddedDatabase dataSource() {
EmbeddedDatabase dataSource() {
return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL)
.addScript("org/springframework/session/jdbc/schema-hsqldb.sql").build();
}

4
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcIndexedSessionRepositoryITests.java
View File

@@ -40,14 +40,14 @@ class MariaDb10JdbcIndexedSessionRepositoryITests extends AbstractContainerJdbcI
static class Config extends BaseContainerConfig {
@Bean
public MariaDBContainer databaseContainer() {
MariaDBContainer databaseContainer() {
MariaDBContainer databaseContainer = DatabaseContainers.mariaDb10();
databaseContainer.start();
return databaseContainer;
}
@Bean
public ResourceDatabasePopulator databasePopulator() {
ResourceDatabasePopulator databasePopulator() {
return DatabasePopulators.mySql();
}

4
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb5JdbcIndexedSessionRepositoryITests.java
View File

@@ -40,14 +40,14 @@ class MariaDb5JdbcIndexedSessionRepositoryITests extends AbstractContainerJdbcIn
static class Config extends BaseContainerConfig {
@Bean
public MariaDBContainer databaseContainer() {
MariaDBContainer databaseContainer() {
MariaDBContainer databaseContainer = DatabaseContainers.mariaDb5();
databaseContainer.start();
return databaseContainer;
}
@Bean
public ResourceDatabasePopulator databasePopulator() {
ResourceDatabasePopulator databasePopulator() {
return DatabasePopulators.mySql();
}

4
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql5JdbcIndexedSessionRepositoryITests.java
View File

@@ -40,14 +40,14 @@ class MySql5JdbcIndexedSessionRepositoryITests extends AbstractContainerJdbcInde
static class Config extends BaseContainerConfig {
@Bean
public MySQLContainer databaseContainer() {
MySQLContainer databaseContainer() {
MySQLContainer databaseContainer = DatabaseContainers.mySql5();
databaseContainer.start();
return databaseContainer;
}
@Bean
public ResourceDatabasePopulator databasePopulator() {
ResourceDatabasePopulator databasePopulator() {
return DatabasePopulators.mySql();
}

4
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql8JdbcIndexedSessionRepositoryITests.java
View File

@@ -40,14 +40,14 @@ class MySql8JdbcIndexedSessionRepositoryITests extends AbstractContainerJdbcInde
static class Config extends BaseContainerConfig {
@Bean
public MySQLContainer databaseContainer() {
MySQLContainer databaseContainer() {
MySQLContainer databaseContainer = DatabaseContainers.mySql8();
databaseContainer.start();
return databaseContainer;
}
@Bean
public ResourceDatabasePopulator databasePopulator() {
ResourceDatabasePopulator databasePopulator() {
return DatabasePopulators.mySql();
}

4
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/OracleJdbcIndexedSessionRepositoryITests.java
View File

@@ -53,14 +53,14 @@ class OracleJdbcIndexedSessionRepositoryITests extends AbstractContainerJdbcInde
static class Config extends BaseContainerConfig {
@Bean
public OracleContainer databaseContainer() {
OracleContainer databaseContainer() {
OracleContainer databaseContainer = DatabaseContainers.oracleXe();
databaseContainer.start();
return databaseContainer;
}
@Bean
public ResourceDatabasePopulator databasePopulator() {
ResourceDatabasePopulator databasePopulator() {
return DatabasePopulators.oracle();
}

4
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql10JdbcIndexedSessionRepositoryITests.java
View File

@@ -41,14 +41,14 @@ class PostgreSql10JdbcIndexedSessionRepositoryITests extends AbstractContainerJd
static class Config extends BaseContainerConfig {
@Bean
public PostgreSQLContainer databaseContainer() {
PostgreSQLContainer databaseContainer() {
PostgreSQLContainer databaseContainer = DatabaseContainers.postgreSql10();
databaseContainer.start();
return databaseContainer;
}
@Bean
public ResourceDatabasePopulator databasePopulator() {
ResourceDatabasePopulator databasePopulator() {
return DatabasePopulators.postgreSql();
}

4
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql11JdbcIndexedSessionRepositoryITests.java
View File

@@ -41,14 +41,14 @@ class PostgreSql11JdbcIndexedSessionRepositoryITests extends AbstractContainerJd
static class Config extends BaseContainerConfig {
@Bean
public PostgreSQLContainer databaseContainer() {
PostgreSQLContainer databaseContainer() {
PostgreSQLContainer databaseContainer = DatabaseContainers.postgreSql11();
databaseContainer.start();
return databaseContainer;
}
@Bean
public ResourceDatabasePopulator databasePopulator() {
ResourceDatabasePopulator databasePopulator() {
return DatabasePopulators.postgreSql();
}

4
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql9JdbcIndexedSessionRepositoryITests.java
View File

@@ -41,14 +41,14 @@ class PostgreSql9JdbcIndexedSessionRepositoryITests extends AbstractContainerJdb
static class Config extends BaseContainerConfig {
@Bean
public PostgreSQLContainer databaseContainer() {
PostgreSQLContainer databaseContainer() {
PostgreSQLContainer databaseContainer = DatabaseContainers.postgreSql9();
databaseContainer.start();
return databaseContainer;
}
@Bean
public ResourceDatabasePopulator databasePopulator() {
ResourceDatabasePopulator databasePopulator() {
return DatabasePopulators.postgreSql();
}

4
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcIndexedSessionRepositoryITests.java
View File

@@ -41,14 +41,14 @@ class SqlServerJdbcIndexedSessionRepositoryITests extends AbstractContainerJdbcI
static class Config extends BaseContainerConfig {
@Bean
public MSSQLServerContainer databaseContainer() {
MSSQLServerContainer databaseContainer() {
MSSQLServerContainer databaseContainer = DatabaseContainers.sqlServer2017();
databaseContainer.start();
return databaseContainer;
}
@Bean
public ResourceDatabasePopulator databasePopulator() {
ResourceDatabasePopulator databasePopulator() {
return DatabasePopulators.sqlServer();
}

30
spring-session-jdbc/src/test/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfigurationTests.java
View File

@@ -310,12 +310,12 @@ class JdbcHttpSessionConfigurationTests {
static class DataSourceConfiguration {
@Bean
public DataSource defaultDataSource() {
DataSource defaultDataSource() {
return mock(DataSource.class);
}
@Bean
public PlatformTransactionManager transactionManager() {
PlatformTransactionManager transactionManager() {
return mock(PlatformTransactionManager.class);
}
@@ -401,7 +401,7 @@ class JdbcHttpSessionConfigurationTests {
@Bean
@SpringSessionDataSource
public DataSource qualifiedDataSource() {
DataSource qualifiedDataSource() {
return mock(DataSource.class);
}
@@ -412,7 +412,7 @@ class JdbcHttpSessionConfigurationTests {
@Bean
@Primary
public DataSource primaryDataSource() {
DataSource primaryDataSource() {
return mock(DataSource.class);
}
@@ -423,13 +423,13 @@ class JdbcHttpSessionConfigurationTests {
@Bean
@SpringSessionDataSource
public DataSource qualifiedDataSource() {
DataSource qualifiedDataSource() {
return mock(DataSource.class);
}
@Bean
@Primary
public DataSource primaryDataSource() {
DataSource primaryDataSource() {
return mock(DataSource.class);
}
@@ -439,7 +439,7 @@ class JdbcHttpSessionConfigurationTests {
static class NamedDataSourceConfiguration {
@Bean
public DataSource dataSource() {
DataSource dataSource() {
return mock(DataSource.class);
}
@@ -449,7 +449,7 @@ class JdbcHttpSessionConfigurationTests {
static class MultipleDataSourceConfiguration {
@Bean
public DataSource secondaryDataSource() {
DataSource secondaryDataSource() {
return mock(DataSource.class);
}
@@ -459,7 +459,7 @@ class JdbcHttpSessionConfigurationTests {
static class CustomTransactionOperationsConfiguration {
@Bean
public TransactionOperations springSessionTransactionOperations() {
TransactionOperations springSessionTransactionOperations() {
return TransactionOperations.withoutTransaction();
}
@@ -470,7 +470,7 @@ class JdbcHttpSessionConfigurationTests {
@Bean
@SuppressWarnings("unchecked")
public IndexResolver<Session> indexResolver() {
IndexResolver<Session> indexResolver() {
return mock(IndexResolver.class);
}
@@ -480,7 +480,7 @@ class JdbcHttpSessionConfigurationTests {
static class CustomLobHandlerConfiguration {
@Bean
public LobHandler springSessionLobHandler() {
LobHandler springSessionLobHandler() {
return mock(LobHandler.class);
}
@@ -490,7 +490,7 @@ class JdbcHttpSessionConfigurationTests {
static class CustomConversionServiceConfiguration {
@Bean
public ConversionService springSessionConversionService() {
ConversionService springSessionConversionService() {
return mock(ConversionService.class);
}
@@ -500,7 +500,7 @@ class JdbcHttpSessionConfigurationTests {
static class CustomJdbcHttpSessionConfiguration {
@Bean
public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
return new PropertySourcesPlaceholderConfigurer();
}
@@ -511,13 +511,13 @@ class JdbcHttpSessionConfigurationTests {
@Bean
@Order(0)
public SessionRepositoryCustomizer<JdbcIndexedSessionRepository> sessionRepositoryCustomizerOne() {
SessionRepositoryCustomizer<JdbcIndexedSessionRepository> sessionRepositoryCustomizerOne() {
return (sessionRepository) -> sessionRepository.setDefaultMaxInactiveInterval(0);
}
@Bean
@Order(1)
public SessionRepositoryCustomizer<JdbcIndexedSessionRepository> sessionRepositoryCustomizerTwo() {
SessionRepositoryCustomizer<JdbcIndexedSessionRepository> sessionRepositoryCustomizerTwo() {
return (sessionRepository) -> sessionRepository
.setDefaultMaxInactiveInterval(MAX_INACTIVE_INTERVAL_IN_SECONDS);
}