mirror of
https://github.com/spring-projects/spring-session.git
synced 2024-10-23 06:34:33 +08:00
Merge branch '3.2.x' into 3.3.x
This commit is contained in:
commit
d816bb1002
@ -27,7 +27,7 @@ com-zaxxer-HikariCP = "com.zaxxer:HikariCP:5.1.0"
|
||||
edu-umd-cs-mtc-multithreadedtc = "edu.umd.cs.mtc:multithreadedtc:1.01"
|
||||
io-lettuce-lettuce-core = "io.lettuce:lettuce-core:6.3.2.RELEASE"
|
||||
io-projectreactor-reactor-bom = "io.projectreactor:reactor-bom:2023.0.9"
|
||||
io-spring-javaformat-spring-javaformat-checkstyle = "io.spring.javaformat:spring-javaformat-checkstyle:0.0.42"
|
||||
io-spring-javaformat-spring-javaformat-checkstyle = "io.spring.javaformat:spring-javaformat-checkstyle:0.0.43"
|
||||
io-spring-nohttp-nohttp-checkstyle = "io.spring.nohttp:nohttp-checkstyle:0.0.11"
|
||||
jakarta-servlet-jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:6.0.0"
|
||||
jakarta-servlet-jsp-jstl-jakarta-servlet-jsp-jstl-api = "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.1"
|
||||
|
@ -57,7 +57,7 @@ import org.springframework.web.reactive.function.BodyInserters;
|
||||
*/
|
||||
@ExtendWith(SpringExtension.class)
|
||||
@ContextConfiguration
|
||||
public class MongoDbDeleteJacksonSessionVerificationTest {
|
||||
class MongoDbDeleteJacksonSessionVerificationTest {
|
||||
|
||||
@Autowired
|
||||
ApplicationContext ctx;
|
||||
|
@ -57,7 +57,7 @@ import org.springframework.web.reactive.function.BodyInserters;
|
||||
*/
|
||||
@ExtendWith(SpringExtension.class)
|
||||
@ContextConfiguration
|
||||
public class MongoDbLogoutVerificationTest {
|
||||
class MongoDbLogoutVerificationTest {
|
||||
|
||||
@Autowired
|
||||
ApplicationContext ctx;
|
||||
|
@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
* @author Greg Turnquist
|
||||
*/
|
||||
@ContextConfiguration
|
||||
public class MongoRepositoryJacksonITest extends AbstractMongoRepositoryITest {
|
||||
class MongoRepositoryJacksonITest extends AbstractMongoRepositoryITest {
|
||||
|
||||
@Test
|
||||
void findByCustomIndex() throws Exception {
|
||||
|
@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
* @author Greg Turnquist
|
||||
*/
|
||||
@ContextConfiguration
|
||||
public class MongoRepositoryJdkSerializationITest extends AbstractMongoRepositoryITest {
|
||||
class MongoRepositoryJdkSerializationITest extends AbstractMongoRepositoryITest {
|
||||
|
||||
@Test
|
||||
void findByDeletedSecurityPrincipalNameReload() throws Exception {
|
||||
|
@ -35,7 +35,7 @@ import org.springframework.util.ReflectionUtils;
|
||||
* @author Jakub Kubrynski
|
||||
* @author Greg Turnquist
|
||||
*/
|
||||
public class JacksonMongoSessionConverterTests extends AbstractMongoSessionConverterTests {
|
||||
class JacksonMongoSessionConverterTests extends AbstractMongoSessionConverterTests {
|
||||
|
||||
JacksonMongoSessionConverter mongoSessionConverter = new JacksonMongoSessionConverter();
|
||||
|
||||
|
@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
|
||||
* @author Rob Winch
|
||||
* @author Greg Turnquist
|
||||
*/
|
||||
public class JdkMongoSessionConverterTests extends AbstractMongoSessionConverterTests {
|
||||
class JdkMongoSessionConverterTests extends AbstractMongoSessionConverterTests {
|
||||
|
||||
Duration inactiveInterval = Duration.ofMinutes(30);
|
||||
|
||||
|
@ -53,7 +53,7 @@ import static org.mockito.BDDMockito.verify;
|
||||
* @author Greg Turnquist
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
public class MongoIndexedSessionRepositoryTests {
|
||||
class MongoIndexedSessionRepositoryTests {
|
||||
|
||||
@Mock
|
||||
private AbstractMongoSessionConverter converter;
|
||||
|
@ -27,7 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
* @author Rob Winch
|
||||
* @author Greg Turnquist
|
||||
*/
|
||||
public class MongoSessionTests {
|
||||
class MongoSessionTests {
|
||||
|
||||
@Test
|
||||
void isExpiredWhenIntervalNegativeThenFalse() {
|
||||
|
@ -56,7 +56,7 @@ import static org.mockito.BDDMockito.verify;
|
||||
* @author Greg Turnquist
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
public class ReactiveMongoSessionRepositoryTests {
|
||||
class ReactiveMongoSessionRepositoryTests {
|
||||
|
||||
@Mock
|
||||
private AbstractMongoSessionConverter converter;
|
||||
|
@ -54,7 +54,7 @@ import static org.mockito.BDDMockito.mock;
|
||||
* @author Eddú Meléndez
|
||||
* @author Vedran Pavic
|
||||
*/
|
||||
public class MongoHttpSessionConfigurationTests {
|
||||
class MongoHttpSessionConfigurationTests {
|
||||
|
||||
private static final String COLLECTION_NAME = "testSessions";
|
||||
|
||||
|
@ -61,7 +61,7 @@ import static org.mockito.BDDMockito.verify;
|
||||
* @author Greg Turnquist
|
||||
* @author Vedran Pavic
|
||||
*/
|
||||
public class ReactiveMongoWebSessionConfigurationTests {
|
||||
class ReactiveMongoWebSessionConfigurationTests {
|
||||
|
||||
private AnnotationConfigApplicationContext context;
|
||||
|
||||
|
@ -41,7 +41,7 @@ import static org.mockito.Mockito.mock;
|
||||
*/
|
||||
@ExtendWith(SpringExtension.class)
|
||||
@ContextConfiguration
|
||||
public class RedisHttpSessionConfigurationClassPathXmlApplicationContextTests {
|
||||
class RedisHttpSessionConfigurationClassPathXmlApplicationContextTests {
|
||||
|
||||
// gh-318
|
||||
@Test
|
||||
|
@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock;
|
||||
@ExtendWith(SpringExtension.class)
|
||||
@ContextConfiguration
|
||||
@WebAppConfiguration
|
||||
public class RedisHttpSessionConfigurationXmlCustomExpireTests {
|
||||
class RedisHttpSessionConfigurationXmlCustomExpireTests {
|
||||
|
||||
@Test
|
||||
void contextLoads() {
|
||||
|
@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock;
|
||||
@ExtendWith(SpringExtension.class)
|
||||
@ContextConfiguration
|
||||
@WebAppConfiguration
|
||||
public class RedisHttpSessionConfigurationXmlTests {
|
||||
class RedisHttpSessionConfigurationXmlTests {
|
||||
|
||||
@Test
|
||||
void contextLoads() {
|
||||
|
@ -41,7 +41,7 @@ import static org.mockito.Mockito.mock;
|
||||
@ExtendWith(SpringExtension.class)
|
||||
@ContextConfiguration
|
||||
@WebAppConfiguration
|
||||
public class HttpSessionConfigurationNoOpConfigureRedisActionXmlTests {
|
||||
class HttpSessionConfigurationNoOpConfigureRedisActionXmlTests {
|
||||
|
||||
@Autowired
|
||||
SessionRepositoryFilter<? extends Session> filter;
|
||||
|
@ -64,11 +64,11 @@ class IndexDocTests {
|
||||
}
|
||||
|
||||
// tag::repository-demo[]
|
||||
public class RepositoryDemo<S extends Session> {
|
||||
class RepositoryDemo<S extends Session> {
|
||||
|
||||
private SessionRepository<S> repository; // <1>
|
||||
|
||||
public void demo() {
|
||||
void demo() {
|
||||
S toSave = this.repository.createSession(); // <2>
|
||||
|
||||
// <3>
|
||||
@ -98,11 +98,11 @@ class IndexDocTests {
|
||||
}
|
||||
|
||||
// tag::expire-repository-demo[]
|
||||
public class ExpiringRepositoryDemo<S extends Session> {
|
||||
class ExpiringRepositoryDemo<S extends Session> {
|
||||
|
||||
private SessionRepository<S> repository; // <1>
|
||||
|
||||
public void demo() {
|
||||
void demo() {
|
||||
S toSave = this.repository.createSession(); // <2>
|
||||
// ...
|
||||
toSave.setMaxInactiveInterval(Duration.ofSeconds(30)); // <3>
|
||||
|
@ -27,7 +27,7 @@ import static org.springframework.security.test.web.servlet.response.SecurityMoc
|
||||
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
|
||||
@AutoConfigureMockMvc
|
||||
@Import(TestContainersConfig.class)
|
||||
public class JdbcJsonAttributeTests {
|
||||
class JdbcJsonAttributeTests {
|
||||
|
||||
@Autowired
|
||||
MockMvc mvc;
|
||||
|
@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
* @author Yanming Zhou
|
||||
*/
|
||||
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
|
||||
public class AttributeTests {
|
||||
class AttributeTests {
|
||||
|
||||
@LocalServerPort
|
||||
int port;
|
||||
|
@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
*/
|
||||
@AutoConfigureMockMvc
|
||||
@SpringBootTest
|
||||
public class BootTests {
|
||||
class BootTests {
|
||||
|
||||
@Autowired
|
||||
private MockMvc mockMvc;
|
||||
|
Loading…
Reference in New Issue
Block a user