Skip to content

Commit 8e8de48

Browse files
vpavicrwinch
vpavic
authored and
rwinch
committed
Fix deprecation warnings
1 parent 8c49d59 commit 8e8de48

File tree

66 files changed

+278
-230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+278
-230
lines changed

‎spring-session-core/spring-session-core.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies {
1919

2020
testImplementation "io.projectreactor:reactor-test"
2121
testImplementation "org.mockito:mockito-core"
22+
testImplementation "org.mockito:mockito-junit-jupiter"
2223
testImplementation "org.mockito:mockito-inline"
2324
testImplementation "edu.umd.cs.mtc:multithreadedtc"
2425
testImplementation "org.springframework:spring-test"

‎spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2021 the original author or authors.
2+
* Copyright 2014-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,12 +24,12 @@
2424
import java.util.List;
2525
import java.util.Map;
2626

27-
import org.junit.jupiter.api.BeforeEach;
2827
import org.junit.jupiter.api.Test;
28+
import org.junit.jupiter.api.extension.ExtendWith;
2929
import org.mockito.ArgumentCaptor;
3030
import org.mockito.InjectMocks;
3131
import org.mockito.Mock;
32-
import org.mockito.MockitoAnnotations;
32+
import org.mockito.junit.jupiter.MockitoExtension;
3333

3434
import org.springframework.security.core.AuthenticatedPrincipal;
3535
import org.springframework.security.core.Authentication;
@@ -44,10 +44,12 @@
4444
import static org.mockito.BDDMockito.given;
4545
import static org.mockito.BDDMockito.mock;
4646
import static org.mockito.BDDMockito.verify;
47+
import static org.mockito.Mockito.withSettings;
4748

4849
/**
4950
* Tests for {@link SpringSessionBackedSessionRegistry}.
5051
*/
52+
@ExtendWith(MockitoExtension.class)
5153
class SpringSessionBackedSessionRegistryTest {
5254

5355
private static final String SESSION_ID = "sessionId";
@@ -66,11 +68,6 @@ class SpringSessionBackedSessionRegistryTest {
6668
@InjectMocks
6769
private SpringSessionBackedSessionRegistry<Session> sessionRegistry;
6870

69-
@BeforeEach
70-
void setUp() {
71-
MockitoAnnotations.initMocks(this);
72-
}
73-
7471
@Test
7572
void sessionInformationForExistingSession() {
7673
Session session = createSession(SESSION_ID, USER_NAME, NOW);
@@ -157,7 +154,7 @@ void expireNow() {
157154
private Session createSession(String sessionId, String userName, Instant lastAccessed) {
158155
MapSession session = new MapSession(sessionId);
159156
session.setLastAccessedTime(lastAccessed);
160-
Authentication authentication = mock(Authentication.class);
157+
Authentication authentication = mock(Authentication.class, withSettings().lenient());
161158
given(authentication.getName()).willReturn(userName);
162159
SecurityContextImpl securityContext = new SecurityContextImpl();
163160
securityContext.setAuthentication(authentication);

‎spring-session-core/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2019 the original author or authors.
2+
* Copyright 2014-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,18 +26,20 @@
2626

2727
import org.junit.jupiter.api.BeforeEach;
2828
import org.junit.jupiter.api.Test;
29+
import org.junit.jupiter.api.extension.ExtendWith;
2930
import org.mockito.Mock;
30-
import org.mockito.MockitoAnnotations;
31+
import org.mockito.junit.jupiter.MockitoExtension;
3132

3233
import static org.assertj.core.api.Assertions.assertThat;
3334
import static org.mockito.BDDMockito.given;
3435
import static org.mockito.Mockito.verify;
3536

37+
@ExtendWith(MockitoExtension.class)
3638
class OnCommittedResponseWrapperTests {
3739

3840
private static final String NL = "\r\n";
3941

40-
@Mock
42+
@Mock(lenient = true)
4143
HttpServletResponse delegate;
4244

4345
@Mock
@@ -52,7 +54,6 @@ class OnCommittedResponseWrapperTests {
5254

5355
@BeforeEach
5456
void setup() throws Exception {
55-
MockitoAnnotations.initMocks(this);
5657
this.response = new OnCommittedResponseWrapper(this.delegate) {
5758
@Override
5859
protected void onResponseCommitted() {

‎spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2021 the original author or authors.
2+
* Copyright 2014-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,10 +25,11 @@
2525

2626
import org.junit.jupiter.api.BeforeEach;
2727
import org.junit.jupiter.api.Test;
28+
import org.junit.jupiter.api.extension.ExtendWith;
2829
import org.mockito.ArgumentCaptor;
2930
import org.mockito.Captor;
3031
import org.mockito.Mock;
31-
import org.mockito.MockitoAnnotations;
32+
import org.mockito.junit.jupiter.MockitoExtension;
3233

3334
import org.springframework.mock.web.MockServletContext;
3435
import org.springframework.session.MapSession;
@@ -47,6 +48,7 @@
4748
* @author Rob Winch
4849
* @since 1.1
4950
*/
51+
@ExtendWith(MockitoExtension.class)
5052
class SessionEventHttpSessionListenerAdapterTests {
5153

5254
@Mock
@@ -69,7 +71,6 @@ class SessionEventHttpSessionListenerAdapterTests {
6971

7072
@BeforeEach
7173
void setup() {
72-
MockitoAnnotations.initMocks(this);
7374
this.listener = new SessionEventHttpSessionListenerAdapter(Arrays.asList(this.listener1, this.listener2));
7475
this.listener.setServletContext(new MockServletContext());
7576

‎spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2019 the original author or authors.
2+
* Copyright 2014-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -45,8 +45,9 @@
4545
import org.assertj.core.data.Offset;
4646
import org.junit.jupiter.api.BeforeEach;
4747
import org.junit.jupiter.api.Test;
48+
import org.junit.jupiter.api.extension.ExtendWith;
4849
import org.mockito.Mock;
49-
import org.mockito.MockitoAnnotations;
50+
import org.mockito.junit.jupiter.MockitoExtension;
5051

5152
import org.springframework.core.Ordered;
5253
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
@@ -78,6 +79,7 @@
7879
/**
7980
* Tests for {@link SessionRepositoryFilter}.
8081
*/
82+
@ExtendWith(MockitoExtension.class)
8183
@SuppressWarnings("deprecation")
8284
class SessionRepositoryFilterTests {
8385

@@ -98,7 +100,6 @@ class SessionRepositoryFilterTests {
98100

99101
@BeforeEach
100102
void setup() {
101-
MockitoAnnotations.initMocks(this);
102103
this.sessions = new HashMap<>();
103104
this.sessionRepository = new MapSessionRepository(this.sessions);
104105
this.filter = new SessionRepositoryFilter<>(this.sessionRepository);

‎spring-session-core/src/test/java/org/springframework/session/web/server/session/SpringSessionWebSessionStoreTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2019 the original author or authors.
2+
* Copyright 2014-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,8 +23,9 @@
2323

2424
import org.junit.jupiter.api.BeforeEach;
2525
import org.junit.jupiter.api.Test;
26+
import org.junit.jupiter.api.extension.ExtendWith;
2627
import org.mockito.Mock;
27-
import org.mockito.MockitoAnnotations;
28+
import org.mockito.junit.jupiter.MockitoExtension;
2829
import reactor.core.publisher.Mono;
2930

3031
import org.springframework.session.ReactiveSessionRepository;
@@ -43,9 +44,10 @@
4344
* @author Rob Winch
4445
* @author Vedran Pavic
4546
*/
47+
@ExtendWith(MockitoExtension.class)
4648
class SpringSessionWebSessionStoreTests<S extends Session> {
4749

48-
@Mock
50+
@Mock(lenient = true)
4951
private ReactiveSessionRepository<S> sessionRepository;
5052

5153
@Mock
@@ -58,7 +60,6 @@ class SpringSessionWebSessionStoreTests<S extends Session> {
5860

5961
@BeforeEach
6062
void setup() {
61-
MockitoAnnotations.initMocks(this);
6263
this.webSessionStore = new SpringSessionWebSessionStore<>(this.sessionRepository);
6364
given(this.sessionRepository.findById(any())).willReturn(Mono.just(this.findByIdSession));
6465
given(this.sessionRepository.createSession()).willReturn(Mono.just(this.createSession));

‎spring-session-core/src/test/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactoryTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2019 the original author or authors.
2+
* Copyright 2014-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,10 +18,11 @@
1818

1919
import org.junit.jupiter.api.BeforeEach;
2020
import org.junit.jupiter.api.Test;
21+
import org.junit.jupiter.api.extension.ExtendWith;
2122
import org.mockito.ArgumentCaptor;
2223
import org.mockito.Captor;
2324
import org.mockito.Mock;
24-
import org.mockito.MockitoAnnotations;
25+
import org.mockito.junit.jupiter.MockitoExtension;
2526

2627
import org.springframework.context.ApplicationEvent;
2728
import org.springframework.context.ApplicationEventPublisher;
@@ -35,6 +36,7 @@
3536
import static org.mockito.Mockito.any;
3637
import static org.mockito.Mockito.verify;
3738

39+
@ExtendWith(MockitoExtension.class)
3840
class WebSocketConnectHandlerDecoratorFactoryTests {
3941

4042
@Mock
@@ -53,7 +55,6 @@ class WebSocketConnectHandlerDecoratorFactoryTests {
5355

5456
@BeforeEach
5557
void setup() {
56-
MockitoAnnotations.initMocks(this);
5758
this.factory = new WebSocketConnectHandlerDecoratorFactory(this.eventPublisher);
5859
}
5960

‎spring-session-core/src/test/java/org/springframework/session/web/socket/handler/WebSocketRegistryListenerTests.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2019 the original author or authors.
2+
* Copyright 2014-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,8 +22,9 @@
2222

2323
import org.junit.jupiter.api.BeforeEach;
2424
import org.junit.jupiter.api.Test;
25+
import org.junit.jupiter.api.extension.ExtendWith;
2526
import org.mockito.Mock;
26-
import org.mockito.MockitoAnnotations;
27+
import org.mockito.junit.jupiter.MockitoExtension;
2728

2829
import org.springframework.messaging.Message;
2930
import org.springframework.messaging.MessageHeaders;
@@ -44,15 +45,16 @@
4445
import static org.mockito.Mockito.times;
4546
import static org.mockito.Mockito.verify;
4647

48+
@ExtendWith(MockitoExtension.class)
4749
class WebSocketRegistryListenerTests {
4850

49-
@Mock
51+
@Mock(lenient = true)
5052
private WebSocketSession wsSession;
5153

52-
@Mock
54+
@Mock(lenient = true)
5355
private WebSocketSession wsSession2;
5456

55-
@Mock
57+
@Mock(lenient = true)
5658
private Message<byte[]> message;
5759

5860
@Mock
@@ -74,7 +76,6 @@ class WebSocketRegistryListenerTests {
7476

7577
@BeforeEach
7678
void setup() {
77-
MockitoAnnotations.initMocks(this);
7879
String sessionId = "session-id";
7980
MapSession session = new MapSession(sessionId);
8081

‎spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2019 the original author or authors.
2+
* Copyright 2014-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -27,9 +27,10 @@
2727

2828
import org.junit.jupiter.api.BeforeEach;
2929
import org.junit.jupiter.api.Test;
30+
import org.junit.jupiter.api.extension.ExtendWith;
3031
import org.mockito.ArgumentMatcher;
3132
import org.mockito.Mock;
32-
import org.mockito.MockitoAnnotations;
33+
import org.mockito.junit.jupiter.MockitoExtension;
3334

3435
import org.springframework.http.server.ServletServerHttpRequest;
3536
import org.springframework.messaging.Message;
@@ -51,9 +52,10 @@
5152
import static org.mockito.Mockito.verify;
5253
import static org.mockito.Mockito.verifyNoMoreInteractions;
5354

55+
@ExtendWith(MockitoExtension.class)
5456
class SessionRepositoryMessageInterceptorTests {
5557

56-
@Mock
58+
@Mock(lenient = true)
5759
SessionRepository<Session> sessionRepository;
5860

5961
@Mock
@@ -70,7 +72,6 @@ class SessionRepositoryMessageInterceptorTests {
7072

7173
@BeforeEach
7274
void setup() {
73-
MockitoAnnotations.initMocks(this);
7475
this.interceptor = new SessionRepositoryMessageInterceptor<>(this.sessionRepository);
7576
this.headers = SimpMessageHeaderAccessor.create();
7677
this.headers.setSessionId("session");

‎spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,8 @@ public MongoDBContainer mongoDbContainer() {
401401
@Bean
402402
public MongoOperations mongoOperations(MongoDBContainer mongoContainer) {
403403

404-
MongoClient mongo = MongoClients.create(
405-
"mongodb://" + mongoContainer.getContainerIpAddress() + ":" + mongoContainer.getFirstMappedPort());
404+
MongoClient mongo = MongoClients
405+
.create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort());
406406
return new MongoTemplate(mongo, "test");
407407
}
408408

‎spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbDeleteJacksonSessionVerificationTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,8 @@ SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
157157

158158
@Bean
159159
MapReactiveUserDetailsService userDetailsService() {
160-
return new MapReactiveUserDetailsService(User.withDefaultPasswordEncoder() //
161-
.username("admin") //
162-
.password("password") //
160+
return new MapReactiveUserDetailsService(User.withUsername("admin") //
161+
.password("{noop}password") //
163162
.roles("USER,ADMIN") //
164163
.build());
165164
}
@@ -188,8 +187,8 @@ MongoDBContainer mongoDbContainer() {
188187
@Bean
189188
ReactiveMongoOperations mongoOperations(MongoDBContainer mongoContainer) {
190189

191-
MongoClient mongo = MongoClients.create(
192-
"mongodb://" + mongoContainer.getContainerIpAddress() + ":" + mongoContainer.getFirstMappedPort());
190+
MongoClient mongo = MongoClients
191+
.create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort());
193192
return new ReactiveMongoTemplate(mongo, "DB_Name_DeleteJacksonSessionVerificationTest");
194193
}
195194

‎spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbLogoutVerificationTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,8 @@ SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
157157
@Bean
158158
MapReactiveUserDetailsService userDetailsService() {
159159

160-
return new MapReactiveUserDetailsService(User.withDefaultPasswordEncoder() //
161-
.username("admin") //
162-
.password("password") //
160+
return new MapReactiveUserDetailsService(User.withUsername("admin") //
161+
.password("{noop}password") //
163162
.roles("USER,ADMIN") //
164163
.build());
165164
}
@@ -183,8 +182,8 @@ MongoDBContainer mongoDbContainer() {
183182
@Bean
184183
ReactiveMongoOperations mongoOperations(MongoDBContainer mongoContainer) {
185184

186-
MongoClient mongo = MongoClients.create(
187-
"mongodb://" + mongoContainer.getContainerIpAddress() + ":" + mongoContainer.getFirstMappedPort());
185+
MongoClient mongo = MongoClients
186+
.create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort());
188187
return new ReactiveMongoTemplate(mongo, "test");
189188
}
190189

0 commit comments

Comments
 (0)