Skip to content

Commit d7a8536

Browse files
committed
Re-introduce and deprecate BDPD.initDefaults(Element)
For compatibility with Spring Integration's standalone usage of BeanDefinitionParserDelegate.
1 parent c9c4361 commit d7a8536

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ protected void error(String message, Element source, Throwable cause) {
325325
/**
326326
* Initialize the default lazy-init, autowire, dependency check settings,
327327
* init-method, destroy-method and merge settings. Support nested 'beans'
328-
* element use cases by falling back to <literal>parent</literal> in case the
328+
* element use cases by falling back to the given parent in case the
329329
* defaults are not explicitly set locally.
330330
* @see #populateDefaults(DocumentDefaultsDefinition, DocumentDefaultsDefinition, org.w3c.dom.Element)
331331
* @see #getDefaults()
@@ -335,6 +335,15 @@ public void initDefaults(Element root, BeanDefinitionParserDelegate parent) {
335335
this.readerContext.fireDefaultsRegistered(this.defaults);
336336
}
337337

338+
/**
339+
* Initialize the default settings assuming a {@code null} parent delegate.
340+
* @deprecated in Spring 3.1 in favor of
341+
* {@link #initDefaults(Element, BeanDefinitionParserDelegate)}
342+
*/
343+
public void initDefaults(Element root) {
344+
initDefaults(root, null);
345+
}
346+
338347
/**
339348
* Populate the given DocumentDefaultsDefinition instance with the default lazy-init,
340349
* autowire, dependency check settings, init-method, destroy-method and merge settings.

0 commit comments

Comments
 (0)