GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Consistent local vs external resolution of https schema references 

Closes gh-22504
pull/22633/head
Juergen Hoeller 7 years ago
parent
f3475dd0ce
commit
7b97ec3ead
8 changed files with 86 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
  2. 8
      spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java
  3. 6
      spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
  4. 22
      spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java
  5. 82
      spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
  6. 20
      spring-context/src/test/java/org/springframework/context/config/ContextNamespaceHandlerTests.java
  7. 2
      spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
  8. 4
      spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-simple.xml

5
spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
Unescape View File

@ -16,6 +16,7 @@
package org.springframework.beans.factory.xml; package org.springframework.beans.factory.xml;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -52,7 +53,7 @@ public class BeansDtdResolver implements EntityResolver {
@Override @Override
@Nullable @Nullable
public InputSource resolveEntity(String publicId, @Nullable String systemId) throws IOException { public InputSource resolveEntity(@Nullable String publicId, @Nullable String systemId) throws IOException {
if (logger.isTraceEnabled()) { if (logger.isTraceEnabled()) {
logger.trace("Trying to resolve XML entity with public ID [" + publicId + logger.trace("Trying to resolve XML entity with public ID [" + publicId +
"] and system ID [" + systemId + "]"); "] and system ID [" + systemId + "]");
@ -76,7 +77,7 @@ public class BeansDtdResolver implements EntityResolver {
} }
return source; return source;
} }
catch (IOException ex) { catch (FileNotFoundException ex) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Could not resolve beans DTD [" + systemId + "]: not found in classpath", ex); logger.debug("Could not resolve beans DTD [" + systemId + "]: not found in classpath", ex);
} }

8
spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -79,7 +79,9 @@ public class DelegatingEntityResolver implements EntityResolver {
@Override @Override
@Nullable @Nullable
public InputSource resolveEntity(String publicId, @Nullable String systemId) throws SAXException, IOException { public InputSource resolveEntity(@Nullable String publicId, @Nullable String systemId)
throws SAXException, IOException {
if (systemId != null) { if (systemId != null) {
if (systemId.endsWith(DTD_SUFFIX)) { if (systemId.endsWith(DTD_SUFFIX)) {
return this.dtdResolver.resolveEntity(publicId, systemId); return this.dtdResolver.resolveEntity(publicId, systemId);
@ -88,6 +90,8 @@ public class DelegatingEntityResolver implements EntityResolver {
return this.schemaResolver.resolveEntity(publicId, systemId); return this.schemaResolver.resolveEntity(publicId, systemId);
} }
} }
// Fall back to the parser's default behavior.
return null; return null;
} }

6
spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
Unescape View File

@ -106,7 +106,7 @@ public class PluggableSchemaResolver implements EntityResolver {
@Override @Override
@Nullable @Nullable
public InputSource resolveEntity(String publicId, @Nullable String systemId) throws IOException { public InputSource resolveEntity(@Nullable String publicId, @Nullable String systemId) throws IOException {
if (logger.isTraceEnabled()) { if (logger.isTraceEnabled()) {
logger.trace("Trying to resolve XML entity with public id [" + publicId + logger.trace("Trying to resolve XML entity with public id [" + publicId +
"] and system id [" + systemId + "]"); "] and system id [" + systemId + "]");
@ -114,6 +114,10 @@ public class PluggableSchemaResolver implements EntityResolver {
if (systemId != null) { if (systemId != null) {
String resourceLocation = getSchemaMappings().get(systemId); String resourceLocation = getSchemaMappings().get(systemId);
if (resourceLocation == null && systemId.startsWith("https:")) {
// Retrieve canonical http schema mapping even for https declaration
resourceLocation = getSchemaMappings().get("http:" + systemId.substring(6));
}
if (resourceLocation != null) { if (resourceLocation != null) {
Resource resource = new ClassPathResource(resourceLocation, this.classLoader); Resource resource = new ClassPathResource(resourceLocation, this.classLoader);
try { try {

22
spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -31,9 +31,9 @@ import org.springframework.core.io.ResourceLoader;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
/** /**
* EntityResolver implementation that tries to resolve entity references * {@code EntityResolver} implementation that tries to resolve entity references
* through a {@link org.springframework.core.io.ResourceLoader} (usually, * through a {@link org.springframework.core.io.ResourceLoader} (usually,
* relative to the resource base of an ApplicationContext), if applicable. * relative to the resource base of an {@code ApplicationContext}), if applicable.
* Extends {@link DelegatingEntityResolver} to also provide DTD and XSD lookup. * Extends {@link DelegatingEntityResolver} to also provide DTD and XSD lookup.
* *
* <p>Allows to use standard XML entities to include XML snippets into an * <p>Allows to use standard XML entities to include XML snippets into an
@ -72,8 +72,11 @@ public class ResourceEntityResolver extends DelegatingEntityResolver {
@Override @Override
@Nullable @Nullable
public InputSource resolveEntity(String publicId, @Nullable String systemId) throws SAXException, IOException { public InputSource resolveEntity(@Nullable String publicId, @Nullable String systemId)
throws SAXException, IOException {
InputSource source = super.resolveEntity(publicId, systemId); InputSource source = super.resolveEntity(publicId, systemId);
if (source == null && systemId != null) { if (source == null && systemId != null) {
String resourcePath = null; String resourcePath = null;
try { try {
@ -105,7 +108,18 @@ public class ResourceEntityResolver extends DelegatingEntityResolver {
logger.debug("Found XML entity [" + systemId + "]: " + resource); logger.debug("Found XML entity [" + systemId + "]: " + resource);
} }
} }
else if (systemId.endsWith(DTD_SUFFIX) || systemId.endsWith(XSD_SUFFIX)) {
// External dtd/xsd lookup via https even for canonical http declaration
String url = systemId;
if (url.startsWith("http:")) {
url = "https:" + url.substring(5);
}
source = new InputSource(url);
source.setPublicId(publicId);
return source;
}
} }
return source; return source;
} }

82
spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -123,16 +123,16 @@ public class XmlBeanFactoryTests {
return new ClassPathResource(CLASSNAME + suffix, CLASS); return new ClassPathResource(CLASSNAME + suffix, CLASS);
} }
/* SPR-2368 */
@Test @Test // SPR-2368
public void testCollectionsReferredToAsRefLocals() throws Exception { public void testCollectionsReferredToAsRefLocals() {
DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(factory).loadBeanDefinitions(COLLECTIONS_XSD_CONTEXT); new XmlBeanDefinitionReader(factory).loadBeanDefinitions(COLLECTIONS_XSD_CONTEXT);
factory.preInstantiateSingletons(); factory.preInstantiateSingletons();
} }
@Test @Test
public void testRefToSeparatePrototypeInstances() throws Exception { public void testRefToSeparatePrototypeInstances() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf);
reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE);
@ -151,7 +151,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testRefToSingleton() throws Exception { public void testRefToSingleton() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf);
reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE);
@ -307,7 +307,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testInheritanceFromParentFactoryPrototype() throws Exception { public void testInheritanceFromParentFactoryPrototype() {
DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
@ -323,7 +323,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testInheritanceWithDifferentClass() throws Exception { public void testInheritanceWithDifferentClass() {
DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
@ -338,7 +338,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testInheritanceWithClass() throws Exception { public void testInheritanceWithClass() {
DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
@ -353,7 +353,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testPrototypeInheritanceFromParentFactoryPrototype() throws Exception { public void testPrototypeInheritanceFromParentFactoryPrototype() {
DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
@ -373,7 +373,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testPrototypeInheritanceFromParentFactorySingleton() throws Exception { public void testPrototypeInheritanceFromParentFactorySingleton() {
DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
@ -433,7 +433,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testDependenciesMaterializeThis() throws Exception { public void testDependenciesMaterializeThis() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(DEP_MATERIALIZE_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(DEP_MATERIALIZE_CONTEXT);
@ -452,7 +452,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testChildOverridesParentBean() throws Exception { public void testChildOverridesParentBean() {
DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
@ -471,7 +471,7 @@ public class XmlBeanFactoryTests {
* If a singleton does this the factory will fail to load. * If a singleton does this the factory will fail to load.
*/ */
@Test @Test
public void testBogusParentageFromParentFactory() throws Exception { public void testBogusParentageFromParentFactory() {
DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
@ -482,7 +482,7 @@ public class XmlBeanFactoryTests {
} }
catch (BeanDefinitionStoreException ex) { catch (BeanDefinitionStoreException ex) {
// check exception message contains the name // check exception message contains the name
assertTrue(ex.getMessage().indexOf("bogusParent") != -1); assertTrue(ex.getMessage().contains("bogusParent"));
assertTrue(ex.getCause() instanceof NoSuchBeanDefinitionException); assertTrue(ex.getCause() instanceof NoSuchBeanDefinitionException);
} }
} }
@ -493,7 +493,7 @@ public class XmlBeanFactoryTests {
* instances even if derived from a prototype * instances even if derived from a prototype
*/ */
@Test @Test
public void testSingletonInheritsFromParentFactoryPrototype() throws Exception { public void testSingletonInheritsFromParentFactoryPrototype() {
DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
@ -658,7 +658,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testInitMethodIsInvoked() throws Exception { public void testInitMethodIsInvoked() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT);
DoubleInitializer in = (DoubleInitializer) xbf.getBean("init-method1"); DoubleInitializer in = (DoubleInitializer) xbf.getBean("init-method1");
@ -678,14 +678,14 @@ public class XmlBeanFactoryTests {
fail(); fail();
} }
catch (BeanCreationException ex) { catch (BeanCreationException ex) {
assertTrue(ex.getResourceDescription().indexOf("initializers.xml") != -1); assertTrue(ex.getResourceDescription().contains("initializers.xml"));
assertEquals("init-method2", ex.getBeanName()); assertEquals("init-method2", ex.getBeanName());
assertTrue(ex.getCause() instanceof IOException); assertTrue(ex.getCause() instanceof IOException);
} }
} }
@Test @Test
public void testNoSuchInitMethod() throws Exception { public void testNoSuchInitMethod() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT);
try { try {
@ -694,9 +694,9 @@ public class XmlBeanFactoryTests {
} }
catch (FatalBeanException ex) { catch (FatalBeanException ex) {
// check message is helpful // check message is helpful
assertTrue(ex.getMessage().indexOf("initializers.xml") != -1); assertTrue(ex.getMessage().contains("initializers.xml"));
assertTrue(ex.getMessage().indexOf("init-method3") != -1); assertTrue(ex.getMessage().contains("init-method3"));
assertTrue(ex.getMessage().indexOf("init") != -1); assertTrue(ex.getMessage().contains("init"));
} }
} }
@ -704,7 +704,7 @@ public class XmlBeanFactoryTests {
* Check that InitializingBean method is called first. * Check that InitializingBean method is called first.
*/ */
@Test @Test
public void testInitializingBeanAndInitMethod() throws Exception { public void testInitializingBeanAndInitMethod() {
InitAndIB.constructed = false; InitAndIB.constructed = false;
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT);
@ -725,7 +725,7 @@ public class XmlBeanFactoryTests {
* Check that InitializingBean method is not called twice. * Check that InitializingBean method is not called twice.
*/ */
@Test @Test
public void testInitializingBeanAndSameInitMethod() throws Exception { public void testInitializingBeanAndSameInitMethod() {
InitAndIB.constructed = false; InitAndIB.constructed = false;
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT);
@ -743,7 +743,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testDefaultLazyInit() throws Exception { public void testDefaultLazyInit() {
InitAndIB.constructed = false; InitAndIB.constructed = false;
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(DEFAULT_LAZY_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(DEFAULT_LAZY_CONTEXT);
@ -759,19 +759,19 @@ public class XmlBeanFactoryTests {
} }
@Test(expected = BeanDefinitionStoreException.class) @Test(expected = BeanDefinitionStoreException.class)
public void noSuchXmlFile() throws Exception { public void noSuchXmlFile() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(MISSING_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(MISSING_CONTEXT);
} }
@Test(expected = BeanDefinitionStoreException.class) @Test(expected = BeanDefinitionStoreException.class)
public void invalidXmlFile() throws Exception { public void invalidXmlFile() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INVALID_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INVALID_CONTEXT);
} }
@Test @Test
public void testAutowire() throws Exception { public void testAutowire() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(AUTOWIRE_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(AUTOWIRE_CONTEXT);
TestBean spouse = new TestBean("kerry", 0); TestBean spouse = new TestBean("kerry", 0);
@ -780,7 +780,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testAutowireWithParent() throws Exception { public void testAutowireWithParent() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(AUTOWIRE_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(AUTOWIRE_CONTEXT);
DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
@ -793,7 +793,7 @@ public class XmlBeanFactoryTests {
doTestAutowire(xbf); doTestAutowire(xbf);
} }
private void doTestAutowire(DefaultListableBeanFactory xbf) throws Exception { private void doTestAutowire(DefaultListableBeanFactory xbf) {
DependenciesBean rod1 = (DependenciesBean) xbf.getBean("rod1"); DependenciesBean rod1 = (DependenciesBean) xbf.getBean("rod1");
TestBean kerry = (TestBean) xbf.getBean("spouse"); TestBean kerry = (TestBean) xbf.getBean("spouse");
// should have been autowired // should have been autowired
@ -842,7 +842,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testAutowireWithDefault() throws Exception { public void testAutowireWithDefault() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(DEFAULT_AUTOWIRE_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(DEFAULT_AUTOWIRE_CONTEXT);
@ -858,7 +858,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testAutowireByConstructor() throws Exception { public void testAutowireByConstructor() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
ConstructorDependenciesBean rod1 = (ConstructorDependenciesBean) xbf.getBean("rod1"); ConstructorDependenciesBean rod1 = (ConstructorDependenciesBean) xbf.getBean("rod1");
@ -896,7 +896,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testAutowireByConstructorWithSimpleValues() throws Exception { public void testAutowireByConstructorWithSimpleValues() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
@ -934,7 +934,7 @@ public class XmlBeanFactoryTests {
xbf.getBean("rod2Accessor"); xbf.getBean("rod2Accessor");
} }
catch (BeanCreationException ex) { catch (BeanCreationException ex) {
assertTrue(ex.toString().indexOf("touchy") != -1); assertTrue(ex.toString().contains("touchy"));
ex.printStackTrace(); ex.printStackTrace();
assertNull(ex.getRelatedCauses()); assertNull(ex.getRelatedCauses());
} }
@ -1014,14 +1014,14 @@ public class XmlBeanFactoryTests {
} }
@Test(expected = BeanCreationException.class) @Test(expected = BeanCreationException.class)
public void throwsExceptionOnTooManyArguments() throws Exception { public void throwsExceptionOnTooManyArguments() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
xbf.getBean("rod7", ConstructorDependenciesBean.class); xbf.getBean("rod7", ConstructorDependenciesBean.class);
} }
@Test(expected = UnsatisfiedDependencyException.class) @Test(expected = UnsatisfiedDependencyException.class)
public void throwsExceptionOnAmbiguousResolution() throws Exception { public void throwsExceptionOnAmbiguousResolution() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
xbf.getBean("rod8", ConstructorDependenciesBean.class); xbf.getBean("rod8", ConstructorDependenciesBean.class);
@ -1115,7 +1115,7 @@ public class XmlBeanFactoryTests {
fail("Must have thrown a CannotLoadBeanClassException"); fail("Must have thrown a CannotLoadBeanClassException");
} }
catch (CannotLoadBeanClassException ex) { catch (CannotLoadBeanClassException ex) {
assertTrue(ex.getResourceDescription().indexOf("classNotFound.xml") != -1); assertTrue(ex.getResourceDescription().contains("classNotFound.xml"));
assertTrue(ex.getCause() instanceof ClassNotFoundException); assertTrue(ex.getCause() instanceof ClassNotFoundException);
} }
} }
@ -1367,12 +1367,12 @@ public class XmlBeanFactoryTests {
} }
catch (BeanDefinitionStoreException ex) { catch (BeanDefinitionStoreException ex) {
// Check that the bogus method name was included in the error message // Check that the bogus method name was included in the error message
assertTrue("Bogus method name correctly reported", ex.getMessage().indexOf("bogusMethod") != -1); assertTrue("Bogus method name correctly reported", ex.getMessage().contains("bogusMethod"));
} }
} }
@Test @Test
public void serializableMethodReplacerAndSuperclass() throws Exception { public void serializableMethodReplacerAndSuperclass() throws IOException {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf);
reader.loadBeanDefinitions(DELEGATION_OVERRIDES_CONTEXT); reader.loadBeanDefinitions(DELEGATION_OVERRIDES_CONTEXT);
@ -1571,7 +1571,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testWithDuplicateName() throws Exception { public void testWithDuplicateName() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
try { try {
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(TEST_WITH_DUP_NAMES_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(TEST_WITH_DUP_NAMES_CONTEXT);
@ -1583,7 +1583,7 @@ public class XmlBeanFactoryTests {
} }
@Test @Test
public void testWithDuplicateNameInAlias() throws Exception { public void testWithDuplicateNameInAlias() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
try { try {
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(TEST_WITH_DUP_NAME_IN_ALIAS_CONTEXT); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(TEST_WITH_DUP_NAME_IN_ALIAS_CONTEXT);

20
spring-context/src/test/java/org/springframework/context/config/ContextNamespaceHandlerTests.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -48,7 +48,7 @@ public class ContextNamespaceHandlerTests {
@Test @Test
public void propertyPlaceholder() throws Exception { public void propertyPlaceholder() {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext( ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
"contextNamespaceHandlerTests-replace.xml", getClass()); "contextNamespaceHandlerTests-replace.xml", getClass());
assertEquals("bar", applicationContext.getBean("string")); assertEquals("bar", applicationContext.getBean("string"));
@ -56,7 +56,7 @@ public class ContextNamespaceHandlerTests {
} }
@Test @Test
public void propertyPlaceholderSystemProperties() throws Exception { public void propertyPlaceholderSystemProperties() {
String value = System.setProperty("foo", "spam"); String value = System.setProperty("foo", "spam");
try { try {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext( ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
@ -72,7 +72,7 @@ public class ContextNamespaceHandlerTests {
} }
@Test @Test
public void propertyPlaceholderEnvironmentProperties() throws Exception { public void propertyPlaceholderEnvironmentProperties() {
MockEnvironment env = new MockEnvironment().withProperty("foo", "spam"); MockEnvironment env = new MockEnvironment().withProperty("foo", "spam");
GenericXmlApplicationContext applicationContext = new GenericXmlApplicationContext(); GenericXmlApplicationContext applicationContext = new GenericXmlApplicationContext();
applicationContext.setEnvironment(env); applicationContext.setEnvironment(env);
@ -83,7 +83,7 @@ public class ContextNamespaceHandlerTests {
} }
@Test @Test
public void propertyPlaceholderLocation() throws Exception { public void propertyPlaceholderLocation() {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext( ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
"contextNamespaceHandlerTests-location.xml", getClass()); "contextNamespaceHandlerTests-location.xml", getClass());
assertEquals("bar", applicationContext.getBean("foo")); assertEquals("bar", applicationContext.getBean("foo"));
@ -92,7 +92,7 @@ public class ContextNamespaceHandlerTests {
} }
@Test @Test
public void propertyPlaceholderLocationWithSystemPropertyForOneLocation() throws Exception { public void propertyPlaceholderLocationWithSystemPropertyForOneLocation() {
System.setProperty("properties", System.setProperty("properties",
"classpath*:/org/springframework/context/config/test-*.properties"); "classpath*:/org/springframework/context/config/test-*.properties");
try { try {
@ -108,7 +108,7 @@ public class ContextNamespaceHandlerTests {
} }
@Test @Test
public void propertyPlaceholderLocationWithSystemPropertyForMultipleLocations() throws Exception { public void propertyPlaceholderLocationWithSystemPropertyForMultipleLocations() {
System.setProperty("properties", System.setProperty("properties",
"classpath*:/org/springframework/context/config/test-*.properties," + "classpath*:/org/springframework/context/config/test-*.properties," +
"classpath*:/org/springframework/context/config/empty-*.properties," + "classpath*:/org/springframework/context/config/empty-*.properties," +
@ -126,7 +126,7 @@ public class ContextNamespaceHandlerTests {
} }
@Test @Test
public void propertyPlaceholderLocationWithSystemPropertyMissing() throws Exception { public void propertyPlaceholderLocationWithSystemPropertyMissing() {
try { try {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext( ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
"contextNamespaceHandlerTests-location-placeholder.xml", getClass()); "contextNamespaceHandlerTests-location-placeholder.xml", getClass());
@ -140,7 +140,7 @@ public class ContextNamespaceHandlerTests {
} }
@Test @Test
public void propertyPlaceholderIgnored() throws Exception { public void propertyPlaceholderIgnored() {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext( ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
"contextNamespaceHandlerTests-replace-ignore.xml", getClass()); "contextNamespaceHandlerTests-replace-ignore.xml", getClass());
assertEquals("${bar}", applicationContext.getBean("string")); assertEquals("${bar}", applicationContext.getBean("string"));
@ -148,7 +148,7 @@ public class ContextNamespaceHandlerTests {
} }
@Test @Test
public void propertyOverride() throws Exception { public void propertyOverride() {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext( ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
"contextNamespaceHandlerTests-override.xml", getClass()); "contextNamespaceHandlerTests-override.xml", getClass());
Date date = (Date) applicationContext.getBean("date"); Date date = (Date) applicationContext.getBean("date");

2
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd"> <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans> <beans>

4
spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-simple.xml
Unescape View File

@ -2,8 +2,8 @@
<beans xmlns="http://www.springframework.org/schema/beans" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd">
<context:property-placeholder/> <context:property-placeholder/>

Write Preview
Loading…
Cancel
Save