This is an automated email from the ASF dual-hosted git repository. veithen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push: new c34a1f5 Simplify the DOMMetaFactory.getDOMImplementation implementation c34a1f5 is described below commit c34a1f5b7dfc8320481a75c74738e31f57f49e3e Author: Andreas Veithen <andreas.veit...@gmail.com> AuthorDate: Mon Nov 29 23:34:03 2021 +0000 Simplify the DOMMetaFactory.getDOMImplementation implementation --- .../org/apache/axiom/om/impl/dom/intf/factory/DOOMNodeFactory.java | 6 ------ .../org/apache/axiom/om/impl/dom/mixin/DOOMNodeFactoryMixin.java | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/intf/factory/DOOMNodeFactory.java b/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/intf/factory/DOOMNodeFactory.java index 3ce4f58..d6f770d 100644 --- a/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/intf/factory/DOOMNodeFactory.java +++ b/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/intf/factory/DOOMNodeFactory.java @@ -33,16 +33,10 @@ import org.apache.axiom.om.impl.dom.intf.DOOMSourcedElement; import org.apache.axiom.om.impl.dom.intf.DOOMText; import org.apache.axiom.om.impl.intf.factory.AxiomNodeFactory; import org.apache.axiom.weaver.annotation.FactoryMethod; -import org.apache.axiom.weaver.annotation.Inject; import org.apache.axiom.weaver.annotation.Singleton; -import org.w3c.dom.DOMImplementation; @Singleton public interface DOOMNodeFactory extends AxiomNodeFactory, DOMNodeFactory, DOMMetaFactory { - @Override - @Inject - DOMImplementation getDOMImplementation(); - @FactoryMethod @Override DOOMDocument createDocument(); diff --git a/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/mixin/DOOMNodeFactoryMixin.java b/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/mixin/DOOMNodeFactoryMixin.java index 1902a70..01be0a4 100644 --- a/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/mixin/DOOMNodeFactoryMixin.java +++ b/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/mixin/DOOMNodeFactoryMixin.java @@ -24,10 +24,16 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.apache.axiom.om.impl.dom.factory.DOOMDocumentBuilderFactory; import org.apache.axiom.om.impl.dom.intf.factory.DOOMNodeFactory; import org.apache.axiom.weaver.annotation.Mixin; +import org.w3c.dom.DOMImplementation; @Mixin public abstract class DOOMNodeFactoryMixin implements DOOMNodeFactory { @Override + public DOMImplementation getDOMImplementation() { + return this; + } + + @Override public DocumentBuilderFactory newDocumentBuilderFactory() { return new DOOMDocumentBuilderFactory(getOMFactory()); }