Skip to content

Commit de7812a

Browse files
michael-simonssnicoll
authored andcommitted
Stop using imports from shaded dependencies
See gh-15950
1 parent 90f059c commit de7812a

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@
2020
import java.util.HashMap;
2121
import java.util.Map;
2222

23+
import com.fasterxml.jackson.core.JsonProcessingException;
24+
import com.fasterxml.jackson.databind.ObjectMapper;
2325
import okhttp3.mockwebserver.MockResponse;
2426
import okhttp3.mockwebserver.MockWebServer;
2527
import org.junit.After;
2628
import org.junit.Test;
27-
import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
2829

2930
import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties.Provider;
3031
import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties.Registration;
@@ -337,7 +338,7 @@ private void testOidcConfiguration(OAuth2ClientProperties.Registration registrat
337338
org.springframework.security.oauth2.core.AuthenticationMethod.HEADER);
338339
}
339340

340-
private void setupMockResponse(String issuer) throws Exception {
341+
private void setupMockResponse(String issuer) throws JsonProcessingException {
341342
MockResponse mockResponse = new MockResponse()
342343
.setResponseCode(HttpStatus.OK.value())
343344
.setBody(new ObjectMapper().writeValueAsString(getResponse(issuer)))

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import java.util.Map;
2222
import java.util.stream.Stream;
2323

24+
import com.fasterxml.jackson.core.JsonProcessingException;
25+
import com.fasterxml.jackson.databind.ObjectMapper;
2426
import okhttp3.mockwebserver.MockResponse;
2527
import okhttp3.mockwebserver.MockWebServer;
2628
import org.junit.After;
2729
import org.junit.Test;
28-
import org.testcontainers.shaded.com.fasterxml.jackson.core.JsonProcessingException;
29-
import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
3030

3131
import org.springframework.boot.autoconfigure.AutoConfigurations;
3232
import org.springframework.boot.test.context.FilteredClassLoader;

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222

2323
import javax.servlet.Filter;
2424

25+
import com.fasterxml.jackson.core.JsonProcessingException;
26+
import com.fasterxml.jackson.databind.ObjectMapper;
2527
import okhttp3.mockwebserver.MockResponse;
2628
import okhttp3.mockwebserver.MockWebServer;
2729
import org.junit.After;
2830
import org.junit.Test;
29-
import org.testcontainers.shaded.com.fasterxml.jackson.core.JsonProcessingException;
30-
import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
3131

3232
import org.springframework.boot.autoconfigure.AutoConfigurations;
3333
import org.springframework.boot.test.context.FilteredClassLoader;

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcPropertiesTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import java.util.Collections;
2020
import java.util.Map;
2121

22+
import org.assertj.core.util.Throwables;
2223
import org.junit.Test;
23-
import org.testcontainers.shaded.com.google.common.base.Throwables;
2424

2525
import org.springframework.boot.context.properties.bind.BindException;
2626
import org.springframework.boot.context.properties.bind.Bindable;

0 commit comments

Comments
 (0)