From 2bdeba8aaa23f925982897b426328cf55df86fbc Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Sat, 1 Aug 2020 12:35:51 +0200 Subject: [PATCH 1/2] Fix NPE in BeanDefinitionLoader when XML support is disabled See gh-22696 --- .../java/org/springframework/boot/BeanDefinitionLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java index 6719541f47..93fdf1658f 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java @@ -189,7 +189,7 @@ class BeanDefinitionLoader { } private void load(CharSequence source) { - String resolvedSource = this.xmlReader.getEnvironment().resolvePlaceholders(source.toString()); + String resolvedSource = this.scanner.getEnvironment().resolvePlaceholders(source.toString()); // Attempt as a Class try { load(ClassUtils.forName(resolvedSource, null)); From 11a296b0684df5caa9e5c0ce91fafb7a3a4efb24 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 3 Aug 2020 09:54:43 +0100 Subject: [PATCH 2/2] Polish "Fix NPE in BeanDefinitionLoader when XML support is disabled" See gh-22696 --- .../classpath/ModifiedClassPathExtension.java | 2 +- .../IgnoringXmlBeanDefinitionLoaderTests.java | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 spring-boot-project/spring-boot/src/test/java/org/springframework/boot/IgnoringXmlBeanDefinitionLoaderTests.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathExtension.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathExtension.java index 0664e9d058..51b4e4d6cd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathExtension.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathExtension.java @@ -41,7 +41,7 @@ import org.springframework.util.ReflectionUtils; * * @author Christoph Dreis */ -class ModifiedClassPathExtension implements InvocationInterceptor { +public class ModifiedClassPathExtension implements InvocationInterceptor { @Override public void interceptBeforeAllMethod(Invocation invocation, diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/IgnoringXmlBeanDefinitionLoaderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/IgnoringXmlBeanDefinitionLoaderTests.java new file mode 100644 index 0000000000..a74a5475b2 --- /dev/null +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/IgnoringXmlBeanDefinitionLoaderTests.java @@ -0,0 +1,51 @@ +/* + * Copyright 2012-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import org.springframework.beans.factory.BeanDefinitionStoreException; +import org.springframework.boot.testsupport.classpath.ModifiedClassPathExtension; +import org.springframework.context.support.StaticApplicationContext; + +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + +@ExtendWith(ModifiedClassPathExtension.class) +class IgnoringXmlBeanDefinitionLoaderTests { + + @BeforeAll + static void ignoreXml() { + System.setProperty("spring.xml.ignore", "true"); + } + + @AfterAll + static void enableXml() { + System.clearProperty("spring.xml.ignore"); + } + + @Test + void whenXmlSupportIsDisabledXmlSourcesAreRejected() { + assertThatExceptionOfType(BeanDefinitionStoreException.class) + .isThrownBy(() -> new BeanDefinitionLoader(new StaticApplicationContext(), + "classpath:org/springframework/boot/sample-beans.xml").load()) + .withMessage("Cannot load XML bean definitions when XML support is disabled"); + } + +}