You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2021/11/29 23:27:40 UTC
[ws-axiom] branch master updated: Use a single node factory for each implementation
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 0bb4a55 Use a single node factory for each implementation
0bb4a55 is described below
commit 0bb4a5539ea81c0e6200532d951ef6577db932f6
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Mon Nov 29 23:27:31 2021 +0000
Use a single node factory for each implementation
---
implementations/axiom-dom/pom.xml | 3 +-
.../axiom/om/impl/dom/factory/DOOMNodeFactory.java | 2 +-
.../axiom/om/impl/dom/factory/Factories.java | 2 +-
.../om/impl/dom/intf/factory/DOOMNodeFactory.java | 59 +++++++++++++++++++++-
implementations/axiom-impl/pom.xml | 1 -
.../om/impl/llom/factory/LLOMNodeFactory.java | 2 +-
.../java/org/apache/axiom/dom/DOMNodeFactory.java | 19 +++++--
.../axiom/dom/impl/mixin/DOMDocumentMixin.java | 2 +-
.../dom/impl/mixin/DOMImplementationMixin.java | 2 +-
.../axiom/dom/impl/mixin/DOMTextNodeMixin.java | 2 +-
.../om/impl/common/factory/OMFactoryImpl.java | 14 ++---
.../impl/common/factory/meta/BuilderFactory.java | 4 +-
.../om/impl/intf/factory/AxiomNodeFactory.java | 22 +++++---
.../impl/common/builder/SOAP11BuilderHelper.java | 6 +--
.../impl/common/builder/SOAP12BuilderHelper.java | 4 +-
15 files changed, 109 insertions(+), 35 deletions(-)
diff --git a/implementations/axiom-dom/pom.xml b/implementations/axiom-dom/pom.xml
index 7aca284..2c75e0a 100644
--- a/implementations/axiom-dom/pom.xml
+++ b/implementations/axiom-dom/pom.xml
@@ -114,8 +114,6 @@
<weavablePackage>org.apache.axiom.om.impl.dom.mixin</weavablePackage>
</weavablePackages>
<interfaces>
- <interface>org.apache.axiom.core.NodeFactory2</interface>
- <interface>org.apache.axiom.dom.DOMNodeFactory</interface>
<interface>org.apache.axiom.om.impl.dom.intf.DOOMCDATASection</interface>
<interface>org.apache.axiom.om.impl.dom.intf.DOOMComment</interface>
<interface>org.apache.axiom.om.impl.dom.intf.DOOMDocument</interface>
@@ -250,6 +248,7 @@
<ignore>
<!-- TODO: inject the reference to the singleton into mixins directly -->
org.apache.axiom.om.impl.dom.CoreNodeImpl -> org.apache.axiom.om.impl.dom.factory.DOOMNodeFactory,
+ org.apache.axiom.om.impl.dom.CoreNodeImpl -> org.apache.axiom.om.impl.dom.factory.DOOMNodeFactoryImpl,
org.apache.axiom.om.impl.dom.DOOMNSAwareElementImpl -> org.apache.axiom.om.impl.dom.factory.DOOMNodeFactoryImpl,
org.apache.axiom.om.impl.dom.CoreChildNodeImpl -> org.apache.axiom.om.impl.dom.factory.DOOMNodeFactoryImpl,
org.apache.axiom.om.impl.dom.AxiomCoreParentNodeImpl -> org.apache.axiom.om.impl.dom.factory.DOOMNodeFactoryImpl,
diff --git a/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/DOOMNodeFactory.java b/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/DOOMNodeFactory.java
index 3704197..5151f9e 100644
--- a/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/DOOMNodeFactory.java
+++ b/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/DOOMNodeFactory.java
@@ -25,7 +25,7 @@ public final class DOOMNodeFactory extends NodeFactoryImpl {
private DOOMNodeFactory() {
super(DOOMNodeFactory.class.getClassLoader(),
- "org.apache.axiom.om.impl.dom.NodeFactory2Impl",
+ "org.apache.axiom.om.impl.dom.factory.DOOMNodeFactoryImpl",
"org.apache.axiom.om.impl.dom",
"org.apache.axiom.soap.impl.dom",
"org.apache.axiom.soap.impl.dom.soap11",
diff --git a/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/Factories.java b/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/Factories.java
index f3f97ec..f248e26 100644
--- a/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/Factories.java
+++ b/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/Factories.java
@@ -25,7 +25,7 @@ public final class Factories {
static {
try {
- DOM_NODE_FACTORY = (DOMNodeFactory)Factories.class.getClassLoader().loadClass("org.apache.axiom.om.impl.dom.DOMNodeFactoryImpl").getField("INSTANCE").get(null);
+ DOM_NODE_FACTORY = (DOMNodeFactory)Factories.class.getClassLoader().loadClass("org.apache.axiom.om.impl.dom.factory.DOOMNodeFactoryImpl").getField("INSTANCE").get(null);
} catch (ReflectiveOperationException ex) {
throw new Error(ex);
}
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 a66648a..3ce4f58 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
@@ -18,15 +18,72 @@
*/
package org.apache.axiom.om.impl.dom.intf.factory;
+import org.apache.axiom.dom.DOMNodeFactory;
import org.apache.axiom.om.dom.DOMMetaFactory;
+import org.apache.axiom.om.impl.dom.intf.DOOMCDATASection;
+import org.apache.axiom.om.impl.dom.intf.DOOMComment;
+import org.apache.axiom.om.impl.dom.intf.DOOMDocument;
+import org.apache.axiom.om.impl.dom.intf.DOOMDocumentType;
+import org.apache.axiom.om.impl.dom.intf.DOOMEntityReference;
+import org.apache.axiom.om.impl.dom.intf.DOOMNSAwareAttribute;
+import org.apache.axiom.om.impl.dom.intf.DOOMNSAwareElement;
+import org.apache.axiom.om.impl.dom.intf.DOOMNamespaceDeclaration;
+import org.apache.axiom.om.impl.dom.intf.DOOMProcessingInstruction;
+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, DOMMetaFactory {
+public interface DOOMNodeFactory extends AxiomNodeFactory, DOMNodeFactory, DOMMetaFactory {
@Override
@Inject
DOMImplementation getDOMImplementation();
+
+ @FactoryMethod
+ @Override
+ DOOMDocument createDocument();
+
+ @FactoryMethod
+ @Override
+ DOOMDocumentType createDocumentTypeDeclaration();
+
+ @FactoryMethod
+ @Override
+ DOOMText createCharacterDataNode();
+
+ @FactoryMethod
+ @Override
+ DOOMCDATASection createCDATASection();
+
+ @FactoryMethod
+ @Override
+ DOOMProcessingInstruction createProcessingInstruction();
+
+ @FactoryMethod
+ @Override
+ DOOMEntityReference createEntityReference();
+
+ @FactoryMethod
+ @Override
+ DOOMComment createComment();
+
+ @FactoryMethod
+ @Override
+ DOOMNSAwareElement createNSAwareElement();
+
+ @FactoryMethod
+ @Override
+ DOOMSourcedElement createSourcedElement();
+
+ @FactoryMethod
+ @Override
+ DOOMNSAwareAttribute createNSAwareAttribute();
+
+ @FactoryMethod
+ @Override
+ DOOMNamespaceDeclaration createNamespaceDeclaration();
}
diff --git a/implementations/axiom-impl/pom.xml b/implementations/axiom-impl/pom.xml
index 1d5dd7a..9ec45ae 100644
--- a/implementations/axiom-impl/pom.xml
+++ b/implementations/axiom-impl/pom.xml
@@ -101,7 +101,6 @@
<weavablePackage>org.apache.axiom.om.impl.llom.mixin</weavablePackage>
</weavablePackages>
<interfaces>
- <interface>org.apache.axiom.core.NodeFactory2</interface>
<interface>org.apache.axiom.om.impl.intf.AxiomAttribute</interface>
<interface>org.apache.axiom.om.impl.intf.AxiomCDATASection</interface>
<interface>org.apache.axiom.om.impl.intf.AxiomCharacterDataNode</interface>
diff --git a/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/LLOMNodeFactory.java b/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/LLOMNodeFactory.java
index 35c7a3a..2286726 100644
--- a/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/LLOMNodeFactory.java
+++ b/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/LLOMNodeFactory.java
@@ -25,7 +25,7 @@ public final class LLOMNodeFactory extends NodeFactoryImpl {
private LLOMNodeFactory() {
super(LLOMNodeFactory.class.getClassLoader(),
- "org.apache.axiom.om.impl.llom.NodeFactory2Impl",
+ "org.apache.axiom.om.impl.llom.factory.AxiomNodeFactoryImpl",
"org.apache.axiom.om.impl.llom",
"org.apache.axiom.soap.impl.llom",
"org.apache.axiom.soap.impl.llom.soap11",
diff --git a/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/DOMNodeFactory.java b/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/DOMNodeFactory.java
index 4748cc5..8c8434b 100644
--- a/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/DOMNodeFactory.java
+++ b/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/DOMNodeFactory.java
@@ -18,46 +18,59 @@
*/
package org.apache.axiom.dom;
+import org.apache.axiom.core.NodeFactory2;
import org.apache.axiom.weaver.annotation.FactoryMethod;
import org.apache.axiom.weaver.annotation.Singleton;
import org.w3c.dom.DOMImplementation;
@Singleton
-public interface DOMNodeFactory extends DOMImplementation {
+public interface DOMNodeFactory extends NodeFactory2, DOMImplementation {
@FactoryMethod
+ @Override
DOMDocument createDocument();
@FactoryMethod
- DOMDocumentType createDocumentType();
+ @Override
+ DOMDocumentType createDocumentTypeDeclaration();
@FactoryMethod
- DOMText createText();
+ @Override
+ DOMText createCharacterDataNode();
@FactoryMethod
+ @Override
DOMCDATASection createCDATASection();
@FactoryMethod
+ @Override
DOMNSUnawareElement createNSUnawareElement();
@FactoryMethod
+ @Override
DOMNSUnawareAttribute createNSUnawareAttribute();
@FactoryMethod
+ @Override
DOMNSAwareElement createNSAwareElement();
@FactoryMethod
+ @Override
DOMNSAwareAttribute createNSAwareAttribute();
@FactoryMethod
+ @Override
DOMNamespaceDeclaration createNamespaceDeclaration();
@FactoryMethod
+ @Override
DOMProcessingInstruction createProcessingInstruction();
@FactoryMethod
+ @Override
DOMEntityReference createEntityReference();
@FactoryMethod
+ @Override
DOMComment createComment();
@FactoryMethod
diff --git a/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/impl/mixin/DOMDocumentMixin.java b/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/impl/mixin/DOMDocumentMixin.java
index 903b9f6..7e92d2f 100644
--- a/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/impl/mixin/DOMDocumentMixin.java
+++ b/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/impl/mixin/DOMDocumentMixin.java
@@ -212,7 +212,7 @@ public abstract class DOMDocumentMixin implements DOMDocument {
@Override
public final Text createTextNode(String data) {
- DOMText text = getDOMNodeFactory().createText();
+ DOMText text = getDOMNodeFactory().createCharacterDataNode();
text.coreSetOwnerDocument(this);
text.coreSetCharacterData(data);
return text;
diff --git a/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/impl/mixin/DOMImplementationMixin.java b/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/impl/mixin/DOMImplementationMixin.java
index 68fef12..2b84f92 100644
--- a/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/impl/mixin/DOMImplementationMixin.java
+++ b/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/impl/mixin/DOMImplementationMixin.java
@@ -52,7 +52,7 @@ public abstract class DOMImplementationMixin implements DOMNodeFactory {
@Override
public DocumentType createDocumentType(String qualifiedName,
String publicId, String systemId) {
- DOMDocumentType docType = createDocumentType();
+ DOMDocumentType docType = createDocumentTypeDeclaration();
docType.coreSetRootName(qualifiedName);
docType.coreSetPublicId(publicId);
docType.coreSetSystemId(systemId);
diff --git a/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/impl/mixin/DOMTextNodeMixin.java b/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/impl/mixin/DOMTextNodeMixin.java
index a3738aa..57ede81 100644
--- a/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/impl/mixin/DOMTextNodeMixin.java
+++ b/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/impl/mixin/DOMTextNodeMixin.java
@@ -92,7 +92,7 @@ public abstract class DOMTextNodeMixin implements DOMTextNode {
try {
DOMText newText;
if (content.length() > 0) {
- newText = getDOMNodeFactory().createText();
+ newText = getDOMNodeFactory().createCharacterDataNode();
newText.coreSetCharacterData(content);
} else {
newText = null;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
index f00cb8a..03b00b2 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
@@ -90,7 +90,7 @@ public class OMFactoryImpl implements OMFactory {
@Override
public final OMDocType createOMDocType(OMContainer parent, String rootName,
String publicId, String systemId, String internalSubset) {
- AxiomDocType node = nodeFactory.createDocType();
+ AxiomDocType node = nodeFactory.createDocumentTypeDeclaration();
node.coreSetRootName(rootName);
node.coreSetPublicId(publicId);
node.coreSetSystemId(systemId);
@@ -263,12 +263,12 @@ public class OMFactoryImpl implements OMFactory {
@Override
public final OMElement createOMElement(String localName, OMNamespace ns, OMContainer parent) {
- return createAxiomElement(AxiomNodeFactory::createElement, parent, localName, ns);
+ return createAxiomElement(AxiomNodeFactory::createNSAwareElement, parent, localName, ns);
}
@Override
public final OMElement createOMElement(QName qname, OMContainer parent) {
- AxiomElement element = nodeFactory.createElement();
+ AxiomElement element = nodeFactory.createNSAwareElement();
if (parent != null) {
parent.addChild(element);
}
@@ -359,7 +359,7 @@ public class OMFactoryImpl implements OMFactory {
throw new IllegalArgumentException("Cannot create an unprefixed attribute with a namespace");
}
}
- AxiomAttribute attr = nodeFactory.createAttribute();
+ AxiomAttribute attr = nodeFactory.createNSAwareAttribute();
attr.internalSetLocalName(localName);
try {
attr.coreSetCharacterData(value, AxiomSemantics.INSTANCE);
@@ -391,7 +391,7 @@ public class OMFactoryImpl implements OMFactory {
int type = child.getType();
switch (type) {
case OMNode.ELEMENT_NODE:
- return importElement((OMElement)child, AxiomNodeFactory::createElement);
+ return importElement((OMElement)child, AxiomNodeFactory::createNSAwareElement);
case OMNode.TEXT_NODE:
case OMNode.SPACE_NODE:
case OMNode.CDATA_SECTION_NODE: {
@@ -419,7 +419,7 @@ public class OMFactoryImpl implements OMFactory {
}
case OMNode.DTD_NODE: {
OMDocType docType = (OMDocType)child;
- AxiomDocType importedDocType = nodeFactory.createDocType();
+ AxiomDocType importedDocType = nodeFactory.createDocumentTypeDeclaration();
importedDocType.coreSetRootName(docType.getRootName());
importedDocType.coreSetPublicId(docType.getPublicId());
importedDocType.coreSetSystemId(docType.getSystemId());
@@ -451,7 +451,7 @@ public class OMFactoryImpl implements OMFactory {
}
private AxiomAttribute importAttribute(OMAttribute attribute) {
- AxiomAttribute importedAttribute = nodeFactory.createAttribute();
+ AxiomAttribute importedAttribute = nodeFactory.createNSAwareAttribute();
copyName(attribute, importedAttribute);
importedAttribute.setAttributeValue(attribute.getAttributeValue());
return importedAttribute;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/BuilderFactory.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/BuilderFactory.java
index e97a906..6fd51e3 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/BuilderFactory.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/BuilderFactory.java
@@ -39,7 +39,7 @@ public abstract class BuilderFactory<T extends OMXMLParserWrapper> {
public final static BuilderFactory<OMXMLParserWrapper> OM = new BuilderFactory<OMXMLParserWrapper>() {
@Override
public OMXMLParserWrapper createBuilder(AxiomNodeFactory nodeFactory, BuilderSpec spec) {
- return new OMXMLParserWrapperImpl(new BuilderImpl(spec.getInput(), nodeFactory.getCoreNodeFactory(),
+ return new OMXMLParserWrapperImpl(new BuilderImpl(spec.getInput(), nodeFactory,
PlainXMLModel.INSTANCE, null), spec.getDetachable());
}
};
@@ -47,7 +47,7 @@ public abstract class BuilderFactory<T extends OMXMLParserWrapper> {
public final static BuilderFactory<SOAPModelBuilder> SOAP = new BuilderFactory<SOAPModelBuilder>() {
@Override
public SOAPModelBuilder createBuilder(AxiomNodeFactory nodeFactory, BuilderSpec spec) {
- BuilderImpl builder = new BuilderImpl(new FilteredXmlInput(spec.getInput(), SOAPFilter.INSTANCE), nodeFactory.getCoreNodeFactory(), new SOAPModel(nodeFactory), null);
+ BuilderImpl builder = new BuilderImpl(new FilteredXmlInput(spec.getInput(), SOAPFilter.INSTANCE), nodeFactory, new SOAPModel(nodeFactory), null);
// The SOAPFactory instance linked to the SOAPMessage is unknown until we reach the
// SOAPEnvelope. Register a post-processor that does the necessary updates on the
// SOAPMessage.
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/factory/AxiomNodeFactory.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/factory/AxiomNodeFactory.java
index 4b5e11b..c319f7f 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/factory/AxiomNodeFactory.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/factory/AxiomNodeFactory.java
@@ -55,45 +55,51 @@ import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultValue;
import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12Header;
import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12HeaderBlock;
import org.apache.axiom.weaver.annotation.FactoryMethod;
-import org.apache.axiom.weaver.annotation.Inject;
import org.apache.axiom.weaver.annotation.Singleton;
@Singleton
-public interface AxiomNodeFactory extends OMMetaFactorySPI {
- @Inject
- NodeFactory2 getCoreNodeFactory();
-
+public interface AxiomNodeFactory extends NodeFactory2, OMMetaFactorySPI {
@FactoryMethod
+ @Override
AxiomDocument createDocument();
@FactoryMethod
- AxiomDocType createDocType();
+ @Override
+ AxiomDocType createDocumentTypeDeclaration();
@FactoryMethod
+ @Override
AxiomCharacterDataNode createCharacterDataNode();
@FactoryMethod
+ @Override
AxiomCDATASection createCDATASection();
@FactoryMethod
+ @Override
AxiomProcessingInstruction createProcessingInstruction();
@FactoryMethod
+ @Override
AxiomEntityReference createEntityReference();
@FactoryMethod
+ @Override
AxiomComment createComment();
@FactoryMethod
- AxiomElement createElement();
+ @Override
+ AxiomElement createNSAwareElement();
@FactoryMethod
AxiomSourcedElement createSourcedElement();
@FactoryMethod
- AxiomAttribute createAttribute();
+ @Override
+ AxiomAttribute createNSAwareAttribute();
@FactoryMethod
+ @Override
AxiomNamespaceDeclaration createNamespaceDeclaration();
@FactoryMethod
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP11BuilderHelper.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP11BuilderHelper.java
index a5c438e..3edda04 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP11BuilderHelper.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP11BuilderHelper.java
@@ -51,7 +51,7 @@ public class SOAP11BuilderHelper extends SOAPBuilderHelper implements SOAP11Cons
} else if (SOAP_FAULT_DETAIL_LOCAL_NAME.equals(localName)) {
elementType = AxiomNodeFactory::createSOAP11FaultDetail;
} else {
- elementType = AxiomNodeFactory::createElement;
+ elementType = AxiomNodeFactory::createNSAwareElement;
}
} else if (elementLevel == 5) {
@@ -75,11 +75,11 @@ public class SOAP11BuilderHelper extends SOAPBuilderHelper implements SOAP11Cons
throw new SOAPProcessingException(
"faultactor element should not have children");
} else {
- elementType = AxiomNodeFactory::createElement;
+ elementType = AxiomNodeFactory::createNSAwareElement;
}
} else if (elementLevel > 5) {
- elementType = AxiomNodeFactory::createElement;
+ elementType = AxiomNodeFactory::createNSAwareElement;
}
return elementType;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java
index ddb995f..197159f 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java
@@ -187,7 +187,7 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
}
} else if (parent.getLocalName().equals(
SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME)) {
- elementType = AxiomNodeFactory::createElement;
+ elementType = AxiomNodeFactory::createNSAwareElement;
processingDetailElements = true;
detailElementNames = new Vector<String>();
detailElementNames.add(localName);
@@ -243,7 +243,7 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
}
if (localNameExist) {
detailElementNames.setSize(detailElementLevel);
- elementType = AxiomNodeFactory::createElement;
+ elementType = AxiomNodeFactory::createNSAwareElement;
detailElementNames.add(localName);
}