Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22696 from dreis2211

Browse Source 
* gh-22696:
  Polish "Fix NPE in BeanDefinitionLoader when XML support is disabled"
  Fix NPE in BeanDefinitionLoader when XML support is disabled

Closes gh-22696
This commit is contained in:
Andy Wilkinson
2020-08-03 09:59:58 +01:00
parent 6efff7b585 11a296b068
commit 86e34dc4a7
3 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathExtension.java
View File

@@ -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<Void> invocation,

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
View File

@@ -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));

51
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/IgnoringXmlBeanDefinitionLoaderTests.java Normal file
View File

@@ -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");
}
}