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 2022/03/12 15:34:56 UTC
[ws-axiom] branch master updated: Enforce consistent formatting in om-mixins
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 d2fcffb Enforce consistent formatting in om-mixins
d2fcffb is described below
commit d2fcffb9d10040f926cb0d3047028de85e0b6240
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Sat Mar 12 15:34:45 2022 +0000
Enforce consistent formatting in om-mixins
---
mixins/om-mixins/pom.xml | 11 ++
.../om/impl/common/AxiomExceptionTranslator.java | 9 +-
.../axiom/om/impl/common/AxiomSemantics.java | 101 +++++-----
.../axiom/om/impl/common/DeferredNamespace.java | 22 +--
.../org/apache/axiom/om/impl/common/NSUtil.java | 9 +-
.../om/impl/common/NamespaceDeclarationMapper.java | 6 +-
.../axiom/om/impl/common/NamespaceIterator.java | 19 +-
.../axiom/om/impl/common/OMNamespaceImpl.java | 13 +-
.../om/impl/common/SAXResultContentHandler.java | 41 +++--
.../impl/common/builder/CustomBuilderManager.java | 47 +++--
.../common/builder/CustomBuilderRegistration.java | 2 +-
.../axiom/om/impl/common/builder/Detachable.java | 4 +-
.../om/impl/common/builder/OMNamespaceCache.java | 12 +-
.../common/builder/OMXMLParserWrapperImpl.java | 8 +-
.../om/impl/common/factory/OMFactoryImpl.java | 203 ++++++++++++---------
.../impl/common/factory/meta/BuilderFactory.java | 73 +++++---
.../om/impl/common/factory/meta/BuilderSpec.java | 81 +++++---
.../impl/common/factory/meta/DetachableReader.java | 4 +-
.../common/factory/meta/NSUnawareNodeFilter.java | 2 +-
.../om/impl/common/util/OMDataSourceUtil.java | 9 +-
.../apache/axiom/om/impl/intf/AxiomAttribute.java | 5 +-
.../axiom/om/impl/intf/AxiomCDATASection.java | 4 +-
.../axiom/om/impl/intf/AxiomCharacterDataNode.java | 5 +-
.../apache/axiom/om/impl/intf/AxiomChildNode.java | 4 +-
.../apache/axiom/om/impl/intf/AxiomComment.java | 4 +-
.../apache/axiom/om/impl/intf/AxiomContainer.java | 13 +-
.../axiom/om/impl/intf/AxiomCoreLeafNode.java | 4 +-
.../axiom/om/impl/intf/AxiomCoreParentNode.java | 4 +-
.../apache/axiom/om/impl/intf/AxiomDocType.java | 4 +-
.../apache/axiom/om/impl/intf/AxiomDocument.java | 4 +-
.../apache/axiom/om/impl/intf/AxiomElement.java | 14 +-
.../axiom/om/impl/intf/AxiomEntityReference.java | 5 +-
.../apache/axiom/om/impl/intf/AxiomLeafNode.java | 4 +-
.../om/impl/intf/AxiomNamedInformationItem.java | 7 +-
.../om/impl/intf/AxiomNamespaceDeclaration.java | 1 +
.../om/impl/intf/AxiomProcessingInstruction.java | 8 +-
.../axiom/om/impl/intf/AxiomSerializable.java | 4 +-
.../axiom/om/impl/intf/AxiomSourcedElement.java | 4 +
.../org/apache/axiom/om/impl/intf/AxiomText.java | 4 +-
.../org/apache/axiom/om/impl/intf/Sequence.java | 6 +-
.../org/apache/axiom/om/impl/intf/TextContent.java | 32 ++--
.../axiom/om/impl/mixin/AxiomAttributeMixin.java | 20 +-
.../axiom/om/impl/mixin/AxiomChildNodeMixin.java | 17 +-
.../axiom/om/impl/mixin/AxiomCommentMixin.java | 5 +-
.../axiom/om/impl/mixin/AxiomContainerMixin.java | 161 ++++++++++------
.../om/impl/mixin/AxiomCoreParentNodeMixin.java | 10 +-
.../axiom/om/impl/mixin/AxiomDocTypeMixin.java | 5 +-
.../axiom/om/impl/mixin/AxiomDocumentMixin.java | 18 +-
.../axiom/om/impl/mixin/AxiomElementMixin.java | 183 ++++++++++++-------
.../om/impl/mixin/AxiomEntityReferenceMixin.java | 5 +-
.../om/impl/mixin/AxiomInformationItemMixin.java | 4 +-
.../impl/mixin/AxiomNamedInformationItemMixin.java | 59 +++---
.../impl/mixin/AxiomNamespaceDeclarationMixin.java | 15 +-
.../axiom/om/impl/mixin/AxiomNodeFactoryMixin.java | 30 +--
.../mixin/AxiomProcessingInstructionMixin.java | 8 +-
.../om/impl/mixin/AxiomSourcedElementMixin.java | 175 +++++++++++-------
.../apache/axiom/om/impl/mixin/AxiomTextMixin.java | 22 ++-
.../apache/axiom/om/impl/mixin/package-info.java | 49 ++---
.../NamespaceContextPreservationFilterHandler.java | 18 +-
.../impl/stream/XmlDeclarationRewriterHandler.java | 7 +-
.../axiom/om/impl/stream/XsiTypeFilterHandler.java | 25 ++-
.../stream/ds/DirectPushOMDataSourceReader.java | 3 +-
.../om/impl/stream/ds/MTOMXMLStreamWriterImpl.java | 31 ++--
.../om/impl/stream/ds/PushOMDataSourceInput.java | 6 +-
.../om/impl/stream/ds/PushOMDataSourceReader.java | 22 ++-
.../stream/ds/PushOMDataSourceStreamWriter.java | 25 ++-
.../impl/stream/ds/PushOMDataSourceXOPHandler.java | 5 +-
.../axiom/om/impl/stream/sax/XMLReaderImpl.java | 8 +-
.../pull/AxiomXMLStreamReaderExtensionFactory.java | 5 +-
.../stax/pull/AxiomXMLStreamReaderHelper.java | 15 +-
.../pull/AxiomXMLStreamReaderHelperFactory.java | 5 +-
.../stream/stax/pull/CharacterDataReaderImpl.java | 23 ++-
.../stream/stax/pull/DataHandlerReaderImpl.java | 14 +-
.../push/AxiomXMLStreamWriterExtensionFactory.java | 5 +-
.../stream/stax/push/DataHandlerWriterImpl.java | 5 +-
.../stream/stax/push/XMLStreamWriterHandler.java | 53 ++++--
.../om/impl/stream/xop/ContentIDGenerator.java | 45 +++--
.../om/impl/stream/xop/ContentIDGeneratorImpl.java | 2 +-
.../om/impl/stream/xop/OptimizationPolicy.java | 92 +++++-----
.../om/impl/stream/xop/OptimizationPolicyImpl.java | 12 +-
.../impl/stream/xop/XOPDecodingFilterHandler.java | 10 +-
.../impl/stream/xop/XOPEncodingFilterHandler.java | 35 ++--
.../axiom/soap/impl/common/MURoleChecker.java | 3 +-
.../apache/axiom/soap/impl/common/RoleChecker.java | 2 +-
.../axiom/soap/impl/common/RolePlayerChecker.java | 21 +--
.../soap/impl/common/SOAPHeaderBlockHelper.java | 27 ++-
.../soap/impl/common/SOAPHeaderBlockMapper.java | 14 +-
.../impl/common/builder/SOAP11BuilderHelper.java | 22 +--
.../impl/common/builder/SOAP12BuilderHelper.java | 62 +++----
.../impl/common/builder/SOAPBuilderHelper.java | 5 +-
.../axiom/soap/impl/common/builder/SOAPFilter.java | 2 +-
.../impl/common/builder/SOAPFilterHandler.java | 14 +-
.../axiom/soap/impl/common/builder/SOAPModel.java | 57 +++---
.../impl/common/builder/SOAPModelBuilderImpl.java | 10 +-
.../axiom/soap/impl/factory/SOAP12Factory.java | 16 +-
.../axiom/soap/impl/factory/SOAPFactoryImpl.java | 39 ++--
.../apache/axiom/soap/impl/intf/AxiomSOAPBody.java | 4 +-
.../axiom/soap/impl/intf/AxiomSOAPEnvelope.java | 4 +-
.../axiom/soap/impl/intf/AxiomSOAPFaultCode.java | 4 +-
.../axiom/soap/impl/intf/AxiomSOAPFaultDetail.java | 4 +-
.../axiom/soap/impl/intf/AxiomSOAPFaultReason.java | 4 +-
.../axiom/soap/impl/intf/AxiomSOAPFaultRole.java | 4 +-
.../axiom/soap/impl/intf/AxiomSOAPHeader.java | 4 +-
.../axiom/soap/impl/intf/AxiomSOAPHeaderBlock.java | 5 +-
.../apache/axiom/soap/impl/intf/SOAPHelper.java | 67 ++++---
.../soap/impl/intf/soap11/AxiomSOAP11Body.java | 4 +-
.../soap/impl/intf/soap11/AxiomSOAP11Element.java | 4 +-
.../soap/impl/intf/soap11/AxiomSOAP11Envelope.java | 4 +-
.../soap/impl/intf/soap11/AxiomSOAP11Fault.java | 4 +-
.../impl/intf/soap11/AxiomSOAP11FaultCode.java | 4 +-
.../impl/intf/soap11/AxiomSOAP11FaultDetail.java | 4 +-
.../impl/intf/soap11/AxiomSOAP11FaultReason.java | 4 +-
.../impl/intf/soap11/AxiomSOAP11FaultRole.java | 4 +-
.../soap/impl/intf/soap11/AxiomSOAP11Header.java | 4 +-
.../impl/intf/soap11/AxiomSOAP11HeaderBlock.java | 4 +-
.../axiom/soap/impl/intf/soap11/SOAP11Helper.java | 7 +-
.../soap/impl/intf/soap12/AxiomSOAP12Body.java | 4 +-
.../soap/impl/intf/soap12/AxiomSOAP12Element.java | 4 +-
.../soap/impl/intf/soap12/AxiomSOAP12Envelope.java | 4 +-
.../soap/impl/intf/soap12/AxiomSOAP12Fault.java | 4 +-
.../intf/soap12/AxiomSOAP12FaultClassifier.java | 4 +-
.../impl/intf/soap12/AxiomSOAP12FaultCode.java | 4 +-
.../impl/intf/soap12/AxiomSOAP12FaultDetail.java | 4 +-
.../impl/intf/soap12/AxiomSOAP12FaultNode.java | 4 +-
.../impl/intf/soap12/AxiomSOAP12FaultReason.java | 4 +-
.../impl/intf/soap12/AxiomSOAP12FaultRole.java | 4 +-
.../impl/intf/soap12/AxiomSOAP12FaultSubCode.java | 4 +-
.../impl/intf/soap12/AxiomSOAP12FaultText.java | 4 +-
.../impl/intf/soap12/AxiomSOAP12FaultValue.java | 4 +-
.../soap/impl/intf/soap12/AxiomSOAP12Header.java | 4 +-
.../impl/intf/soap12/AxiomSOAP12HeaderBlock.java | 4 +-
.../axiom/soap/impl/intf/soap12/SOAP12Helper.java | 25 +--
.../soap/impl/mixin/AxiomSOAP11EnvelopeMixin.java | 6 +-
.../soap/impl/mixin/AxiomSOAP11FaultMixin.java | 20 +-
.../mixin/AxiomSOAP12FaultClassifierMixin.java | 19 +-
.../soap/impl/mixin/AxiomSOAP12FaultMixin.java | 23 ++-
.../impl/mixin/AxiomSOAP12FaultReasonMixin.java | 14 +-
.../soap/impl/mixin/AxiomSOAP12FaultTextMixin.java | 20 +-
.../axiom/soap/impl/mixin/AxiomSOAPBodyMixin.java | 8 +-
.../soap/impl/mixin/AxiomSOAPElementMixin.java | 18 +-
.../soap/impl/mixin/AxiomSOAPEnvelopeMixin.java | 8 +-
.../soap/impl/mixin/AxiomSOAPFaultDetailMixin.java | 2 +-
.../axiom/soap/impl/mixin/AxiomSOAPFaultMixin.java | 20 +-
.../soap/impl/mixin/AxiomSOAPHeaderBlockMixin.java | 24 ++-
.../soap/impl/mixin/AxiomSOAPHeaderMixin.java | 82 ++++++---
.../soap/impl/mixin/AxiomSOAPMessageMixin.java | 12 +-
.../apache/axiom/soap/impl/mixin/package-info.java | 73 ++++----
.../axiom/om/impl/common/OMNamespaceImplTest.java | 27 +--
.../axiom/om/impl/common/util/LocaleUtilTest.java | 3 +-
149 files changed, 1689 insertions(+), 1289 deletions(-)
diff --git a/mixins/om-mixins/pom.xml b/mixins/om-mixins/pom.xml
index 89dfbba..99174f5 100644
--- a/mixins/om-mixins/pom.xml
+++ b/mixins/om-mixins/pom.xml
@@ -89,6 +89,17 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>java-format-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/AxiomExceptionTranslator.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/AxiomExceptionTranslator.java
index 80d8b25..9f700e9 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/AxiomExceptionTranslator.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/AxiomExceptionTranslator.java
@@ -29,21 +29,22 @@ import org.apache.axiom.om.OMException;
public class AxiomExceptionTranslator {
private AxiomExceptionTranslator() {}
-
+
public static OMException translate(CoreModelException ex) {
if (ex instanceof NodeConsumedException) {
return new NodeUnavailableException();
} else if (ex instanceof DeferredParsingException) {
- throw new org.apache.axiom.om.DeferredParsingException(((DeferredParsingException) ex).getStreamException());
+ throw new org.apache.axiom.om.DeferredParsingException(
+ ((DeferredParsingException) ex).getStreamException());
} else {
return new OMException(ex);
}
}
-
+
public static XMLStreamException toXMLStreamException(StreamException ex) {
Throwable cause = ex.getCause();
if (cause instanceof XMLStreamException) {
- return (XMLStreamException)cause;
+ return (XMLStreamException) cause;
} else {
return new XMLStreamException(ex);
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/AxiomSemantics.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/AxiomSemantics.java
index c1a3fa8..16998c2 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/AxiomSemantics.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/AxiomSemantics.java
@@ -35,14 +35,14 @@ import org.apache.axiom.om.impl.intf.AxiomSourcedElement;
public final class AxiomSemantics implements Semantics {
public static final AxiomSemantics INSTANCE = new AxiomSemantics();
-
+
private AxiomSemantics() {}
-
+
@Override
public DetachPolicy getDetachPolicy() {
return DetachPolicy.NEW_DOCUMENT;
}
-
+
@Override
public boolean isUseStrictNamespaceLookup() {
return true;
@@ -53,56 +53,65 @@ public final class AxiomSemantics implements Semantics {
return nodeType == NodeType.DOCUMENT || nodeType == NodeType.NS_AWARE_ELEMENT;
}
- public static final AttributeMatcher ATTRIBUTE_MATCHER = new NSAwareAttributeMatcher(
- INSTANCE,
- false, // Axiom doesn't support namespace unaware attributes
- false);
+ public static final AttributeMatcher ATTRIBUTE_MATCHER =
+ new NSAwareAttributeMatcher(
+ INSTANCE, false, // Axiom doesn't support namespace unaware attributes
+ false);
- public static final AttributeMatcher NAMESPACE_DECLARATION_MATCHER = new NamespaceDeclarationMatcher(INSTANCE);
-
- public static final ClonePolicy<OMCloneOptions> CLONE_POLICY = new ClonePolicy<OMCloneOptions>() {
- @Override
- public Class<? extends CoreNode> getTargetNodeClass(OMCloneOptions options, CoreNode node) {
- if (options != null && options.isPreserveModel()) {
- return node.coreGetNodeClass();
- } else if (options != null && options.isCopyOMDataSources() && node instanceof AxiomSourcedElement) {
- return AxiomSourcedElement.class;
- } else {
- return node.coreGetNodeType().getInterface();
- }
- }
+ public static final AttributeMatcher NAMESPACE_DECLARATION_MATCHER =
+ new NamespaceDeclarationMatcher(INSTANCE);
- @Override
- public boolean repairNamespaces(OMCloneOptions options) {
- return true;
- }
+ public static final ClonePolicy<OMCloneOptions> CLONE_POLICY =
+ new ClonePolicy<OMCloneOptions>() {
+ @Override
+ public Class<? extends CoreNode> getTargetNodeClass(
+ OMCloneOptions options, CoreNode node) {
+ if (options != null && options.isPreserveModel()) {
+ return node.coreGetNodeClass();
+ } else if (options != null
+ && options.isCopyOMDataSources()
+ && node instanceof AxiomSourcedElement) {
+ return AxiomSourcedElement.class;
+ } else {
+ return node.coreGetNodeType().getInterface();
+ }
+ }
- @Override
- public boolean cloneAttributes(OMCloneOptions options) {
- return true;
- }
+ @Override
+ public boolean repairNamespaces(OMCloneOptions options) {
+ return true;
+ }
+
+ @Override
+ public boolean cloneAttributes(OMCloneOptions options) {
+ return true;
+ }
- @Override
- public boolean cloneChildren(OMCloneOptions options, NodeType nodeType) {
- return true;
- }
+ @Override
+ public boolean cloneChildren(OMCloneOptions options, NodeType nodeType) {
+ return true;
+ }
- @Override
- public void postProcess(OMCloneOptions options, CoreNode clone) {
- if (clone instanceof AxiomElement && ((AxiomElement)clone).isExpanded()) {
- // Repair namespaces
- AxiomElement element = (AxiomElement)clone;
- NSUtil.handleNamespace(element, element.getNamespace(), false, true);
- CoreAttribute attr = element.coreGetFirstAttribute();
- while (attr != null) {
- if (attr instanceof AxiomAttribute) {
- NSUtil.handleNamespace(element, ((AxiomAttribute)attr).getNamespace(), true, true);
+ @Override
+ public void postProcess(OMCloneOptions options, CoreNode clone) {
+ if (clone instanceof AxiomElement && ((AxiomElement) clone).isExpanded()) {
+ // Repair namespaces
+ AxiomElement element = (AxiomElement) clone;
+ NSUtil.handleNamespace(element, element.getNamespace(), false, true);
+ CoreAttribute attr = element.coreGetFirstAttribute();
+ while (attr != null) {
+ if (attr instanceof AxiomAttribute) {
+ NSUtil.handleNamespace(
+ element,
+ ((AxiomAttribute) attr).getNamespace(),
+ true,
+ true);
+ }
+ attr = attr.coreGetNextAttribute();
+ }
}
- attr = attr.coreGetNextAttribute();
}
- }
- }
- };
+ };
@Override
public RuntimeException toUncheckedException(CoreModelException ex) {
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/DeferredNamespace.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/DeferredNamespace.java
index 51b8545..2c3ab33 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/DeferredNamespace.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/DeferredNamespace.java
@@ -23,9 +23,9 @@ import org.apache.axiom.om.impl.intf.AxiomSourcedElement;
public final class DeferredNamespace implements OMNamespace {
private final AxiomSourcedElement element;
-
+
final String uri;
-
+
public DeferredNamespace(AxiomSourcedElement element, String ns) {
this.element = element;
this.uri = ns;
@@ -34,9 +34,8 @@ public final class DeferredNamespace implements OMNamespace {
@Override
public boolean equals(String uri, String prefix) {
String thisPrefix = getPrefix();
- return (this.uri.equals(uri) &&
- (thisPrefix == null ? prefix == null :
- thisPrefix.equals(prefix)));
+ return (this.uri.equals(uri)
+ && (thisPrefix == null ? prefix == null : thisPrefix.equals(prefix)));
}
@Override
@@ -57,23 +56,22 @@ public final class DeferredNamespace implements OMNamespace {
OMNamespace actualNS = element.getNamespace();
return actualNS == null ? "" : actualNS.getPrefix();
}
-
+
@Override
public int hashCode() {
String thisPrefix = getPrefix();
return uri.hashCode() ^ (thisPrefix != null ? thisPrefix.hashCode() : 0);
}
-
+
@Override
public boolean equals(Object obj) {
if (!(obj instanceof OMNamespace)) {
return false;
}
- OMNamespace other = (OMNamespace)obj;
+ OMNamespace other = (OMNamespace) obj;
String otherPrefix = other.getPrefix();
String thisPrefix = getPrefix();
- return (uri.equals(other.getNamespaceURI()) &&
- (thisPrefix == null ? otherPrefix == null :
- thisPrefix.equals(otherPrefix)));
+ return (uri.equals(other.getNamespaceURI())
+ && (thisPrefix == null ? otherPrefix == null : thisPrefix.equals(otherPrefix)));
}
-}
\ No newline at end of file
+}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/NSUtil.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/NSUtil.java
index b454522..9b2dfd4 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/NSUtil.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/NSUtil.java
@@ -26,12 +26,14 @@ import org.apache.axiom.om.impl.intf.AxiomElement;
public final class NSUtil {
private NSUtil() {}
- public static OMNamespace handleNamespace(AxiomElement context, OMNamespace ns, boolean attr, boolean decl) {
+ public static OMNamespace handleNamespace(
+ AxiomElement context, OMNamespace ns, boolean attr, boolean decl) {
String namespaceURI = ns == null ? "" : ns.getNamespaceURI();
String prefix = ns == null ? "" : ns.getPrefix();
if (namespaceURI.length() == 0) {
if (prefix != null && prefix.length() != 0) {
- throw new IllegalArgumentException("Cannot bind a prefix to the empty namespace name");
+ throw new IllegalArgumentException(
+ "Cannot bind a prefix to the empty namespace name");
}
if (!attr && decl) {
// Special case: no namespace; we need to generate a namespace declaration only if
@@ -44,7 +46,8 @@ public final class NSUtil {
return null;
} else {
if (attr && prefix != null && prefix.length() == 0) {
- throw new IllegalArgumentException("An attribute with a namespace must be prefixed");
+ throw new IllegalArgumentException(
+ "An attribute with a namespace must be prefixed");
}
boolean addNSDecl = false;
if (context != null && (decl || prefix == null)) {
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/NamespaceDeclarationMapper.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/NamespaceDeclarationMapper.java
index bb0fe2c..8178438 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/NamespaceDeclarationMapper.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/NamespaceDeclarationMapper.java
@@ -22,11 +22,11 @@ import org.apache.axiom.core.Mapper;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.intf.AxiomNamespaceDeclaration;
-public class NamespaceDeclarationMapper implements Mapper<OMNamespace,AxiomNamespaceDeclaration> {
+public class NamespaceDeclarationMapper implements Mapper<OMNamespace, AxiomNamespaceDeclaration> {
public static final NamespaceDeclarationMapper INSTANCE = new NamespaceDeclarationMapper();
-
+
private NamespaceDeclarationMapper() {}
-
+
@Override
public OMNamespace map(AxiomNamespaceDeclaration namespaceDeclaration) {
return namespaceDeclaration.getDeclaredNamespace();
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/NamespaceIterator.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/NamespaceIterator.java
index 3250148..93920b5 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/NamespaceIterator.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/NamespaceIterator.java
@@ -27,9 +27,7 @@ import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-/**
- * Iterator implementation used by {@link OMElement#getNamespacesInScope()}.
- */
+/** Iterator implementation used by {@link OMElement#getNamespacesInScope()}. */
public final class NamespaceIterator implements Iterator<OMNamespace> {
private final Set<String> seenPrefixes = new HashSet<String>();
private OMElement element;
@@ -50,12 +48,13 @@ public final class NamespaceIterator implements Iterator<OMNamespace> {
} else if (declaredNamespaces.hasNext()) {
OMNamespace namespace = declaredNamespaces.next();
// We only return a namespace declaration if it has not been overridden (i.e. if
- // we have not seen another declaration with the same prefix yet) and if the namespace
- // URI is not empty. The second part of the condition covers the case of namespace
- // declarations such as xmlns="" (for which no OMNamespace object is returned, as
- // described in the Javadoc of the getNamespacesInScope method) as well as undeclared
- // prefixes (XML 1.1 only).
- if (seenPrefixes.add(namespace.getPrefix()) && namespace.getNamespaceURI().length() > 0) {
+ // we have not seen another declaration with the same prefix yet) and if the
+ // namespace URI is not empty. The second part of the condition covers the case
+ // of namespace declarations such as xmlns="" (for which no OMNamespace object
+ // is returned, as described in the Javadoc of the getNamespacesInScope method)
+ // as well as undeclared prefixes (XML 1.1 only).
+ if (seenPrefixes.add(namespace.getPrefix())
+ && namespace.getNamespaceURI().length() > 0) {
next = namespace;
break;
}
@@ -63,7 +62,7 @@ public final class NamespaceIterator implements Iterator<OMNamespace> {
declaredNamespaces = null;
OMContainer parent = element.getParent();
if (parent instanceof OMElement) {
- element = (OMElement)parent;
+ element = (OMElement) parent;
} else {
next = null;
break;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/OMNamespaceImpl.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/OMNamespaceImpl.java
index 95573e2..009bfc2 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/OMNamespaceImpl.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/OMNamespaceImpl.java
@@ -51,20 +51,17 @@ public class OMNamespaceImpl implements OMNamespace {
*/
@Override
public boolean equals(String uri, String prefix) {
- return (this.uri.equals(uri) &&
- (this.prefix == null ? prefix == null :
- this.prefix.equals(prefix)));
-
+ return (this.uri.equals(uri)
+ && (this.prefix == null ? prefix == null : this.prefix.equals(prefix)));
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof OMNamespace)) return false;
- OMNamespace other = (OMNamespace)obj;
+ OMNamespace other = (OMNamespace) obj;
String otherPrefix = other.getPrefix();
- return (uri.equals(other.getNamespaceURI()) &&
- (prefix == null ? otherPrefix == null :
- prefix.equals(otherPrefix)));
+ return (uri.equals(other.getNamespaceURI())
+ && (prefix == null ? otherPrefix == null : prefix.equals(otherPrefix)));
}
/**
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/SAXResultContentHandler.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/SAXResultContentHandler.java
index 41e6565..b59bc99 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/SAXResultContentHandler.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/SAXResultContentHandler.java
@@ -42,7 +42,7 @@ public final class SAXResultContentHandler implements XmlHandler {
this.root = root;
factory = root.getOMFactory();
}
-
+
private String stopBuffering() {
String content = buffer.toString();
buffer.clear();
@@ -51,10 +51,11 @@ public final class SAXResultContentHandler implements XmlHandler {
}
@Override
- public void startDocument(String inputEncoding, String xmlVersion, String xmlEncoding, Boolean standalone) {
+ public void startDocument(
+ String inputEncoding, String xmlVersion, String xmlEncoding, Boolean standalone) {
target = root;
}
-
+
@Override
public void startFragment() throws StreamException {
// TODO
@@ -62,12 +63,11 @@ public final class SAXResultContentHandler implements XmlHandler {
}
@Override
- public void completed() {
- }
+ public void completed() {}
@Override
- public void processDocumentTypeDeclaration(String rootName, String publicId,
- String systemId, String internalSubset) {
+ public void processDocumentTypeDeclaration(
+ String rootName, String publicId, String systemId, String internalSubset) {
if (target instanceof OMDocument) {
factory.createOMDocType(target, rootName, publicId, systemId, internalSubset);
}
@@ -76,18 +76,25 @@ public final class SAXResultContentHandler implements XmlHandler {
@Override
public void startElement(String namespaceURI, String localName, String prefix) {
// TODO: inefficient: we should not create a new OMNamespace instance every time
- target = factory.createOMElement(localName, factory.createOMNamespace(namespaceURI, prefix), target);
+ target =
+ factory.createOMElement(
+ localName, factory.createOMNamespace(namespaceURI, prefix), target);
}
@Override
public void endElement() {
- target = ((OMNode)target).getParent();
+ target = ((OMNode) target).getParent();
}
@Override
- public void processAttribute(String namespaceURI, String localName, String prefix, String value,
- String type, boolean specified) {
- OMElement element = (OMElement)target;
+ public void processAttribute(
+ String namespaceURI,
+ String localName,
+ String prefix,
+ String value,
+ String type,
+ boolean specified) {
+ OMElement element = (OMElement) target;
OMNamespace ns;
if (namespaceURI.length() > 0) {
ns = element.findNamespace(namespaceURI, prefix);
@@ -111,22 +118,22 @@ public final class SAXResultContentHandler implements XmlHandler {
@Override
public void processNamespaceDeclaration(String prefix, String namespaceURI) {
if (prefix.isEmpty()) {
- ((OMElement)target).declareDefaultNamespace(namespaceURI);
+ ((OMElement) target).declareDefaultNamespace(namespaceURI);
} else {
- ((OMElement)target).declareNamespace(namespaceURI, prefix);
+ ((OMElement) target).declareNamespace(namespaceURI, prefix);
}
}
@Override
- public void attributesCompleted() {
- }
+ public void attributesCompleted() {}
@Override
public void processCharacterData(Object data, boolean ignorable) {
if (buffering) {
buffer.append(data);
} else {
- factory.createOMText(target, data.toString(), ignorable ? OMNode.SPACE_NODE : OMNode.TEXT_NODE);
+ factory.createOMText(
+ target, data.toString(), ignorable ? OMNode.SPACE_NODE : OMNode.TEXT_NODE);
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/CustomBuilderManager.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/CustomBuilderManager.java
index 5de289b..fdab087 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/CustomBuilderManager.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/CustomBuilderManager.java
@@ -42,11 +42,11 @@ import org.apache.commons.logging.LogFactory;
final class CustomBuilderManager implements BuilderListener {
private static final Log log = LogFactory.getLog(CustomBuilderManager.class);
-
+
private ArrayList<CustomBuilderRegistration> registrations;
private AxiomElement lastCandidateElement;
private int lastCandidateDepth = -1;
-
+
void register(CustomBuilder.Selector selector, CustomBuilder customBuilder) {
if (registrations == null) {
registrations = new ArrayList<CustomBuilderRegistration>();
@@ -59,7 +59,8 @@ final class CustomBuilderManager implements BuilderListener {
// executed before the custom builder registration may have checked if the payload is a
// SOAP fault).
if (lastCandidateElement != null) {
- DeferredAction action = getAction(lastCandidateElement, lastCandidateDepth, registrations.size()-1);
+ DeferredAction action =
+ getAction(lastCandidateElement, lastCandidateDepth, registrations.size() - 1);
if (action != null) {
try {
action.run();
@@ -69,26 +70,37 @@ final class CustomBuilderManager implements BuilderListener {
}
}
}
-
+
@Override
public DeferredAction nodeAdded(CoreNode node, int depth) {
return getAction(node, depth, 0);
}
-
+
private DeferredAction getAction(CoreNode node, int depth, int firstCustomBuilder) {
lastCandidateElement = null;
lastCandidateDepth = -1;
- if (node instanceof AxiomElement && (node instanceof AxiomSOAPHeaderBlock || !(node instanceof AxiomSOAPElement))) {
- AxiomElement element = (AxiomElement)node;
+ if (node instanceof AxiomElement
+ && (node instanceof AxiomSOAPHeaderBlock || !(node instanceof AxiomSOAPElement))) {
+ AxiomElement element = (AxiomElement) node;
if (registrations != null) {
- for (int i=firstCustomBuilder; i<registrations.size(); i++) {
+ for (int i = firstCustomBuilder; i < registrations.size(); i++) {
CustomBuilderRegistration registration = registrations.get(i);
String namespaceURI = element.coreGetNamespaceURI();
String localName = element.coreGetLocalName();
- if (registration.getSelector().accepts(element.getParent(), depth, namespaceURI, localName)) {
+ if (registration
+ .getSelector()
+ .accepts(element.getParent(), depth, namespaceURI, localName)) {
CustomBuilder customBuilder = registration.getCustomBuilder();
if (log.isDebugEnabled()) {
- log.debug("Custom builder " + customBuilder + " accepted element {" + namespaceURI + "}" + localName + " at depth " + depth);
+ log.debug(
+ "Custom builder "
+ + customBuilder
+ + " accepted element {"
+ + namespaceURI
+ + "}"
+ + localName
+ + " at depth "
+ + depth);
}
return () -> {
if (log.isDebugEnabled()) {
@@ -103,11 +115,17 @@ final class CustomBuilderManager implements BuilderListener {
} else {
type = AxiomNodeFactory::createSourcedElement;
}
- AxiomSourcedElement newElement = type.create((AxiomNodeFactory)element.coreGetNodeFactory().getFactory2());
+ AxiomSourcedElement newElement =
+ type.create(
+ (AxiomNodeFactory)
+ element.coreGetNodeFactory().getFactory2());
if (log.isDebugEnabled()) {
- log.debug("Replacing element with new sourced element of type " + newElement.getClass().getName());
+ log.debug(
+ "Replacing element with new sourced element of type "
+ + newElement.getClass().getName());
}
- newElement.init(localName, new OMNamespaceImpl(namespaceURI, null), dataSource);
+ newElement.init(
+ localName, new OMNamespaceImpl(namespaceURI, null), dataSource);
try {
element.coreReplaceWith(newElement, AxiomSemantics.INSTANCE);
} catch (CoreModelException ex) {
@@ -117,7 +135,8 @@ final class CustomBuilderManager implements BuilderListener {
}
}
}
- // Save a reference to the element so that we can process it when another custom builder is registered
+ // Save a reference to the element so that we can process it when another custom builder
+ // is registered
lastCandidateElement = element;
lastCandidateDepth = depth;
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/CustomBuilderRegistration.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/CustomBuilderRegistration.java
index 702f54d..f4ea192 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/CustomBuilderRegistration.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/CustomBuilderRegistration.java
@@ -24,7 +24,7 @@ import org.apache.axiom.om.ds.custombuilder.CustomBuilder.Selector;
final class CustomBuilderRegistration {
private final CustomBuilder.Selector selector;
private final CustomBuilder customBuilder;
-
+
CustomBuilderRegistration(Selector selector, CustomBuilder customBuilder) {
this.selector = selector;
this.customBuilder = customBuilder;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/Detachable.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/Detachable.java
index a59ef89..d9ce6ce 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/Detachable.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/Detachable.java
@@ -20,9 +20,7 @@ package org.apache.axiom.om.impl.common.builder;
import org.apache.axiom.om.OMException;
-/**
- * For internal use only.
- */
+/** For internal use only. */
public interface Detachable {
void detach() throws OMException;
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/OMNamespaceCache.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/OMNamespaceCache.java
index cb2aa11..97813ef 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/OMNamespaceCache.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/OMNamespaceCache.java
@@ -24,7 +24,7 @@ import org.apache.axiom.om.impl.common.OMNamespaceImpl;
public final class OMNamespaceCache {
private OMNamespace[] items = new OMNamespace[16];
private int size;
-
+
public OMNamespace getOMNamespace(String uri, String prefix) {
if (uri.isEmpty() && prefix.isEmpty()) {
return null;
@@ -41,9 +41,9 @@ public final class OMNamespaceCache {
index = 0;
}
}
- if (items.length < size*4/3) {
+ if (items.length < size * 4 / 3) {
OMNamespace[] oldItems = items;
- items = new OMNamespace[items.length*2];
+ items = new OMNamespace[items.length * 2];
for (OMNamespace ns : oldItems) {
if (ns != null) {
items[freeIndex(ns.getNamespaceURI(), ns.getPrefix())] = ns;
@@ -56,11 +56,11 @@ public final class OMNamespaceCache {
size++;
return ns;
}
-
+
private int index(String uri, String prefix) {
- return (uri.hashCode() ^ prefix.hashCode()) & (items.length-1);
+ return (uri.hashCode() ^ prefix.hashCode()) & (items.length - 1);
}
-
+
private int freeIndex(String uri, String prefix) {
int index = index(uri, prefix);
while (items[index] != null) {
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/OMXMLParserWrapperImpl.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/OMXMLParserWrapperImpl.java
index 4249bfa..82475f5 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/OMXMLParserWrapperImpl.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/builder/OMXMLParserWrapperImpl.java
@@ -46,7 +46,7 @@ public class OMXMLParserWrapperImpl implements OMXMLParserWrapper, CustomBuilder
public final void registerCustomBuilder(Selector selector, CustomBuilder customBuilder) {
customBuilderManager.register(selector, customBuilder);
}
-
+
@Override
public final boolean isCompleted() {
return builder.isCompleted();
@@ -55,12 +55,12 @@ public class OMXMLParserWrapperImpl implements OMXMLParserWrapper, CustomBuilder
@Override
public final OMDocument getDocument() {
try {
- return (AxiomDocument)builder.getDocument();
+ return (AxiomDocument) builder.getDocument();
} catch (CoreModelException ex) {
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
@Override
public final OMElement getDocumentElement() {
return getDocumentElement(false);
@@ -73,7 +73,7 @@ public class OMXMLParserWrapperImpl implements OMXMLParserWrapper, CustomBuilder
OMElement element = document.getOMDocumentElement();
if (discardDocument) {
element.detach();
- ((AxiomDocument)document).coreDiscard(false);
+ ((AxiomDocument) document).coreDiscard(false);
}
return element;
} catch (CoreModelException ex) {
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 03b00b2..6ab4be7 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
@@ -67,7 +67,7 @@ import org.apache.axiom.om.impl.intf.factory.AxiomNodeFactory;
public class OMFactoryImpl implements OMFactory {
protected final AxiomNodeFactory nodeFactory;
-
+
public OMFactoryImpl(AxiomNodeFactory nodeFactory) {
this.nodeFactory = nodeFactory;
}
@@ -81,22 +81,26 @@ public class OMFactoryImpl implements OMFactory {
public final OMNamespace createOMNamespace(String uri, String prefix) {
return new OMNamespaceImpl(uri, prefix);
}
-
+
@Override
public final OMDocument createOMDocument() {
return nodeFactory.createDocument();
}
@Override
- public final OMDocType createOMDocType(OMContainer parent, String rootName,
- String publicId, String systemId, String internalSubset) {
+ public final OMDocType createOMDocType(
+ OMContainer parent,
+ String rootName,
+ String publicId,
+ String systemId,
+ String internalSubset) {
AxiomDocType node = nodeFactory.createDocumentTypeDeclaration();
node.coreSetRootName(rootName);
node.coreSetPublicId(publicId);
node.coreSetSystemId(systemId);
node.coreSetInternalSubset(internalSubset);
if (parent != null) {
- ((AxiomContainer)parent).addChild(node);
+ ((AxiomContainer) parent).addChild(node);
}
return node;
}
@@ -104,25 +108,28 @@ public class OMFactoryImpl implements OMFactory {
private AxiomText createAxiomText(OMContainer parent, Object content, int type) {
AxiomText node;
switch (type) {
- case OMNode.TEXT_NODE: {
- node = nodeFactory.createCharacterDataNode();
- break;
- }
- case OMNode.SPACE_NODE: {
- AxiomCharacterDataNode cdata = nodeFactory.createCharacterDataNode();
- cdata.coreSetIgnorable(true);
- node = cdata;
- break;
- }
- case OMNode.CDATA_SECTION_NODE: {
- node = nodeFactory.createCDATASection();
- break;
- }
+ case OMNode.TEXT_NODE:
+ {
+ node = nodeFactory.createCharacterDataNode();
+ break;
+ }
+ case OMNode.SPACE_NODE:
+ {
+ AxiomCharacterDataNode cdata = nodeFactory.createCharacterDataNode();
+ cdata.coreSetIgnorable(true);
+ node = cdata;
+ break;
+ }
+ case OMNode.CDATA_SECTION_NODE:
+ {
+ node = nodeFactory.createCDATASection();
+ break;
+ }
default:
throw new IllegalArgumentException("Invalid node type");
}
if (parent != null) {
- ((AxiomContainer)parent).addChild(node);
+ ((AxiomContainer) parent).addChild(node);
}
try {
node.coreSetCharacterData(content, AxiomSemantics.INSTANCE);
@@ -146,12 +153,12 @@ public class OMFactoryImpl implements OMFactory {
public final OMText createOMText(OMContainer parent, String text, int type) {
return createAxiomText(parent, text, type);
}
-
+
@Override
public final OMText createOMText(OMContainer parent, String text) {
return createAxiomText(parent, text, OMNode.TEXT_NODE);
}
-
+
@Override
public final OMText createOMText(OMContainer parent, char[] charArray, int type) {
return createAxiomText(parent, new String(charArray), type);
@@ -162,17 +169,22 @@ public class OMFactoryImpl implements OMFactory {
if (text == null) {
throw new IllegalArgumentException("QName text arg cannot be null!");
}
- OMNamespace ns = ((AxiomElement)parent).handleNamespace(text.getNamespaceURI(), text.getPrefix());
- return createAxiomText(parent, ns == null ? text.getLocalPart() : ns.getPrefix() + ":" + text.getLocalPart(), type);
+ OMNamespace ns =
+ ((AxiomElement) parent).handleNamespace(text.getNamespaceURI(), text.getPrefix());
+ return createAxiomText(
+ parent,
+ ns == null ? text.getLocalPart() : ns.getPrefix() + ":" + text.getLocalPart(),
+ type);
}
-
+
@Override
public final OMText createOMText(OMContainer parent, QName text) {
return createAxiomText(parent, text, OMNode.TEXT_NODE);
}
@Override
- public final OMText createOMText(OMContainer parent, String s, String mimeType, boolean optimize) {
+ public final OMText createOMText(
+ OMContainer parent, String s, String mimeType, boolean optimize) {
return createAxiomText(parent, new TextContent(s, mimeType, optimize), OMNode.TEXT_NODE);
}
@@ -185,7 +197,9 @@ public class OMFactoryImpl implements OMFactory {
public final OMText createOMText(OMContainer parent, OMText source) {
try {
// TODO: this doesn't necessarily produce a node with the expected OMFactory
- return (AxiomText)((AxiomText)source).coreClone(AxiomSemantics.CLONE_POLICY, null, (AxiomContainer)parent);
+ return (AxiomText)
+ ((AxiomText) source)
+ .coreClone(AxiomSemantics.CLONE_POLICY, null, (AxiomContainer) parent);
} catch (CoreModelException ex) {
throw AxiomExceptionTranslator.translate(ex);
}
@@ -193,19 +207,22 @@ public class OMFactoryImpl implements OMFactory {
@Override
public final OMText createOMText(Object dataHandler, boolean optimize) {
- return createOMText((DataHandler)dataHandler, optimize);
+ return createOMText((DataHandler) dataHandler, optimize);
}
@Override
public final OMText createOMText(DataHandler dataHandler, boolean optimize) {
- return createAxiomText(null, new TextContent(null, dataHandler, optimize), OMNode.TEXT_NODE);
+ return createAxiomText(
+ null, new TextContent(null, dataHandler, optimize), OMNode.TEXT_NODE);
}
@Override
- public final OMText createOMText(String contentID, DataHandlerProvider dataHandlerProvider, boolean optimize) {
- return createAxiomText(null, new TextContent(contentID, dataHandlerProvider, optimize), OMNode.TEXT_NODE);
+ public final OMText createOMText(
+ String contentID, DataHandlerProvider dataHandlerProvider, boolean optimize) {
+ return createAxiomText(
+ null, new TextContent(contentID, dataHandlerProvider, optimize), OMNode.TEXT_NODE);
}
-
+
@Override
public final OMProcessingInstruction createOMProcessingInstruction(
OMContainer parent, String piTarget, String piData) {
@@ -217,7 +234,7 @@ public class OMFactoryImpl implements OMFactory {
throw AxiomExceptionTranslator.translate(ex);
}
if (parent != null) {
- ((AxiomContainer)parent).addChild(node);
+ ((AxiomContainer) parent).addChild(node);
}
return node;
}
@@ -227,7 +244,7 @@ public class OMFactoryImpl implements OMFactory {
AxiomEntityReference node = nodeFactory.createEntityReference();
node.coreSetName(name);
if (parent != null) {
- ((AxiomContainer)parent).addChild(node);
+ ((AxiomContainer) parent).addChild(node);
}
return node;
}
@@ -241,21 +258,21 @@ public class OMFactoryImpl implements OMFactory {
throw AxiomExceptionTranslator.translate(ex);
}
if (parent != null) {
- ((AxiomContainer)parent).addChild(node);
+ ((AxiomContainer) parent).addChild(node);
}
return node;
}
-
+
@Override
public final OMElement createOMElement(String localName, OMNamespace ns) {
return createOMElement(localName, ns, null);
}
- protected final <T extends AxiomElement> T createAxiomElement(AxiomElementType<T> type,
- OMContainer parent, String localName, OMNamespace ns) {
+ protected final <T extends AxiomElement> T createAxiomElement(
+ AxiomElementType<T> type, OMContainer parent, String localName, OMNamespace ns) {
T element = type.create(nodeFactory);
if (parent != null) {
- ((AxiomContainer)parent).addChild(element);
+ ((AxiomContainer) parent).addChild(element);
}
element.initName(localName, ns, true);
return element;
@@ -279,7 +296,8 @@ public class OMFactoryImpl implements OMFactory {
// The goal here is twofold:
// * check if the namespace needs to be declared;
// * locate an existing OMNamespace object, so that we can avoid creating a new one.
- OMNamespace ns = element.findNamespace(namespaceURI, prefix.length() == 0 ? null : prefix);
+ OMNamespace ns =
+ element.findNamespace(namespaceURI, prefix.length() == 0 ? null : prefix);
if (ns == null) {
if ("".equals(prefix)) {
prefix = generatePrefix(namespaceURI);
@@ -288,7 +306,8 @@ public class OMFactoryImpl implements OMFactory {
}
element.internalSetNamespace(ns);
} else if (prefix.length() > 0) {
- throw new IllegalArgumentException("Cannot create a prefixed element with an empty namespace name");
+ throw new IllegalArgumentException(
+ "Cannot create a prefixed element with an empty namespace name");
} else {
if (element.getDefaultNamespace() != null) {
element.declareDefaultNamespace("");
@@ -302,14 +321,15 @@ public class OMFactoryImpl implements OMFactory {
public final OMElement createOMElement(QName qname) {
return createOMElement(qname, null);
}
-
+
@Override
public final OMElement createOMElement(String localName, String namespaceURI, String prefix) {
if (namespaceURI == null) {
throw new IllegalArgumentException("namespaceURI must not be null");
} else if (namespaceURI.length() == 0) {
if (prefix != null && prefix.length() > 0) {
- throw new IllegalArgumentException("Cannot create a prefixed element with an empty namespace name");
+ throw new IllegalArgumentException(
+ "Cannot create a prefixed element with an empty namespace name");
}
return createOMElement(localName, null);
} else {
@@ -325,7 +345,8 @@ public class OMFactoryImpl implements OMFactory {
}
@Override
- public final OMSourcedElement createOMElement(OMDataSource source, String localName, OMNamespace ns) {
+ public final OMSourcedElement createOMElement(
+ OMDataSource source, String localName, OMNamespace ns) {
AxiomSourcedElement element = nodeFactory.createSourcedElement();
element.init(localName, ns, source);
return element;
@@ -351,12 +372,14 @@ public class OMFactoryImpl implements OMFactory {
if (ns != null) {
if (ns.getNamespaceURI().length() == 0) {
if (ns.getPrefix().length() > 0) {
- throw new IllegalArgumentException("Cannot create a prefixed attribute with an empty namespace name");
+ throw new IllegalArgumentException(
+ "Cannot create a prefixed attribute with an empty namespace name");
} else {
ns = null;
}
} else if (ns.getPrefix().length() == 0) {
- throw new IllegalArgumentException("Cannot create an unprefixed attribute with a namespace");
+ throw new IllegalArgumentException(
+ "Cannot create an unprefixed attribute with a namespace");
}
}
AxiomAttribute attr = nodeFactory.createNSAwareAttribute();
@@ -371,7 +394,8 @@ public class OMFactoryImpl implements OMFactory {
return attr;
}
- protected final <T extends AxiomElement> T importElement(OMElement element, AxiomElementType<T> type) {
+ protected final <T extends AxiomElement> T importElement(
+ OMElement element, AxiomElementType<T> type) {
T importedElement = type.create(nodeFactory);
copyName(element, importedElement);
for (Iterator<OMAttribute> it = element.getAllAttributes(); it.hasNext(); ) {
@@ -391,44 +415,53 @@ public class OMFactoryImpl implements OMFactory {
int type = child.getType();
switch (type) {
case OMNode.ELEMENT_NODE:
- return importElement((OMElement)child, AxiomNodeFactory::createNSAwareElement);
+ return importElement((OMElement) child, AxiomNodeFactory::createNSAwareElement);
case OMNode.TEXT_NODE:
case OMNode.SPACE_NODE:
- case OMNode.CDATA_SECTION_NODE: {
- OMText text = (OMText)child;
- Object content;
- if (text.isBinary()) {
- content = new TextContent(text.getContentID(), text.getDataHandler(), text.isOptimized());
- } else {
- content = text.getText();
+ case OMNode.CDATA_SECTION_NODE:
+ {
+ OMText text = (OMText) child;
+ Object content;
+ if (text.isBinary()) {
+ content =
+ new TextContent(
+ text.getContentID(),
+ text.getDataHandler(),
+ text.isOptimized());
+ } else {
+ content = text.getText();
+ }
+ return createAxiomText(null, content, type);
+ }
+ case OMNode.PI_NODE:
+ {
+ OMProcessingInstruction pi = (OMProcessingInstruction) child;
+ AxiomProcessingInstruction importedPI =
+ nodeFactory.createProcessingInstruction();
+ importedPI.setTarget(pi.getTarget());
+ importedPI.setValue(pi.getValue());
+ return importedPI;
+ }
+ case OMNode.COMMENT_NODE:
+ {
+ OMComment comment = (OMComment) child;
+ AxiomComment importedComment = nodeFactory.createComment();
+ importedComment.setValue(comment.getValue());
+ return importedComment;
+ }
+ case OMNode.DTD_NODE:
+ {
+ OMDocType docType = (OMDocType) child;
+ AxiomDocType importedDocType = nodeFactory.createDocumentTypeDeclaration();
+ importedDocType.coreSetRootName(docType.getRootName());
+ importedDocType.coreSetPublicId(docType.getPublicId());
+ importedDocType.coreSetSystemId(docType.getSystemId());
+ importedDocType.coreSetInternalSubset(docType.getInternalSubset());
+ return importedDocType;
}
- return createAxiomText(null, content, type);
- }
- case OMNode.PI_NODE: {
- OMProcessingInstruction pi = (OMProcessingInstruction)child;
- AxiomProcessingInstruction importedPI = nodeFactory.createProcessingInstruction();
- importedPI.setTarget(pi.getTarget());
- importedPI.setValue(pi.getValue());
- return importedPI;
- }
- case OMNode.COMMENT_NODE: {
- OMComment comment = (OMComment)child;
- AxiomComment importedComment = nodeFactory.createComment();
- importedComment.setValue(comment.getValue());
- return importedComment;
- }
- case OMNode.DTD_NODE: {
- OMDocType docType = (OMDocType)child;
- AxiomDocType importedDocType = nodeFactory.createDocumentTypeDeclaration();
- importedDocType.coreSetRootName(docType.getRootName());
- importedDocType.coreSetPublicId(docType.getPublicId());
- importedDocType.coreSetSystemId(docType.getSystemId());
- importedDocType.coreSetInternalSubset(docType.getInternalSubset());
- return importedDocType;
- }
case OMNode.ENTITY_REFERENCE_NODE:
AxiomEntityReference importedEntityRef = nodeFactory.createEntityReference();
- importedEntityRef.coreSetName(((OMEntityReference)child).getName());
+ importedEntityRef.coreSetName(((OMEntityReference) child).getName());
return importedEntityRef;
default:
throw new IllegalArgumentException("Unsupported node type");
@@ -441,7 +474,9 @@ public class OMFactoryImpl implements OMFactory {
}
private void importChildren(OMContainer node, AxiomContainer importedNode) {
- for (OMNode child = node.getFirstOMChild(); child != null; child = child.getNextOMSibling()) {
+ for (OMNode child = node.getFirstOMChild();
+ child != null;
+ child = child.getNextOMSibling()) {
try {
importedNode.coreAppendChild(importChildNode(child));
} catch (CoreModelException ex) {
@@ -460,15 +495,15 @@ public class OMFactoryImpl implements OMFactory {
@Override
public final OMInformationItem importInformationItem(OMInformationItem node) {
if (node instanceof OMNode) {
- return importChildNode((OMNode)node);
+ return importChildNode((OMNode) node);
} else if (node instanceof OMDocument) {
- OMDocument document = (OMDocument)node;
+ OMDocument document = (OMDocument) node;
AxiomDocument importedDocument = nodeFactory.createDocument();
// TODO: other attributes
importChildren(document, importedDocument);
return importedDocument;
} else if (node instanceof OMAttribute) {
- return importAttribute((OMAttribute)node);
+ return importAttribute((OMAttribute) node);
} else {
throw new IllegalArgumentException("Unsupported node type");
}
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 6fd51e3..69ae426 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
@@ -36,37 +36,54 @@ import org.apache.axiom.soap.impl.intf.AxiomSOAPEnvelope;
import org.apache.axiom.soap.impl.intf.AxiomSOAPMessage;
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,
- PlainXMLModel.INSTANCE, null), spec.getDetachable());
- }
- };
+ public static final BuilderFactory<OMXMLParserWrapper> OM =
+ new BuilderFactory<OMXMLParserWrapper>() {
+ @Override
+ public OMXMLParserWrapper createBuilder(
+ AxiomNodeFactory nodeFactory, BuilderSpec spec) {
+ return new OMXMLParserWrapperImpl(
+ new BuilderImpl(
+ spec.getInput(), nodeFactory, PlainXMLModel.INSTANCE, null),
+ spec.getDetachable());
+ }
+ };
- 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, 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.
- builder.addListener(new BuilderListener() {
- private AxiomSOAPMessage message;
-
+ public static final BuilderFactory<SOAPModelBuilder> SOAP =
+ new BuilderFactory<SOAPModelBuilder>() {
@Override
- public DeferredAction nodeAdded(CoreNode node, int depth) {
- if (node instanceof AxiomSOAPMessage) {
- message = (AxiomSOAPMessage)node;
- } else if (message != null && node instanceof AxiomSOAPEnvelope) {
- message.initSOAPFactory((SOAPFactory)((AxiomSOAPEnvelope)node).getOMFactory());
- }
- return null;
+ public SOAPModelBuilder createBuilder(
+ AxiomNodeFactory nodeFactory, BuilderSpec spec) {
+ 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.
+ builder.addListener(
+ new BuilderListener() {
+ private AxiomSOAPMessage message;
+
+ @Override
+ public DeferredAction nodeAdded(CoreNode node, int depth) {
+ if (node instanceof AxiomSOAPMessage) {
+ message = (AxiomSOAPMessage) node;
+ } else if (message != null
+ && node instanceof AxiomSOAPEnvelope) {
+ message.initSOAPFactory(
+ (SOAPFactory)
+ ((AxiomSOAPEnvelope) node).getOMFactory());
+ }
+ return null;
+ }
+ });
+ return new SOAPModelBuilderImpl(builder, spec.getDetachable());
}
- });
- return new SOAPModelBuilderImpl(builder, spec.getDetachable());
- }
- };
+ };
public abstract T createBuilder(AxiomNodeFactory nodeFactory, BuilderSpec spec);
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/BuilderSpec.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/BuilderSpec.java
index 3551b70..10a0f96 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/BuilderSpec.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/BuilderSpec.java
@@ -62,8 +62,8 @@ public final class BuilderSpec {
this.detachable = detachable;
}
- private static BuilderSpec create(StAXParserConfiguration configuration,
- InputSource is, boolean makeDetachable) {
+ private static BuilderSpec create(
+ StAXParserConfiguration configuration, InputSource is, boolean makeDetachable) {
XMLStreamReader reader;
Detachable detachable;
Closeable closeable;
@@ -73,7 +73,8 @@ public final class BuilderSpec {
String encoding = is.getEncoding();
InputStream in = is.getByteStream();
if (makeDetachable) {
- DetachableInputStream detachableInputStream = new DetachableInputStream(in, false);
+ DetachableInputStream detachableInputStream =
+ new DetachableInputStream(in, false);
in = detachableInputStream;
detachable = detachableInputStream;
} else {
@@ -108,7 +109,8 @@ public final class BuilderSpec {
String systemId = is.getSystemId();
InputStream in = new URL(systemId).openConnection().getInputStream();
if (makeDetachable) {
- DetachableInputStream detachableInputStream = new DetachableInputStream(in, true);
+ DetachableInputStream detachableInputStream =
+ new DetachableInputStream(in, true);
in = detachableInputStream;
detachable = detachableInputStream;
} else {
@@ -122,9 +124,12 @@ public final class BuilderSpec {
} catch (IOException ex) {
throw new OMException(ex);
}
- return new BuilderSpec(new StAXPullInput(reader, AxiomXMLStreamReaderHelperFactory.INSTANCE, true, closeable), detachable);
+ return new BuilderSpec(
+ new StAXPullInput(
+ reader, AxiomXMLStreamReaderHelperFactory.INSTANCE, true, closeable),
+ detachable);
}
-
+
public static BuilderSpec from(XMLStreamReader reader) {
int eventType = reader.getEventType();
switch (eventType) {
@@ -134,24 +139,30 @@ public final class BuilderSpec {
reader = new XMLFragmentStreamReader(reader);
break;
default:
- throw new OMException("The supplied XMLStreamReader is in an unexpected state ("
- + XMLEventUtils.getEventTypeString(eventType) + ")");
+ throw new OMException(
+ "The supplied XMLStreamReader is in an unexpected state ("
+ + XMLEventUtils.getEventTypeString(eventType)
+ + ")");
}
- return new BuilderSpec(new FilteredXmlInput(new StAXPullInput(reader, AxiomXMLStreamReaderHelperFactory.INSTANCE, false, null), NamespaceRepairingFilter.DEFAULT), null);
+ return new BuilderSpec(
+ new FilteredXmlInput(
+ new StAXPullInput(
+ reader, AxiomXMLStreamReaderHelperFactory.INSTANCE, false, null),
+ NamespaceRepairingFilter.DEFAULT),
+ null);
}
- public static BuilderSpec from(StAXParserConfiguration configuration,
- InputSource is) {
+ public static BuilderSpec from(StAXParserConfiguration configuration, InputSource is) {
return create(configuration, is, true);
}
public static BuilderSpec from(StAXParserConfiguration configuration, Source source) {
if (source instanceof SAXSource) {
- return from((SAXSource)source, true);
+ return from((SAXSource) source, true);
} else if (source instanceof DOMSource) {
- return from(((DOMSource)source).getNode(), true);
+ return from(((DOMSource) source).getNode(), true);
} else if (source instanceof StreamSource) {
- StreamSource streamSource = (StreamSource)source;
+ StreamSource streamSource = (StreamSource) source;
InputSource is = new InputSource();
is.setByteStream(streamSource.getInputStream());
is.setCharacterStream(streamSource.getReader());
@@ -159,12 +170,17 @@ public final class BuilderSpec {
is.setSystemId(streamSource.getSystemId());
return from(configuration, is);
} else if (source instanceof StAXSource) {
- return from(((StAXSource)source).getXMLStreamReader());
+ return from(((StAXSource) source).getXMLStreamReader());
} else {
try {
return new BuilderSpec(
new FilteredXmlInput(
- new StAXPullInput(StAXUtils.getXMLInputFactory().createXMLStreamReader(source), AxiomXMLStreamReaderHelperFactory.INSTANCE, true, null),
+ new StAXPullInput(
+ StAXUtils.getXMLInputFactory()
+ .createXMLStreamReader(source),
+ AxiomXMLStreamReaderHelperFactory.INSTANCE,
+ true,
+ null),
NamespaceRepairingFilter.DEFAULT),
null);
} catch (XMLStreamException ex) {
@@ -184,10 +200,15 @@ public final class BuilderSpec {
}
public static BuilderSpec from(SAXSource source, boolean expandEntityReferences) {
- return new BuilderSpec(new FilteredXmlInput(new SAXInput(source, expandEntityReferences), NamespaceRepairingFilter.DEFAULT), null);
+ return new BuilderSpec(
+ new FilteredXmlInput(
+ new SAXInput(source, expandEntityReferences),
+ NamespaceRepairingFilter.DEFAULT),
+ null);
}
- public static BuilderSpec from(StAXParserConfiguration configuration, final MultipartBody message) {
+ public static BuilderSpec from(
+ StAXParserConfiguration configuration, final MultipartBody message) {
Part rootPart = message.getRootPart();
InputSource is = new InputSource(rootPart.getInputStream(false));
is.setEncoding(rootPart.getContentType().getParameter("charset"));
@@ -195,13 +216,14 @@ public final class BuilderSpec {
return new BuilderSpec(
new FilteredXmlInput(
spec.getInput(),
- new XOPDecodingFilter(new OMAttachmentAccessor() {
- @Override
- public DataHandler getDataHandler(String contentID) {
- Part part = message.getPart(contentID);
- return part == null ? null : part.getDataHandler();
- }
- })),
+ new XOPDecodingFilter(
+ new OMAttachmentAccessor() {
+ @Override
+ public DataHandler getDataHandler(String contentID) {
+ Part part = message.getPart(contentID);
+ return part == null ? null : part.getDataHandler();
+ }
+ })),
new Detachable() {
@Override
public void detach() {
@@ -210,12 +232,13 @@ public final class BuilderSpec {
});
}
- public static BuilderSpec from(StAXParserConfiguration configuration, Source source, OMAttachmentAccessor attachmentAccessor) {
+ public static BuilderSpec from(
+ StAXParserConfiguration configuration,
+ Source source,
+ OMAttachmentAccessor attachmentAccessor) {
BuilderSpec spec = from(configuration, source);
return new BuilderSpec(
- new FilteredXmlInput(
- spec.getInput(),
- new XOPDecodingFilter(attachmentAccessor)),
+ new FilteredXmlInput(spec.getInput(), new XOPDecodingFilter(attachmentAccessor)),
spec.getDetachable());
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/DetachableReader.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/DetachableReader.java
index cfa6318..33a79ae 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/DetachableReader.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/DetachableReader.java
@@ -33,7 +33,7 @@ import org.apache.axiom.om.impl.common.builder.Detachable;
final class DetachableReader extends Reader implements Detachable {
private static final Charset UTF8 = Charset.forName("UTF-8");
-
+
private Reader target;
DetachableReader(Reader target) {
@@ -74,7 +74,7 @@ final class DetachableReader extends Reader implements Detachable {
public void close() throws IOException {
target.close();
}
-
+
@Override
public void detach() {
MemoryBlob blob = Blobs.createMemoryBlob();
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/NSUnawareNodeFilter.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/NSUnawareNodeFilter.java
index ab246ef..8712749 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/NSUnawareNodeFilter.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/NSUnawareNodeFilter.java
@@ -28,7 +28,7 @@ import org.apache.axiom.core.stream.XmlHandler;
*/
final class NSUnawareNodeFilter implements XmlFilter {
static final NSUnawareNodeFilter INSTANCE = new NSUnawareNodeFilter();
-
+
private NSUnawareNodeFilter() {}
@Override
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/util/OMDataSourceUtil.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/util/OMDataSourceUtil.java
index 78bbad5..189b10e 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/util/OMDataSourceUtil.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/util/OMDataSourceUtil.java
@@ -25,14 +25,17 @@ import org.apache.axiom.om.ds.AbstractPushOMDataSource;
public final class OMDataSourceUtil {
private OMDataSourceUtil() {}
-
+
public static boolean isPullDataSource(OMDataSource dataSource) {
return dataSource instanceof AbstractPullOMDataSource;
}
public static boolean isPushDataSource(OMDataSource dataSource) {
return dataSource instanceof AbstractPushOMDataSource
- || dataSource.getClass().getName().equals("org.apache.axis2.jaxws.message.databinding.impl.JAXBBlockImpl");
+ || dataSource
+ .getClass()
+ .getName()
+ .equals("org.apache.axis2.jaxws.message.databinding.impl.JAXBBlockImpl");
}
public static boolean isDestructiveWrite(OMDataSource dataSource) {
@@ -42,7 +45,7 @@ public final class OMDataSourceUtil {
return true;
}
}
-
+
public static boolean isDestructiveRead(OMDataSource dataSource) {
if (dataSource instanceof OMDataSourceExt) {
return ((OMDataSourceExt) dataSource).isDestructiveRead();
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomAttribute.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomAttribute.java
index a5dae90..1186b95 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomAttribute.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomAttribute.java
@@ -21,6 +21,5 @@ package org.apache.axiom.om.impl.intf;
import org.apache.axiom.core.CoreNSAwareAttribute;
import org.apache.axiom.om.OMAttribute;
-public interface AxiomAttribute extends OMAttribute, CoreNSAwareAttribute, AxiomNamedInformationItem {
-
-}
+public interface AxiomAttribute
+ extends OMAttribute, CoreNSAwareAttribute, AxiomNamedInformationItem {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCDATASection.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCDATASection.java
index 80d2bdd..a45eb70 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCDATASection.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCDATASection.java
@@ -20,6 +20,4 @@ package org.apache.axiom.om.impl.intf;
import org.apache.axiom.core.CoreCDATASection;
-public interface AxiomCDATASection extends CoreCDATASection, AxiomText, AxiomCoreParentNode {
-
-}
+public interface AxiomCDATASection extends CoreCDATASection, AxiomText, AxiomCoreParentNode {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCharacterDataNode.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCharacterDataNode.java
index 84206ae..b0742a8 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCharacterDataNode.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCharacterDataNode.java
@@ -20,6 +20,5 @@ package org.apache.axiom.om.impl.intf;
import org.apache.axiom.core.CoreCharacterDataNode;
-public interface AxiomCharacterDataNode extends CoreCharacterDataNode, AxiomText, AxiomCoreLeafNode {
-
-}
+public interface AxiomCharacterDataNode
+ extends CoreCharacterDataNode, AxiomText, AxiomCoreLeafNode {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomChildNode.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomChildNode.java
index 77f57ba..37d3ee9 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomChildNode.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomChildNode.java
@@ -21,6 +21,4 @@ package org.apache.axiom.om.impl.intf;
import org.apache.axiom.core.CoreChildNode;
import org.apache.axiom.om.OMNode;
-public interface AxiomChildNode extends OMNode, CoreChildNode, AxiomSerializable {
-
-}
+public interface AxiomChildNode extends OMNode, CoreChildNode, AxiomSerializable {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomComment.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomComment.java
index 059a3ee..24422c3 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomComment.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomComment.java
@@ -21,6 +21,4 @@ package org.apache.axiom.om.impl.intf;
import org.apache.axiom.core.CoreComment;
import org.apache.axiom.om.OMComment;
-public interface AxiomComment extends OMComment, AxiomLeafNode, CoreComment, AxiomCoreParentNode {
-
-}
+public interface AxiomComment extends OMComment, AxiomLeafNode, CoreComment, AxiomCoreParentNode {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomContainer.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomContainer.java
index 7cadaac..01449ef 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomContainer.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomContainer.java
@@ -29,15 +29,16 @@ import org.apache.axiom.om.OMXMLStreamReaderConfiguration;
public interface AxiomContainer extends OMContainer, AxiomCoreParentNode {
/**
* Check if the node can be added as a child of this container.
- *
- * @param child
- * the child that will be added
- * @throws OMException
- * if the node is not allowed as a child of the container
+ *
+ * @param child the child that will be added
+ * @throws OMException if the node is not allowed as a child of the container
*/
void checkChild(OMNode child);
AxiomChildNode prepareNewChild(OMNode omNode);
- XMLStreamReader defaultGetXMLStreamReader(boolean cache, OMXMLStreamReaderConfiguration configuration);
+
+ XMLStreamReader defaultGetXMLStreamReader(
+ boolean cache, OMXMLStreamReaderConfiguration configuration);
+
CoreElement getContextElement();
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCoreLeafNode.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCoreLeafNode.java
index 60a5767..b4750c5 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCoreLeafNode.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCoreLeafNode.java
@@ -18,6 +18,4 @@
*/
package org.apache.axiom.om.impl.intf;
-public interface AxiomCoreLeafNode extends AxiomLeafNode {
-
-}
+public interface AxiomCoreLeafNode extends AxiomLeafNode {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCoreParentNode.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCoreParentNode.java
index 5c3c6ad..2e50905 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCoreParentNode.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomCoreParentNode.java
@@ -20,6 +20,4 @@ package org.apache.axiom.om.impl.intf;
import org.apache.axiom.core.CoreParentNode;
-public interface AxiomCoreParentNode extends CoreParentNode, AxiomSerializable {
-
-}
+public interface AxiomCoreParentNode extends CoreParentNode, AxiomSerializable {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomDocType.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomDocType.java
index 9663a96..8b78317 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomDocType.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomDocType.java
@@ -21,6 +21,4 @@ package org.apache.axiom.om.impl.intf;
import org.apache.axiom.core.CoreDocumentTypeDeclaration;
import org.apache.axiom.om.OMDocType;
-public interface AxiomDocType extends OMDocType, AxiomCoreLeafNode, CoreDocumentTypeDeclaration {
-
-}
+public interface AxiomDocType extends OMDocType, AxiomCoreLeafNode, CoreDocumentTypeDeclaration {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomDocument.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomDocument.java
index 6cde9a3..1c0fed5 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomDocument.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomDocument.java
@@ -21,6 +21,4 @@ package org.apache.axiom.om.impl.intf;
import org.apache.axiom.core.CoreDocument;
import org.apache.axiom.om.OMDocument;
-public interface AxiomDocument extends OMDocument, AxiomContainer, CoreDocument {
-
-}
+public interface AxiomDocument extends OMDocument, AxiomContainer, CoreDocument {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomElement.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomElement.java
index 080fbc2..88955b3 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomElement.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomElement.java
@@ -24,10 +24,20 @@ import org.apache.axiom.core.CoreNSAwareElement;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-public interface AxiomElement extends OMElement, AxiomContainer, AxiomChildNode, AxiomNamedInformationItem, CoreNSAwareElement {
+public interface AxiomElement
+ extends OMElement,
+ AxiomContainer,
+ AxiomChildNode,
+ AxiomNamedInformationItem,
+ CoreNSAwareElement {
void addNamespaceDeclaration(OMNamespace ns);
- <T extends OMElement> void insertChild(Sequence sequence, int pos, T newChild, boolean allowReplace);
+
+ <T extends OMElement> void insertChild(
+ Sequence sequence, int pos, T newChild, boolean allowReplace);
+
void _setAttributeValue(QName qname, String value);
+
OMNamespace handleNamespace(String namespaceURI, String prefix);
+
void initName(String localName, OMNamespace ns, boolean generateNSDecl);
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomEntityReference.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomEntityReference.java
index c77321e..a76a06e 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomEntityReference.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomEntityReference.java
@@ -21,6 +21,5 @@ package org.apache.axiom.om.impl.intf;
import org.apache.axiom.core.CoreEntityReference;
import org.apache.axiom.om.OMEntityReference;
-public interface AxiomEntityReference extends OMEntityReference, AxiomCoreLeafNode, CoreEntityReference {
-
-}
+public interface AxiomEntityReference
+ extends OMEntityReference, AxiomCoreLeafNode, CoreEntityReference {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomLeafNode.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomLeafNode.java
index cad3340..25cb30f 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomLeafNode.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomLeafNode.java
@@ -18,6 +18,4 @@
*/
package org.apache.axiom.om.impl.intf;
-public interface AxiomLeafNode extends AxiomChildNode {
-
-}
+public interface AxiomLeafNode extends AxiomChildNode {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomNamedInformationItem.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomNamedInformationItem.java
index bb8c3e1..5c7121f 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomNamedInformationItem.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomNamedInformationItem.java
@@ -24,10 +24,15 @@ import org.apache.axiom.core.CoreNSAwareNamedNode;
import org.apache.axiom.om.OMNamedInformationItem;
import org.apache.axiom.om.OMNamespace;
-public interface AxiomNamedInformationItem extends OMNamedInformationItem, AxiomInformationItem, CoreNSAwareNamedNode {
+public interface AxiomNamedInformationItem
+ extends OMNamedInformationItem, AxiomInformationItem, CoreNSAwareNamedNode {
void internalSetNamespace(OMNamespace namespace);
+
String internalGetLocalName();
+
void internalSetLocalName(String localName);
+
OMNamespace defaultGetNamespace();
+
QName defaultGetQName();
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomNamespaceDeclaration.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomNamespaceDeclaration.java
index 32b9799..0c45ef3 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomNamespaceDeclaration.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomNamespaceDeclaration.java
@@ -23,5 +23,6 @@ import org.apache.axiom.om.OMNamespace;
public interface AxiomNamespaceDeclaration extends AxiomInformationItem, CoreNamespaceDeclaration {
OMNamespace getDeclaredNamespace();
+
void setDeclaredNamespace(OMNamespace declaredNamespace);
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomProcessingInstruction.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomProcessingInstruction.java
index 9865aa7..ae8b1c3 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomProcessingInstruction.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomProcessingInstruction.java
@@ -21,6 +21,8 @@ package org.apache.axiom.om.impl.intf;
import org.apache.axiom.core.CoreProcessingInstruction;
import org.apache.axiom.om.OMProcessingInstruction;
-public interface AxiomProcessingInstruction extends OMProcessingInstruction, AxiomLeafNode, CoreProcessingInstruction, AxiomCoreParentNode {
-
-}
+public interface AxiomProcessingInstruction
+ extends OMProcessingInstruction,
+ AxiomLeafNode,
+ CoreProcessingInstruction,
+ AxiomCoreParentNode {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java
index 4fac5e8..836f63f 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java
@@ -20,6 +20,4 @@ package org.apache.axiom.om.impl.intf;
import org.apache.axiom.om.OMSerializable;
-public interface AxiomSerializable extends OMSerializable, AxiomInformationItem {
-
-}
+public interface AxiomSerializable extends OMSerializable, AxiomInformationItem {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomSourcedElement.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomSourcedElement.java
index b897fb8..bcd18f3 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomSourcedElement.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomSourcedElement.java
@@ -26,8 +26,12 @@ import org.apache.axiom.om.OMSourcedElement;
public interface AxiomSourcedElement extends OMSourcedElement, AxiomElement {
void init(OMDataSource source);
+
void init(String localName, OMNamespace ns, OMDataSource source);
+
void init(QName qName, OMDataSource source);
+
boolean internalIsDefinedNamespaceSet();
+
OMNamespace internalGetDefinedNamespace();
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomText.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomText.java
index 0710dd7..930394d 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomText.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/AxiomText.java
@@ -21,6 +21,4 @@ package org.apache.axiom.om.impl.intf;
import org.apache.axiom.core.CoreCharacterDataContainer;
import org.apache.axiom.om.OMText;
-public interface AxiomText extends OMText, AxiomLeafNode, CoreCharacterDataContainer {
-
-}
+public interface AxiomText extends OMText, AxiomLeafNode, CoreCharacterDataContainer {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/Sequence.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/Sequence.java
index 6650706..d525611 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/Sequence.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/Sequence.java
@@ -26,18 +26,18 @@ import org.apache.axiom.om.OMElement;
public final class Sequence {
private List<Class<? extends OMElement>> types;
-
+
public Sequence(Class<?>... types) {
this.types = new ArrayList<Class<? extends OMElement>>(types.length);
for (Class<?> type : types) {
this.types.add(type.asSubclass(OMElement.class));
}
}
-
+
public Class<? extends OMElement> item(int index) {
return types.get(index);
}
-
+
public int index(Class<? extends OMElement> type) {
int index = types.indexOf(type);
if (index == -1) {
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java
index 634b5fb..45a62c3 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java
@@ -38,12 +38,12 @@ import org.apache.axiom.util.base64.Base64Utils;
public final class TextContent implements CloneableCharacterData {
private final String value;
-
+
private final String mimeType;
-
+
/** Field contentID for the mime part used when serializing Binary stuff as MTOM optimized. */
private String contentID;
-
+
/**
* Contains a {@link DataHandler} or {@link DataHandlerProvider} object if the text node
* represents base64 encoded binary data.
@@ -52,19 +52,19 @@ public final class TextContent implements CloneableCharacterData {
private boolean optimize;
private boolean binary;
-
+
public TextContent(String value) {
this.value = value;
this.mimeType = null;
}
-
+
public TextContent(String value, String mimeType, boolean optimize) {
this.value = value;
this.mimeType = mimeType;
binary = true;
this.optimize = optimize;
}
-
+
public TextContent(String contentID, Object dataHandlerObject, boolean optimize) {
this.value = null;
mimeType = null;
@@ -73,7 +73,7 @@ public final class TextContent implements CloneableCharacterData {
binary = true;
this.optimize = optimize;
}
-
+
private TextContent(TextContent other) {
this.value = other.value;
this.mimeType = other.mimeType;
@@ -121,19 +121,20 @@ public final class TextContent implements CloneableCharacterData {
if (dataHandlerObject != null) {
if (dataHandlerObject instanceof DataHandlerProvider) {
try {
- dataHandlerObject = ((DataHandlerProvider)dataHandlerObject).getDataHandler();
+ dataHandlerObject = ((DataHandlerProvider) dataHandlerObject).getDataHandler();
} catch (IOException ex) {
throw new OMException(ex);
}
}
- return (DataHandler)dataHandlerObject;
+ return (DataHandler) dataHandlerObject;
} else if (binary) {
- return new DataHandler(new BlobDataSource(Blobs.createBlob(Base64Utils.decode(value)), mimeType));
+ return new DataHandler(
+ new BlobDataSource(Blobs.createBlob(Base64Utils.decode(value)), mimeType));
} else {
throw new OMException("No DataHandler available");
}
}
-
+
@Override
public String toString() {
if (dataHandlerObject != null) {
@@ -146,7 +147,7 @@ public final class TextContent implements CloneableCharacterData {
return value;
}
}
-
+
public char[] toCharArray() {
if (dataHandlerObject != null) {
try {
@@ -161,7 +162,9 @@ public final class TextContent implements CloneableCharacterData {
@Override
public <T> CharacterData clone(ClonePolicy<T> policy, T options) {
- if (binary && options instanceof OMCloneOptions && ((OMCloneOptions)options).isFetchDataHandlers()) {
+ if (binary
+ && options instanceof OMCloneOptions
+ && ((OMCloneOptions) options).isFetchDataHandlers()) {
// Force loading of the reference to the DataHandler and ensure that its content is
// completely fetched into memory (or temporary storage).
getDataHandler().getDataSource();
@@ -184,7 +187,8 @@ public final class TextContent implements CloneableCharacterData {
@Override
public void appendTo(StringBuilder buffer) {
if (binary) {
- Base64EncodingStringBufferOutputStream out = new Base64EncodingStringBufferOutputStream(buffer);
+ Base64EncodingStringBufferOutputStream out =
+ new Base64EncodingStringBufferOutputStream(buffer);
try {
getDataHandler().writeTo(out);
out.complete();
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeMixin.java
index de701c1..abd6648 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeMixin.java
@@ -32,22 +32,22 @@ import org.apache.axiom.weaver.annotation.Mixin;
public abstract class AxiomAttributeMixin implements AxiomAttribute {
@Override
public final OMElement getOwner() {
- return (OMElement)coreGetOwnerElement();
+ return (OMElement) coreGetOwnerElement();
}
- final void beforeSetLocalName() {
- }
-
+ final void beforeSetLocalName() {}
+
@Override
public final void setNamespace(OMNamespace namespace, boolean decl) {
- internalSetNamespace(NSUtil.handleNamespace((AxiomElement)getOwner(), namespace, true, decl));
+ internalSetNamespace(
+ NSUtil.handleNamespace((AxiomElement) getOwner(), namespace, true, decl));
}
-
+
@Override
public final void setOMNamespace(OMNamespace omNamespace) {
internalSetNamespace(omNamespace);
}
-
+
@Override
public final String getAttributeValue() {
try {
@@ -56,7 +56,7 @@ public abstract class AxiomAttributeMixin implements AxiomAttribute {
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
@Override
public final void setAttributeValue(String value) {
try {
@@ -65,7 +65,7 @@ public abstract class AxiomAttributeMixin implements AxiomAttribute {
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
@Override
public final String getAttributeType() {
return coreGetType();
@@ -75,7 +75,7 @@ public abstract class AxiomAttributeMixin implements AxiomAttribute {
public final void setAttributeType(String type) {
coreSetType(type);
}
-
+
public final void build() {
// TODO
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomChildNodeMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomChildNodeMixin.java
index b676742..bce67d6 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomChildNodeMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomChildNodeMixin.java
@@ -34,13 +34,13 @@ public abstract class AxiomChildNodeMixin implements AxiomChildNode {
@Override
public final OMContainer getParent() {
CoreParentNode parent = coreGetParent();
- return parent instanceof OMContainer ? (OMContainer)parent : null;
+ return parent instanceof OMContainer ? (OMContainer) parent : null;
}
-
+
@Override
public final OMNode getNextOMSibling() {
try {
- return (OMNode)coreGetNextSibling();
+ return (OMNode) coreGetNextSibling();
} catch (CoreModelException ex) {
throw AxiomExceptionTranslator.translate(ex);
}
@@ -48,13 +48,13 @@ public abstract class AxiomChildNodeMixin implements AxiomChildNode {
@Override
public final OMNode getPreviousOMSibling() {
- return (OMNode)coreGetPreviousSibling();
+ return (OMNode) coreGetPreviousSibling();
}
@Override
public final void insertSiblingAfter(OMNode sibling) throws OMException {
try {
- AxiomContainer parent = (AxiomContainer)getParent();
+ AxiomContainer parent = (AxiomContainer) getParent();
if (parent == null) {
throw new OMException("Parent can not be null");
}
@@ -67,7 +67,7 @@ public abstract class AxiomChildNodeMixin implements AxiomChildNode {
@Override
public final void insertSiblingBefore(OMNode sibling) throws OMException {
try {
- AxiomContainer parent = (AxiomContainer)getParent();
+ AxiomContainer parent = (AxiomContainer) getParent();
if (parent == null) {
throw new OMException("Parent can not be null");
}
@@ -76,12 +76,11 @@ public abstract class AxiomChildNodeMixin implements AxiomChildNode {
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
@Override
public final OMNode detach() {
if (!coreHasParent()) {
- throw new OMException(
- "Nodes that don't have a parent can not be detached");
+ throw new OMException("Nodes that don't have a parent can not be detached");
}
coreDetach(AxiomSemantics.INSTANCE);
return this;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentMixin.java
index 086b95e..f35c4f3 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentMixin.java
@@ -61,8 +61,7 @@ public abstract class AxiomCommentMixin implements AxiomComment {
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
@Override
- public final void buildWithAttachments() {
- }
+ public final void buildWithAttachments() {}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerMixin.java
index 7e639ee..eb135c3 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerMixin.java
@@ -82,15 +82,16 @@ import org.xml.sax.InputSource;
@Mixin
public abstract class AxiomContainerMixin implements AxiomContainer {
- private static final OMXMLStreamReaderConfiguration defaultReaderConfiguration = new OMXMLStreamReaderConfiguration();
-
+ private static final OMXMLStreamReaderConfiguration defaultReaderConfiguration =
+ new OMXMLStreamReaderConfiguration();
+
@Override
public final OMXMLParserWrapper getBuilder() {
- BuilderImpl builder = (BuilderImpl)coreGetBuilder();
+ BuilderImpl builder = (BuilderImpl) coreGetBuilder();
if (builder == null) {
return null;
} else {
- OMXMLParserWrapper facade = (OMXMLParserWrapper)builder.getFacade();
+ OMXMLParserWrapper facade = (OMXMLParserWrapper) builder.getFacade();
if (facade == null) {
facade = new OMXMLParserWrapperImpl(builder, null);
}
@@ -102,7 +103,7 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
public final XMLStreamReader getXMLStreamReader() {
return getXMLStreamReader(true);
}
-
+
@Override
public final XMLStreamReader getXMLStreamReaderWithoutCaching() {
return getXMLStreamReader(false);
@@ -112,14 +113,16 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
public final XMLStreamReader getXMLStreamReader(boolean cache) {
return getXMLStreamReader(cache, defaultReaderConfiguration);
}
-
+
@Override
- public XMLStreamReader getXMLStreamReader(boolean cache, OMXMLStreamReaderConfiguration configuration) {
+ public XMLStreamReader getXMLStreamReader(
+ boolean cache, OMXMLStreamReaderConfiguration configuration) {
return defaultGetXMLStreamReader(cache, configuration);
}
-
+
@Override
- public final XMLStreamReader defaultGetXMLStreamReader(boolean cache, OMXMLStreamReaderConfiguration configuration) {
+ public final XMLStreamReader defaultGetXMLStreamReader(
+ boolean cache, OMXMLStreamReaderConfiguration configuration) {
StAXPivot pivot = new StAXPivot(AxiomXMLStreamReaderExtensionFactory.INSTANCE);
XmlHandler handler = pivot;
if (configuration.isNamespaceURIInterning()) {
@@ -130,7 +133,8 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
if (configuration.isPreserveNamespaceContext()) {
handler = new NamespaceContextPreservationFilterHandler(handler, contextElement);
} else {
- for (Iterator<OMNamespace> it = ((OMElement)contextElement).getNamespacesInScope(); it.hasNext(); ) {
+ for (Iterator<OMNamespace> it = ((OMElement) contextElement).getNamespacesInScope();
+ it.hasNext(); ) {
OMNamespace ns = it.next();
pivot.setPrefix(ns.getPrefix(), ns.getNamespaceURI());
}
@@ -144,11 +148,13 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
}
return pivot;
}
-
+
@Override
public final XOPEncoded<XMLStreamReader> getXOPEncodedStreamReader(boolean cache) {
StAXPivot pivot = new StAXPivot(AxiomXMLStreamReaderExtensionFactory.INSTANCE);
- XOPEncodingFilterHandler encoder = new XOPEncodingFilterHandler(pivot, ContentIDGenerator.DEFAULT, OptimizationPolicy.ALL);
+ XOPEncodingFilterHandler encoder =
+ new XOPEncodingFilterHandler(
+ pivot, ContentIDGenerator.DEFAULT, OptimizationPolicy.ALL);
try {
pivot.setReader(coreGetReader(encoder, cache, true));
} catch (StreamException ex) {
@@ -156,16 +162,16 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
}
return new XOPEncoded<XMLStreamReader>(pivot, encoder);
}
-
+
@Override
public final AxiomChildNode prepareNewChild(OMNode omNode) {
AxiomChildNode child;
// Careful here: if the child was created by another Axiom implementation, it doesn't
// necessarily implement AxiomChildNode
if (omNode.getOMFactory().getMetaFactory().equals(getOMFactory().getMetaFactory())) {
- child = (AxiomChildNode)omNode;
+ child = (AxiomChildNode) omNode;
} else {
- child = (AxiomChildNode)getOMFactory().importInformationItem(omNode);
+ child = (AxiomChildNode) getOMFactory().importInformationItem(omNode);
}
checkChild(omNode);
return child;
@@ -179,16 +185,16 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
@Override
public OMNode getFirstOMChild() {
try {
- return (OMNode)coreGetFirstChild();
+ return (OMNode) coreGetFirstChild();
} catch (CoreModelException ex) {
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
@Override
public void removeChildren() {
try {
@@ -197,41 +203,61 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
@Override
public Iterator<OMNode> getChildren() {
- return coreGetNodes(Axis.CHILDREN, AxiomChildNode.class, Mappers.<OMNode>identity(), AxiomSemantics.INSTANCE);
+ return coreGetNodes(
+ Axis.CHILDREN,
+ AxiomChildNode.class,
+ Mappers.<OMNode>identity(),
+ AxiomSemantics.INSTANCE);
}
@Override
public Iterator<OMElement> getChildrenWithLocalName(String localName) {
- return coreGetElements(Axis.CHILDREN, AxiomElement.class,
- ElementMatcher.BY_LOCAL_NAME, null, localName,
- Mappers.<OMElement>identity(), AxiomSemantics.INSTANCE);
+ return coreGetElements(
+ Axis.CHILDREN,
+ AxiomElement.class,
+ ElementMatcher.BY_LOCAL_NAME,
+ null,
+ localName,
+ Mappers.<OMElement>identity(),
+ AxiomSemantics.INSTANCE);
}
@Override
public Iterator<OMElement> getChildrenWithNamespaceURI(String uri) {
- return coreGetElements(Axis.CHILDREN, AxiomElement.class,
- ElementMatcher.BY_NAMESPACE_URI, uri, null,
- Mappers.<OMElement>identity(), AxiomSemantics.INSTANCE);
+ return coreGetElements(
+ Axis.CHILDREN,
+ AxiomElement.class,
+ ElementMatcher.BY_NAMESPACE_URI,
+ uri,
+ null,
+ Mappers.<OMElement>identity(),
+ AxiomSemantics.INSTANCE);
}
@Override
public Iterator<OMElement> getChildrenWithName(QName name) {
- return coreGetElements(Axis.CHILDREN, AxiomElement.class,
- ElementMatcher.BY_QNAME, name.getNamespaceURI(), name.getLocalPart(),
- Mappers.<OMElement>identity(), AxiomSemantics.INSTANCE);
+ return coreGetElements(
+ Axis.CHILDREN,
+ AxiomElement.class,
+ ElementMatcher.BY_QNAME,
+ name.getNamespaceURI(),
+ name.getLocalPart(),
+ Mappers.<OMElement>identity(),
+ AxiomSemantics.INSTANCE);
}
-
+
@Override
public final OMElement getFirstChildWithName(QName name) throws OMException {
try {
CoreChildNode child = coreGetFirstChild();
while (child != null) {
if (child instanceof AxiomElement) {
- AxiomElement element = (AxiomElement)child;
- if (name.getLocalPart().equals(element.coreGetLocalName()) && name.getNamespaceURI().equals(element.coreGetNamespaceURI())) {
+ AxiomElement element = (AxiomElement) child;
+ if (name.getLocalPart().equals(element.coreGetLocalName())
+ && name.getNamespaceURI().equals(element.coreGetNamespaceURI())) {
return element;
}
}
@@ -250,14 +276,20 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
@Override
public final SAXResult getSAXResult() {
- XmlHandlerContentHandler handler = new XmlHandlerContentHandler(new SAXResultContentHandler(this), true);
+ XmlHandlerContentHandler handler =
+ new XmlHandlerContentHandler(new SAXResultContentHandler(this), true);
SAXResult result = new SAXResult();
result.setHandler(handler);
result.setLexicalHandler(handler);
return result;
}
- private void serialize(XmlHandler handler, NamespaceContextProvider namespaceContextProvider, OMOutputFormat format, boolean cache) throws StreamException {
+ private void serialize(
+ XmlHandler handler,
+ NamespaceContextProvider namespaceContextProvider,
+ OMOutputFormat format,
+ boolean cache)
+ throws StreamException {
handler = new XmlDeclarationRewriterHandler(handler, format);
CoreElement contextElement = getContextElement();
if (contextElement != null) {
@@ -271,13 +303,18 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
}
}
- private void serializeAndSurfaceIOException(XmlHandler handler, NamespaceContextProvider namespaceContextProvider, OMOutputFormat format, boolean cache) throws IOException {
+ private void serializeAndSurfaceIOException(
+ XmlHandler handler,
+ NamespaceContextProvider namespaceContextProvider,
+ OMOutputFormat format,
+ boolean cache)
+ throws IOException {
try {
serialize(handler, namespaceContextProvider, format, cache);
} catch (StreamException ex) {
Throwable cause = ex.getCause();
if (cause instanceof IOException) {
- throw (IOException)cause;
+ throw (IOException) cause;
} else {
throw new OMException(ex);
}
@@ -287,7 +324,11 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
@Override
public final void serialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
try {
- serialize(new XMLStreamWriterHandler(writer), new XMLStreamWriterNamespaceContextProvider(writer), new OMOutputFormat(), cache);
+ serialize(
+ new XMLStreamWriterHandler(writer),
+ new XMLStreamWriterNamespaceContextProvider(writer),
+ new OMOutputFormat(),
+ cache);
} catch (StreamException ex) {
throw AxiomExceptionTranslator.toXMLStreamException(ex);
}
@@ -304,9 +345,10 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
}
@Override
- public final void serialize(OutputStream out, OMOutputFormat format, boolean cache) throws IOException {
+ public final void serialize(OutputStream out, OMOutputFormat format, boolean cache)
+ throws IOException {
String encoding = format.getCharSetEncoding();
- if (encoding == null) { //Default encoding is UTF-8
+ if (encoding == null) { // Default encoding is UTF-8
format.setCharSetEncoding(encoding = OMOutputFormat.DEFAULT_CHAR_SET_ENCODING);
}
@@ -319,21 +361,23 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
multipartWriter = null;
rootPartOutputStream = out;
}
-
+
Serializer serializer = new Serializer(rootPartOutputStream, encoding);
-
+
XmlHandler handler;
XOPEncodingFilterHandler encoder;
if (format.isOptimized()) {
- handler = encoder = new XOPEncodingFilterHandler(
- serializer,
- new ContentIDGeneratorImpl(format),
- new OptimizationPolicyImpl(format));
+ handler =
+ encoder =
+ new XOPEncodingFilterHandler(
+ serializer,
+ new ContentIDGeneratorImpl(format),
+ new OptimizationPolicyImpl(format));
} else {
handler = serializer;
encoder = null;
}
-
+
serializeAndSurfaceIOException(handler, null, format, cache);
if (encoder != null) {
@@ -343,17 +387,23 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
if (cache || !(dataHandler instanceof PartDataHandler)) {
multipartWriter.writePart(dataHandler, contentID);
} else {
- OutputStream part = multipartWriter.writePart(dataHandler.getContentType(), contentID);
- IOUtils.copy(((PartDataHandler)dataHandler).getPart().getInputStream(false), part, -1);
+ OutputStream part =
+ multipartWriter.writePart(dataHandler.getContentType(), contentID);
+ IOUtils.copy(
+ ((PartDataHandler) dataHandler).getPart().getInputStream(false),
+ part,
+ -1);
part.close();
}
}
multipartWriter.complete();
- };
+ }
+ ;
}
@Override
- public final void serialize(Writer writer, OMOutputFormat format, boolean cache) throws IOException {
+ public final void serialize(Writer writer, OMOutputFormat format, boolean cache)
+ throws IOException {
serializeAndSurfaceIOException(new Serializer(writer), null, format, cache);
}
@@ -368,7 +418,8 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
}
@Override
- public final void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
+ public final void serialize(OutputStream output, OMOutputFormat format)
+ throws XMLStreamException {
try {
serialize(output, format, true);
} catch (IOException ex) {
@@ -377,7 +428,8 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
}
@Override
- public final void serializeAndConsume(OutputStream output, OMOutputFormat format) throws XMLStreamException {
+ public final void serializeAndConsume(OutputStream output, OMOutputFormat format)
+ throws XMLStreamException {
try {
serialize(output, format, false);
} catch (IOException ex) {
@@ -413,7 +465,8 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
}
@Override
- public final void serializeAndConsume(Writer writer, OMOutputFormat format) throws XMLStreamException {
+ public final void serializeAndConsume(Writer writer, OMOutputFormat format)
+ throws XMLStreamException {
try {
serialize(writer, format, false);
} catch (IOException ex) {
@@ -427,7 +480,7 @@ public abstract class AxiomContainerMixin implements AxiomContainer {
if (build) {
this.build();
}
-
+
if (builder != null) {
builder.close();
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCoreParentNodeMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCoreParentNodeMixin.java
index 7e2190e..95fc285 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCoreParentNodeMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCoreParentNodeMixin.java
@@ -39,7 +39,8 @@ public abstract class AxiomCoreParentNodeMixin implements AxiomCoreParentNode {
if (isExpanded()) {
CoreChildNode child = coreGetFirstChild();
while (child != null) {
- if (!(child instanceof AxiomSourcedElement || ((AxiomSerializable)child).isComplete())) {
+ if (!(child instanceof AxiomSourcedElement
+ || ((AxiomSerializable) child).isComplete())) {
return false;
}
child = child.coreGetNextSibling();
@@ -53,7 +54,7 @@ public abstract class AxiomCoreParentNodeMixin implements AxiomCoreParentNode {
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
@Override
public final void build() {
try {
@@ -67,14 +68,15 @@ public abstract class AxiomCoreParentNodeMixin implements AxiomCoreParentNode {
}
// Fall through
case INCOMPLETE:
- // First do the children that have already been created; only they need recursion.
+ // First do the children that have already been created; only they need
+ // recursion.
CoreChildNode child = coreGetFirstChildIfAvailable();
while (child != null) {
// Historically, Axiom skipped OMSourcedElements in the tree. Quote: "The
// OMSourcedElement has its own isolated builder/reader during the
// expansion process."
if (!(child instanceof AxiomSourcedElement)) {
- ((AxiomSerializable)child).build();
+ ((AxiomSerializable) child).build();
}
child = child.coreGetNextSibling();
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeMixin.java
index e1b0a3f..eb575fa 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocTypeMixin.java
@@ -65,8 +65,7 @@ public abstract class AxiomDocTypeMixin implements AxiomDocType {
throw AxiomExceptionTranslator.toXMLStreamException(ex);
}
}
-
+
@Override
- public final void buildWithAttachments() {
- }
+ public final void buildWithAttachments() {}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentMixin.java
index a905828..bf010f0 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomDocumentMixin.java
@@ -40,7 +40,7 @@ public abstract class AxiomDocumentMixin implements AxiomDocument {
@Override
public final OMElement getOMDocumentElement() {
try {
- return (OMElement)coreGetDocumentElement();
+ return (OMElement) coreGetDocumentElement();
} catch (CoreModelException ex) {
throw AxiomExceptionTranslator.translate(ex);
}
@@ -52,11 +52,12 @@ public abstract class AxiomDocumentMixin implements AxiomDocument {
if (documentElement == null) {
throw new IllegalArgumentException("documentElement must not be null");
}
- AxiomElement existingDocumentElement = (AxiomElement)coreGetDocumentElement();
+ AxiomElement existingDocumentElement = (AxiomElement) coreGetDocumentElement();
if (existingDocumentElement == null) {
addChild(documentElement);
} else {
- existingDocumentElement.coreReplaceWith((AxiomElement)documentElement, AxiomSemantics.INSTANCE);
+ existingDocumentElement.coreReplaceWith(
+ (AxiomElement) documentElement, AxiomSemantics.INSTANCE);
}
} catch (CoreModelException ex) {
throw AxiomExceptionTranslator.translate(ex);
@@ -115,13 +116,12 @@ public abstract class AxiomDocumentMixin implements AxiomDocument {
if (getOMDocumentElement() != null) {
throw new OMException("Document element already exists");
} else {
- checkDocumentElement((OMElement)child);
+ checkDocumentElement((OMElement) child);
}
}
}
- public void checkDocumentElement(OMElement element) {
- }
+ public void checkDocumentElement(OMElement element) {}
@Override
public final CoreElement getContextElement() {
@@ -130,6 +130,10 @@ public abstract class AxiomDocumentMixin implements AxiomDocument {
@Override
public Iterator<OMSerializable> getDescendants(boolean includeSelf) {
- return coreGetNodes(includeSelf ? Axis.DESCENDANTS_OR_SELF : Axis.DESCENDANTS, AxiomSerializable.class, Mappers.<OMSerializable>identity(), AxiomSemantics.INSTANCE);
+ return coreGetNodes(
+ includeSelf ? Axis.DESCENDANTS_OR_SELF : Axis.DESCENDANTS,
+ AxiomSerializable.class,
+ Mappers.<OMSerializable>identity(),
+ AxiomSemantics.INSTANCE);
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementMixin.java
index 2119b1a..1d5e80e 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementMixin.java
@@ -71,8 +71,8 @@ import org.apache.axiom.util.xml.QNameCache;
import org.apache.axiom.weaver.annotation.Mixin;
/**
- * Utility class with default implementations for some of the methods defined by the
- * {@link OMElement} interface.
+ * Utility class with default implementations for some of the methods defined by the {@link
+ * OMElement} interface.
*/
@Mixin
public abstract class AxiomElementMixin implements AxiomElement {
@@ -81,16 +81,16 @@ public abstract class AxiomElementMixin implements AxiomElement {
internalSetLocalName(localName);
internalSetNamespace(generateNSDecl ? NSUtil.handleNamespace(this, ns, false, true) : ns);
}
-
+
final void beforeSetLocalName() {
forceExpand();
}
-
+
@Override
public final int getType() {
return OMNode.ELEMENT_NODE;
}
-
+
@Override
public final void setNamespaceWithNoFindInCurrentScope(OMNamespace namespace) {
forceExpand();
@@ -118,8 +118,14 @@ public abstract class AxiomElementMixin implements AxiomElement {
@Override
public final Iterator<OMElement> getChildElements() {
- return coreGetElements(Axis.CHILDREN, AxiomElement.class, ElementMatcher.ANY, null, null,
- Mappers.<OMElement>identity(), AxiomSemantics.INSTANCE);
+ return coreGetElements(
+ Axis.CHILDREN,
+ AxiomElement.class,
+ ElementMatcher.ANY,
+ null,
+ null,
+ Mappers.<OMElement>identity(),
+ AxiomSemantics.INSTANCE);
}
@Override
@@ -130,7 +136,7 @@ public abstract class AxiomElementMixin implements AxiomElement {
@Override
public NamespaceContext getNamespaceContext(boolean detached) {
if (detached) {
- Map<String,String> namespaces = new HashMap<String,String>();
+ Map<String, String> namespaces = new HashMap<String, String>();
for (Iterator<OMNamespace> it = getNamespacesInScope(); it.hasNext(); ) {
OMNamespace ns = it.next();
namespaces.put(ns.getPrefix(), ns.getNamespaceURI());
@@ -140,7 +146,7 @@ public abstract class AxiomElementMixin implements AxiomElement {
return new LiveNamespaceContext(this);
}
}
-
+
@Override
public final QName resolveQName(String qname) {
int idx = qname.indexOf(':');
@@ -150,7 +156,9 @@ public abstract class AxiomElementMixin implements AxiomElement {
} else {
String prefix = qname.substring(0, idx);
OMNamespace ns = findNamespace(null, prefix);
- return ns == null ? null : QNameCache.getQName(ns.getNamespaceURI(), qname.substring(idx+1), prefix);
+ return ns == null
+ ? null
+ : QNameCache.getQName(ns.getNamespaceURI(), qname.substring(idx + 1), prefix);
}
}
@@ -162,7 +170,7 @@ public abstract class AxiomElementMixin implements AxiomElement {
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
@Override
public final QName getTextAsQName() {
String childText = getText().trim();
@@ -178,7 +186,7 @@ public abstract class AxiomElementMixin implements AxiomElement {
if (child == null) {
return new StringReader("");
} else if (child.getNextOMSibling() == null) {
- return new StringReader(child instanceof OMText ? ((OMText)child).getText() : "");
+ return new StringReader(child instanceof OMText ? ((OMText) child).getText() : "");
}
}
// In all other cases, extract the data from the XMLStreamReader
@@ -190,23 +198,24 @@ public abstract class AxiomElementMixin implements AxiomElement {
Reader stream = XMLStreamReaderUtils.getElementTextAsStream(reader, true);
if (!cache) {
// If caching is disabled, we need to close the XMLStreamReader to reenable it
- stream = new FilterReader(stream) {
- @Override
- public void close() throws IOException {
- try {
- reader.close();
- } catch (XMLStreamException ex) {
- throw new XMLStreamIOException(ex);
- }
- }
- };
+ stream =
+ new FilterReader(stream) {
+ @Override
+ public void close() throws IOException {
+ try {
+ reader.close();
+ } catch (XMLStreamException ex) {
+ throw new XMLStreamIOException(ex);
+ }
+ }
+ };
}
return stream;
} catch (XMLStreamException ex) {
throw new OMException(ex);
}
}
-
+
@Override
public void writeTextTo(Writer out, boolean cache) throws IOException {
try {
@@ -231,7 +240,7 @@ public abstract class AxiomElementMixin implements AxiomElement {
throw new OMException(ex);
}
}
-
+
@Override
public final void setText(String text) {
try {
@@ -247,8 +256,12 @@ public abstract class AxiomElementMixin implements AxiomElement {
// Add a new text node
if (qname != null) {
OMNamespace ns = handleNamespace(qname.getNamespaceURI(), qname.getPrefix());
- getOMFactory().createOMText(this,
- ns == null ? qname.getLocalPart() : ns.getPrefix() + ":" + qname.getLocalPart());
+ getOMFactory()
+ .createOMText(
+ this,
+ ns == null
+ ? qname.getLocalPart()
+ : ns.getPrefix() + ":" + qname.getLocalPart());
}
}
@@ -261,9 +274,10 @@ public abstract class AxiomElementMixin implements AxiomElement {
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
@Override
- public <T extends OMElement> void insertChild(Sequence sequence, int pos, T newChild, boolean allowReplace) {
+ public <T extends OMElement> void insertChild(
+ Sequence sequence, int pos, T newChild, boolean allowReplace) {
if (!sequence.item(pos).isInstance(newChild)) {
throw new IllegalArgumentException();
}
@@ -282,13 +296,14 @@ public abstract class AxiomElementMixin implements AxiomElement {
child.insertSiblingAfter(newChild);
child.detach();
} else {
- throw new OMException("The element already has a child of type " + type.getName());
+ throw new OMException(
+ "The element already has a child of type " + type.getName());
}
return;
}
// isAfter indicates if the new child should be inserted after the current child
boolean isAfter = false;
- for (int i=0; i<pos; i++) {
+ for (int i = 0; i < pos; i++) {
if (sequence.item(i).isInstance(child)) {
isAfter = true;
break;
@@ -315,29 +330,35 @@ public abstract class AxiomElementMixin implements AxiomElement {
}
return null;
} else {
- OMNamespace namespace = findNamespace(namespaceURI,
- prefix);
+ OMNamespace namespace = findNamespace(namespaceURI, prefix);
if (namespace == null) {
namespace = declareNamespace(namespaceURI, prefix.length() > 0 ? prefix : null);
}
return namespace;
}
}
-
+
public final void internalAppendAttribute(OMAttribute attr) {
- coreSetAttribute(AxiomSemantics.ATTRIBUTE_MATCHER, (AxiomAttribute)attr, AxiomSemantics.INSTANCE);
+ coreSetAttribute(
+ AxiomSemantics.ATTRIBUTE_MATCHER, (AxiomAttribute) attr, AxiomSemantics.INSTANCE);
}
-
+
@Override
- public final OMAttribute addAttribute(OMAttribute attr){
- // If the attribute already has an owner element then clone the attribute (except if it is owned
+ public final OMAttribute addAttribute(OMAttribute attr) {
+ // If the attribute already has an owner element then clone the attribute (except if it is
+ // owned
// by the this element)
OMElement owner = attr.getOwner();
if (owner != null) {
if (owner == this) {
return attr;
}
- attr = getOMFactory().createOMAttribute(attr.getLocalName(), attr.getNamespace(), attr.getAttributeValue());
+ attr =
+ getOMFactory()
+ .createOMAttribute(
+ attr.getLocalName(),
+ attr.getNamespace(),
+ attr.getAttributeValue());
}
NSUtil.handleNamespace(this, attr.getNamespace(), true, true);
internalAppendAttribute(attr);
@@ -353,7 +374,10 @@ public abstract class AxiomElementMixin implements AxiomElement {
if (namespaceURI.length() > 0 || prefix != null) {
namespace = findNamespace(namespaceURI, prefix);
if (namespace == null || prefix == null && namespace.getPrefix().length() == 0) {
- namespace = new OMNamespaceImpl(namespaceURI, prefix != null ? prefix : generatePrefix(namespaceURI));
+ namespace =
+ new OMNamespaceImpl(
+ namespaceURI,
+ prefix != null ? prefix : generatePrefix(namespaceURI));
}
}
}
@@ -362,12 +386,17 @@ public abstract class AxiomElementMixin implements AxiomElement {
@Override
public final Iterator<OMAttribute> getAllAttributes() {
- return coreGetAttributesByType(AxiomAttribute.class, Mappers.<OMAttribute>identity(), AxiomSemantics.INSTANCE);
+ return coreGetAttributesByType(
+ AxiomAttribute.class, Mappers.<OMAttribute>identity(), AxiomSemantics.INSTANCE);
}
-
+
@Override
public final OMAttribute getAttribute(QName qname) {
- return (AxiomAttribute)coreGetAttribute(AxiomSemantics.ATTRIBUTE_MATCHER, qname.getNamespaceURI(), qname.getLocalPart());
+ return (AxiomAttribute)
+ coreGetAttribute(
+ AxiomSemantics.ATTRIBUTE_MATCHER,
+ qname.getNamespaceURI(),
+ qname.getLocalPart());
}
@Override
@@ -376,35 +405,43 @@ public abstract class AxiomElementMixin implements AxiomElement {
return attr == null ? null : attr.getAttributeValue();
}
- // TODO: complete the implementation (i.e. support value == null and the no namespace case) and add the method to the OMElement API
+ // TODO: complete the implementation (i.e. support value == null and the no namespace case) and
+ // add the method to the OMElement API
@Override
public final void _setAttributeValue(QName qname, String value) {
OMAttribute attr = getAttribute(qname);
if (attr != null) {
attr.setAttributeValue(value);
} else {
- addAttribute(qname.getLocalPart(), value, new OMNamespaceImpl(qname.getNamespaceURI(), qname.getLocalPart()));
+ addAttribute(
+ qname.getLocalPart(),
+ value,
+ new OMNamespaceImpl(qname.getNamespaceURI(), qname.getLocalPart()));
}
}
-
+
@Override
public final void removeAttribute(OMAttribute attr) {
if (attr.getOwner() != this) {
throw new OMException("The attribute is not owned by this element");
}
- ((AxiomAttribute)attr).coreRemove(AxiomSemantics.INSTANCE);
+ ((AxiomAttribute) attr).coreRemove(AxiomSemantics.INSTANCE);
}
@Override
public final void addNamespaceDeclaration(OMNamespace ns) {
AxiomNamespaceDeclaration decl = getNodeFactory().createNamespaceDeclaration();
decl.setDeclaredNamespace(ns);
- coreSetAttribute(AxiomSemantics.NAMESPACE_DECLARATION_MATCHER, decl, AxiomSemantics.INSTANCE);
+ coreSetAttribute(
+ AxiomSemantics.NAMESPACE_DECLARATION_MATCHER, decl, AxiomSemantics.INSTANCE);
}
-
+
@Override
public final Iterator<OMNamespace> getAllDeclaredNamespaces() {
- return coreGetAttributesByType(AxiomNamespaceDeclaration.class, NamespaceDeclarationMapper.INSTANCE, AxiomSemantics.INSTANCE);
+ return coreGetAttributesByType(
+ AxiomNamespaceDeclaration.class,
+ NamespaceDeclarationMapper.INSTANCE,
+ AxiomSemantics.INSTANCE);
}
@Override
@@ -431,9 +468,12 @@ public abstract class AxiomElementMixin implements AxiomElement {
public final OMNamespace declareDefaultNamespace(String uri) {
OMNamespace elementNamespace = getNamespace();
if (elementNamespace == null && uri.length() > 0
- || elementNamespace != null && elementNamespace.getPrefix().length() == 0 && !elementNamespace.getNamespaceURI().equals(uri)) {
- throw new OMException("Attempt to add a namespace declaration that conflicts with " +
- "the namespace information of the element");
+ || elementNamespace != null
+ && elementNamespace.getPrefix().length() == 0
+ && !elementNamespace.getNamespaceURI().equals(uri)) {
+ throw new OMException(
+ "Attempt to add a namespace declaration that conflicts with "
+ + "the namespace information of the element");
}
OMNamespace namespace = new OMNamespaceImpl(uri == null ? "" : uri, "");
addNamespaceDeclaration(namespace);
@@ -457,13 +497,14 @@ public abstract class AxiomElementMixin implements AxiomElement {
// go up to check with ancestors
OMContainer parent = getParent();
if (parent != null) {
- //For the OMDocumentImpl there won't be any explicit namespace
- //declarations, so going up the parent chain till the document
- //element should be enough.
+ // For the OMDocumentImpl there won't be any explicit namespace
+ // declarations, so going up the parent chain till the document
+ // element should be enough.
if (parent instanceof OMElement) {
namespace = ((OMElement) parent).findNamespace(uri, prefix);
// If the prefix has been redeclared, then ignore the binding found on the ancestors
- if (namespace != null && findDeclaredNamespace(null, namespace.getPrefix()) != null) {
+ if (namespace != null
+ && findDeclaredNamespace(null, namespace.getPrefix()) != null) {
namespace = null;
}
}
@@ -472,7 +513,8 @@ public abstract class AxiomElementMixin implements AxiomElement {
return namespace;
}
- private static final OMNamespace XMLNS = new OMNamespaceImpl(XMLConstants.XML_NS_URI, XMLConstants.XML_NS_PREFIX);
+ private static final OMNamespace XMLNS =
+ new OMNamespaceImpl(XMLConstants.XML_NS_URI, XMLConstants.XML_NS_PREFIX);
/**
* Checks for the namespace <B>only</B> in the current Element. This is also used to retrieve
@@ -482,7 +524,7 @@ public abstract class AxiomElementMixin implements AxiomElement {
CoreAttribute attr = coreGetFirstAttribute();
while (attr != null) {
if (attr instanceof AxiomNamespaceDeclaration) {
- OMNamespace namespace = ((AxiomNamespaceDeclaration)attr).getDeclaredNamespace();
+ OMNamespace namespace = ((AxiomNamespaceDeclaration) attr).getDeclaredNamespace();
if ((prefix == null || prefix.equals(namespace.getPrefix()))
&& (uri == null || uri.equals(namespace.getNamespaceURI()))) {
return namespace;
@@ -491,7 +533,7 @@ public abstract class AxiomElementMixin implements AxiomElement {
attr = attr.coreGetNextAttribute();
}
- //If the prefix is available and uri is available and its the xml namespace
+ // If the prefix is available and uri is available and its the xml namespace
if ((prefix == null || prefix.equals(XMLConstants.XML_NS_PREFIX))
&& (uri == null || uri.equals(XMLConstants.XML_NS_URI))) {
return XMLNS;
@@ -508,11 +550,12 @@ public abstract class AxiomElementMixin implements AxiomElement {
CoreAttribute attr = coreGetFirstAttribute();
while (attr != null) {
if (attr instanceof AxiomNamespaceDeclaration) {
- AxiomNamespaceDeclaration nsDecl = (AxiomNamespaceDeclaration)attr;
+ AxiomNamespaceDeclaration nsDecl = (AxiomNamespaceDeclaration) attr;
if (nsDecl.coreGetDeclaredPrefix().equals(prefix)) {
OMNamespace ns = nsDecl.getDeclaredNamespace();
if (ns.getNamespaceURI().length() == 0) {
- // We are either in the prefix undeclaring case (XML 1.1 only) or the namespace
+ // We are either in the prefix undeclaring case (XML 1.1 only) or the
+ // namespace
// declaration is xmlns="". In both cases we need to return null.
return null;
} else {
@@ -525,7 +568,7 @@ public abstract class AxiomElementMixin implements AxiomElement {
OMContainer parent = getParent();
if (parent instanceof OMElement) {
// try with the parent
- return ((OMElement)parent).findNamespaceURI(prefix);
+ return ((OMElement) parent).findNamespaceURI(prefix);
} else {
return null;
}
@@ -556,7 +599,7 @@ public abstract class AxiomElementMixin implements AxiomElement {
@Override
public final OMElement cloneOMElement() {
- return (OMElement)clone(null);
+ return (OMElement) clone(null);
}
@Override
@@ -574,8 +617,7 @@ public abstract class AxiomElementMixin implements AxiomElement {
}
@Override
- public void checkChild(OMNode child) {
- }
+ public void checkChild(OMNode child) {}
@Override
public final void setNamespace(OMNamespace namespace) {
@@ -583,8 +625,7 @@ public abstract class AxiomElementMixin implements AxiomElement {
}
@Override
- public final void setLineNumber(int lineNumber) {
- }
+ public final void setLineNumber(int lineNumber) {}
@Override
public final int getLineNumber() {
@@ -594,11 +635,15 @@ public abstract class AxiomElementMixin implements AxiomElement {
@Override
public final CoreElement getContextElement() {
CoreParentNode parent = coreGetParent();
- return parent instanceof CoreElement ? (CoreElement)parent : null;
+ return parent instanceof CoreElement ? (CoreElement) parent : null;
}
@Override
public Iterator<OMNode> getDescendants(boolean includeSelf) {
- return coreGetNodes(includeSelf ? Axis.DESCENDANTS_OR_SELF : Axis.DESCENDANTS, AxiomChildNode.class, Mappers.<OMNode>identity(), AxiomSemantics.INSTANCE);
+ return coreGetNodes(
+ includeSelf ? Axis.DESCENDANTS_OR_SELF : Axis.DESCENDANTS,
+ AxiomChildNode.class,
+ Mappers.<OMNode>identity(),
+ AxiomSemantics.INSTANCE);
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomEntityReferenceMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomEntityReferenceMixin.java
index 1bb6640..5abc50f 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomEntityReferenceMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomEntityReferenceMixin.java
@@ -46,8 +46,7 @@ public abstract class AxiomEntityReferenceMixin implements AxiomEntityReference
public final String getReplacementText() {
return coreGetReplacementText();
}
-
+
@Override
- public final void buildWithAttachments() {
- }
+ public final void buildWithAttachments() {}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomInformationItemMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomInformationItemMixin.java
index 7ca0b97..9cca5d9 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomInformationItemMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomInformationItemMixin.java
@@ -33,11 +33,11 @@ public abstract class AxiomInformationItemMixin implements AxiomInformationItem
public OMFactory getOMFactory() {
return getMetaFactory().getOMFactory();
}
-
+
@Override
public final OMInformationItem clone(OMCloneOptions options) {
try {
- return (OMInformationItem)coreClone(AxiomSemantics.CLONE_POLICY, options);
+ return (OMInformationItem) coreClone(AxiomSemantics.CLONE_POLICY, options);
} catch (CoreModelException ex) {
throw AxiomExceptionTranslator.translate(ex);
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamedInformationItemMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamedInformationItemMixin.java
index 8db82b2..bf8b78d 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamedInformationItemMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamedInformationItemMixin.java
@@ -35,31 +35,33 @@ import org.apache.axiom.weaver.annotation.Mixin;
public abstract class AxiomNamedInformationItemMixin implements AxiomNamedInformationItem {
/**
* The namespace of the information item. Possible values:
+ *
* <ul>
- * <li><code>null</code> (if the information item has no namespace)
- * <li>any {@link OMNamespace} instance, with the following exceptions:
- * <ul>
- * <li>an {@link OMNamespace} instance with a <code>null</code> prefix
- * <li>for elements: an {@link OMNamespace} instance with both prefix and namespace URI set to
- * the empty string
- * <li>for attributes: an {@link OMNamespace} instance with an empty prefix (because an
- * unprefixed attribute never has a namespace)
- * </ul>
+ * <li><code>null</code> (if the information item has no namespace)
+ * <li>any {@link OMNamespace} instance, with the following exceptions:
+ * <ul>
+ * <li>an {@link OMNamespace} instance with a <code>null</code> prefix
+ * <li>for elements: an {@link OMNamespace} instance with both prefix and namespace URI
+ * set to the empty string
+ * <li>for attributes: an {@link OMNamespace} instance with an empty prefix (because an
+ * unprefixed attribute never has a namespace)
+ * </ul>
* </ul>
*/
private OMNamespace namespace;
-
+
private String localName;
-
+
@Override
- public final void initName(String namespaceURI, String localName, String prefix, Object namespaceHelper) {
+ public final void initName(
+ String namespaceURI, String localName, String prefix, Object namespaceHelper) {
this.localName = localName;
- namespace = ((OMNamespaceCache)namespaceHelper).getOMNamespace(namespaceURI, prefix);
+ namespace = ((OMNamespaceCache) namespaceHelper).getOMNamespace(namespaceURI, prefix);
}
-
+
/**
* Set the namespace of the node without adding a corresponding namespace declaration.
- *
+ *
* @param namespace
*/
@Override
@@ -81,7 +83,7 @@ public abstract class AxiomNamedInformationItemMixin implements AxiomNamedInform
public OMNamespace getNamespace() {
return defaultGetNamespace();
}
-
+
@Override
public final String getLocalName() {
return coreGetLocalName();
@@ -105,7 +107,7 @@ public abstract class AxiomNamedInformationItemMixin implements AxiomNamedInform
}
abstract void beforeSetLocalName();
-
+
@Override
public final void setLocalName(String localName) {
beforeSetLocalName();
@@ -116,7 +118,7 @@ public abstract class AxiomNamedInformationItemMixin implements AxiomNamedInform
public QName getQName() {
return defaultGetQName();
}
-
+
@Override
public final QName defaultGetQName() {
return QNameCache.getQName(
@@ -124,7 +126,7 @@ public abstract class AxiomNamedInformationItemMixin implements AxiomNamedInform
localName,
namespace == null ? "" : namespace.getPrefix());
}
-
+
@Override
public final boolean hasName(QName name) {
if (name.getLocalPart().equals(getLocalName())) {
@@ -141,23 +143,26 @@ public abstract class AxiomNamedInformationItemMixin implements AxiomNamedInform
OMNamespace namespace = getNamespace();
return namespace == null ? "" : namespace.getNamespaceURI();
}
-
+
@Override
public final String coreGetPrefix() {
OMNamespace namespace = getNamespace();
return namespace == null ? "" : namespace.getPrefix();
}
-
+
@Override
public final void coreSetName(String namespaceURI, String localName, String prefix) {
this.localName = localName;
- namespace = namespaceURI.length() == 0 && prefix.length() == 0 ? null : new OMNamespaceImpl(namespaceURI, prefix);
+ namespace =
+ namespaceURI.length() == 0 && prefix.length() == 0
+ ? null
+ : new OMNamespaceImpl(namespaceURI, prefix);
}
@Override
public final void initName(CoreNamedNode other) {
- AxiomNamedInformationItem o = (AxiomNamedInformationItem)other;
- if (o instanceof AxiomSourcedElement && ((AxiomElement)this).isExpanded()) {
+ AxiomNamedInformationItem o = (AxiomNamedInformationItem) other;
+ if (o instanceof AxiomSourcedElement && ((AxiomElement) this).isExpanded()) {
localName = o.coreGetLocalName();
namespace = o.getNamespace();
} else {
@@ -165,11 +170,11 @@ public abstract class AxiomNamedInformationItemMixin implements AxiomNamedInform
namespace = o.defaultGetNamespace();
}
}
-
+
public void updateLocalName() {
throw new IllegalStateException();
}
-
+
@Override
public final String coreGetLocalName() {
if (localName == null) {
@@ -177,7 +182,7 @@ public abstract class AxiomNamedInformationItemMixin implements AxiomNamedInform
}
return localName;
}
-
+
@Override
public final void coreSetPrefix(String prefix) {
OMNamespace ns = getNamespace();
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationMixin.java
index bcdee08..7e4e856 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationMixin.java
@@ -30,12 +30,12 @@ import org.apache.axiom.weaver.annotation.Mixin;
@Mixin
public abstract class AxiomNamespaceDeclarationMixin implements AxiomNamespaceDeclaration {
private static final OMNamespace DEFAULT_NS = new OMNamespaceImpl("", "");
-
+
private OMNamespace declaredNamespace;
-
+
@Override
public final void init(String prefix, String namespaceURI, Object namespaceHelper) {
- OMNamespace ns = ((OMNamespaceCache)namespaceHelper).getOMNamespace(namespaceURI, prefix);
+ OMNamespace ns = ((OMNamespaceCache) namespaceHelper).getOMNamespace(namespaceURI, prefix);
setDeclaredNamespace(ns == null ? DEFAULT_NS : ns);
}
@@ -49,19 +49,20 @@ public abstract class AxiomNamespaceDeclarationMixin implements AxiomNamespaceDe
try {
String namespaceURI = coreGetCharacterData().toString();
if (!namespaceURI.equals(declaredNamespace.getNamespaceURI())) {
- declaredNamespace = new OMNamespaceImpl(namespaceURI, declaredNamespace.getPrefix());
+ declaredNamespace =
+ new OMNamespaceImpl(namespaceURI, declaredNamespace.getPrefix());
}
return declaredNamespace;
} catch (CoreModelException ex) {
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
@Override
public final void coreSetDeclaredNamespace(String prefix, String namespaceURI) {
setDeclaredNamespace(new OMNamespaceImpl(namespaceURI, prefix));
}
-
+
@Override
public final void setDeclaredNamespace(OMNamespace declaredNamespace) {
try {
@@ -71,7 +72,7 @@ public abstract class AxiomNamespaceDeclarationMixin implements AxiomNamespaceDe
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
public final void build() {
// TODO
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNodeFactoryMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNodeFactoryMixin.java
index ca2af94..a5324db 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNodeFactoryMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNodeFactoryMixin.java
@@ -46,13 +46,13 @@ public abstract class AxiomNodeFactoryMixin implements AxiomNodeFactory {
private final OMFactory omFactory;
private final SOAPFactory soap11Factory;
private final SOAPFactory soap12Factory;
-
+
public AxiomNodeFactoryMixin() {
omFactory = new OMFactoryImpl(this);
soap11Factory = new SOAP11Factory(this);
soap12Factory = new SOAP12Factory(this);
}
-
+
@Override
public final OMFactory getOMFactory() {
return omFactory;
@@ -67,17 +67,18 @@ public abstract class AxiomNodeFactoryMixin implements AxiomNodeFactory {
public final SOAPFactory getSOAP12Factory() {
return soap12Factory;
}
-
+
@Override
public final OMXMLParserWrapper createStAXOMBuilder(XMLStreamReader parser) {
return OM.createBuilder(this, BuilderSpec.from(parser));
}
@Override
- public final OMXMLParserWrapper createOMBuilder(StAXParserConfiguration configuration, InputSource is) {
+ public final OMXMLParserWrapper createOMBuilder(
+ StAXParserConfiguration configuration, InputSource is) {
return OM.createBuilder(this, BuilderSpec.from(configuration, is));
}
-
+
@Override
public final OMXMLParserWrapper createOMBuilder(Source source) {
return OM.createBuilder(this, BuilderSpec.from(StAXParserConfiguration.DEFAULT, source));
@@ -89,18 +90,23 @@ public abstract class AxiomNodeFactoryMixin implements AxiomNodeFactory {
}
@Override
- public final OMXMLParserWrapper createOMBuilder(SAXSource source, boolean expandEntityReferences) {
+ public final OMXMLParserWrapper createOMBuilder(
+ SAXSource source, boolean expandEntityReferences) {
return OM.createBuilder(this, BuilderSpec.from(source, expandEntityReferences));
}
@Override
- public final OMXMLParserWrapper createOMBuilder(StAXParserConfiguration configuration, MultipartBody message) {
+ public final OMXMLParserWrapper createOMBuilder(
+ StAXParserConfiguration configuration, MultipartBody message) {
return OM.createBuilder(this, BuilderSpec.from(configuration, message));
}
@Override
- public final OMXMLParserWrapper createOMBuilder(Source rootPart, OMAttachmentAccessor attachmentAccessor) {
- return OM.createBuilder(this, BuilderSpec.from(StAXParserConfiguration.DEFAULT, rootPart, attachmentAccessor));
+ public final OMXMLParserWrapper createOMBuilder(
+ Source rootPart, OMAttachmentAccessor attachmentAccessor) {
+ return OM.createBuilder(
+ this,
+ BuilderSpec.from(StAXParserConfiguration.DEFAULT, rootPart, attachmentAccessor));
}
@Override
@@ -124,7 +130,9 @@ public abstract class AxiomNodeFactoryMixin implements AxiomNodeFactory {
}
@Override
- public final SOAPModelBuilder createSOAPModelBuilder(Source rootPart, OMAttachmentAccessor attachmentAccessor) {
- return SOAP.createBuilder(this, BuilderSpec.from(StAXParserConfiguration.SOAP, rootPart, attachmentAccessor));
+ public final SOAPModelBuilder createSOAPModelBuilder(
+ Source rootPart, OMAttachmentAccessor attachmentAccessor) {
+ return SOAP.createBuilder(
+ this, BuilderSpec.from(StAXParserConfiguration.SOAP, rootPart, attachmentAccessor));
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionMixin.java
index 20f0b32..0a4d013 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionMixin.java
@@ -65,13 +65,13 @@ public abstract class AxiomProcessingInstructionMixin implements AxiomProcessing
@Override
public final void serialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
try {
- writer.writeProcessingInstruction(coreGetTarget() + " ", coreGetCharacterData().toString());
+ writer.writeProcessingInstruction(
+ coreGetTarget() + " ", coreGetCharacterData().toString());
} catch (CoreModelException ex) {
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
@Override
- public final void buildWithAttachments() {
- }
+ public final void buildWithAttachments() {}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementMixin.java
index eff5368..729e8ae 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementMixin.java
@@ -55,26 +55,26 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
/**
- * <p>Element backed by an arbitrary data source. When necessary, this element will be expanded by
- * creating a parser from the data source.</p>
- * <p/>
- * <p>Whenever methods are added to the base {@link OMElementImpl}
- * class the corresponding methods must be added to this class (there's a unit test to verify that
- * this has been done, just to make sure nothing gets accidentally broken). If the method only
- * requires the element name and/or namespace information, the base class method can be called
- * directly. Otherwise, the element must be expanded into a full OM tree (by calling the {@link
- * #forceExpand()} method) before the base class method is called. This will typically involve a
- * heavy overhead penalty, so should be avoided if possible.</p>
+ * Element backed by an arbitrary data source. When necessary, this element will be expanded by
+ * creating a parser from the data source.
+ *
+ * <p>Whenever methods are added to the base {@link OMElementImpl} class the corresponding methods
+ * must be added to this class (there's a unit test to verify that this has been done, just to make
+ * sure nothing gets accidentally broken). If the method only requires the element name and/or
+ * namespace information, the base class method can be called directly. Otherwise, the element must
+ * be expanded into a full OM tree (by calling the {@link #forceExpand()} method) before the base
+ * class method is called. This will typically involve a heavy overhead penalty, so should be
+ * avoided if possible.
*/
@Mixin
public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
-
+
/** Data source for element data. */
private OMDataSource dataSource;
/** Namespace for element, needed in order to bypass base class handling. */
private OMNamespace definedNamespace;
-
+
/**
* Flag indicating whether the {@link #definedNamespace} attribute has been set. If this flag is
* <code>true</code> and {@link #definedNamespace} is <code>null</code> then the element has no
@@ -88,25 +88,27 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
private boolean isExpanded = true;
private static final Log log = LogFactory.getLog(AxiomSourcedElementMixin.class);
-
- private static final Log forceExpandLog = LogFactory.getLog(AxiomSourcedElementMixin.class.getName() + ".forceExpand");
-
+
+ private static final Log forceExpandLog =
+ LogFactory.getLog(AxiomSourcedElementMixin.class.getName() + ".forceExpand");
+
private static OMNamespace getOMNamespace(QName qName) {
- return qName.getNamespaceURI().length() == 0 ? null
+ return qName.getNamespaceURI().length() == 0
+ ? null
: new OMNamespaceImpl(qName.getNamespaceURI(), qName.getPrefix());
}
-
+
@Override
public Class<? extends CoreNode> coreGetNodeClass() {
return AxiomSourcedElement.class;
}
-
+
@Override
public void init(OMDataSource source) {
dataSource = source;
isExpanded = false;
}
-
+
/**
* Constructor.
*
@@ -202,9 +204,8 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
if (!isExpanded && dataSource != null) {
if (log.isDebugEnabled()) {
- log.debug("forceExpand: expanding element " +
- getPrintableName());
- if(forceExpandLog.isDebugEnabled()){
+ log.debug("forceExpand: expanding element " + getPrintableName());
+ if (forceExpandLog.isDebugEnabled()) {
// When using an OMSourcedElement, it can be particularly difficult to
// determine why an expand occurs... a stack trace should help debugging this
Exception e = new Exception("Debug Stack Trace");
@@ -214,18 +215,36 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
Builder builder;
if (OMDataSourceUtil.isPushDataSource(dataSource)) {
- // Disable namespace repairing because the OMDataSource is required to produce well formed
+ // Disable namespace repairing because the OMDataSource is required to produce well
+ // formed
// XML with respect to namespaces.
- builder = new BuilderImpl(new PushOMDataSourceInput(this, dataSource), coreGetNodeFactory().getFactory2(), PlainXMLModel.INSTANCE, this);
+ builder =
+ new BuilderImpl(
+ new PushOMDataSourceInput(this, dataSource),
+ coreGetNodeFactory().getFactory2(),
+ PlainXMLModel.INSTANCE,
+ this);
} else {
// Get the XMLStreamReader
XMLStreamReader readerFromDS;
try {
- readerFromDS = dataSource.getReader();
+ readerFromDS = dataSource.getReader();
} catch (XMLStreamException ex) {
- throw new OMException("Error obtaining parser from data source for element " + getPrintableName(), ex);
+ throw new OMException(
+ "Error obtaining parser from data source for element "
+ + getPrintableName(),
+ ex);
}
- builder = new BuilderImpl(new FilteredXmlInput(new StAXPullInput(readerFromDS, AxiomXMLStreamReaderHelperFactory.INSTANCE), NamespaceRepairingFilter.DEFAULT), coreGetNodeFactory().getFactory2(), PlainXMLModel.INSTANCE, this);
+ builder =
+ new BuilderImpl(
+ new FilteredXmlInput(
+ new StAXPullInput(
+ readerFromDS,
+ AxiomXMLStreamReaderHelperFactory.INSTANCE),
+ NamespaceRepairingFilter.DEFAULT),
+ coreGetNodeFactory().getFactory2(),
+ PlainXMLModel.INSTANCE,
+ this);
}
isExpanded = true;
coreSetState(ATTRIBUTES_PENDING);
@@ -238,14 +257,14 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
}
}
}
-
+
/**
* Validates that the actual name of the element obtained from StAX matches the information
- * specified when the sourced element was constructed or retrieved through the
- * {@link QNameAwareOMDataSource} interface. Also updates the local name if necessary. Note that
- * the namespace information is not updated; this is the responsibility of the builder (and is
- * done at the same time as namespace repairing).
- *
+ * specified when the sourced element was constructed or retrieved through the {@link
+ * QNameAwareOMDataSource} interface. Also updates the local name if necessary. Note that the
+ * namespace information is not updated; this is the responsibility of the builder (and is done
+ * at the same time as namespace repairing).
+ *
* @param staxPrefix
* @param staxLocalName
* @param staxNamespaceURI
@@ -258,18 +277,25 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
} else {
// Make sure element local name and namespace matches what was expected
if (!staxLocalName.equals(internalGetLocalName())) {
- throw new OMException("Element name from data source is " +
- staxLocalName + ", not the expected " + internalGetLocalName());
+ throw new OMException(
+ "Element name from data source is "
+ + staxLocalName
+ + ", not the expected "
+ + internalGetLocalName());
}
}
if (definedNamespaceSet) {
if (staxNamespaceURI == null) {
staxNamespaceURI = "";
}
- String namespaceURI = definedNamespace == null ? "" : definedNamespace.getNamespaceURI();
+ String namespaceURI =
+ definedNamespace == null ? "" : definedNamespace.getNamespaceURI();
if (!staxNamespaceURI.equals(namespaceURI)) {
- throw new OMException("Element namespace from data source is " +
- staxNamespaceURI + ", not the expected " + namespaceURI);
+ throw new OMException(
+ "Element namespace from data source is "
+ + staxNamespaceURI
+ + ", not the expected "
+ + namespaceURI);
}
if (!(definedNamespace instanceof DeferredNamespace)) {
if (staxPrefix == null) {
@@ -277,13 +303,17 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
}
String prefix = definedNamespace == null ? "" : definedNamespace.getPrefix();
if (!staxPrefix.equals(prefix)) {
- throw new OMException("Element prefix from data source is '" +
- staxPrefix + "', not the expected '" + prefix + "'");
+ throw new OMException(
+ "Element prefix from data source is '"
+ + staxPrefix
+ + "', not the expected '"
+ + prefix
+ + "'");
}
}
}
}
-
+
/**
* Check if element has been expanded into tree.
*
@@ -295,22 +325,26 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
}
@Override
- public XMLStreamReader getXMLStreamReader(boolean cache, OMXMLStreamReaderConfiguration configuration) {
+ public XMLStreamReader getXMLStreamReader(
+ boolean cache, OMXMLStreamReaderConfiguration configuration) {
if (log.isDebugEnabled()) {
- log.debug("getting XMLStreamReader for " + getPrintableName()
- + " with cache=" + cache);
+ log.debug("getting XMLStreamReader for " + getPrintableName() + " with cache=" + cache);
}
if (isExpanded) {
return defaultGetXMLStreamReader(cache, configuration);
} else {
- if ((cache && OMDataSourceUtil.isDestructiveRead(dataSource)) || OMDataSourceUtil.isPushDataSource(dataSource)) {
+ if ((cache && OMDataSourceUtil.isDestructiveRead(dataSource))
+ || OMDataSourceUtil.isPushDataSource(dataSource)) {
forceExpand();
return defaultGetXMLStreamReader(true, configuration);
} else {
try {
- return dataSource.getReader();
+ return dataSource.getReader();
} catch (XMLStreamException ex) {
- throw new OMException("Error obtaining parser from data source for element " + getPrintableName(), ex);
+ throw new OMException(
+ "Error obtaining parser from data source for element "
+ + getPrintableName(),
+ ex);
}
}
}
@@ -318,7 +352,7 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
public final void updateLocalName() {
if (dataSource instanceof QNameAwareOMDataSource) {
- internalSetLocalName(((QNameAwareOMDataSource)dataSource).getLocalName());
+ internalSetLocalName(((QNameAwareOMDataSource) dataSource).getLocalName());
}
if (internalGetLocalName() == null) {
forceExpand();
@@ -333,7 +367,7 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
return definedNamespace;
} else {
if (dataSource instanceof QNameAwareOMDataSource) {
- String namespaceURI = ((QNameAwareOMDataSource)dataSource).getNamespaceURI();
+ String namespaceURI = ((QNameAwareOMDataSource) dataSource).getNamespaceURI();
if (namespaceURI != null) {
if (namespaceURI.length() == 0) {
// No namespace case. definedNamespace is already null, so we only need
@@ -342,7 +376,7 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
// namespace URI.
definedNamespaceSet = true;
} else {
- String prefix = ((QNameAwareOMDataSource)dataSource).getPrefix();
+ String prefix = ((QNameAwareOMDataSource) dataSource).getPrefix();
if (prefix == null) {
// Prefix is unknown
definedNamespace = new DeferredNamespace(this, namespaceURI);
@@ -377,21 +411,21 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
}
public <T> void initSource(ClonePolicy<T> policy, T options, CoreElement other) {
- AxiomSourcedElement o = (AxiomSourcedElement)other;
+ AxiomSourcedElement o = (AxiomSourcedElement) other;
// If already expanded or this is not an OMDataSourceExt, then
// create a copy of the OM Tree
OMDataSource ds = o.getDataSource();
- if (!(options instanceof OMCloneOptions) || !((OMCloneOptions)options).isCopyOMDataSources() ||
- ds == null ||
- o.isExpanded() ||
- !(ds instanceof OMDataSourceExt)) {
+ if (!(options instanceof OMCloneOptions)
+ || !((OMCloneOptions) options).isCopyOMDataSources()
+ || ds == null
+ || o.isExpanded()
+ || !(ds instanceof OMDataSourceExt)) {
return;
}
-
+
// If copying is destructive, then copy the OM tree
OMDataSourceExt sourceDS = (OMDataSourceExt) ds;
- if (sourceDS.isDestructiveRead() ||
- sourceDS.isDestructiveWrite()) {
+ if (sourceDS.isDestructiveRead() || sourceDS.isDestructiveWrite()) {
return;
}
OMDataSourceExt targetDS = ((OMDataSourceExt) ds).copy();
@@ -425,12 +459,15 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
} else {
pull = incremental;
}
- if (cache && (pull && OMDataSourceUtil.isDestructiveRead(dataSource) || !pull && OMDataSourceUtil.isDestructiveWrite(dataSource))) {
+ if (cache
+ && (pull && OMDataSourceUtil.isDestructiveRead(dataSource)
+ || !pull && OMDataSourceUtil.isDestructiveWrite(dataSource))) {
return null;
}
if (pull) {
try {
- return new StAXPullInput(dataSource.getReader(), AxiomXMLStreamReaderHelperFactory.INSTANCE);
+ return new StAXPullInput(
+ dataSource.getReader(), AxiomXMLStreamReaderHelperFactory.INSTANCE);
} catch (XMLStreamException ex) {
throw new StreamException(ex);
}
@@ -440,8 +477,8 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
}
/**
- * Provide access to the data source encapsulated in OMSourcedElement.
- * This is usesful when we want to access the raw data in the data source.
+ * Provide access to the data source encapsulated in OMSourcedElement. This is usesful when we
+ * want to access the raw data in the data source.
*
* @return the internal datasource
*/
@@ -449,17 +486,15 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
public OMDataSource getDataSource() {
return dataSource;
}
-
- /**
- * setOMDataSource
- */
+
+ /** setOMDataSource */
@Override
public OMDataSource setDataSource(OMDataSource dataSource) {
try {
if (!isExpanded()) {
OMDataSource oldDS = this.dataSource;
this.dataSource = dataSource;
- return oldDS; // Caller is responsible for closing the data source
+ return oldDS; // Caller is responsible for closing the data source
} else {
OMDataSource oldDS = this.dataSource;
coreSetInputContext(null);
@@ -477,18 +512,18 @@ public abstract class AxiomSourcedElementMixin implements AxiomSourcedElement {
public void completed() {
if (dataSource != null) {
if (dataSource instanceof OMDataSourceExt) {
- ((OMDataSourceExt)dataSource).close();
+ ((OMDataSourceExt) dataSource).close();
}
dataSource = null;
}
}
-
+
@Override
public Object getObject(Class<? extends OMDataSourceExt> dataSourceClass) {
if (dataSource == null || isExpanded || !dataSourceClass.isInstance(dataSource)) {
return null;
} else {
- return ((OMDataSourceExt)dataSource).getObject();
+ return ((OMDataSourceExt) dataSource).getObject();
}
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextMixin.java
index 597081a..f578b9e 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextMixin.java
@@ -39,9 +39,9 @@ public abstract class AxiomTextMixin implements AxiomText {
try {
Object content = coreGetCharacterData();
if (content instanceof TextContent) {
- return (TextContent)content;
+ return (TextContent) content;
} else if (force) {
- TextContent textContent = new TextContent((String)content);
+ TextContent textContent = new TextContent((String) content);
coreSetCharacterData(textContent, AxiomSemantics.INSTANCE);
return textContent;
} else {
@@ -51,7 +51,7 @@ public abstract class AxiomTextMixin implements AxiomText {
throw AxiomExceptionTranslator.translate(ex);
}
}
-
+
@Override
public final boolean isBinary() {
TextContent textContent = getTextContent(false);
@@ -79,7 +79,7 @@ public abstract class AxiomTextMixin implements AxiomText {
textContent.setOptimize(optimize);
}
}
-
+
@Override
public final String getText() throws OMException {
try {
@@ -94,9 +94,9 @@ public abstract class AxiomTextMixin implements AxiomText {
try {
Object content = coreGetCharacterData();
if (content instanceof TextContent) {
- return ((TextContent)content).toCharArray();
+ return ((TextContent) content).toCharArray();
} else {
- return ((String)content).toCharArray();
+ return ((String) content).toCharArray();
}
} catch (CoreModelException ex) {
throw AxiomExceptionTranslator.translate(ex);
@@ -110,7 +110,7 @@ public abstract class AxiomTextMixin implements AxiomText {
@Override
public final QName getTextAsQName() throws OMException {
- return ((OMElement)getParent()).resolveQName(getText());
+ return ((OMElement) getParent()).resolveQName(getText());
}
@Override
@@ -121,7 +121,9 @@ public abstract class AxiomTextMixin implements AxiomText {
return null;
} else {
String namespaceURI = qname.getNamespaceURI();
- return namespaceURI.length() == 0 ? null : new OMNamespaceImpl(namespaceURI, qname.getPrefix());
+ return namespaceURI.length() == 0
+ ? null
+ : new OMNamespaceImpl(namespaceURI, qname.getPrefix());
}
}
@@ -130,7 +132,7 @@ public abstract class AxiomTextMixin implements AxiomText {
try {
Object content = coreGetCharacterData();
if (content instanceof TextContent) {
- return ((TextContent)content).getDataHandler();
+ return ((TextContent) content).getDataHandler();
} else {
throw new OMException("No DataHandler available");
}
@@ -149,7 +151,7 @@ public abstract class AxiomTextMixin implements AxiomText {
if (isOptimized()) {
DataHandler dataHandler = getDataHandler();
if (dataHandler instanceof PartDataHandler) {
- ((PartDataHandler)dataHandler).getPart().fetch();
+ ((PartDataHandler) dataHandler).getPart().fetch();
}
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/package-info.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/package-info.java
index 2b14f7a..13a9497 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/package-info.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/mixin/package-info.java
@@ -16,28 +16,29 @@
* specific language governing permissions and limitations
* under the License.
*/
-@org.apache.axiom.weaver.annotation.WeavablePackage(mixins={
- AxiomAttributeMixin.class,
- AxiomCDATASectionMixin.class,
- AxiomCharacterDataNodeMixin.class,
- AxiomChildNodeMixin.class,
- AxiomCommentMixin.class,
- AxiomContainerMixin.class,
- AxiomCoreLeafNodeMixin.class,
- AxiomCoreParentNodeMixin.class,
- AxiomDocTypeMixin.class,
- AxiomDocumentMixin.class,
- AxiomElementMixin.class,
- AxiomEntityReferenceMixin.class,
- AxiomInformationItemMixin.class,
- AxiomLeafNodeMixin.class,
- AxiomNamedInformationItemMixin.class,
- AxiomNamespaceDeclarationMixin.class,
- AxiomNodeFactoryMixin.class,
- AxiomProcessingInstructionMixin.class,
- AxiomSerializableMixin.class,
- AxiomSourcedElementMixin.class,
- AxiomTextMixin.class,
- NodeFactoryMixin.class,
-})
+@org.apache.axiom.weaver.annotation.WeavablePackage(
+ mixins = {
+ AxiomAttributeMixin.class,
+ AxiomCDATASectionMixin.class,
+ AxiomCharacterDataNodeMixin.class,
+ AxiomChildNodeMixin.class,
+ AxiomCommentMixin.class,
+ AxiomContainerMixin.class,
+ AxiomCoreLeafNodeMixin.class,
+ AxiomCoreParentNodeMixin.class,
+ AxiomDocTypeMixin.class,
+ AxiomDocumentMixin.class,
+ AxiomElementMixin.class,
+ AxiomEntityReferenceMixin.class,
+ AxiomInformationItemMixin.class,
+ AxiomLeafNodeMixin.class,
+ AxiomNamedInformationItemMixin.class,
+ AxiomNamespaceDeclarationMixin.class,
+ AxiomNodeFactoryMixin.class,
+ AxiomProcessingInstructionMixin.class,
+ AxiomSerializableMixin.class,
+ AxiomSourcedElementMixin.class,
+ AxiomTextMixin.class,
+ NodeFactoryMixin.class,
+ })
package org.apache.axiom.om.impl.mixin;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/NamespaceContextPreservationFilterHandler.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/NamespaceContextPreservationFilterHandler.java
index a4b3944..e40fe0f 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/NamespaceContextPreservationFilterHandler.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/NamespaceContextPreservationFilterHandler.java
@@ -37,14 +37,16 @@ public final class NamespaceContextPreservationFilterHandler extends XmlHandlerW
// for the same prefix on an ancestor of the element.
private Set<String> prefixesAlreadyBound;
private boolean done = false;
-
- public NamespaceContextPreservationFilterHandler(XmlHandler parent, CoreElement contextElement) {
+
+ public NamespaceContextPreservationFilterHandler(
+ XmlHandler parent, CoreElement contextElement) {
super(parent);
this.contextElement = contextElement;
}
@Override
- public void startElement(String namespaceURI, String localName, String prefix) throws StreamException {
+ public void startElement(String namespaceURI, String localName, String prefix)
+ throws StreamException {
super.startElement(namespaceURI, localName, prefix);
if (!done) {
prefixesAlreadyBound = new HashSet<String>();
@@ -52,7 +54,8 @@ public final class NamespaceContextPreservationFilterHandler extends XmlHandlerW
}
@Override
- public void processNamespaceDeclaration(String prefix, String namespaceURI) throws StreamException {
+ public void processNamespaceDeclaration(String prefix, String namespaceURI)
+ throws StreamException {
super.processNamespaceDeclaration(prefix, namespaceURI);
if (!done) {
prefixesAlreadyBound.add(prefix);
@@ -68,10 +71,11 @@ public final class NamespaceContextPreservationFilterHandler extends XmlHandlerW
CoreAttribute attr = current.coreGetFirstAttribute();
while (attr != null) {
if (attr instanceof CoreNamespaceDeclaration) {
- CoreNamespaceDeclaration decl = (CoreNamespaceDeclaration)attr;
+ CoreNamespaceDeclaration decl = (CoreNamespaceDeclaration) attr;
String prefix = decl.coreGetDeclaredPrefix();
if (prefixesAlreadyBound.add(prefix)) {
- super.processNamespaceDeclaration(prefix, decl.coreGetCharacterData().toString());
+ super.processNamespaceDeclaration(
+ prefix, decl.coreGetCharacterData().toString());
}
}
attr = attr.coreGetNextAttribute();
@@ -80,7 +84,7 @@ public final class NamespaceContextPreservationFilterHandler extends XmlHandlerW
if (!(parent instanceof CoreElement)) {
break;
}
- current = (CoreElement)parent;
+ current = (CoreElement) parent;
}
prefixesAlreadyBound = null;
done = true;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/XmlDeclarationRewriterHandler.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/XmlDeclarationRewriterHandler.java
index b4de324..471b0c0 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/XmlDeclarationRewriterHandler.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/XmlDeclarationRewriterHandler.java
@@ -25,7 +25,7 @@ import org.apache.axiom.om.OMOutputFormat;
public final class XmlDeclarationRewriterHandler extends XmlHandlerWrapper {
private final OMOutputFormat format;
-
+
public XmlDeclarationRewriterHandler(XmlHandler parent, OMOutputFormat format) {
super(parent);
this.format = format;
@@ -36,8 +36,9 @@ public final class XmlDeclarationRewriterHandler extends XmlHandlerWrapper {
}
@Override
- public void startDocument(String inputEncoding, String xmlVersion, String xmlEncoding,
- Boolean standalone) throws StreamException {
+ public void startDocument(
+ String inputEncoding, String xmlVersion, String xmlEncoding, Boolean standalone)
+ throws StreamException {
if (format.isIgnoreXMLDeclaration()) {
super.startFragment();
} else {
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/XsiTypeFilterHandler.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/XsiTypeFilterHandler.java
index 7406cb8..ad1136b 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/XsiTypeFilterHandler.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/XsiTypeFilterHandler.java
@@ -39,10 +39,11 @@ public class XsiTypeFilterHandler extends XmlHandlerWrapper {
}
@Override
- public void startElement(String namespaceURI, String localName, String prefix) throws StreamException {
+ public void startElement(String namespaceURI, String localName, String prefix)
+ throws StreamException {
super.startElement(namespaceURI, localName, prefix);
if (scopes == scopeStack.length) {
- int[] newScopeStack = new int[scopeStack.length*2];
+ int[] newScopeStack = new int[scopeStack.length * 2];
System.arraycopy(scopeStack, 0, newScopeStack, 0, scopeStack.length);
scopeStack = newScopeStack;
}
@@ -56,10 +57,11 @@ public class XsiTypeFilterHandler extends XmlHandlerWrapper {
}
@Override
- public void processNamespaceDeclaration(String prefix, String namespaceURI) throws StreamException {
+ public void processNamespaceDeclaration(String prefix, String namespaceURI)
+ throws StreamException {
super.processNamespaceDeclaration(prefix, namespaceURI);
if (prefixes.length == prefixCount) {
- String[] newPrefixes = new String[prefixes.length*2];
+ String[] newPrefixes = new String[prefixes.length * 2];
System.arraycopy(prefixes, 0, newPrefixes, 0, prefixes.length);
prefixes = newPrefixes;
}
@@ -67,8 +69,14 @@ public class XsiTypeFilterHandler extends XmlHandlerWrapper {
}
@Override
- public void processAttribute(String namespaceURI, String localName, String prefix, String value,
- String type, boolean specified) throws StreamException {
+ public void processAttribute(
+ String namespaceURI,
+ String localName,
+ String prefix,
+ String value,
+ String type,
+ boolean specified)
+ throws StreamException {
super.processAttribute(namespaceURI, localName, prefix, value, type, specified);
if (namespaceURI.equals("http://www.w3.org/2001/XMLSchema-instance")
&& localName.equals("type")) {
@@ -83,14 +91,15 @@ public class XsiTypeFilterHandler extends XmlHandlerWrapper {
int idx = xsiType.indexOf(':');
String prefix = idx == -1 ? "" : xsiType.substring(0, idx);
boolean bound = false;
- for (int i=0; i<prefixCount; i++) {
+ for (int i = 0; i < prefixCount; i++) {
if (prefixes[i] == prefix) {
bound = true;
break;
}
}
if (!bound) {
- String namespaceURI = contextElement.coreLookupNamespaceURI(prefix, AxiomSemantics.INSTANCE);
+ String namespaceURI =
+ contextElement.coreLookupNamespaceURI(prefix, AxiomSemantics.INSTANCE);
if (namespaceURI != null && !namespaceURI.isEmpty()) {
processNamespaceDeclaration(prefix, namespaceURI);
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/DirectPushOMDataSourceReader.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/DirectPushOMDataSourceReader.java
index 33acd65..d699f51 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/DirectPushOMDataSourceReader.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/DirectPushOMDataSourceReader.java
@@ -45,6 +45,5 @@ final class DirectPushOMDataSourceReader implements XmlReader {
}
@Override
- public void dispose() {
- }
+ public void dispose() {}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/MTOMXMLStreamWriterImpl.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/MTOMXMLStreamWriterImpl.java
index cdd256e..9b3ea10 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/MTOMXMLStreamWriterImpl.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/MTOMXMLStreamWriterImpl.java
@@ -55,21 +55,21 @@ final class MTOMXMLStreamWriterImpl extends MTOMXMLStreamWriter {
}
this.format = format;
}
-
+
/**
* Get the {@link XmlHandler} events are serialized to.
- *
+ *
* @return the {@link XmlHandler} or {@code null} if the {@link XMLStreamWriter} is not
- * connected to a {@link XmlHandler} (e.g. because the {@link XMLStreamWriter} is user
- * supplied)
+ * connected to a {@link XmlHandler} (e.g. because the {@link XMLStreamWriter} is user
+ * supplied)
*/
private XmlHandler getHandler() {
XMLStreamWriter xmlWriter = this.xmlWriter;
if (xmlWriter instanceof PushOMDataSourceStreamWriter) {
- xmlWriter = ((PushOMDataSourceStreamWriter)xmlWriter).getParent();
+ xmlWriter = ((PushOMDataSourceStreamWriter) xmlWriter).getParent();
}
if (xmlWriter instanceof XmlHandlerStreamWriter) {
- return ((XmlHandlerStreamWriter)xmlWriter).getHandler();
+ return ((XmlHandlerStreamWriter) xmlWriter).getHandler();
} else {
return null;
}
@@ -123,15 +123,12 @@ final class MTOMXMLStreamWriterImpl extends MTOMXMLStreamWriter {
throw new UnsupportedOperationException();
}
- /**
- * Flush is overridden to trigger the attachment serialization
- */
+ /** Flush is overridden to trigger the attachment serialization */
@Override
public void flush() throws XMLStreamException {
log.debug("Calling MTOMXMLStreamWriter.flush");
xmlWriter.flush();
}
-
@Override
public void writeAttribute(String string, String string1) throws XMLStreamException {
@@ -256,9 +253,9 @@ final class MTOMXMLStreamWriterImpl extends MTOMXMLStreamWriter {
XmlHandler handler = getHandler();
while (handler instanceof XmlHandlerWrapper) {
if (handler instanceof XOPHandler) {
- return ((XOPHandler)handler).prepareDataHandler(dataHandler);
+ return ((XOPHandler) handler).prepareDataHandler(dataHandler);
}
- handler = ((XmlHandlerWrapper)handler).getParent();
+ handler = ((XmlHandlerWrapper) handler).getParent();
}
// TODO: hack for compatibility with Axis2
// If we don't serialize to a MIME package, we should return null here because the
@@ -268,7 +265,7 @@ final class MTOMXMLStreamWriterImpl extends MTOMXMLStreamWriter {
// elements...
return format.getNextContentId();
}
-
+
@Override
public String getCharSetEncoding() {
return format.getCharSetEncoding();
@@ -280,7 +277,7 @@ final class MTOMXMLStreamWriterImpl extends MTOMXMLStreamWriter {
}
@Override
- public OutputStream getOutputStream() throws XMLStreamException {
+ public OutputStream getOutputStream() throws XMLStreamException {
OutputStream outputStream;
XmlHandler handler = getHandler();
// Remove wrappers that can be safely removed
@@ -289,18 +286,18 @@ final class MTOMXMLStreamWriterImpl extends MTOMXMLStreamWriter {
|| handler instanceof XsiTypeFilterHandler
|| handler instanceof XmlDeclarationRewriterHandler
|| handler instanceof XOPEncodingFilterHandler) {
- handler = ((XmlHandlerWrapper)handler).getParent();
+ handler = ((XmlHandlerWrapper) handler).getParent();
}
if (handler instanceof Serializer) {
try {
- outputStream = ((Serializer)handler).getOutputStream();
+ outputStream = ((Serializer) handler).getOutputStream();
} catch (StreamException ex) {
throw new XMLStreamException(ex);
}
} else {
outputStream = null;
}
-
+
if (log.isDebugEnabled()) {
if (outputStream == null) {
log.debug("Direct access to the output stream is not available.");
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceInput.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceInput.java
index 9cd2738..be1fdf4 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceInput.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceInput.java
@@ -37,15 +37,15 @@ public final class PushOMDataSourceInput implements XmlInput {
this.root = root;
this.dataSource = dataSource;
}
-
+
@Override
public XmlReader createReader(XmlHandler handler) {
XmlHandler unwrappedHandler = handler;
while (unwrappedHandler instanceof XmlHandlerWrapper) {
- unwrappedHandler = ((XmlHandlerWrapper)unwrappedHandler).getParent();
+ unwrappedHandler = ((XmlHandlerWrapper) unwrappedHandler).getParent();
}
if (unwrappedHandler instanceof XMLStreamWriterHandler) {
- XMLStreamWriter writer = ((XMLStreamWriterHandler)unwrappedHandler).getWriter();
+ XMLStreamWriter writer = ((XMLStreamWriterHandler) unwrappedHandler).getWriter();
// This condition is to cover the case where the following conditions are met:
// - The OMDataSource uses MTOMXMLStreamWriter to add optimized binary data.
// - The tree is serialized to an XMLStreamWriter that implements the
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceReader.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceReader.java
index 55eaab1..e25b0e0 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceReader.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceReader.java
@@ -47,7 +47,7 @@ final class PushOMDataSourceReader implements XmlReader {
this.root = root;
this.dataSource = dataSource;
}
-
+
@Override
public boolean proceed() throws StreamException {
// TODO: we might want to unwrap the NamespaceRepairingFilter (and some other filters) here
@@ -56,10 +56,10 @@ final class PushOMDataSourceReader implements XmlReader {
XmlHandler current = handler;
while (current instanceof XmlHandlerWrapper) {
if (current instanceof XmlDeclarationRewriterHandler) {
- format = ((XmlDeclarationRewriterHandler)current).getFormat();
+ format = ((XmlDeclarationRewriterHandler) current).getFormat();
break;
}
- current = ((XmlHandlerWrapper)current).getParent();
+ current = ((XmlHandlerWrapper) current).getParent();
}
if (format == null) {
// This is for the OMSourcedElement expansion case
@@ -68,23 +68,26 @@ final class PushOMDataSourceReader implements XmlReader {
handler = new PushOMDataSourceXOPHandler(handler);
}
try {
- XMLStreamWriter writer = new XmlHandlerStreamWriter(handler, null,
- AxiomXMLStreamWriterExtensionFactory.INSTANCE);
+ XMLStreamWriter writer =
+ new XmlHandlerStreamWriter(
+ handler, null, AxiomXMLStreamWriterExtensionFactory.INSTANCE);
// Seed the namespace context with the namespace context from the parent
OMContainer parent = root.getParent();
if (parent instanceof OMElement) {
- for (Iterator<OMNamespace> it = ((OMElement)parent).getNamespacesInScope(); it.hasNext(); ) {
+ for (Iterator<OMNamespace> it = ((OMElement) parent).getNamespacesInScope();
+ it.hasNext(); ) {
OMNamespace ns = it.next();
writer.setPrefix(ns.getPrefix(), ns.getNamespaceURI());
}
}
handler.startFragment();
- dataSource.serialize(new MTOMXMLStreamWriterImpl(new PushOMDataSourceStreamWriter(writer), format));
+ dataSource.serialize(
+ new MTOMXMLStreamWriterImpl(new PushOMDataSourceStreamWriter(writer), format));
handler.completed();
} catch (XMLStreamException ex) {
Throwable cause = ex.getCause();
if (cause instanceof StreamException) {
- throw (StreamException)cause;
+ throw (StreamException) cause;
} else {
throw new StreamException(ex);
}
@@ -93,6 +96,5 @@ final class PushOMDataSourceReader implements XmlReader {
}
@Override
- public void dispose() {
- }
+ public void dispose() {}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceStreamWriter.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceStreamWriter.java
index c401e20..494a305 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceStreamWriter.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceStreamWriter.java
@@ -25,8 +25,8 @@ import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.util.stax.wrapper.XMLStreamWriterWrapper;
/**
- * {@link XMLStreamWriter} wrapper that throws exceptions for invocations of methods that
- * {@link OMDataSource#serialize(XMLStreamWriter)} is not allowed to call.
+ * {@link XMLStreamWriter} wrapper that throws exceptions for invocations of methods that {@link
+ * OMDataSource#serialize(XMLStreamWriter)} is not allowed to call.
*/
public final class PushOMDataSourceStreamWriter extends XMLStreamWriterWrapper {
PushOMDataSourceStreamWriter(XMLStreamWriter parent) {
@@ -40,22 +40,26 @@ public final class PushOMDataSourceStreamWriter extends XMLStreamWriterWrapper {
@Override
public void writeStartDocument() {
- throw new UnsupportedOperationException("OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeStartDocument()");
+ throw new UnsupportedOperationException(
+ "OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeStartDocument()");
}
@Override
public void writeStartDocument(String encoding, String version) {
- throw new UnsupportedOperationException("OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeStartDocument(String, String)");
+ throw new UnsupportedOperationException(
+ "OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeStartDocument(String, String)");
}
@Override
public void writeStartDocument(String version) {
- throw new UnsupportedOperationException("OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeStartDocument(String)");
+ throw new UnsupportedOperationException(
+ "OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeStartDocument(String)");
}
@Override
public void writeEndDocument() {
- throw new UnsupportedOperationException("OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeEndDocument()");
+ throw new UnsupportedOperationException(
+ "OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeEndDocument()");
}
@Override
@@ -65,12 +69,14 @@ public final class PushOMDataSourceStreamWriter extends XMLStreamWriterWrapper {
@Override
public void writeStartElement(String localName) throws XMLStreamException {
- throw new UnsupportedOperationException("OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeStartElement(String)");
+ throw new UnsupportedOperationException(
+ "OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeStartElement(String)");
}
@Override
public void writeEmptyElement(String localName) throws XMLStreamException {
- throw new UnsupportedOperationException("OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeEmptyElement(String)");
+ throw new UnsupportedOperationException(
+ "OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeEmptyElement(String)");
}
@Override
@@ -80,6 +86,7 @@ public final class PushOMDataSourceStreamWriter extends XMLStreamWriterWrapper {
@Override
public void close() throws XMLStreamException {
- throw new UnsupportedOperationException("OMDataSource#serialize(XMLStreamWriter) MUST NOT call XMLStreamWriter#close()");
+ throw new UnsupportedOperationException(
+ "OMDataSource#serialize(XMLStreamWriter) MUST NOT call XMLStreamWriter#close()");
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceXOPHandler.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceXOPHandler.java
index 6a21cc6..8793985 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceXOPHandler.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceXOPHandler.java
@@ -30,8 +30,9 @@ import org.apache.axiom.om.impl.intf.TextContent;
import org.apache.axiom.om.impl.stream.xop.XOPHandler;
import org.apache.axiom.util.UIDGenerator;
-final class PushOMDataSourceXOPHandler extends AbstractXOPDecodingFilterHandler implements XOPHandler {
- private final Map<String,DataHandler> dataHandlers = new HashMap<String,DataHandler>();
+final class PushOMDataSourceXOPHandler extends AbstractXOPDecodingFilterHandler
+ implements XOPHandler {
+ private final Map<String, DataHandler> dataHandlers = new HashMap<String, DataHandler>();
PushOMDataSourceXOPHandler(XmlHandler parent) {
super(parent);
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/sax/XMLReaderImpl.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/sax/XMLReaderImpl.java
index 16b53ac..07f8895 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/sax/XMLReaderImpl.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/sax/XMLReaderImpl.java
@@ -49,7 +49,7 @@ public class XMLReaderImpl extends AbstractXMLReader {
public void parse(String systemId) throws IOException, SAXException {
parse();
}
-
+
private void parse() throws SAXException {
XmlHandler handler = new ContentHandlerXmlHandler(contentHandler, lexicalHandler);
CoreElement contextElement = root.getContextElement();
@@ -63,9 +63,9 @@ public class XMLReaderImpl extends AbstractXMLReader {
} catch (StreamException ex) {
Throwable cause = ex.getCause();
if (cause instanceof SAXException) {
- throw (SAXException)cause;
- } else if (cause instanceof Exception){
- throw new SAXException((Exception)cause);
+ throw (SAXException) cause;
+ } else if (cause instanceof Exception) {
+ throw new SAXException((Exception) cause);
} else {
throw new SAXException(ex);
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/AxiomXMLStreamReaderExtensionFactory.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/AxiomXMLStreamReaderExtensionFactory.java
index de62b93..911a312 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/AxiomXMLStreamReaderExtensionFactory.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/AxiomXMLStreamReaderExtensionFactory.java
@@ -25,10 +25,11 @@ import org.apache.axiom.ext.stax.DTDReader;
import org.apache.axiom.ext.stax.datahandler.DataHandlerReader;
public final class AxiomXMLStreamReaderExtensionFactory implements XMLStreamReaderExtensionFactory {
- public static final AxiomXMLStreamReaderExtensionFactory INSTANCE = new AxiomXMLStreamReaderExtensionFactory();
+ public static final AxiomXMLStreamReaderExtensionFactory INSTANCE =
+ new AxiomXMLStreamReaderExtensionFactory();
private AxiomXMLStreamReaderExtensionFactory() {}
-
+
@Override
public Object createExtension(String propertyName, InternalXMLStreamReader reader) {
if (propertyName.equals(DataHandlerReader.PROPERTY)) {
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/AxiomXMLStreamReaderHelper.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/AxiomXMLStreamReaderHelper.java
index ae46400..8fe733d 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/AxiomXMLStreamReaderHelper.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/AxiomXMLStreamReaderHelper.java
@@ -39,7 +39,6 @@ final class AxiomXMLStreamReaderHelper extends XMLStreamReaderHelper {
*/
private final DataHandlerReader dataHandlerReader;
-
AxiomXMLStreamReaderHelper(XMLStreamReader reader) {
this.reader = reader;
dataHandlerReader = XMLStreamReaderUtils.getDataHandlerReader(reader);
@@ -49,26 +48,30 @@ final class AxiomXMLStreamReaderHelper extends XMLStreamReaderHelper {
public DTDInfo getDTDInfo() throws StreamException {
DTDReader dtdReader;
try {
- dtdReader = (DTDReader)reader.getProperty(DTDReader.PROPERTY);
+ dtdReader = (DTDReader) reader.getProperty(DTDReader.PROPERTY);
} catch (IllegalArgumentException ex) {
dtdReader = null;
}
if (dtdReader == null) {
- throw new StreamException("Cannot process DTD events because the XMLStreamReader doesn't support the DTDReader extension");
+ throw new StreamException(
+ "Cannot process DTD events because the XMLStreamReader doesn't support the DTDReader extension");
}
- return new DTDInfo(dtdReader.getRootName(), dtdReader.getPublicId(), dtdReader.getSystemId());
+ return new DTDInfo(
+ dtdReader.getRootName(), dtdReader.getPublicId(), dtdReader.getSystemId());
}
@Override
public CharacterData getCharacterData() throws StreamException {
if (dataHandlerReader != null && dataHandlerReader.isBinary()) {
if (dataHandlerReader.isDeferred()) {
- return new TextContent(dataHandlerReader.getContentID(),
+ return new TextContent(
+ dataHandlerReader.getContentID(),
dataHandlerReader.getDataHandlerProvider(),
dataHandlerReader.isOptimized());
} else {
try {
- return new TextContent(dataHandlerReader.getContentID(),
+ return new TextContent(
+ dataHandlerReader.getContentID(),
dataHandlerReader.getDataHandler(),
dataHandlerReader.isOptimized());
} catch (XMLStreamException ex) {
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/AxiomXMLStreamReaderHelperFactory.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/AxiomXMLStreamReaderHelperFactory.java
index 8925640..0f97c90 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/AxiomXMLStreamReaderHelperFactory.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/AxiomXMLStreamReaderHelperFactory.java
@@ -24,10 +24,11 @@ import org.apache.axiom.core.stream.stax.pull.input.XMLStreamReaderHelper;
import org.apache.axiom.core.stream.stax.pull.input.XMLStreamReaderHelperFactory;
public final class AxiomXMLStreamReaderHelperFactory implements XMLStreamReaderHelperFactory {
- public static final AxiomXMLStreamReaderHelperFactory INSTANCE = new AxiomXMLStreamReaderHelperFactory();
+ public static final AxiomXMLStreamReaderHelperFactory INSTANCE =
+ new AxiomXMLStreamReaderHelperFactory();
private AxiomXMLStreamReaderHelperFactory() {}
-
+
@Override
public XMLStreamReaderHelper createHelper(XMLStreamReader reader) {
return new AxiomXMLStreamReaderHelper(reader);
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/CharacterDataReaderImpl.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/CharacterDataReaderImpl.java
index fa17893..d568794 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/CharacterDataReaderImpl.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/CharacterDataReaderImpl.java
@@ -44,17 +44,20 @@ final class CharacterDataReaderImpl implements CharacterDataReader {
case XMLStreamReader.CHARACTERS:
Object data = reader.getCharacterData();
if (data instanceof CharacterData) {
- ((CharacterData)data).writeTo(new CharacterDataSink() {
- @Override
- public Writer getWriter() {
- return writer;
- }
+ ((CharacterData) data)
+ .writeTo(
+ new CharacterDataSink() {
+ @Override
+ public Writer getWriter() {
+ return writer;
+ }
- @Override
- public AbstractBase64EncodingOutputStream getBase64EncodingOutputStream() {
- return new Base64EncodingWriterOutputStream(writer);
- }
- });
+ @Override
+ public AbstractBase64EncodingOutputStream
+ getBase64EncodingOutputStream() {
+ return new Base64EncodingWriterOutputStream(writer);
+ }
+ });
} else {
writer.write(data.toString());
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/DataHandlerReaderImpl.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/DataHandlerReaderImpl.java
index f820666..8a4a0e2 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/DataHandlerReaderImpl.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/pull/DataHandlerReaderImpl.java
@@ -38,7 +38,7 @@ final class DataHandlerReaderImpl implements DataHandlerReader {
public boolean isBinary() {
if (reader.getEventType() == XMLStreamReader.CHARACTERS) {
Object data = reader.getCharacterData();
- return data instanceof TextContent && ((TextContent)data).isBinary();
+ return data instanceof TextContent && ((TextContent) data).isBinary();
} else {
return false;
}
@@ -46,26 +46,28 @@ final class DataHandlerReaderImpl implements DataHandlerReader {
@Override
public boolean isOptimized() {
- return ((TextContent)reader.getCharacterData()).isOptimize();
+ return ((TextContent) reader.getCharacterData()).isOptimize();
}
@Override
public boolean isDeferred() {
- return ((TextContent)reader.getCharacterData()).getDataHandlerObject() instanceof DataHandlerProvider;
+ return ((TextContent) reader.getCharacterData()).getDataHandlerObject()
+ instanceof DataHandlerProvider;
}
@Override
public String getContentID() {
- return ((TextContent)reader.getCharacterData()).getContentID();
+ return ((TextContent) reader.getCharacterData()).getContentID();
}
@Override
public DataHandler getDataHandler() throws XMLStreamException {
- return ((TextContent)reader.getCharacterData()).getDataHandler();
+ return ((TextContent) reader.getCharacterData()).getDataHandler();
}
@Override
public DataHandlerProvider getDataHandlerProvider() {
- return (DataHandlerProvider)((TextContent)reader.getCharacterData()).getDataHandlerObject();
+ return (DataHandlerProvider)
+ ((TextContent) reader.getCharacterData()).getDataHandlerObject();
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/push/AxiomXMLStreamWriterExtensionFactory.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/push/AxiomXMLStreamWriterExtensionFactory.java
index bca8152..1844504 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/push/AxiomXMLStreamWriterExtensionFactory.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/push/AxiomXMLStreamWriterExtensionFactory.java
@@ -23,8 +23,9 @@ import org.apache.axiom.core.stream.stax.push.input.XMLStreamWriterExtensionFact
import org.apache.axiom.ext.stax.datahandler.DataHandlerWriter;
public final class AxiomXMLStreamWriterExtensionFactory implements XMLStreamWriterExtensionFactory {
- public static final AxiomXMLStreamWriterExtensionFactory INSTANCE = new AxiomXMLStreamWriterExtensionFactory();
-
+ public static final AxiomXMLStreamWriterExtensionFactory INSTANCE =
+ new AxiomXMLStreamWriterExtensionFactory();
+
private AxiomXMLStreamWriterExtensionFactory() {}
@Override
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/push/DataHandlerWriterImpl.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/push/DataHandlerWriterImpl.java
index ab6ebb3..de13cf8 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/push/DataHandlerWriterImpl.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/push/DataHandlerWriterImpl.java
@@ -42,8 +42,9 @@ public final class DataHandlerWriterImpl implements DataHandlerWriter {
}
@Override
- public void writeDataHandler(DataHandlerProvider dataHandlerProvider, String contentID,
- boolean optimize) throws IOException, XMLStreamException {
+ public void writeDataHandler(
+ DataHandlerProvider dataHandlerProvider, String contentID, boolean optimize)
+ throws IOException, XMLStreamException {
writer.writeCharacterData(new TextContent(contentID, dataHandlerProvider, optimize));
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/push/XMLStreamWriterHandler.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/push/XMLStreamWriterHandler.java
index 54e43b0..16a21d6 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/push/XMLStreamWriterHandler.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/stax/push/XMLStreamWriterHandler.java
@@ -39,7 +39,7 @@ public class XMLStreamWriterHandler implements XmlHandler {
private final CharacterDataAccumulator buffer = new CharacterDataAccumulator();
private boolean buffering;
private String piTarget;
-
+
public XMLStreamWriterHandler(XMLStreamWriter writer) {
this.writer = writer;
}
@@ -56,8 +56,9 @@ public class XMLStreamWriterHandler implements XmlHandler {
}
@Override
- public void startDocument(String inputEncoding, String xmlVersion, String xmlEncoding,
- Boolean standalone) throws StreamException {
+ public void startDocument(
+ String inputEncoding, String xmlVersion, String xmlEncoding, Boolean standalone)
+ throws StreamException {
try {
if (xmlEncoding == null) {
writer.writeStartDocument(xmlVersion);
@@ -68,13 +69,14 @@ public class XMLStreamWriterHandler implements XmlHandler {
throw new StreamException(ex);
}
}
-
+
@Override
- public void startFragment() throws StreamException {
- }
+ public void startFragment() throws StreamException {}
@Override
- public void processDocumentTypeDeclaration(String rootName, String publicId, String systemId, String internalSubset) throws StreamException {
+ public void processDocumentTypeDeclaration(
+ String rootName, String publicId, String systemId, String internalSubset)
+ throws StreamException {
StringWriter sw = new StringWriter();
Serializer serializer = new Serializer(sw);
serializer.startFragment();
@@ -88,7 +90,8 @@ public class XMLStreamWriterHandler implements XmlHandler {
}
@Override
- public void startElement(String namespaceURI, String localName, String prefix) throws StreamException {
+ public void startElement(String namespaceURI, String localName, String prefix)
+ throws StreamException {
try {
writer.writeStartElement(prefix, localName, namespaceURI);
} catch (XMLStreamException ex) {
@@ -97,7 +100,8 @@ public class XMLStreamWriterHandler implements XmlHandler {
}
@Override
- public void processNamespaceDeclaration(String prefix, String namespaceURI) throws StreamException {
+ public void processNamespaceDeclaration(String prefix, String namespaceURI)
+ throws StreamException {
try {
if (prefix.length() != 0) {
writer.writeNamespace(prefix, namespaceURI);
@@ -110,7 +114,14 @@ public class XMLStreamWriterHandler implements XmlHandler {
}
@Override
- public void processAttribute(String namespaceURI, String localName, String prefix, String value, String type, boolean specified) throws StreamException {
+ public void processAttribute(
+ String namespaceURI,
+ String localName,
+ String prefix,
+ String value,
+ String type,
+ boolean specified)
+ throws StreamException {
try {
writer.writeAttribute(prefix, namespaceURI, localName, value);
} catch (XMLStreamException ex) {
@@ -119,7 +130,8 @@ public class XMLStreamWriterHandler implements XmlHandler {
}
@Override
- public void processAttribute(String name, String value, String type, boolean specified) throws StreamException {
+ public void processAttribute(String name, String value, String type, boolean specified)
+ throws StreamException {
try {
writer.writeAttribute(name, value);
} catch (XMLStreamException ex) {
@@ -149,13 +161,21 @@ public class XMLStreamWriterHandler implements XmlHandler {
}
try {
if (data instanceof TextContent) {
- TextContent textContent = (TextContent)data;
+ TextContent textContent = (TextContent) data;
if (textContent.isBinary()) {
Object dataHandlerObject = textContent.getDataHandlerObject();
if (dataHandlerObject instanceof DataHandlerProvider) {
- getDataHandlerWriter().writeDataHandler((DataHandlerProvider)dataHandlerObject, textContent.getContentID(), textContent.isOptimize());
+ getDataHandlerWriter()
+ .writeDataHandler(
+ (DataHandlerProvider) dataHandlerObject,
+ textContent.getContentID(),
+ textContent.isOptimize());
} else {
- getDataHandlerWriter().writeDataHandler(textContent.getDataHandler(), textContent.getContentID(), textContent.isOptimize());
+ getDataHandlerWriter()
+ .writeDataHandler(
+ textContent.getDataHandler(),
+ textContent.getContentID(),
+ textContent.isOptimize());
}
return;
}
@@ -167,7 +187,7 @@ public class XMLStreamWriterHandler implements XmlHandler {
throw new StreamException(ex);
}
}
-
+
@Override
public void startCDATASection() throws StreamException {
buffering = true;
@@ -231,7 +251,8 @@ public class XMLStreamWriterHandler implements XmlHandler {
@Override
public void completed() throws StreamException {
- // TODO: the original StAX serialization code newer called writeEndDocument; this is probably a mistake
+ // TODO: the original StAX serialization code newer called writeEndDocument; this is
+ // probably a mistake
}
@Override
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGenerator.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGenerator.java
index 4971c12..e97c0ca 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGenerator.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGenerator.java
@@ -22,34 +22,31 @@ package org.apache.axiom.om.impl.stream.xop;
import org.apache.axiom.util.UIDGenerator;
/**
- * Content ID generator interface. Implementations of this interface are used by
- * {@link XOPEncodingFilterHandler} to generate content IDs for use in {@code xop:Include}
- * elements.
+ * Content ID generator interface. Implementations of this interface are used by {@link
+ * XOPEncodingFilterHandler} to generate content IDs for use in {@code xop:Include} elements.
*/
public interface ContentIDGenerator {
- /**
- * Default content ID generator that preserves any existing content ID.
- */
- ContentIDGenerator DEFAULT = new ContentIDGenerator() {
- @Override
- public String generateContentID(String existingContentID) {
- if (existingContentID == null) {
- return UIDGenerator.generateContentId();
- } else {
- return existingContentID;
- }
- }
- };
-
+ /** Default content ID generator that preserves any existing content ID. */
+ ContentIDGenerator DEFAULT =
+ new ContentIDGenerator() {
+ @Override
+ public String generateContentID(String existingContentID) {
+ if (existingContentID == null) {
+ return UIDGenerator.generateContentId();
+ } else {
+ return existingContentID;
+ }
+ }
+ };
+
/**
* Generate a content ID.
- *
- * @param existingContentID
- * An existing content ID for the {@link javax.activation.DataHandler} being
- * processed, as returned by
- * {@link org.apache.axiom.ext.stax.datahandler.DataHandlerReader#getContentID()},
- * or <code>null</code> if no existing content ID is known. The implementation is
- * free to use this information or not.
+ *
+ * @param existingContentID An existing content ID for the {@link javax.activation.DataHandler}
+ * being processed, as returned by {@link
+ * org.apache.axiom.ext.stax.datahandler.DataHandlerReader#getContentID()}, or <code>null
+ * </code> if no existing content ID is known. The implementation is free to use this
+ * information or not.
* @return the content ID; may not be <code>null</code>
*/
String generateContentID(String existingContentID);
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGeneratorImpl.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGeneratorImpl.java
index 570dd02..e0f6af9 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGeneratorImpl.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGeneratorImpl.java
@@ -26,7 +26,7 @@ public final class ContentIDGeneratorImpl implements ContentIDGenerator {
public ContentIDGeneratorImpl(OMOutputFormat format) {
this.format = format;
}
-
+
@Override
public String generateContentID(String existingContentID) {
return existingContentID != null ? existingContentID : format.getNextContentId();
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicy.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicy.java
index a71010e..9172c96 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicy.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicy.java
@@ -30,72 +30,72 @@ import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
* using XOP. The implementation takes the decision based on the submitted binary content and the
* "eligible for optimization" flag. Depending on the context of use, this flag is provided by the
* return value of {@link org.apache.axiom.ext.stax.datahandler.DataHandlerReader#isOptimized()} or
- * the <code>optimize</code> argument of
- * {@link org.apache.axiom.ext.stax.datahandler.DataHandlerWriter#writeDataHandler(DataHandler, String, boolean)}
- * or
- * {@link org.apache.axiom.ext.stax.datahandler.DataHandlerWriter#writeDataHandler(DataHandlerProvider, String, boolean)}.
+ * the <code>optimize</code> argument of {@link
+ * org.apache.axiom.ext.stax.datahandler.DataHandlerWriter#writeDataHandler(DataHandler, String,
+ * boolean)} or {@link
+ * org.apache.axiom.ext.stax.datahandler.DataHandlerWriter#writeDataHandler(DataHandlerProvider,
+ * String, boolean)}.
*/
public interface OptimizationPolicy {
/**
* Policy implementation that optimizes all binary content marked as eligible for optimization.
*/
- OptimizationPolicy DEFAULT = new OptimizationPolicy() {
- @Override
- public boolean isOptimized(DataHandler dataHandler, boolean optimize) {
- return optimize;
- }
+ OptimizationPolicy DEFAULT =
+ new OptimizationPolicy() {
+ @Override
+ public boolean isOptimized(DataHandler dataHandler, boolean optimize) {
+ return optimize;
+ }
+
+ @Override
+ public boolean isOptimized(
+ DataHandlerProvider dataHandlerProvider, boolean optimize) {
+ return optimize;
+ }
+ };
- @Override
- public boolean isOptimized(DataHandlerProvider dataHandlerProvider, boolean optimize) {
- return optimize;
- }
- };
-
/**
* Policy implementation that optimizes all binary content, regardless of whether is has been
* marked as eligible for optimization.
*/
- OptimizationPolicy ALL = new OptimizationPolicy() {
- @Override
- public boolean isOptimized(DataHandler dataHandler, boolean optimize) {
- return true;
- }
+ OptimizationPolicy ALL =
+ new OptimizationPolicy() {
+ @Override
+ public boolean isOptimized(DataHandler dataHandler, boolean optimize) {
+ return true;
+ }
+
+ @Override
+ public boolean isOptimized(
+ DataHandlerProvider dataHandlerProvider, boolean optimize) {
+ return true;
+ }
+ };
- @Override
- public boolean isOptimized(DataHandlerProvider dataHandlerProvider, boolean optimize) {
- return true;
- }
- };
-
/**
* Determine whether the binary content supplied by a given {@link DataHandler} should be
* optimized.
- *
- * @param dataHandler
- * the binary content
- * @param optimize
- * indicates whether the binary content was initially marked as eligible for
- * optimization (see above)
+ *
+ * @param dataHandler the binary content
+ * @param optimize indicates whether the binary content was initially marked as eligible for
+ * optimization (see above)
* @return <code>true</code> if the binary content should be optimized using XOP, i.e. encoded
- * using {@code xop:Include}
- * @throws IOException
- * if an error occurs while reading the data handler
+ * using {@code xop:Include}
+ * @throws IOException if an error occurs while reading the data handler
*/
boolean isOptimized(DataHandler dataHandler, boolean optimize) throws IOException;
-
+
/**
* Determine whether the binary content supplied by a given {@link DataHandlerProvider} should
* be optimized.
- *
- * @param dataHandlerProvider
- * the binary content
- * @param optimize
- * indicates whether the binary content was initially marked as eligible for
- * optimization (see above)
+ *
+ * @param dataHandlerProvider the binary content
+ * @param optimize indicates whether the binary content was initially marked as eligible for
+ * optimization (see above)
* @return <code>true</code> if the binary content should be optimized using XOP, i.e. encoded
- * using {@code xop:Include}
- * @throws IOException
- * if an error occurs while reading the data handler
+ * using {@code xop:Include}
+ * @throws IOException if an error occurs while reading the data handler
*/
- boolean isOptimized(DataHandlerProvider dataHandlerProvider, boolean optimize) throws IOException;
+ boolean isOptimized(DataHandlerProvider dataHandlerProvider, boolean optimize)
+ throws IOException;
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicyImpl.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicyImpl.java
index 1d83658..d709c7b 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicyImpl.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicyImpl.java
@@ -30,14 +30,14 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
- * {@link OptimizationPolicy} implementation that takes a decision based on the
- * settings in {@link OMOutputFormat}.
- * <p>
- * For internal use only.
+ * {@link OptimizationPolicy} implementation that takes a decision based on the settings in {@link
+ * OMOutputFormat}.
+ *
+ * <p>For internal use only.
*/
public final class OptimizationPolicyImpl implements OptimizationPolicy {
private static final Log log = LogFactory.getLog(OptimizationPolicyImpl.class);
-
+
private final OMOutputFormat format;
public OptimizationPolicyImpl(OMOutputFormat format) {
@@ -64,7 +64,7 @@ public final class OptimizationPolicyImpl implements OptimizationPolicy {
@Override
public boolean isOptimized(DataHandlerProvider dataHandlerProvider, boolean optimize)
throws IOException {
-
+
if (!optimize) {
return false;
} else if (format.getOptimizedThreshold() == 0) {
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java
index 1efd46b..5382260 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java
@@ -33,7 +33,7 @@ final class XOPDecodingFilterHandler extends AbstractXOPDecodingFilterHandler {
private static class DataHandlerProviderImpl implements DataHandlerProvider {
private final OMAttachmentAccessor attachmentAccessor;
private final String contentID;
-
+
public DataHandlerProviderImpl(OMAttachmentAccessor attachmentAccessor, String contentID) {
this.attachmentAccessor = attachmentAccessor;
this.contentID = contentID;
@@ -51,7 +51,10 @@ final class XOPDecodingFilterHandler extends AbstractXOPDecodingFilterHandler {
}
private enum State {
- AFTER_START_ELEMENT, CONTENT_SEEN, IN_XOP_INCLUDE, AFTER_XOP_INCLUDE
+ AFTER_START_ELEMENT,
+ CONTENT_SEEN,
+ IN_XOP_INCLUDE,
+ AFTER_XOP_INCLUDE
}
private final OMAttachmentAccessor attachmentAccessor;
@@ -63,6 +66,7 @@ final class XOPDecodingFilterHandler extends AbstractXOPDecodingFilterHandler {
@Override
protected Object buildCharacterData(String contentID) {
- return new TextContent(contentID, new DataHandlerProviderImpl(attachmentAccessor, contentID), true);
+ return new TextContent(
+ contentID, new DataHandlerProviderImpl(attachmentAccessor, contentID), true);
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPEncodingFilterHandler.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPEncodingFilterHandler.java
index 6e81048..742ee43 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPEncodingFilterHandler.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPEncodingFilterHandler.java
@@ -34,12 +34,15 @@ import org.apache.axiom.om.OMAttachmentAccessor;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.impl.intf.TextContent;
-public final class XOPEncodingFilterHandler extends AbstractXOPEncodingFilterHandler implements XOPHandler, OMAttachmentAccessor {
- private final Map<String,Object> dataHandlerObjects = new LinkedHashMap<String,Object>();
+public final class XOPEncodingFilterHandler extends AbstractXOPEncodingFilterHandler
+ implements XOPHandler, OMAttachmentAccessor {
+ private final Map<String, Object> dataHandlerObjects = new LinkedHashMap<String, Object>();
private final ContentIDGenerator contentIDGenerator;
private final OptimizationPolicy optimizationPolicy;
- public XOPEncodingFilterHandler(XmlHandler parent, ContentIDGenerator contentIDGenerator,
+ public XOPEncodingFilterHandler(
+ XmlHandler parent,
+ ContentIDGenerator contentIDGenerator,
OptimizationPolicy optimizationPolicy) {
super(parent);
this.contentIDGenerator = contentIDGenerator;
@@ -66,10 +69,10 @@ public final class XOPEncodingFilterHandler extends AbstractXOPEncodingFilterHan
/**
* Get the set of content IDs referenced in {@code xop:Include} element information items
* produced by this wrapper.
- *
- * @return The set of content IDs in their order of appearance in the infoset. If no
- * {@code xop:Include} element information items have been produced yet, an empty
- * set will be returned.
+ *
+ * @return The set of content IDs in their order of appearance in the infoset. If no {@code
+ * xop:Include} element information items have been produced yet, an empty set will be
+ * returned.
*/
public Set<String> getContentIDs() {
return Collections.unmodifiableSet(dataHandlerObjects.keySet());
@@ -81,10 +84,10 @@ public final class XOPEncodingFilterHandler extends AbstractXOPEncodingFilterHan
if (dataHandlerObject == null) {
return null;
} else if (dataHandlerObject instanceof DataHandler) {
- return (DataHandler)dataHandlerObject;
+ return (DataHandler) dataHandlerObject;
} else {
try {
- return ((DataHandlerProvider)dataHandlerObject).getDataHandler();
+ return ((DataHandlerProvider) dataHandlerObject).getDataHandler();
} catch (IOException ex) {
throw new OMException(ex);
}
@@ -94,21 +97,27 @@ public final class XOPEncodingFilterHandler extends AbstractXOPEncodingFilterHan
@Override
protected String processCharacterData(Object data) throws StreamException {
if (data instanceof TextContent) {
- TextContent textContent = (TextContent)data;
+ TextContent textContent = (TextContent) data;
if (textContent.isBinary()) {
Object dataHandlerObject = textContent.getDataHandlerObject();
boolean optimize;
try {
if (dataHandlerObject instanceof DataHandlerProvider) {
- optimize = optimizationPolicy.isOptimized((DataHandlerProvider)dataHandlerObject, textContent.isOptimize());
+ optimize =
+ optimizationPolicy.isOptimized(
+ (DataHandlerProvider) dataHandlerObject,
+ textContent.isOptimize());
} else {
- optimize = optimizationPolicy.isOptimized((DataHandler)dataHandlerObject, textContent.isOptimize());
+ optimize =
+ optimizationPolicy.isOptimized(
+ (DataHandler) dataHandlerObject, textContent.isOptimize());
}
} catch (IOException ex) {
throw new StreamException(ex);
}
if (optimize) {
- String contentID = contentIDGenerator.generateContentID(textContent.getContentID());
+ String contentID =
+ contentIDGenerator.generateContentID(textContent.getContentID());
dataHandlerObjects.put(contentID, dataHandlerObject);
return contentID;
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/MURoleChecker.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/MURoleChecker.java
index 10dfadf..ca25f08 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/MURoleChecker.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/MURoleChecker.java
@@ -35,6 +35,7 @@ public class MURoleChecker implements ElementMatcher<AxiomElement> {
@Override
public boolean matches(AxiomElement element, String namespaceURI, String name) {
return SOAPHeaderBlockHelper.getMustUnderstand(element, soapHelper)
- && (role == null || role.equals(SOAPHeaderBlockHelper.getRole(element, soapHelper)));
+ && (role == null
+ || role.equals(SOAPHeaderBlockHelper.getRole(element, soapHelper)));
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/RoleChecker.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/RoleChecker.java
index d4b923d..62d98da 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/RoleChecker.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/RoleChecker.java
@@ -23,7 +23,7 @@ import org.apache.axiom.om.impl.intf.AxiomElement;
import org.apache.axiom.soap.impl.intf.SOAPHelper;
/**
- * A Checker to make sure headers match a given role. If the role we're looking for is null, then
+ * A Checker to make sure headers match a given role. If the role we're looking for is null, then
* everything matches.
*/
public class RoleChecker implements ElementMatcher<AxiomElement> {
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/RolePlayerChecker.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/RolePlayerChecker.java
index 3e6f13c..6c673ef 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/RolePlayerChecker.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/RolePlayerChecker.java
@@ -41,13 +41,10 @@ public class RolePlayerChecker implements ElementMatcher<AxiomElement> {
/**
* Constructor.
*
- * @param soapHelper
- * the helper corresponding to the SOAP version
- * @param rolePlayer
- * the RolePlayer to check against, or {@code null} to match only header blocks for
- * the ultimate destination.
- * @param namespace
- * the namespace URI to check for, or {@code null} to match any header block
+ * @param soapHelper the helper corresponding to the SOAP version
+ * @param rolePlayer the RolePlayer to check against, or {@code null} to match only header
+ * blocks for the ultimate destination.
+ * @param namespace the namespace URI to check for, or {@code null} to match any header block
*/
public RolePlayerChecker(SOAPHelper soapHelper, RolePlayer rolePlayer, String namespace) {
this.soapHelper = soapHelper;
@@ -69,9 +66,10 @@ public class RolePlayerChecker implements ElementMatcher<AxiomElement> {
SOAPVersion version = soapHelper.getVersion();
// 1. If role is ultimatedest, go by what the rolePlayer says
- if (role == null || role.equals("") ||
- (version instanceof SOAP12Version &&
- role.equals(SOAP12Constants.SOAP_ROLE_ULTIMATE_RECEIVER))) {
+ if (role == null
+ || role.equals("")
+ || (version instanceof SOAP12Version
+ && role.equals(SOAP12Constants.SOAP_ROLE_ULTIMATE_RECEIVER))) {
return (rolePlayer == null || rolePlayer.isUltimateDestination());
}
@@ -79,8 +77,7 @@ public class RolePlayerChecker implements ElementMatcher<AxiomElement> {
if (role.equals(version.getNextRoleURI())) return true;
// 3. If role is none, always return false
- if (version instanceof SOAP12Version &&
- role.equals(SOAP12Constants.SOAP_ROLE_NONE)) {
+ if (version instanceof SOAP12Version && role.equals(SOAP12Constants.SOAP_ROLE_NONE)) {
return false;
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/SOAPHeaderBlockHelper.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/SOAPHeaderBlockHelper.java
index 0eb9044..7e614ba 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/SOAPHeaderBlockHelper.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/SOAPHeaderBlockHelper.java
@@ -35,18 +35,19 @@ public final class SOAPHeaderBlockHelper {
// First, try getting the information from the property.
// Fallback to getting the information from the attribute.
if (block instanceof OMSourcedElement && !block.isExpanded()) {
- OMDataSource ds = ((OMSourcedElement)block).getDataSource();
+ OMDataSource ds = ((OMSourcedElement) block).getDataSource();
if (ds instanceof OMDataSourceExt) {
- OMDataSourceExt dsExt = (OMDataSourceExt)ds;
+ OMDataSourceExt dsExt = (OMDataSourceExt) ds;
if (dsExt.hasProperty(key)) {
- return (String)dsExt.getProperty(key);
+ return (String) dsExt.getProperty(key);
}
}
}
return block.getAttributeValue(qname);
}
-
- public static boolean getBooleanAttributeValue(AxiomElement block, SOAPHelper soapHelper, String key, QName qname) {
+
+ public static boolean getBooleanAttributeValue(
+ AxiomElement block, SOAPHelper soapHelper, String key, QName qname) {
String literal = getAttributeValue(block, key, qname);
if (literal != null) {
Boolean value = soapHelper.parseBoolean(literal);
@@ -54,18 +55,26 @@ public final class SOAPHeaderBlockHelper {
return value.booleanValue();
} else {
throw new SOAPProcessingException(
- "Invalid value for attribute " + qname.getLocalPart() + " in header block " + block.getQName());
+ "Invalid value for attribute "
+ + qname.getLocalPart()
+ + " in header block "
+ + block.getQName());
}
} else {
return false;
}
}
-
+
public static String getRole(AxiomElement block, SOAPHelper soapHelper) {
- return getAttributeValue(block, SOAPHeaderBlock.ROLE_PROPERTY, soapHelper.getRoleAttributeQName());
+ return getAttributeValue(
+ block, SOAPHeaderBlock.ROLE_PROPERTY, soapHelper.getRoleAttributeQName());
}
public static boolean getMustUnderstand(AxiomElement block, SOAPHelper soapHelper) {
- return getBooleanAttributeValue(block, soapHelper, SOAPHeaderBlock.MUST_UNDERSTAND_PROPERTY, soapHelper.getMustUnderstandAttributeQName());
+ return getBooleanAttributeValue(
+ block,
+ soapHelper,
+ SOAPHeaderBlock.MUST_UNDERSTAND_PROPERTY,
+ soapHelper.getMustUnderstandAttributeQName());
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/SOAPHeaderBlockMapper.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/SOAPHeaderBlockMapper.java
index 9ec7251..abab9fa 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/SOAPHeaderBlockMapper.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/SOAPHeaderBlockMapper.java
@@ -26,18 +26,22 @@ import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.soap.impl.intf.AxiomSOAPHeader;
import org.apache.axiom.soap.impl.intf.AxiomSOAPHeaderBlock;
-public final class SOAPHeaderBlockMapper implements Mapper<SOAPHeaderBlock,AxiomElement> {
+public final class SOAPHeaderBlockMapper implements Mapper<SOAPHeaderBlock, AxiomElement> {
public static final SOAPHeaderBlockMapper INSTANCE = new SOAPHeaderBlockMapper();
-
+
private SOAPHeaderBlockMapper() {}
-
+
@Override
public SOAPHeaderBlock map(AxiomElement element) {
if (element instanceof SOAPHeaderBlock) {
- return (SOAPHeaderBlock)element;
+ return (SOAPHeaderBlock) element;
} else {
try {
- AxiomSOAPHeaderBlock newElement = ((AxiomSOAPHeader)element.coreGetParent()).getSOAPHelper().getHeaderBlockType().create(element.getNodeFactory());
+ AxiomSOAPHeaderBlock newElement =
+ ((AxiomSOAPHeader) element.coreGetParent())
+ .getSOAPHelper()
+ .getHeaderBlockType()
+ .create(element.getNodeFactory());
element.corePromote(newElement, AxiomSemantics.INSTANCE);
return newElement;
} catch (CoreModelException ex) {
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 3edda04..b344be9 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
@@ -32,8 +32,9 @@ public class SOAP11BuilderHelper extends SOAPBuilderHelper implements SOAP11Cons
private boolean faultstringPresent = false;
@Override
- public AxiomElementType<? extends AxiomElement> handleEvent(OMElement parent, int elementLevel,
- String namespaceURI, String localName) throws SOAPProcessingException {
+ public AxiomElementType<? extends AxiomElement> handleEvent(
+ OMElement parent, int elementLevel, String namespaceURI, String localName)
+ throws SOAPProcessingException {
AxiomElementType<? extends AxiomElement> elementType = null;
if (elementLevel == 4) {
@@ -64,16 +65,11 @@ public class SOAP11BuilderHelper extends SOAPBuilderHelper implements SOAP11Cons
}
if (parentTagName.equals(SOAP_FAULT_CODE_LOCAL_NAME)) {
- throw new SOAPProcessingException(
- "faultcode element should not have children");
- } else if (parentTagName.equals(
- SOAP_FAULT_STRING_LOCAL_NAME)) {
- throw new SOAPProcessingException(
- "faultstring element should not have children");
- } else if (parentTagName.equals(
- SOAP_FAULT_ACTOR_LOCAL_NAME)) {
- throw new SOAPProcessingException(
- "faultactor element should not have children");
+ throw new SOAPProcessingException("faultcode element should not have children");
+ } else if (parentTagName.equals(SOAP_FAULT_STRING_LOCAL_NAME)) {
+ throw new SOAPProcessingException("faultstring element should not have children");
+ } else if (parentTagName.equals(SOAP_FAULT_ACTOR_LOCAL_NAME)) {
+ throw new SOAPProcessingException("faultactor element should not have children");
} else {
elementType = AxiomNodeFactory::createNSAwareElement;
}
@@ -84,4 +80,4 @@ public class SOAP11BuilderHelper extends SOAPBuilderHelper implements SOAP11Cons
return elementType;
}
-}
\ No newline at end of file
+}
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 197159f..b512a26 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
@@ -45,15 +45,15 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
private Vector<String> detailElementNames;
@Override
- public AxiomElementType<? extends AxiomElement> handleEvent(OMElement parent, int elementLevel,
- String namespaceURI, String localName) throws SOAPProcessingException {
+ public AxiomElementType<? extends AxiomElement> handleEvent(
+ OMElement parent, int elementLevel, String namespaceURI, String localName)
+ throws SOAPProcessingException {
AxiomElementType<? extends AxiomElement> elementType = null;
if (elementLevel == 4) {
if (localName.equals(SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME)) {
if (codePresent) {
- throw new SOAPProcessingException(
- "Multiple Code element encountered");
+ throw new SOAPProcessingException("Multiple Code element encountered");
} else {
elementType = AxiomNodeFactory::createSOAP12FaultCode;
codePresent = true;
@@ -76,11 +76,9 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
}
} else {
if (codeprocessing) {
- throw new SOAPProcessingException(
- "Code doesn't have a value");
+ throw new SOAPProcessingException("Code doesn't have a value");
} else {
- throw new SOAPProcessingException(
- "A subcode doesn't have a Value");
+ throw new SOAPProcessingException("A subcode doesn't have a Value");
}
}
@@ -88,8 +86,7 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
if (!reasonProcessing) {
if (reasonPresent && !rolePresent && !detailPresent) {
if (nodePresent) {
- throw new SOAPProcessingException(
- "Multiple Node element encountered");
+ throw new SOAPProcessingException("Multiple Node element encountered");
} else {
elementType = AxiomNodeFactory::createSOAP12FaultNode;
nodePresent = true;
@@ -99,15 +96,13 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
"wrong element order encountered at " + localName);
}
} else {
- throw new SOAPProcessingException(
- "Reason element Should have a text");
+ throw new SOAPProcessingException("Reason element Should have a text");
}
} else if (localName.equals(SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME)) {
if (!reasonProcessing) {
if (reasonPresent && !detailPresent) {
if (rolePresent) {
- throw new SOAPProcessingException(
- "Multiple Role element encountered");
+ throw new SOAPProcessingException("Multiple Role element encountered");
} else {
elementType = AxiomNodeFactory::createSOAP12FaultRole;
rolePresent = true;
@@ -117,8 +112,7 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
"Wrong element order encountered at " + localName);
}
} else {
- throw new SOAPProcessingException(
- "Reason element should have a text");
+ throw new SOAPProcessingException("Reason element should have a text");
}
} else if (localName.equals(SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME)) {
if (!reasonProcessing) {
@@ -135,8 +129,7 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
"wrong element order encountered at " + localName);
}
} else {
- throw new SOAPProcessingException(
- "Reason element should have a text");
+ throw new SOAPProcessingException("Reason element should have a text");
}
} else {
throw new SOAPProcessingException(
@@ -144,8 +137,7 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
}
} else if (elementLevel == 5) {
- if (parent.getLocalName().equals(
- SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME)) {
+ if (parent.getLocalName().equals(SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME)) {
if (localName.equals(SOAP12Constants.SOAP_FAULT_VALUE_LOCAL_NAME)) {
if (!valuePresent) {
elementType = AxiomNodeFactory::createSOAP12FaultValue;
@@ -176,8 +168,7 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
localName + " is not supported inside the code element");
}
- } else if (parent.getLocalName().equals(
- SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME)) {
+ } else if (parent.getLocalName().equals(SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME)) {
if (localName.equals(SOAP12Constants.SOAP_FAULT_TEXT_LOCAL_NAME)) {
elementType = AxiomNodeFactory::createSOAP12FaultText;
reasonProcessing = false;
@@ -185,8 +176,7 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
throw new SOAPProcessingException(
localName + " is not supported inside the reason");
}
- } else if (parent.getLocalName().equals(
- SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME)) {
+ } else if (parent.getLocalName().equals(SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME)) {
elementType = AxiomNodeFactory::createNSAwareElement;
processingDetailElements = true;
detailElementNames = new Vector<String>();
@@ -194,18 +184,14 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
} else {
throw new SOAPProcessingException(
- parent.getLocalName() +
- " should not have child element");
+ parent.getLocalName() + " should not have child element");
}
-
} else if (elementLevel > 5) {
- if (parent.getLocalName().equals(
- SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME)) {
+ if (parent.getLocalName().equals(SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME)) {
if (localName.equals(SOAP12Constants.SOAP_FAULT_VALUE_LOCAL_NAME)) {
if (subcodeValuePresent) {
- throw new SOAPProcessingException(
- "multiple subCode value encountered");
+ throw new SOAPProcessingException("multiple subCode value encountered");
} else {
elementType = AxiomNodeFactory::createSOAP12FaultValue;
subcodeValuePresent = true;
@@ -220,8 +206,7 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
subSubcodePresent = true;
subCodeProcessing = true;
} else {
- throw new SOAPProcessingException(
- "multiple subcode encountered");
+ throw new SOAPProcessingException("multiple subcode encountered");
}
} else {
throw new SOAPProcessingException(
@@ -235,8 +220,7 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
int detailElementLevel = 0;
boolean localNameExist = false;
for (int i = 0; i < detailElementNames.size(); i++) {
- if (parent.getLocalName().equals(
- detailElementNames.get(i))) {
+ if (parent.getLocalName().equals(detailElementNames.get(i))) {
localNameExist = true;
detailElementLevel = i + 1;
}
@@ -249,11 +233,11 @@ public class SOAP12BuilderHelper extends SOAPBuilderHelper {
} else {
throw new SOAPProcessingException(
- parent.getLocalName() +
- " should not have child at element level " +
- elementLevel);
+ parent.getLocalName()
+ + " should not have child at element level "
+ + elementLevel);
}
}
return elementType;
}
-}
\ No newline at end of file
+}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPBuilderHelper.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPBuilderHelper.java
index add7fd1..29ff292 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPBuilderHelper.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPBuilderHelper.java
@@ -25,6 +25,7 @@ import org.apache.axiom.om.impl.intf.factory.AxiomElementType;
import org.apache.axiom.soap.SOAPProcessingException;
public abstract class SOAPBuilderHelper {
- public abstract AxiomElementType<? extends AxiomElement> handleEvent(OMElement element, int elementLevel,
- String namespaceURI, String localName) throws SOAPProcessingException;
+ public abstract AxiomElementType<? extends AxiomElement> handleEvent(
+ OMElement element, int elementLevel, String namespaceURI, String localName)
+ throws SOAPProcessingException;
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilter.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilter.java
index 04b0a0f..70abccd 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilter.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilter.java
@@ -23,7 +23,7 @@ import org.apache.axiom.core.stream.XmlHandler;
public final class SOAPFilter implements XmlFilter {
public static final SOAPFilter INSTANCE = new SOAPFilter();
-
+
private SOAPFilter() {}
@Override
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilterHandler.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilterHandler.java
index 4eb7c06..d7111d1 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilterHandler.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPFilterHandler.java
@@ -29,18 +29,22 @@ final class SOAPFilterHandler extends XmlHandlerWrapper {
}
@Override
- public void processDocumentTypeDeclaration(String rootName, String publicId, String systemId,
- String internalSubset) throws StreamException {
- throw new SOAPProcessingException("SOAP message MUST NOT contain a Document Type Declaration(DTD)");
+ public void processDocumentTypeDeclaration(
+ String rootName, String publicId, String systemId, String internalSubset)
+ throws StreamException {
+ throw new SOAPProcessingException(
+ "SOAP message MUST NOT contain a Document Type Declaration(DTD)");
}
@Override
public void startProcessingInstruction(String target) throws StreamException {
- throw new SOAPProcessingException("SOAP message MUST NOT contain Processing Instructions(PI)");
+ throw new SOAPProcessingException(
+ "SOAP message MUST NOT contain Processing Instructions(PI)");
}
@Override
public void processEntityReference(String name, String replacementText) throws StreamException {
- throw new SOAPProcessingException("A SOAP message cannot contain entity references because it must not have a DTD");
+ throw new SOAPProcessingException(
+ "A SOAP message cannot contain entity references because it must not have a DTD");
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java
index 86895bc..ccd19a5 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModel.java
@@ -63,15 +63,18 @@ public final class SOAPModel implements Model {
}
@Override
- public CoreNSAwareElement createElement(CoreParentNode parent,
- int elementLevel, String namespaceURI, String localName) {
+ public CoreNSAwareElement createElement(
+ CoreParentNode parent, int elementLevel, String namespaceURI, String localName) {
if (elementLevel == 1) {
// Now I've found a SOAP Envelope, now create SOAPEnvelope here.
if (!localName.equals(SOAPConstants.SOAPENVELOPE_LOCAL_NAME)) {
- throw new SOAPProcessingException("First Element must contain the local name, "
- + SOAPConstants.SOAPENVELOPE_LOCAL_NAME + " , but found " + localName,
+ throw new SOAPProcessingException(
+ "First Element must contain the local name, "
+ + SOAPConstants.SOAPENVELOPE_LOCAL_NAME
+ + " , but found "
+ + localName,
SOAPConstants.FAULT_CODE_SENDER);
}
@@ -84,8 +87,8 @@ public final class SOAPModel implements Model {
log.debug("Starting to process SOAP 1.1 message");
} else {
throw new SOAPProcessingException(
- "Only SOAP 1.1 or SOAP 1.2 messages are supported in the" +
- " system", SOAPConstants.FAULT_CODE_VERSION_MISMATCH);
+ "Only SOAP 1.1 or SOAP 1.2 messages are supported in the" + " system",
+ SOAPConstants.FAULT_CODE_VERSION_MISMATCH);
}
return soapHelper.getEnvelopeType().create(nodeFactory);
@@ -94,47 +97,49 @@ public final class SOAPModel implements Model {
// this is either a header or a body
if (localName.equals(SOAPConstants.HEADER_LOCAL_NAME)) {
if (headerPresent) {
- throw new SOAPProcessingException("Multiple headers encountered!",
- getSenderFaultCode());
+ throw new SOAPProcessingException(
+ "Multiple headers encountered!", getSenderFaultCode());
}
if (bodyPresent) {
- throw new SOAPProcessingException("Header Body wrong order!",
- getSenderFaultCode());
+ throw new SOAPProcessingException(
+ "Header Body wrong order!", getSenderFaultCode());
}
headerPresent = true;
return soapHelper.getHeaderType().create(nodeFactory);
} else if (localName.equals(SOAPConstants.BODY_LOCAL_NAME)) {
if (bodyPresent) {
- throw new SOAPProcessingException("Multiple body elements encountered",
- getSenderFaultCode());
+ throw new SOAPProcessingException(
+ "Multiple body elements encountered", getSenderFaultCode());
}
bodyPresent = true;
return soapHelper.getBodyType().create(nodeFactory);
} else {
- throw new SOAPProcessingException(localName + " is not supported here.",
- getSenderFaultCode());
+ throw new SOAPProcessingException(
+ localName + " is not supported here.", getSenderFaultCode());
}
} else if (soapHelper == SOAP11Helper.INSTANCE && bodyPresent) {
return null;
} else {
- throw new SOAPProcessingException("Disallowed element found inside Envelope : {"
- + namespaceURI + "}" + localName);
+ throw new SOAPProcessingException(
+ "Disallowed element found inside Envelope : {"
+ + namespaceURI
+ + "}"
+ + localName);
}
} else if ((elementLevel == 3)
- &&
- ((OMElement)parent).getLocalName().equals(SOAPConstants.HEADER_LOCAL_NAME)) {
+ && ((OMElement) parent).getLocalName().equals(SOAPConstants.HEADER_LOCAL_NAME)) {
// this is a headerblock
try {
return soapHelper.getHeaderBlockType().create(nodeFactory);
} catch (SOAPProcessingException e) {
- throw new SOAPProcessingException("Can not create SOAPHeader block",
- getReceiverFaultCode(), e);
+ throw new SOAPProcessingException(
+ "Can not create SOAPHeader block", getReceiverFaultCode(), e);
}
- } else if ((elementLevel == 3) &&
- ((OMElement)parent).getLocalName().equals(SOAPConstants.BODY_LOCAL_NAME) &&
- localName.equals(SOAPConstants.BODY_FAULT_LOCAL_NAME) &&
- soapHelper.getEnvelopeURI().equals(namespaceURI)) {
+ } else if ((elementLevel == 3)
+ && ((OMElement) parent).getLocalName().equals(SOAPConstants.BODY_LOCAL_NAME)
+ && localName.equals(SOAPConstants.BODY_FAULT_LOCAL_NAME)
+ && soapHelper.getEnvelopeURI().equals(namespaceURI)) {
// this is a SOAP fault
processingFault = true;
if (soapHelper == SOAP12Helper.INSTANCE) {
@@ -145,7 +150,9 @@ public final class SOAPModel implements Model {
return soapHelper.getFaultType().create(nodeFactory);
} else if (elementLevel > 3 && processingFault) {
- return builderHelper.handleEvent((OMElement)parent, elementLevel, namespaceURI, localName).create(nodeFactory);
+ return builderHelper
+ .handleEvent((OMElement) parent, elementLevel, namespaceURI, localName)
+ .create(nodeFactory);
} else {
// this is neither of above. Just create an element
return null;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModelBuilderImpl.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModelBuilderImpl.java
index 27edf1f..9f6ded2 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModelBuilderImpl.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModelBuilderImpl.java
@@ -27,21 +27,19 @@ import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPMessage;
import org.apache.axiom.soap.SOAPModelBuilder;
-/**
- * Internal implementation class.
- */
+/** Internal implementation class. */
public class SOAPModelBuilderImpl extends OMXMLParserWrapperImpl implements SOAPModelBuilder {
public SOAPModelBuilderImpl(BuilderImpl builder, Detachable detachable) {
super(builder, detachable);
}
-
+
@Override
public SOAPEnvelope getSOAPEnvelope() throws OMException {
- return (SOAPEnvelope)getDocumentElement();
+ return (SOAPEnvelope) getDocumentElement();
}
@Override
public SOAPMessage getSOAPMessage() {
- return (SOAPMessage)getDocument();
+ return (SOAPMessage) getDocument();
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java
index 2adeab9..89759b9 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java
@@ -43,7 +43,10 @@ public class SOAP12Factory extends SOAPFactoryImpl {
}
public final SOAPFaultValue internalCreateSOAPFaultValue(SOAPFaultClassifier parent) {
- return createSOAPElement(AxiomNodeFactory::createSOAP12FaultValue, parent, SOAP12Constants.QNAME_FAULT_VALUE);
+ return createSOAPElement(
+ AxiomNodeFactory::createSOAP12FaultValue,
+ parent,
+ SOAP12Constants.QNAME_FAULT_VALUE);
}
@Override
@@ -62,7 +65,10 @@ public class SOAP12Factory extends SOAPFactoryImpl {
}
private SOAPFaultSubCode internalCreateSOAPFaultSubCode(SOAPFaultClassifier parent) {
- return createSOAPElement(AxiomNodeFactory::createSOAP12FaultSubCode, parent, SOAP12Constants.QNAME_FAULT_SUBCODE);
+ return createSOAPElement(
+ AxiomNodeFactory::createSOAP12FaultSubCode,
+ parent,
+ SOAP12Constants.QNAME_FAULT_SUBCODE);
}
@Override
@@ -82,7 +88,8 @@ public class SOAP12Factory extends SOAPFactoryImpl {
@Override
public final SOAPFaultText createSOAPFaultText(SOAPFaultReason parent) {
- return createSOAPElement(AxiomNodeFactory::createSOAP12FaultText, parent, SOAP12Constants.QNAME_FAULT_TEXT);
+ return createSOAPElement(
+ AxiomNodeFactory::createSOAP12FaultText, parent, SOAP12Constants.QNAME_FAULT_TEXT);
}
@Override
@@ -92,7 +99,8 @@ public class SOAP12Factory extends SOAPFactoryImpl {
@Override
public final SOAPFaultNode createSOAPFaultNode(SOAPFault parent) {
- return createSOAPElement(AxiomNodeFactory::createSOAP12FaultNode, parent, SOAP12Constants.QNAME_FAULT_NODE);
+ return createSOAPElement(
+ AxiomNodeFactory::createSOAP12FaultNode, parent, SOAP12Constants.QNAME_FAULT_NODE);
}
@Override
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java
index e9a8140..922edb6 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java
@@ -48,11 +48,11 @@ import org.apache.axiom.soap.impl.intf.SOAPHelper;
public abstract class SOAPFactoryImpl extends OMFactoryImpl implements SOAPFactory {
private static final Sequence envelopeSequence = new Sequence(SOAPHeader.class, SOAPBody.class);
-
+
public SOAPFactoryImpl(AxiomNodeFactory nodeFactory) {
super(nodeFactory);
}
-
+
public abstract SOAPHelper getSOAPHelper();
@Override
@@ -64,23 +64,25 @@ public abstract class SOAPFactoryImpl extends OMFactoryImpl implements SOAPFacto
public final SOAPVersion getSOAPVersion() {
return getSOAPHelper().getVersion();
}
-
+
@Override
public final OMNamespace getNamespace() {
return getSOAPHelper().getNamespace();
}
-
- protected final <T extends AxiomSOAPElement> T createSOAPElement(AxiomElementType<T> type, OMElement parent, QName qname) {
+
+ protected final <T extends AxiomSOAPElement> T createSOAPElement(
+ AxiomElementType<T> type, OMElement parent, QName qname) {
return createSOAPElement(type, parent, qname, null, -1);
}
-
- protected final <T extends AxiomSOAPElement> T createSOAPElement(AxiomElementType<T> type, OMElement parent, QName qname, Sequence sequence, int pos) {
+
+ protected final <T extends AxiomSOAPElement> T createSOAPElement(
+ AxiomElementType<T> type, OMElement parent, QName qname, Sequence sequence, int pos) {
T element = type.create(nodeFactory);
if (parent != null) {
if (sequence != null) {
- ((AxiomElement)parent).insertChild(sequence, pos, element, false);
+ ((AxiomElement) parent).insertChild(sequence, pos, element, false);
} else {
- ((AxiomElement)parent).addChild(element);
+ ((AxiomElement) parent).addChild(element);
}
}
if (qname.getNamespaceURI().length() == 0) {
@@ -104,16 +106,18 @@ public abstract class SOAPFactoryImpl extends OMFactoryImpl implements SOAPFacto
public final SOAPEnvelope createSOAPEnvelope() {
return createSOAPEnvelope(getNamespace());
}
-
+
@Override
public final SOAPEnvelope createSOAPEnvelope(OMNamespace ns) {
- return createAxiomElement(getSOAPHelper().getEnvelopeType(), null, SOAPConstants.SOAPENVELOPE_LOCAL_NAME, ns);
+ return createAxiomElement(
+ getSOAPHelper().getEnvelopeType(), null, SOAPConstants.SOAPENVELOPE_LOCAL_NAME, ns);
}
@Override
public final SOAPHeader createSOAPHeader(SOAPEnvelope parent) {
SOAPHelper helper = getSOAPHelper();
- return createSOAPElement(helper.getHeaderType(), parent, helper.getHeaderQName(), envelopeSequence, 0);
+ return createSOAPElement(
+ helper.getHeaderType(), parent, helper.getHeaderQName(), envelopeSequence, 0);
}
@Override
@@ -122,7 +126,8 @@ public abstract class SOAPFactoryImpl extends OMFactoryImpl implements SOAPFacto
}
@Override
- public final SOAPHeaderBlock createSOAPHeaderBlock(String localName, OMNamespace ns, SOAPHeader parent) {
+ public final SOAPHeaderBlock createSOAPHeaderBlock(
+ String localName, OMNamespace ns, SOAPHeader parent) {
return createAxiomElement(getSOAPHelper().getHeaderBlockType(), parent, localName, ns);
}
@@ -139,7 +144,8 @@ public abstract class SOAPFactoryImpl extends OMFactoryImpl implements SOAPFacto
}
@Override
- public final SOAPHeaderBlock createSOAPHeaderBlock(String localName, OMNamespace ns, OMDataSource ds) {
+ public final SOAPHeaderBlock createSOAPHeaderBlock(
+ String localName, OMNamespace ns, OMDataSource ds) {
AxiomSOAPHeaderBlock element = getSOAPHelper().getHeaderBlockType().create(nodeFactory);
element.init(localName, ns, ds);
return element;
@@ -153,7 +159,8 @@ public abstract class SOAPFactoryImpl extends OMFactoryImpl implements SOAPFacto
@Override
public final SOAPBody createSOAPBody(SOAPEnvelope parent) {
SOAPHelper helper = getSOAPHelper();
- return createSOAPElement(helper.getBodyType(), parent, helper.getBodyQName(), envelopeSequence, 1);
+ return createSOAPElement(
+ helper.getBodyType(), parent, helper.getBodyQName(), envelopeSequence, 1);
}
@Override
@@ -231,7 +238,7 @@ public abstract class SOAPFactoryImpl extends OMFactoryImpl implements SOAPFacto
createSOAPBody(env);
return message;
}
-
+
@Override
public final SOAPEnvelope getDefaultEnvelope() {
SOAPEnvelope env = createSOAPEnvelope();
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPBody.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPBody.java
index adbc4d4..85d5924 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPBody.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPBody.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf;
import org.apache.axiom.soap.SOAPBody;
-public interface AxiomSOAPBody extends AxiomSOAPElement, SOAPBody {
-
-}
+public interface AxiomSOAPBody extends AxiomSOAPElement, SOAPBody {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPEnvelope.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPEnvelope.java
index d31bfe5..a041471 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPEnvelope.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPEnvelope.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf;
import org.apache.axiom.soap.SOAPEnvelope;
-public interface AxiomSOAPEnvelope extends AxiomSOAPElement, SOAPEnvelope {
-
-}
+public interface AxiomSOAPEnvelope extends AxiomSOAPElement, SOAPEnvelope {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultCode.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultCode.java
index 58e4214..b128a4b 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultCode.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultCode.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf;
import org.apache.axiom.soap.SOAPFaultCode;
-public interface AxiomSOAPFaultCode extends AxiomSOAPElement, SOAPFaultCode {
-
-}
+public interface AxiomSOAPFaultCode extends AxiomSOAPElement, SOAPFaultCode {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultDetail.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultDetail.java
index d1f0a45..cd60cc1 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultDetail.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultDetail.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf;
import org.apache.axiom.soap.SOAPFaultDetail;
-public interface AxiomSOAPFaultDetail extends AxiomSOAPElement, SOAPFaultDetail {
-
-}
+public interface AxiomSOAPFaultDetail extends AxiomSOAPElement, SOAPFaultDetail {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultReason.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultReason.java
index 6f08a4d..80c8e52 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultReason.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultReason.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf;
import org.apache.axiom.soap.SOAPFaultReason;
-public interface AxiomSOAPFaultReason extends AxiomSOAPElement, SOAPFaultReason {
-
-}
+public interface AxiomSOAPFaultReason extends AxiomSOAPElement, SOAPFaultReason {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultRole.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultRole.java
index 09923b0..d3f0acb 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultRole.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPFaultRole.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf;
import org.apache.axiom.soap.SOAPFaultRole;
-public interface AxiomSOAPFaultRole extends AxiomSOAPElement, SOAPFaultRole {
-
-}
+public interface AxiomSOAPFaultRole extends AxiomSOAPElement, SOAPFaultRole {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPHeader.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPHeader.java
index 68ca4ce..f86aa41 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPHeader.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPHeader.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf;
import org.apache.axiom.soap.SOAPHeader;
-public interface AxiomSOAPHeader extends AxiomSOAPElement, SOAPHeader {
-
-}
+public interface AxiomSOAPHeader extends AxiomSOAPElement, SOAPHeader {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPHeaderBlock.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPHeaderBlock.java
index f26d93f..9ea4108 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPHeaderBlock.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/AxiomSOAPHeaderBlock.java
@@ -21,6 +21,5 @@ package org.apache.axiom.soap.impl.intf;
import org.apache.axiom.om.impl.intf.AxiomSourcedElement;
import org.apache.axiom.soap.SOAPHeaderBlock;
-public interface AxiomSOAPHeaderBlock extends AxiomSOAPElement, AxiomSourcedElement, SOAPHeaderBlock {
-
-}
+public interface AxiomSOAPHeaderBlock
+ extends AxiomSOAPElement, AxiomSourcedElement, SOAPHeaderBlock {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java
index 660691d..8c1d6fd 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/SOAPHelper.java
@@ -52,8 +52,10 @@ public abstract class SOAPHelper {
private final QName mustUnderstandAttributeQName;
private final QName roleAttributeQName;
private final QName relayAttributeQName;
-
- protected SOAPHelper(SOAPVersion version, String specName,
+
+ protected SOAPHelper(
+ SOAPVersion version,
+ String specName,
AxiomElementType<? extends AxiomSOAPEnvelope> envelopeType,
AxiomElementType<? extends AxiomSOAPHeader> headerType,
AxiomElementType<? extends AxiomSOAPHeaderBlock> headerBlockType,
@@ -63,40 +65,62 @@ public abstract class SOAPHelper {
AxiomElementType<? extends AxiomSOAPFaultReason> faultReasonType,
AxiomElementType<? extends AxiomSOAPFaultRole> faultRoleType,
AxiomElementType<? extends AxiomSOAPFaultDetail> faultDetailType,
- String roleAttributeLocalName, String relayAttributeLocalName) {
+ String roleAttributeLocalName,
+ String relayAttributeLocalName) {
this.version = version;
- namespace = new OMNamespaceImpl(version.getEnvelopeURI(),
- SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
+ namespace =
+ new OMNamespaceImpl(
+ version.getEnvelopeURI(), SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
this.specName = specName;
this.envelopeType = envelopeType;
this.headerType = headerType;
- headerQName = new QName(version.getEnvelopeURI(), SOAPConstants.HEADER_LOCAL_NAME,
- SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
+ headerQName =
+ new QName(
+ version.getEnvelopeURI(),
+ SOAPConstants.HEADER_LOCAL_NAME,
+ SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
this.headerBlockType = headerBlockType;
this.bodyType = bodyType;
- bodyQName = new QName(version.getEnvelopeURI(), SOAPConstants.BODY_LOCAL_NAME,
- SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
+ bodyQName =
+ new QName(
+ version.getEnvelopeURI(),
+ SOAPConstants.BODY_LOCAL_NAME,
+ SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
this.faultType = faultType;
- faultQName = new QName(version.getEnvelopeURI(), SOAPConstants.SOAPFAULT_LOCAL_NAME,
- SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
+ faultQName =
+ new QName(
+ version.getEnvelopeURI(),
+ SOAPConstants.SOAPFAULT_LOCAL_NAME,
+ SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
this.faultCodeType = faultCodeType;
this.faultReasonType = faultReasonType;
this.faultRoleType = faultRoleType;
this.faultDetailType = faultDetailType;
- mustUnderstandAttributeQName = new QName(
- version.getEnvelopeURI(), SOAPConstants.ATTR_MUSTUNDERSTAND, SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
- roleAttributeQName = new QName(
- version.getEnvelopeURI(), roleAttributeLocalName, SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
- relayAttributeQName = relayAttributeLocalName == null ? null :
- new QName(version.getEnvelopeURI(), relayAttributeLocalName, SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
- }
-
+ mustUnderstandAttributeQName =
+ new QName(
+ version.getEnvelopeURI(),
+ SOAPConstants.ATTR_MUSTUNDERSTAND,
+ SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
+ roleAttributeQName =
+ new QName(
+ version.getEnvelopeURI(),
+ roleAttributeLocalName,
+ SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
+ relayAttributeQName =
+ relayAttributeLocalName == null
+ ? null
+ : new QName(
+ version.getEnvelopeURI(),
+ relayAttributeLocalName,
+ SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
+ }
+
public final SOAPVersion getVersion() {
return version;
}
-
+
public abstract SOAPFactory getSOAPFactory(OMMetaFactory metaFactory);
-
+
public final String getEnvelopeURI() {
return version.getEnvelopeURI();
}
@@ -186,5 +210,6 @@ public abstract class SOAPHelper {
}
public abstract Boolean parseBoolean(String literal);
+
public abstract String formatBoolean(boolean value);
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Body.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Body.java
index fc01b2f..2d8f301 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Body.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Body.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap11;
import org.apache.axiom.soap.impl.intf.AxiomSOAPBody;
-public interface AxiomSOAP11Body extends AxiomSOAPBody, AxiomSOAP11Element {
-
-}
+public interface AxiomSOAP11Body extends AxiomSOAPBody, AxiomSOAP11Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Element.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Element.java
index b9e06f4..c3c2fcb 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Element.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Element.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap11;
import org.apache.axiom.soap.impl.intf.AxiomSOAPElement;
-public interface AxiomSOAP11Element extends AxiomSOAPElement {
-
-}
+public interface AxiomSOAP11Element extends AxiomSOAPElement {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Envelope.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Envelope.java
index 941e355..29d56c7 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Envelope.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Envelope.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap11;
import org.apache.axiom.soap.impl.intf.AxiomSOAPEnvelope;
-public interface AxiomSOAP11Envelope extends AxiomSOAPEnvelope, AxiomSOAP11Element {
-
-}
+public interface AxiomSOAP11Envelope extends AxiomSOAPEnvelope, AxiomSOAP11Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Fault.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Fault.java
index bb25517..ef8cd09 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Fault.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Fault.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap11;
import org.apache.axiom.soap.impl.intf.AxiomSOAPFault;
-public interface AxiomSOAP11Fault extends AxiomSOAPFault, AxiomSOAP11Element {
-
-}
+public interface AxiomSOAP11Fault extends AxiomSOAPFault, AxiomSOAP11Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultCode.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultCode.java
index 8868e67..4e5c788 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultCode.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultCode.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap11;
import org.apache.axiom.soap.impl.intf.AxiomSOAPFaultCode;
-public interface AxiomSOAP11FaultCode extends AxiomSOAPFaultCode, AxiomSOAP11Element {
-
-}
+public interface AxiomSOAP11FaultCode extends AxiomSOAPFaultCode, AxiomSOAP11Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultDetail.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultDetail.java
index 5cc6579..e3aa682 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultDetail.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultDetail.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap11;
import org.apache.axiom.soap.impl.intf.AxiomSOAPFaultDetail;
-public interface AxiomSOAP11FaultDetail extends AxiomSOAPFaultDetail, AxiomSOAP11Element {
-
-}
+public interface AxiomSOAP11FaultDetail extends AxiomSOAPFaultDetail, AxiomSOAP11Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultReason.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultReason.java
index 599aa0a..dff366f 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultReason.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultReason.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap11;
import org.apache.axiom.soap.impl.intf.AxiomSOAPFaultReason;
-public interface AxiomSOAP11FaultReason extends AxiomSOAPFaultReason, AxiomSOAP11Element {
-
-}
+public interface AxiomSOAP11FaultReason extends AxiomSOAPFaultReason, AxiomSOAP11Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultRole.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultRole.java
index 59cf8a5..db127cd 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultRole.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11FaultRole.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap11;
import org.apache.axiom.soap.impl.intf.AxiomSOAPFaultRole;
-public interface AxiomSOAP11FaultRole extends AxiomSOAPFaultRole, AxiomSOAP11Element {
-
-}
+public interface AxiomSOAP11FaultRole extends AxiomSOAPFaultRole, AxiomSOAP11Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Header.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Header.java
index 4cd3a7f..4d40ecb 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Header.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11Header.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap11;
import org.apache.axiom.soap.impl.intf.AxiomSOAPHeader;
-public interface AxiomSOAP11Header extends AxiomSOAPHeader, AxiomSOAP11Element {
-
-}
+public interface AxiomSOAP11Header extends AxiomSOAPHeader, AxiomSOAP11Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11HeaderBlock.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11HeaderBlock.java
index 8288a9f..55572c7 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11HeaderBlock.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/AxiomSOAP11HeaderBlock.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap11;
import org.apache.axiom.soap.impl.intf.AxiomSOAPHeaderBlock;
-public interface AxiomSOAP11HeaderBlock extends AxiomSOAPHeaderBlock, AxiomSOAP11Element {
-
-}
+public interface AxiomSOAP11HeaderBlock extends AxiomSOAPHeaderBlock, AxiomSOAP11Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/SOAP11Helper.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/SOAP11Helper.java
index 25f6800..8a2c79b 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/SOAP11Helper.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap11/SOAP11Helper.java
@@ -29,7 +29,9 @@ public final class SOAP11Helper extends SOAPHelper {
public static final SOAP11Helper INSTANCE = new SOAP11Helper();
private SOAP11Helper() {
- super(SOAPVersion.SOAP11, "SOAP 1.1",
+ super(
+ SOAPVersion.SOAP11,
+ "SOAP 1.1",
AxiomNodeFactory::createSOAP11Envelope,
AxiomNodeFactory::createSOAP11Header,
AxiomNodeFactory::createSOAP11HeaderBlock,
@@ -39,7 +41,8 @@ public final class SOAP11Helper extends SOAPHelper {
AxiomNodeFactory::createSOAP11FaultReason,
AxiomNodeFactory::createSOAP11FaultRole,
AxiomNodeFactory::createSOAP11FaultDetail,
- SOAP11Constants.ATTR_ACTOR, null);
+ SOAP11Constants.ATTR_ACTOR,
+ null);
}
@Override
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Body.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Body.java
index 8b1cc04..95aa202 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Body.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Body.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.impl.intf.AxiomSOAPBody;
-public interface AxiomSOAP12Body extends AxiomSOAPBody, AxiomSOAP12Element {
-
-}
+public interface AxiomSOAP12Body extends AxiomSOAPBody, AxiomSOAP12Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Element.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Element.java
index 893588e..39548ee 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Element.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Element.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.impl.intf.AxiomSOAPElement;
-public interface AxiomSOAP12Element extends AxiomSOAPElement {
-
-}
+public interface AxiomSOAP12Element extends AxiomSOAPElement {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Envelope.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Envelope.java
index 626612c..51dfd96 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Envelope.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Envelope.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.impl.intf.AxiomSOAPEnvelope;
-public interface AxiomSOAP12Envelope extends AxiomSOAPEnvelope, AxiomSOAP12Element {
-
-}
+public interface AxiomSOAP12Envelope extends AxiomSOAPEnvelope, AxiomSOAP12Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Fault.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Fault.java
index 1fd0a59..cbbff2a 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Fault.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Fault.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.impl.intf.AxiomSOAPFault;
-public interface AxiomSOAP12Fault extends AxiomSOAPFault, AxiomSOAP12Element {
-
-}
+public interface AxiomSOAP12Fault extends AxiomSOAPFault, AxiomSOAP12Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultClassifier.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultClassifier.java
index 15f7eda..89852a0 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultClassifier.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultClassifier.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.SOAPFaultClassifier;
-public interface AxiomSOAP12FaultClassifier extends SOAPFaultClassifier, AxiomSOAP12Element {
-
-}
+public interface AxiomSOAP12FaultClassifier extends SOAPFaultClassifier, AxiomSOAP12Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultCode.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultCode.java
index fd39c75..8e666ea 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultCode.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultCode.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.impl.intf.AxiomSOAPFaultCode;
-public interface AxiomSOAP12FaultCode extends AxiomSOAPFaultCode, AxiomSOAP12FaultClassifier {
-
-}
+public interface AxiomSOAP12FaultCode extends AxiomSOAPFaultCode, AxiomSOAP12FaultClassifier {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultDetail.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultDetail.java
index d878cf0..94e43a4 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultDetail.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultDetail.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.impl.intf.AxiomSOAPFaultDetail;
-public interface AxiomSOAP12FaultDetail extends AxiomSOAPFaultDetail, AxiomSOAP12Element {
-
-}
+public interface AxiomSOAP12FaultDetail extends AxiomSOAPFaultDetail, AxiomSOAP12Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultNode.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultNode.java
index 0ede965..c57c487 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultNode.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultNode.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.SOAPFaultNode;
-public interface AxiomSOAP12FaultNode extends AxiomSOAP12Element, SOAPFaultNode {
-
-}
+public interface AxiomSOAP12FaultNode extends AxiomSOAP12Element, SOAPFaultNode {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultReason.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultReason.java
index 2d45597..7ff6545 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultReason.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultReason.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.impl.intf.AxiomSOAPFaultReason;
-public interface AxiomSOAP12FaultReason extends AxiomSOAPFaultReason, AxiomSOAP12Element {
-
-}
+public interface AxiomSOAP12FaultReason extends AxiomSOAPFaultReason, AxiomSOAP12Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultRole.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultRole.java
index adf669f..341ef05 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultRole.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultRole.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.impl.intf.AxiomSOAPFaultRole;
-public interface AxiomSOAP12FaultRole extends AxiomSOAPFaultRole, AxiomSOAP12Element {
-
-}
+public interface AxiomSOAP12FaultRole extends AxiomSOAPFaultRole, AxiomSOAP12Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultSubCode.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultSubCode.java
index 2ea53ae..aa4e3f3 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultSubCode.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultSubCode.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.SOAPFaultSubCode;
-public interface AxiomSOAP12FaultSubCode extends AxiomSOAP12FaultClassifier, SOAPFaultSubCode {
-
-}
+public interface AxiomSOAP12FaultSubCode extends AxiomSOAP12FaultClassifier, SOAPFaultSubCode {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultText.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultText.java
index fa5cba6..0c7f919 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultText.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultText.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.SOAPFaultText;
-public interface AxiomSOAP12FaultText extends AxiomSOAP12Element, SOAPFaultText {
-
-}
+public interface AxiomSOAP12FaultText extends AxiomSOAP12Element, SOAPFaultText {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultValue.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultValue.java
index cd684e0..d795dd2 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultValue.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12FaultValue.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.SOAPFaultValue;
-public interface AxiomSOAP12FaultValue extends AxiomSOAP12Element, SOAPFaultValue {
-
-}
+public interface AxiomSOAP12FaultValue extends AxiomSOAP12Element, SOAPFaultValue {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Header.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Header.java
index 42fa4fa..fbb8570 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Header.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12Header.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.impl.intf.AxiomSOAPHeader;
-public interface AxiomSOAP12Header extends AxiomSOAPHeader, AxiomSOAP12Element {
-
-}
+public interface AxiomSOAP12Header extends AxiomSOAPHeader, AxiomSOAP12Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12HeaderBlock.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12HeaderBlock.java
index dacc43e..98fd3fc 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12HeaderBlock.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/AxiomSOAP12HeaderBlock.java
@@ -20,6 +20,4 @@ package org.apache.axiom.soap.impl.intf.soap12;
import org.apache.axiom.soap.impl.intf.AxiomSOAPHeaderBlock;
-public interface AxiomSOAP12HeaderBlock extends AxiomSOAPHeaderBlock, AxiomSOAP12Element {
-
-}
+public interface AxiomSOAP12HeaderBlock extends AxiomSOAPHeaderBlock, AxiomSOAP12Element {}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/SOAP12Helper.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/SOAP12Helper.java
index 14b07cf..1800ecd 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/SOAP12Helper.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/intf/soap12/SOAP12Helper.java
@@ -29,17 +29,20 @@ public final class SOAP12Helper extends SOAPHelper {
public static final SOAP12Helper INSTANCE = new SOAP12Helper();
private SOAP12Helper() {
- super(SOAPVersion.SOAP12, "SOAP 1.2",
- AxiomNodeFactory::createSOAP12Envelope,
- AxiomNodeFactory::createSOAP12Header,
- AxiomNodeFactory::createSOAP12HeaderBlock,
- AxiomNodeFactory::createSOAP12Body,
- AxiomNodeFactory::createSOAP12Fault,
- AxiomNodeFactory::createSOAP12FaultCode,
- AxiomNodeFactory::createSOAP12FaultReason,
- AxiomNodeFactory::createSOAP12FaultRole,
- AxiomNodeFactory::createSOAP12FaultDetail,
- SOAP12Constants.SOAP_ROLE, SOAP12Constants.SOAP_RELAY);
+ super(
+ SOAPVersion.SOAP12,
+ "SOAP 1.2",
+ AxiomNodeFactory::createSOAP12Envelope,
+ AxiomNodeFactory::createSOAP12Header,
+ AxiomNodeFactory::createSOAP12HeaderBlock,
+ AxiomNodeFactory::createSOAP12Body,
+ AxiomNodeFactory::createSOAP12Fault,
+ AxiomNodeFactory::createSOAP12FaultCode,
+ AxiomNodeFactory::createSOAP12FaultReason,
+ AxiomNodeFactory::createSOAP12FaultRole,
+ AxiomNodeFactory::createSOAP12FaultDetail,
+ SOAP12Constants.SOAP_ROLE,
+ SOAP12Constants.SOAP_RELAY);
}
@Override
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11EnvelopeMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11EnvelopeMixin.java
index edd024e..db50ace 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11EnvelopeMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11EnvelopeMixin.java
@@ -32,8 +32,10 @@ public abstract class AxiomSOAP11EnvelopeMixin implements AxiomSOAP11Envelope {
public final Class<? extends CoreNode> coreGetNodeClass() {
return AxiomSOAP11Envelope.class;
}
-
+
public final boolean isChildElementAllowed(OMElement child) {
- return !(child instanceof AxiomSOAPElement) || child instanceof SOAPHeader || child instanceof SOAPBody;
+ return !(child instanceof AxiomSOAPElement)
+ || child instanceof SOAPHeader
+ || child instanceof SOAPBody;
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultMixin.java
index 10c8a46..ffcd10e 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultMixin.java
@@ -31,19 +31,23 @@ import org.apache.axiom.weaver.annotation.Mixin;
@Mixin
public abstract class AxiomSOAP11FaultMixin implements AxiomSOAP11Fault {
- private static final Sequence sequence = new Sequence(SOAPFaultCode.class, SOAPFaultReason.class,
- SOAPFaultRole.class, SOAPFaultDetail.class);
+ private static final Sequence sequence =
+ new Sequence(
+ SOAPFaultCode.class,
+ SOAPFaultReason.class,
+ SOAPFaultRole.class,
+ SOAPFaultDetail.class);
@Override
public final Class<? extends CoreNode> coreGetNodeClass() {
return AxiomSOAP11Fault.class;
}
-
+
@Override
public final Sequence getSequence() {
return sequence;
}
-
+
@Override
public final void setNode(SOAPFaultNode node) {
throw new UnsupportedOperationException("SOAP 1.1 has no SOAP Fault Node");
@@ -51,12 +55,12 @@ public abstract class AxiomSOAP11FaultMixin implements AxiomSOAP11Fault {
@Override
public final SOAPFaultCode getCode() {
- return (SOAPFaultCode)getFirstChildWithName(SOAP11Constants.QNAME_FAULT_CODE);
+ return (SOAPFaultCode) getFirstChildWithName(SOAP11Constants.QNAME_FAULT_CODE);
}
@Override
public final SOAPFaultReason getReason() {
- return (SOAPFaultReason)getFirstChildWithName(SOAP11Constants.QNAME_FAULT_REASON);
+ return (SOAPFaultReason) getFirstChildWithName(SOAP11Constants.QNAME_FAULT_REASON);
}
@Override
@@ -66,11 +70,11 @@ public abstract class AxiomSOAP11FaultMixin implements AxiomSOAP11Fault {
@Override
public final SOAPFaultRole getRole() {
- return (SOAPFaultRole)getFirstChildWithName(SOAP11Constants.QNAME_FAULT_ROLE);
+ return (SOAPFaultRole) getFirstChildWithName(SOAP11Constants.QNAME_FAULT_ROLE);
}
@Override
public final SOAPFaultDetail getDetail() {
- return (SOAPFaultDetail)getFirstChildWithName(SOAP11Constants.QNAME_FAULT_DETAIL);
+ return (SOAPFaultDetail) getFirstChildWithName(SOAP11Constants.QNAME_FAULT_DETAIL);
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultClassifierMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultClassifierMixin.java
index 1ec9480..90b5f9b 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultClassifierMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultClassifierMixin.java
@@ -31,27 +31,28 @@ import org.apache.axiom.weaver.annotation.Mixin;
@Mixin
public abstract class AxiomSOAP12FaultClassifierMixin implements AxiomSOAP12FaultClassifier {
- private static final Sequence sequence = new Sequence(SOAPFaultValue.class, SOAPFaultSubCode.class);
-
+ private static final Sequence sequence =
+ new Sequence(SOAPFaultValue.class, SOAPFaultSubCode.class);
+
public final boolean isChildElementAllowed(OMElement child) {
return child instanceof SOAPFaultValue || child instanceof SOAPFaultSubCode;
}
-
+
@Override
public final SOAPFaultValue getValue() {
- return (SOAPFaultValue)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_VALUE);
+ return (SOAPFaultValue) getFirstChildWithName(SOAP12Constants.QNAME_FAULT_VALUE);
}
@Override
public final void setValue(SOAPFaultValue value) {
insertChild(sequence, 0, value, true);
}
-
+
@Override
public final SOAPFaultSubCode getSubCode() {
- return (SOAPFaultSubCode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_SUBCODE);
+ return (SOAPFaultSubCode) getFirstChildWithName(SOAP12Constants.QNAME_FAULT_SUBCODE);
}
-
+
@Override
public final void setSubCode(SOAPFaultSubCode subCode) {
insertChild(sequence, 1, subCode, true);
@@ -62,12 +63,12 @@ public abstract class AxiomSOAP12FaultClassifierMixin implements AxiomSOAP12Faul
SOAPFaultValue value = getValue();
return value == null ? null : value.getTextAsQName();
}
-
+
@Override
public final void setValue(QName value) {
SOAPFaultValue valueElement = getValue();
if (valueElement == null) {
- valueElement = ((SOAP12Factory)getOMFactory()).internalCreateSOAPFaultValue(this);
+ valueElement = ((SOAP12Factory) getOMFactory()).internalCreateSOAPFaultValue(this);
}
valueElement.setText(value);
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultMixin.java
index 01625d5..5deb4e9 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultMixin.java
@@ -31,19 +31,24 @@ import org.apache.axiom.weaver.annotation.Mixin;
@Mixin
public abstract class AxiomSOAP12FaultMixin implements AxiomSOAP12Fault {
- private static final Sequence sequence = new Sequence(SOAPFaultCode.class, SOAPFaultReason.class,
- SOAPFaultNode.class, SOAPFaultRole.class, SOAPFaultDetail.class);
+ private static final Sequence sequence =
+ new Sequence(
+ SOAPFaultCode.class,
+ SOAPFaultReason.class,
+ SOAPFaultNode.class,
+ SOAPFaultRole.class,
+ SOAPFaultDetail.class);
@Override
public final Class<? extends CoreNode> coreGetNodeClass() {
return AxiomSOAP12Fault.class;
}
-
+
@Override
public final Sequence getSequence() {
return sequence;
}
-
+
@Override
public final void setNode(SOAPFaultNode node) {
insertChild(sequence, 2, node, true);
@@ -51,26 +56,26 @@ public abstract class AxiomSOAP12FaultMixin implements AxiomSOAP12Fault {
@Override
public final SOAPFaultCode getCode() {
- return (SOAPFaultCode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_CODE);
+ return (SOAPFaultCode) getFirstChildWithName(SOAP12Constants.QNAME_FAULT_CODE);
}
@Override
public final SOAPFaultReason getReason() {
- return (SOAPFaultReason)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_REASON);
+ return (SOAPFaultReason) getFirstChildWithName(SOAP12Constants.QNAME_FAULT_REASON);
}
@Override
public final SOAPFaultNode getNode() {
- return (SOAPFaultNode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_NODE);
+ return (SOAPFaultNode) getFirstChildWithName(SOAP12Constants.QNAME_FAULT_NODE);
}
@Override
public final SOAPFaultRole getRole() {
- return (SOAPFaultRole)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_ROLE);
+ return (SOAPFaultRole) getFirstChildWithName(SOAP12Constants.QNAME_FAULT_ROLE);
}
@Override
public final SOAPFaultDetail getDetail() {
- return (SOAPFaultDetail)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_DETAIL);
+ return (SOAPFaultDetail) getFirstChildWithName(SOAP12Constants.QNAME_FAULT_DETAIL);
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultReasonMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultReasonMixin.java
index da4feff..be4c143 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultReasonMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultReasonMixin.java
@@ -40,7 +40,7 @@ public abstract class AxiomSOAP12FaultReasonMixin implements AxiomSOAP12FaultRea
public final boolean isChildElementAllowed(OMElement child) {
return child instanceof SOAPFaultText;
}
-
+
@Override
public final void addSOAPText(SOAPFaultText soapFaultText) {
addChild(soapFaultText);
@@ -48,14 +48,14 @@ public abstract class AxiomSOAP12FaultReasonMixin implements AxiomSOAP12FaultRea
@Override
public final SOAPFaultText getFirstSOAPText() {
- return (SOAPFaultText)getFirstElement();
+ return (SOAPFaultText) getFirstElement();
}
@Override
public final List<SOAPFaultText> getAllSoapTexts() {
List<SOAPFaultText> faultTexts = new ArrayList<SOAPFaultText>();
for (Iterator<OMElement> it = getChildElements(); it.hasNext(); ) {
- faultTexts.add((SOAPFaultText)it.next());
+ faultTexts.add((SOAPFaultText) it.next());
}
return faultTexts;
}
@@ -63,7 +63,7 @@ public abstract class AxiomSOAP12FaultReasonMixin implements AxiomSOAP12FaultRea
@Override
public final SOAPFaultText getSOAPFaultText(String language) {
for (Iterator<OMElement> it = getChildElements(); it.hasNext(); ) {
- SOAPFaultText text = (SOAPFaultText)it.next();
+ SOAPFaultText text = (SOAPFaultText) it.next();
if (language == null || language.equals(text.getLang())) {
return text;
}
@@ -76,9 +76,11 @@ public abstract class AxiomSOAP12FaultReasonMixin implements AxiomSOAP12FaultRea
String text = "";
int maxScore = -1;
for (Iterator<OMElement> it = getChildElements(); it.hasNext(); ) {
- SOAPFaultText textNode = (SOAPFaultText)it.next();
+ SOAPFaultText textNode = (SOAPFaultText) it.next();
String lang = textNode.getLang();
- int score = LocaleUtil.getMatchScore(locale, lang == null ? null : Locale.forLanguageTag(lang));
+ int score =
+ LocaleUtil.getMatchScore(
+ locale, lang == null ? null : Locale.forLanguageTag(lang));
if (score > maxScore) {
text = textNode.getText();
maxScore = score;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultTextMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultTextMixin.java
index ab9491b..e874015 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultTextMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultTextMixin.java
@@ -30,14 +30,16 @@ import org.apache.axiom.weaver.annotation.Mixin;
@Mixin
public abstract class AxiomSOAP12FaultTextMixin implements AxiomSOAP12FaultText {
- private static final OMNamespace LANG_NAMESPACE = new OMNamespaceImpl(
- SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_URI,
- SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX);
- private static final QName LANG_QNAME = new QName(
- SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_URI,
- SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_LOCAL_NAME,
- SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX);
-
+ private static final OMNamespace LANG_NAMESPACE =
+ new OMNamespaceImpl(
+ SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_URI,
+ SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX);
+ private static final QName LANG_QNAME =
+ new QName(
+ SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_URI,
+ SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_LOCAL_NAME,
+ SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX);
+
@Override
public final Class<? extends CoreNode> coreGetNodeClass() {
return AxiomSOAP12FaultText.class;
@@ -51,7 +53,7 @@ public abstract class AxiomSOAP12FaultTextMixin implements AxiomSOAP12FaultText
public final void setLang(String lang) {
addAttribute(SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_LOCAL_NAME, lang, LANG_NAMESPACE);
}
-
+
@Override
public final String getLang() {
return getAttributeValue(LANG_QNAME);
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodyMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodyMixin.java
index dae6c6c..953aeac 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodyMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPBodyMixin.java
@@ -32,10 +32,10 @@ public abstract class AxiomSOAPBodyMixin implements AxiomSOAPBody {
public final boolean isChildElementAllowed(OMElement child) {
return !(child instanceof AxiomSOAPElement) || child instanceof SOAPFault;
}
-
+
@Override
public final SOAPFault addFault(Exception e) throws OMException {
- return ((SOAPFactory)getOMFactory()).createSOAPFault(this, e);
+ return ((SOAPFactory) getOMFactory()).createSOAPFault(this, e);
}
@Override
@@ -48,7 +48,7 @@ public abstract class AxiomSOAPBodyMixin implements AxiomSOAPBody {
OMElement element = getFirstElement();
return element == null ? null : element.getNamespace();
}
-
+
@Override
public final String getFirstElementLocalName() {
OMElement element = getFirstElement();
@@ -58,7 +58,7 @@ public abstract class AxiomSOAPBodyMixin implements AxiomSOAPBody {
@Override
public final SOAPFault getFault() {
OMElement element = getFirstElement();
- return element instanceof SOAPFault ? (SOAPFault)element : null;
+ return element instanceof SOAPFault ? (SOAPFault) element : null;
}
@Override
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPElementMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPElementMixin.java
index 32da01b..8547a58 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPElementMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPElementMixin.java
@@ -35,17 +35,25 @@ public abstract class AxiomSOAPElementMixin implements AxiomSOAPElement {
@Override
public final void checkChild(OMNode child) {
- if (child instanceof OMElement && !isChildElementAllowed((OMElement)child)) {
- throw new SOAPProcessingException(child.getClass().getName() + " is not allowed as a child of " + getClass().getName());
+ if (child instanceof OMElement && !isChildElementAllowed((OMElement) child)) {
+ throw new SOAPProcessingException(
+ child.getClass().getName()
+ + " is not allowed as a child of "
+ + getClass().getName());
}
if (child instanceof AxiomSOAPElement) {
SOAPHelper soapHelper = getSOAPHelper();
- SOAPHelper childSOAPHelper = ((AxiomSOAPElement)child).getSOAPHelper();
+ SOAPHelper childSOAPHelper = ((AxiomSOAPElement) child).getSOAPHelper();
if (childSOAPHelper != soapHelper) {
- throw new SOAPProcessingException("Cannot add a " + childSOAPHelper.getSpecName() + " element as a child of a " + soapHelper.getSpecName() + " element");
+ throw new SOAPProcessingException(
+ "Cannot add a "
+ + childSOAPHelper.getSpecName()
+ + " element as a child of a "
+ + soapHelper.getSpecName()
+ + " element");
}
}
}
-
+
public abstract boolean isChildElementAllowed(OMElement child);
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPEnvelopeMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPEnvelopeMixin.java
index f3d0446..594b219 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPEnvelopeMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPEnvelopeMixin.java
@@ -39,27 +39,27 @@ public abstract class AxiomSOAPEnvelopeMixin implements AxiomSOAPEnvelope {
public final SOAPHeader getHeader() {
// The soap header is the first element in the envelope.
OMElement e = getFirstElement();
- return e instanceof SOAPHeader ? (SOAPHeader)e : null;
+ return e instanceof SOAPHeader ? (SOAPHeader) e : null;
}
@Override
public final SOAPHeader getOrCreateHeader() {
SOAPHeader header = getHeader();
- return header != null ? header : ((SOAPFactory)getOMFactory()).createSOAPHeader(this);
+ return header != null ? header : ((SOAPFactory) getOMFactory()).createSOAPHeader(this);
}
@Override
public final SOAPBody getBody() {
OMElement element = getFirstElement();
if (element instanceof SOAPBody) {
- return (SOAPBody)element;
+ return (SOAPBody) element;
} else if (element instanceof SOAPHeader) {
OMNode node = element.getNextOMSibling();
while (node != null && !(node instanceof OMElement)) {
node = node.getNextOMSibling();
}
if (node instanceof SOAPBody) {
- return (SOAPBody)node;
+ return (SOAPBody) node;
}
}
return null;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPFaultDetailMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPFaultDetailMixin.java
index 82977f2..823220e 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPFaultDetailMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPFaultDetailMixin.java
@@ -30,7 +30,7 @@ public abstract class AxiomSOAPFaultDetailMixin implements AxiomSOAPFaultDetail
public final boolean isChildElementAllowed(OMElement child) {
return !(child instanceof AxiomSOAPElement);
}
-
+
@Override
public final void addDetailEntry(OMElement detailElement) {
addChild(detailElement);
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPFaultMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPFaultMixin.java
index 1e794bc..ef951db 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPFaultMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPFaultMixin.java
@@ -38,8 +38,11 @@ import org.apache.axiom.weaver.annotation.Mixin;
@Mixin
public abstract class AxiomSOAPFaultMixin implements AxiomSOAPFault {
public final boolean isChildElementAllowed(OMElement child) {
- return child instanceof SOAPFaultCode || child instanceof SOAPFaultDetail
- || child instanceof SOAPFaultReason || child instanceof SOAPFaultRole || child instanceof SOAPFaultNode;
+ return child instanceof SOAPFaultCode
+ || child instanceof SOAPFaultDetail
+ || child instanceof SOAPFaultReason
+ || child instanceof SOAPFaultRole
+ || child instanceof SOAPFaultNode;
}
@Override
@@ -69,14 +72,15 @@ public abstract class AxiomSOAPFaultMixin implements AxiomSOAPFault {
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
sw.flush();
- SOAPFactory factory = (SOAPFactory)getOMFactory();
+ SOAPFactory factory = (SOAPFactory) getOMFactory();
SOAPFaultDetail detail = getDetail();
if (detail == null) {
detail = factory.createSOAPFaultDetail(this);
setDetail(detail);
}
- OMElement faultDetailEnty = factory.createOMElement(
- SOAPConstants.SOAP_FAULT_DETAIL_EXCEPTION_ENTRY, null, detail);
+ OMElement faultDetailEnty =
+ factory.createOMElement(
+ SOAPConstants.SOAP_FAULT_DETAIL_EXCEPTION_ENTRY, null, detail);
faultDetailEnty.setText(sw.getBuffer().toString());
}
@@ -86,8 +90,10 @@ public abstract class AxiomSOAPFaultMixin implements AxiomSOAPFault {
if (detail == null) {
return null;
} else {
- OMElement exceptionElement = getDetail().getFirstChildWithName(
- new QName(SOAPConstants.SOAP_FAULT_DETAIL_EXCEPTION_ENTRY));
+ OMElement exceptionElement =
+ getDetail()
+ .getFirstChildWithName(
+ new QName(SOAPConstants.SOAP_FAULT_DETAIL_EXCEPTION_ENTRY));
if (exceptionElement != null) {
return new Exception(exceptionElement.getText());
} else {
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPHeaderBlockMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPHeaderBlockMixin.java
index 7f2387b..6b84035 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPHeaderBlockMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPHeaderBlockMixin.java
@@ -59,23 +59,24 @@ public abstract class AxiomSOAPHeaderBlockMixin implements AxiomSOAPHeaderBlock
public final boolean getMustUnderstand() throws SOAPProcessingException {
return SOAPHeaderBlockHelper.getMustUnderstand(this, getSOAPHelper());
}
-
+
@Override
public final void setMustUnderstand(boolean mustUnderstand) {
SOAPHelper helper = getSOAPHelper();
- _setAttributeValue(helper.getMustUnderstandAttributeQName(), helper.formatBoolean(mustUnderstand));
+ _setAttributeValue(
+ helper.getMustUnderstandAttributeQName(), helper.formatBoolean(mustUnderstand));
}
@Override
public final String getRole() {
return SOAPHeaderBlockHelper.getRole(this, getSOAPHelper());
}
-
+
@Override
public final void setRole(String role) {
_setAttributeValue(getSOAPHelper().getRoleAttributeQName(), role);
}
-
+
@Override
public final boolean getRelay() {
SOAPHelper helper = getSOAPHelper();
@@ -83,10 +84,11 @@ public abstract class AxiomSOAPHeaderBlockMixin implements AxiomSOAPHeaderBlock
if (attributeQName == null) {
throw new UnsupportedOperationException("Not supported for " + helper.getSpecName());
} else {
- return SOAPHeaderBlockHelper.getBooleanAttributeValue(this, helper, RELAY_PROPERTY, attributeQName);
+ return SOAPHeaderBlockHelper.getBooleanAttributeValue(
+ this, helper, RELAY_PROPERTY, attributeQName);
}
}
-
+
@Override
public final void setRelay(boolean relay) {
SOAPHelper helper = getSOAPHelper();
@@ -100,10 +102,14 @@ public abstract class AxiomSOAPHeaderBlockMixin implements AxiomSOAPHeaderBlock
@Override
public final <T> void initAncillaryData(ClonePolicy<T> policy, T options, CoreNode other) {
- // Copy the processed flag. The other SOAPHeaderBlock information
+ // Copy the processed flag. The other SOAPHeaderBlock information
// (e.g. role, mustUnderstand) are attributes on the tag and are copied elsewhere.
- Boolean processedFlag = options instanceof SOAPCloneOptions ? ((SOAPCloneOptions)options).getProcessedFlag() : null;
- if ((processedFlag == null && ((SOAPHeaderBlock)other).isProcessed()) || (processedFlag != null && processedFlag.booleanValue())) {
+ Boolean processedFlag =
+ options instanceof SOAPCloneOptions
+ ? ((SOAPCloneOptions) options).getProcessedFlag()
+ : null;
+ if ((processedFlag == null && ((SOAPHeaderBlock) other).isProcessed())
+ || (processedFlag != null && processedFlag.booleanValue())) {
setProcessed();
}
}
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPHeaderMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPHeaderMixin.java
index 1aa79b0..7e35348 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPHeaderMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPHeaderMixin.java
@@ -51,20 +51,20 @@ public abstract class AxiomSOAPHeaderMixin implements AxiomSOAPHeader {
@Override
public final SOAPHeaderBlock addHeaderBlock(String localName, OMNamespace ns)
throws OMException {
-
+
if (ns == null || ns.getNamespaceURI().length() == 0) {
- throw new OMException(
- "All the SOAP Header blocks should be namespace qualified");
+ throw new OMException("All the SOAP Header blocks should be namespace qualified");
}
-
+
OMNamespace namespace = findNamespace(ns.getNamespaceURI(), ns.getPrefix());
if (namespace != null) {
ns = namespace;
}
-
+
SOAPHeaderBlock soapHeaderBlock;
try {
- soapHeaderBlock = ((SOAPFactory)getOMFactory()).createSOAPHeaderBlock(localName, ns, this);
+ soapHeaderBlock =
+ ((SOAPFactory) getOMFactory()).createSOAPHeaderBlock(localName, ns, this);
} catch (SOAPProcessingException e) {
throw new OMException(e);
}
@@ -73,25 +73,45 @@ public abstract class AxiomSOAPHeaderMixin implements AxiomSOAPHeader {
@Override
public final SOAPHeaderBlock addHeaderBlock(QName qname) throws OMException {
- return addHeaderBlock(qname.getLocalPart(), getOMFactory().createOMNamespace(qname.getNamespaceURI(), qname.getPrefix()));
+ return addHeaderBlock(
+ qname.getLocalPart(),
+ getOMFactory().createOMNamespace(qname.getNamespaceURI(), qname.getPrefix()));
}
@Override
public final Iterator<SOAPHeaderBlock> examineAllHeaderBlocks() {
- return coreGetElements(Axis.CHILDREN, AxiomElement.class, ElementMatcher.ANY, null, null,
- SOAPHeaderBlockMapper.INSTANCE, AxiomSemantics.INSTANCE);
+ return coreGetElements(
+ Axis.CHILDREN,
+ AxiomElement.class,
+ ElementMatcher.ANY,
+ null,
+ null,
+ SOAPHeaderBlockMapper.INSTANCE,
+ AxiomSemantics.INSTANCE);
}
@Override
public final Iterator<SOAPHeaderBlock> examineHeaderBlocks(String role) {
- return coreGetElements(Axis.CHILDREN, AxiomElement.class, new RoleChecker(getSOAPHelper(), role), null, null,
- SOAPHeaderBlockMapper.INSTANCE, AxiomSemantics.INSTANCE);
+ return coreGetElements(
+ Axis.CHILDREN,
+ AxiomElement.class,
+ new RoleChecker(getSOAPHelper(), role),
+ null,
+ null,
+ SOAPHeaderBlockMapper.INSTANCE,
+ AxiomSemantics.INSTANCE);
}
@Override
public final Iterator<SOAPHeaderBlock> examineMustUnderstandHeaderBlocks(String role) {
- return coreGetElements(Axis.CHILDREN, AxiomElement.class, new MURoleChecker(getSOAPHelper(), role), null, null,
- SOAPHeaderBlockMapper.INSTANCE, AxiomSemantics.INSTANCE);
+ return coreGetElements(
+ Axis.CHILDREN,
+ AxiomElement.class,
+ new MURoleChecker(getSOAPHelper(), role),
+ null,
+ null,
+ SOAPHeaderBlockMapper.INSTANCE,
+ AxiomSemantics.INSTANCE);
}
@Override
@@ -100,27 +120,47 @@ public abstract class AxiomSOAPHeaderMixin implements AxiomSOAPHeader {
}
@Override
- public final Iterator<SOAPHeaderBlock> getHeadersToProcess(RolePlayer rolePlayer, String namespace) {
- return coreGetElements(Axis.CHILDREN, AxiomElement.class, new RolePlayerChecker(getSOAPHelper(), rolePlayer, namespace), null, null,
- SOAPHeaderBlockMapper.INSTANCE, AxiomSemantics.INSTANCE);
+ public final Iterator<SOAPHeaderBlock> getHeadersToProcess(
+ RolePlayer rolePlayer, String namespace) {
+ return coreGetElements(
+ Axis.CHILDREN,
+ AxiomElement.class,
+ new RolePlayerChecker(getSOAPHelper(), rolePlayer, namespace),
+ null,
+ null,
+ SOAPHeaderBlockMapper.INSTANCE,
+ AxiomSemantics.INSTANCE);
}
@Override
public final Iterator<SOAPHeaderBlock> getHeaderBlocksWithNamespaceURI(String uri) {
- return coreGetElements(Axis.CHILDREN, AxiomElement.class, ElementMatcher.BY_NAMESPACE_URI, uri, null,
- SOAPHeaderBlockMapper.INSTANCE, AxiomSemantics.INSTANCE);
+ return coreGetElements(
+ Axis.CHILDREN,
+ AxiomElement.class,
+ ElementMatcher.BY_NAMESPACE_URI,
+ uri,
+ null,
+ SOAPHeaderBlockMapper.INSTANCE,
+ AxiomSemantics.INSTANCE);
}
@Override
public final Iterator<SOAPHeaderBlock> getHeaderBlocksWithName(QName name) {
- return coreGetElements(Axis.CHILDREN, AxiomElement.class, ElementMatcher.BY_QNAME, name.getNamespaceURI(), name.getLocalPart(),
- SOAPHeaderBlockMapper.INSTANCE, AxiomSemantics.INSTANCE);
+ return coreGetElements(
+ Axis.CHILDREN,
+ AxiomElement.class,
+ ElementMatcher.BY_QNAME,
+ name.getNamespaceURI(),
+ name.getLocalPart(),
+ SOAPHeaderBlockMapper.INSTANCE,
+ AxiomSemantics.INSTANCE);
}
@Override
public final ArrayList<SOAPHeaderBlock> getHeaderBlocksWithNSURI(String nsURI) {
ArrayList<SOAPHeaderBlock> result = new ArrayList<SOAPHeaderBlock>();
- for (Iterator<SOAPHeaderBlock> it = getHeaderBlocksWithNamespaceURI(nsURI); it.hasNext(); ) {
+ for (Iterator<SOAPHeaderBlock> it = getHeaderBlocksWithNamespaceURI(nsURI);
+ it.hasNext(); ) {
result.add(it.next());
}
return result;
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPMessageMixin.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPMessageMixin.java
index 4301dd0..a985041 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPMessageMixin.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPMessageMixin.java
@@ -41,18 +41,18 @@ public abstract class AxiomSOAPMessageMixin implements AxiomSOAPMessage {
public final void initSOAPFactory(SOAPFactory factory) {
this.factory = factory;
}
-
+
@Override
public final <T> void initAncillaryData(ClonePolicy<T> policy, T options, CoreNode other) {
- factory = (SOAPFactory)((AxiomSOAPMessage)other).getOMFactory();
+ factory = (SOAPFactory) ((AxiomSOAPMessage) other).getOMFactory();
}
-
+
public final void checkDocumentElement(OMElement element) {
if (!(element instanceof SOAPEnvelope)) {
throw new OMException("Child not allowed; must be a SOAPEnvelope");
}
}
-
+
@Override
public final OMFactory getOMFactory() {
if (factory == null) {
@@ -61,10 +61,10 @@ public abstract class AxiomSOAPMessageMixin implements AxiomSOAPMessage {
}
return factory;
}
-
+
@Override
public final SOAPEnvelope getSOAPEnvelope() {
- return (SOAPEnvelope)getOMDocumentElement();
+ return (SOAPEnvelope) getOMDocumentElement();
}
@Override
diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/package-info.java b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/package-info.java
index cbe724b..0e3042c 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/package-info.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/package-info.java
@@ -16,40 +16,41 @@
* specific language governing permissions and limitations
* under the License.
*/
-@org.apache.axiom.weaver.annotation.WeavablePackage(mixins={
- AxiomSOAP11BodyMixin.class,
- AxiomSOAP11ElementMixin.class,
- AxiomSOAP11EnvelopeMixin.class,
- AxiomSOAP11FaultCodeMixin.class,
- AxiomSOAP11FaultDetailMixin.class,
- AxiomSOAP11FaultMixin.class,
- AxiomSOAP11FaultReasonMixin.class,
- AxiomSOAP11FaultRoleMixin.class,
- AxiomSOAP11HeaderBlockMixin.class,
- AxiomSOAP11HeaderMixin.class,
- AxiomSOAP12BodyMixin.class,
- AxiomSOAP12ElementMixin.class,
- AxiomSOAP12EnvelopeMixin.class,
- AxiomSOAP12FaultClassifierMixin.class,
- AxiomSOAP12FaultCodeMixin.class,
- AxiomSOAP12FaultDetailMixin.class,
- AxiomSOAP12FaultMixin.class,
- AxiomSOAP12FaultNodeMixin.class,
- AxiomSOAP12FaultReasonMixin.class,
- AxiomSOAP12FaultRoleMixin.class,
- AxiomSOAP12FaultSubCodeMixin.class,
- AxiomSOAP12FaultTextMixin.class,
- AxiomSOAP12FaultValueMixin.class,
- AxiomSOAP12HeaderBlockMixin.class,
- AxiomSOAP12HeaderMixin.class,
- AxiomSOAPBodyMixin.class,
- AxiomSOAPElementMixin.class,
- AxiomSOAPEnvelopeMixin.class,
- AxiomSOAPFaultDetailMixin.class,
- AxiomSOAPFaultMixin.class,
- AxiomSOAPFaultRoleMixin.class,
- AxiomSOAPHeaderBlockMixin.class,
- AxiomSOAPHeaderMixin.class,
- AxiomSOAPMessageMixin.class,
-})
+@org.apache.axiom.weaver.annotation.WeavablePackage(
+ mixins = {
+ AxiomSOAP11BodyMixin.class,
+ AxiomSOAP11ElementMixin.class,
+ AxiomSOAP11EnvelopeMixin.class,
+ AxiomSOAP11FaultCodeMixin.class,
+ AxiomSOAP11FaultDetailMixin.class,
+ AxiomSOAP11FaultMixin.class,
+ AxiomSOAP11FaultReasonMixin.class,
+ AxiomSOAP11FaultRoleMixin.class,
+ AxiomSOAP11HeaderBlockMixin.class,
+ AxiomSOAP11HeaderMixin.class,
+ AxiomSOAP12BodyMixin.class,
+ AxiomSOAP12ElementMixin.class,
+ AxiomSOAP12EnvelopeMixin.class,
+ AxiomSOAP12FaultClassifierMixin.class,
+ AxiomSOAP12FaultCodeMixin.class,
+ AxiomSOAP12FaultDetailMixin.class,
+ AxiomSOAP12FaultMixin.class,
+ AxiomSOAP12FaultNodeMixin.class,
+ AxiomSOAP12FaultReasonMixin.class,
+ AxiomSOAP12FaultRoleMixin.class,
+ AxiomSOAP12FaultSubCodeMixin.class,
+ AxiomSOAP12FaultTextMixin.class,
+ AxiomSOAP12FaultValueMixin.class,
+ AxiomSOAP12HeaderBlockMixin.class,
+ AxiomSOAP12HeaderMixin.class,
+ AxiomSOAPBodyMixin.class,
+ AxiomSOAPElementMixin.class,
+ AxiomSOAPEnvelopeMixin.class,
+ AxiomSOAPFaultDetailMixin.class,
+ AxiomSOAPFaultMixin.class,
+ AxiomSOAPFaultRoleMixin.class,
+ AxiomSOAPHeaderBlockMixin.class,
+ AxiomSOAPHeaderMixin.class,
+ AxiomSOAPMessageMixin.class,
+ })
package org.apache.axiom.soap.impl.mixin;
diff --git a/mixins/om-mixins/src/test/java/org/apache/axiom/om/impl/common/OMNamespaceImplTest.java b/mixins/om-mixins/src/test/java/org/apache/axiom/om/impl/common/OMNamespaceImplTest.java
index d26ffd5..d1938eb 100644
--- a/mixins/om-mixins/src/test/java/org/apache/axiom/om/impl/common/OMNamespaceImplTest.java
+++ b/mixins/om-mixins/src/test/java/org/apache/axiom/om/impl/common/OMNamespaceImplTest.java
@@ -35,28 +35,29 @@ public class OMNamespaceImplTest extends TestCase {
Field[] clsField = OMNamespaceImpl.class.getDeclaredFields();
for (int i = 0; i < clsField.length; i++) {
String fieldData = clsField[i].toString();
- if ((fieldData.indexOf("prefix") != -1)
- || (fieldData.indexOf("uri") != -1)) {
- assertTrue("The field should have been private, "
- + " but instead contained: " + fieldData + ".",
- fieldData.indexOf("private") != -1);
+ if ((fieldData.indexOf("prefix") != -1) || (fieldData.indexOf("uri") != -1)) {
+ assertTrue(
+ "The field should have been private, "
+ + " but instead contained: "
+ + fieldData
+ + ".",
+ fieldData.indexOf("private") != -1);
}
}
- String[] method = new String[] { "setPrefix", "setUri", "setName" };
+ String[] method = new String[] {"setPrefix", "setUri", "setName"};
for (int i = 0; i < method.length; i++) {
try {
- OMNamespaceImpl.class.getMethod(method[i],
- new Class[] { String.class });
- fail("A NoSuchMethodException should have been thrown"
- + " when trying to get method \"" + method[i]
- + "\".");
+ OMNamespaceImpl.class.getMethod(method[i], new Class[] {String.class});
+ fail(
+ "A NoSuchMethodException should have been thrown"
+ + " when trying to get method \""
+ + method[i]
+ + "\".");
} catch (NoSuchMethodException e) {
// These methods should not exist, so this is
// expected.
}
}
-
}
-
}
diff --git a/mixins/om-mixins/src/test/java/org/apache/axiom/om/impl/common/util/LocaleUtilTest.java b/mixins/om-mixins/src/test/java/org/apache/axiom/om/impl/common/util/LocaleUtilTest.java
index e383195..f2b7200 100644
--- a/mixins/om-mixins/src/test/java/org/apache/axiom/om/impl/common/util/LocaleUtilTest.java
+++ b/mixins/om-mixins/src/test/java/org/apache/axiom/om/impl/common/util/LocaleUtilTest.java
@@ -26,7 +26,8 @@ import org.junit.Test;
public class LocaleUtilTest {
private static void assertCloserMatch(Locale requested, Locale closer, Locale other) {
- assertThat(LocaleUtil.getMatchScore(requested, closer)).isGreaterThan(LocaleUtil.getMatchScore(requested, other));
+ assertThat(LocaleUtil.getMatchScore(requested, closer))
+ .isGreaterThan(LocaleUtil.getMatchScore(requested, other));
}
@Test