From a8c558a671bdb493819482e2c2a363587cc1d9fd Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Tue, 2 Aug 2022 15:03:13 +0200 Subject: [PATCH] Fix build after Spring Framework deprecation See spring-projects/spring-framework#28905 --- .../boot/test/context/SpringBootContextLoader.java | 6 ------ .../servlet/support/ErrorPageFilterIntegrationTests.java | 5 ----- 2 files changed, 11 deletions(-) diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java index f3aebd1986c..cd258e5deae 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java @@ -244,12 +244,6 @@ public class SpringBootContextLoader extends AbstractContextLoader { return AnnotationConfigContextLoaderUtils.detectDefaultConfigurationClasses(declaringClass); } - @Override - public ApplicationContext loadContext(String... locations) throws Exception { - throw new UnsupportedOperationException( - "SpringApplicationContextLoader does not support the loadContext(String...) method"); - } - @Override protected String[] getResourceSuffixes() { return new String[] { "-context.xml", "Context.groovy" }; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java index 2d60115735a..565bcd2307b 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java @@ -186,11 +186,6 @@ class ErrorPageFilterIntegrationTests { return context; } - @Override - public ApplicationContext loadContext(String... locations) { - throw new UnsupportedOperationException(); - } - @Override protected String[] getResourceSuffixes() { return EMPTY_RESOURCE_SUFFIXES;