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 0d748175e Remove `coreGetNodeClass()`: bypass NodeFactory in clone
policies via direct reflective instantiation
0d748175e is described below
commit 0d748175ef5846342cf83727a43484e9ea13a930
Author: Copilot <[email protected]>
AuthorDate: Sun May 24 13:26:38 2026 +0100
Remove `coreGetNodeClass()`: bypass NodeFactory in clone policies via
direct reflective instantiation
Co-authored-by: Andreas Veithen-Knowles <[email protected]>
---
.../main/java/org/apache/axiom/core/CoreNode.java | 2 --
.../axiom/core/impl/mixin/CoreNodeMixin.java | 6 -----
.../java/org/apache/axiom/dom/DOMClonePolicy.java | 7 ++++-
.../axiom/om/impl/common/AxiomSemantics.java | 7 ++++-
.../om/impl/mixin/AxiomSourcedElementMixin.java | 6 -----
.../soap/impl/mixin/AxiomSOAP11BodyMixin.java | 31 ----------------------
.../soap/impl/mixin/AxiomSOAP11EnvelopeMixin.java | 5 ----
.../soap/impl/mixin/AxiomSOAP11FaultCodeMixin.java | 6 -----
.../impl/mixin/AxiomSOAP11FaultDetailMixin.java | 31 ----------------------
.../soap/impl/mixin/AxiomSOAP11FaultMixin.java | 6 -----
.../impl/mixin/AxiomSOAP11FaultReasonMixin.java | 5 ----
.../soap/impl/mixin/AxiomSOAP11FaultRoleMixin.java | 31 ----------------------
.../impl/mixin/AxiomSOAP11HeaderBlockMixin.java | 31 ----------------------
.../soap/impl/mixin/AxiomSOAP11HeaderMixin.java | 31 ----------------------
.../soap/impl/mixin/AxiomSOAP12BodyMixin.java | 31 ----------------------
.../soap/impl/mixin/AxiomSOAP12EnvelopeMixin.java | 5 ----
.../soap/impl/mixin/AxiomSOAP12FaultCodeMixin.java | 31 ----------------------
.../impl/mixin/AxiomSOAP12FaultDetailMixin.java | 31 ----------------------
.../soap/impl/mixin/AxiomSOAP12FaultMixin.java | 6 -----
.../soap/impl/mixin/AxiomSOAP12FaultNodeMixin.java | 5 ----
.../impl/mixin/AxiomSOAP12FaultReasonMixin.java | 5 ----
.../soap/impl/mixin/AxiomSOAP12FaultRoleMixin.java | 31 ----------------------
.../impl/mixin/AxiomSOAP12FaultSubCodeMixin.java | 31 ----------------------
.../soap/impl/mixin/AxiomSOAP12FaultTextMixin.java | 6 -----
.../impl/mixin/AxiomSOAP12FaultValueMixin.java | 6 -----
.../impl/mixin/AxiomSOAP12HeaderBlockMixin.java | 31 ----------------------
.../soap/impl/mixin/AxiomSOAP12HeaderMixin.java | 31 ----------------------
.../soap/impl/mixin/AxiomSOAPMessageMixin.java | 5 ----
.../apache/axiom/soap/impl/mixin/package-info.java | 12 ---------
29 files changed, 12 insertions(+), 460 deletions(-)
diff --git
a/mixins/core-mixins/src/main/java/org/apache/axiom/core/CoreNode.java
b/mixins/core-mixins/src/main/java/org/apache/axiom/core/CoreNode.java
index 7125a80d0..38335c05f 100644
--- a/mixins/core-mixins/src/main/java/org/apache/axiom/core/CoreNode.java
+++ b/mixins/core-mixins/src/main/java/org/apache/axiom/core/CoreNode.java
@@ -47,8 +47,6 @@ public interface CoreNode {
*/
NodeType coreGetNodeType();
- Class<? extends CoreNode> coreGetNodeClass();
-
/**
* Clone this node according to the provided policy.
*
diff --git
a/mixins/core-mixins/src/main/java/org/apache/axiom/core/impl/mixin/CoreNodeMixin.java
b/mixins/core-mixins/src/main/java/org/apache/axiom/core/impl/mixin/CoreNodeMixin.java
index 03d5317bc..0fb0adf4d 100644
---
a/mixins/core-mixins/src/main/java/org/apache/axiom/core/impl/mixin/CoreNodeMixin.java
+++
b/mixins/core-mixins/src/main/java/org/apache/axiom/core/impl/mixin/CoreNodeMixin.java
@@ -30,12 +30,6 @@ import org.apache.axiom.weaver.annotation.Mixin;
public abstract class CoreNodeMixin implements CoreNode {
int flags;
- // Default implementation; may be overridden
- @Override
- public Class<? extends CoreNode> coreGetNodeClass() {
- return coreGetNodeType().getInterface();
- }
-
@Override
public final CoreDocument coreGetOwnerDocument(boolean create) {
CoreNode root = getRootOrOwnerDocument();
diff --git
a/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/DOMClonePolicy.java
b/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/DOMClonePolicy.java
index 38273938b..804236560 100644
--- a/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/DOMClonePolicy.java
+++ b/mixins/dom-mixins/src/main/java/org/apache/axiom/dom/DOMClonePolicy.java
@@ -21,6 +21,7 @@ package org.apache.axiom.dom;
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.NodeFactory;
+import org.apache.axiom.core.NodeFactoryException;
import org.apache.axiom.core.NodeType;
abstract class DOMClonePolicy implements ClonePolicy<Void> {
@@ -28,7 +29,11 @@ abstract class DOMClonePolicy implements ClonePolicy<Void> {
public CoreNode createTargetNode(Void options, CoreNode node, NodeFactory
factory) {
// This is not specified by the API, but it's compatible with versions
before
// 1.2.14
- return factory.createNode(node.coreGetNodeClass());
+ try {
+ return (CoreNode) node.getClass().getConstructor().newInstance();
+ } catch (ReflectiveOperationException ex) {
+ throw new NodeFactoryException("Failed to clone node", ex);
+ }
}
@Override
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 6aa9f90c1..64f98dce5 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
@@ -27,6 +27,7 @@ import org.apache.axiom.core.DetachPolicy;
import org.apache.axiom.core.NSAwareAttributeMatcher;
import org.apache.axiom.core.NamespaceDeclarationMatcher;
import org.apache.axiom.core.NodeFactory;
+import org.apache.axiom.core.NodeFactoryException;
import org.apache.axiom.core.NodeType;
import org.apache.axiom.core.Semantics;
import org.apache.axiom.om.OMCloneOptions;
@@ -65,7 +66,11 @@ public final class AxiomSemantics implements Semantics {
@Override
public CoreNode createTargetNode(OMCloneOptions options, CoreNode
node, NodeFactory factory) {
if (options != null && options.isPreserveModel()) {
- return factory.createNode(node.coreGetNodeClass());
+ try {
+ return (CoreNode)
node.getClass().getConstructor().newInstance();
+ } catch (ReflectiveOperationException ex) {
+ throw new NodeFactoryException("Failed to clone node", ex);
+ }
} else if (options != null && options.isCopyOMDataSources() &&
node instanceof AxiomSourcedElement) {
return ((AxiomNodeFactory)
factory.getFactory2()).createSourcedElement();
} else {
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 006c7c2d2..93b21c65b 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
@@ -25,7 +25,6 @@ import org.apache.axiom.core.Builder;
import org.apache.axiom.core.ClonePolicy;
import org.apache.axiom.core.CoreElement;
import org.apache.axiom.core.CoreModelException;
-import org.apache.axiom.core.CoreNode;
import org.apache.axiom.core.DeferredParsingException;
import org.apache.axiom.core.impl.builder.BuilderImpl;
import org.apache.axiom.core.impl.builder.PlainXMLModel;
@@ -97,11 +96,6 @@ public abstract class AxiomSourcedElementMixin implements
AxiomSourcedElement {
: new OMNamespaceImpl(qName.getNamespaceURI(),
qName.getPrefix());
}
- @Override
- public Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSourcedElement.class;
- }
-
@Override
public void init(OMDataSource source) {
dataSource = source;
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11BodyMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11BodyMixin.java
deleted file mode 100644
index 8f5c63551..000000000
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11BodyMixin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.axiom.soap.impl.mixin;
-
-import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11Body;
-import org.apache.axiom.weaver.annotation.Mixin;
-
-@Mixin
-public abstract class AxiomSOAP11BodyMixin implements AxiomSOAP11Body {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP11Body.class;
- }
-}
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 832771bf1..f1ae80304 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
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.soap.impl.mixin;
-import org.apache.axiom.core.CoreNode;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPHeader;
@@ -28,10 +27,6 @@ import org.apache.axiom.weaver.annotation.Mixin;
@Mixin
public abstract class AxiomSOAP11EnvelopeMixin implements AxiomSOAP11Envelope {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP11Envelope.class;
- }
@Override
public final boolean isChildElementAllowed(OMElement child) {
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultCodeMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultCodeMixin.java
index 2479767a1..459636c0b 100644
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultCodeMixin.java
+++
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultCodeMixin.java
@@ -19,7 +19,6 @@
package org.apache.axiom.soap.impl.mixin;
import javax.xml.namespace.QName;
-import org.apache.axiom.core.CoreNode;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPFaultSubCode;
import org.apache.axiom.soap.SOAPFaultValue;
@@ -33,11 +32,6 @@ public abstract class AxiomSOAP11FaultCodeMixin implements
AxiomSOAP11FaultCode
return false;
}
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP11FaultCode.class;
- }
-
@Override
public final SOAPFaultValue getValue() {
return null;
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultDetailMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultDetailMixin.java
deleted file mode 100644
index 0a12ef46e..000000000
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultDetailMixin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.axiom.soap.impl.mixin;
-
-import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11FaultDetail;
-import org.apache.axiom.weaver.annotation.Mixin;
-
-@Mixin
-public abstract class AxiomSOAP11FaultDetailMixin implements
AxiomSOAP11FaultDetail {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP11FaultDetail.class;
- }
-}
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 684e3d826..fb5c9a140 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
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.soap.impl.mixin;
-import org.apache.axiom.core.CoreNode;
import org.apache.axiom.om.impl.intf.Sequence;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPFaultCode;
@@ -34,11 +33,6 @@ public abstract class AxiomSOAP11FaultMixin implements
AxiomSOAP11Fault {
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;
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultReasonMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultReasonMixin.java
index fbaad0a30..627aeac00 100644
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultReasonMixin.java
+++
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultReasonMixin.java
@@ -21,7 +21,6 @@ package org.apache.axiom.soap.impl.mixin;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import org.apache.axiom.core.CoreNode;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPFaultText;
import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11FaultReason;
@@ -29,10 +28,6 @@ import org.apache.axiom.weaver.annotation.Mixin;
@Mixin
public abstract class AxiomSOAP11FaultReasonMixin implements
AxiomSOAP11FaultReason {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP11FaultReason.class;
- }
@Override
public final boolean isChildElementAllowed(OMElement child) {
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultRoleMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultRoleMixin.java
deleted file mode 100644
index 7a3b9fcf5..000000000
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11FaultRoleMixin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.axiom.soap.impl.mixin;
-
-import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11FaultRole;
-import org.apache.axiom.weaver.annotation.Mixin;
-
-@Mixin
-public abstract class AxiomSOAP11FaultRoleMixin implements
AxiomSOAP11FaultRole {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP11FaultRole.class;
- }
-}
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11HeaderBlockMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11HeaderBlockMixin.java
deleted file mode 100644
index 97414e2dc..000000000
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11HeaderBlockMixin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.axiom.soap.impl.mixin;
-
-import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11HeaderBlock;
-import org.apache.axiom.weaver.annotation.Mixin;
-
-@Mixin
-public abstract class AxiomSOAP11HeaderBlockMixin implements
AxiomSOAP11HeaderBlock {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP11HeaderBlock.class;
- }
-}
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11HeaderMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11HeaderMixin.java
deleted file mode 100644
index ea85d5a9c..000000000
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP11HeaderMixin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.axiom.soap.impl.mixin;
-
-import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.soap.impl.intf.soap11.AxiomSOAP11Header;
-import org.apache.axiom.weaver.annotation.Mixin;
-
-@Mixin
-public abstract class AxiomSOAP11HeaderMixin implements AxiomSOAP11Header {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP11Header.class;
- }
-}
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12BodyMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12BodyMixin.java
deleted file mode 100644
index a1e15a4d4..000000000
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12BodyMixin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.axiom.soap.impl.mixin;
-
-import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12Body;
-import org.apache.axiom.weaver.annotation.Mixin;
-
-@Mixin
-public abstract class AxiomSOAP12BodyMixin implements AxiomSOAP12Body {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP12Body.class;
- }
-}
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12EnvelopeMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12EnvelopeMixin.java
index 6a1f52121..0a47ba4a3 100644
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12EnvelopeMixin.java
+++
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12EnvelopeMixin.java
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.soap.impl.mixin;
-import org.apache.axiom.core.CoreNode;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPHeader;
@@ -27,10 +26,6 @@ import org.apache.axiom.weaver.annotation.Mixin;
@Mixin
public abstract class AxiomSOAP12EnvelopeMixin implements AxiomSOAP12Envelope {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP12Envelope.class;
- }
@Override
public final boolean isChildElementAllowed(OMElement child) {
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultCodeMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultCodeMixin.java
deleted file mode 100644
index 3f151dcda..000000000
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultCodeMixin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.axiom.soap.impl.mixin;
-
-import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultCode;
-import org.apache.axiom.weaver.annotation.Mixin;
-
-@Mixin
-public abstract class AxiomSOAP12FaultCodeMixin implements
AxiomSOAP12FaultCode {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP12FaultCode.class;
- }
-}
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultDetailMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultDetailMixin.java
deleted file mode 100644
index 657643492..000000000
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultDetailMixin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.axiom.soap.impl.mixin;
-
-import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultDetail;
-import org.apache.axiom.weaver.annotation.Mixin;
-
-@Mixin
-public abstract class AxiomSOAP12FaultDetailMixin implements
AxiomSOAP12FaultDetail {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP12FaultDetail.class;
- }
-}
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 d0343a3ac..7febc8411 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
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.soap.impl.mixin;
-import org.apache.axiom.core.CoreNode;
import org.apache.axiom.om.impl.intf.Sequence;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPFaultCode;
@@ -38,11 +37,6 @@ public abstract class AxiomSOAP12FaultMixin implements
AxiomSOAP12Fault {
SOAPFaultRole.class,
SOAPFaultDetail.class);
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP12Fault.class;
- }
-
@Override
public final Sequence getSequence() {
return sequence;
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultNodeMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultNodeMixin.java
index 4c3bd5fe7..d382d2ed7 100644
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultNodeMixin.java
+++
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultNodeMixin.java
@@ -18,17 +18,12 @@
*/
package org.apache.axiom.soap.impl.mixin;
-import org.apache.axiom.core.CoreNode;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultNode;
import org.apache.axiom.weaver.annotation.Mixin;
@Mixin
public abstract class AxiomSOAP12FaultNodeMixin implements
AxiomSOAP12FaultNode {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP12FaultNode.class;
- }
@Override
public final boolean isChildElementAllowed(OMElement child) {
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 2e4d3398e..315631afa 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
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
-import org.apache.axiom.core.CoreNode;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.common.util.LocaleUtil;
import org.apache.axiom.soap.SOAPFaultText;
@@ -31,10 +30,6 @@ import org.apache.axiom.weaver.annotation.Mixin;
@Mixin
public abstract class AxiomSOAP12FaultReasonMixin implements
AxiomSOAP12FaultReason {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP12FaultReason.class;
- }
@Override
public final boolean isChildElementAllowed(OMElement child) {
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultRoleMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultRoleMixin.java
deleted file mode 100644
index 1309fe90c..000000000
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultRoleMixin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.axiom.soap.impl.mixin;
-
-import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultRole;
-import org.apache.axiom.weaver.annotation.Mixin;
-
-@Mixin
-public abstract class AxiomSOAP12FaultRoleMixin implements
AxiomSOAP12FaultRole {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP12FaultRole.class;
- }
-}
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultSubCodeMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultSubCodeMixin.java
deleted file mode 100644
index c9f724a40..000000000
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultSubCodeMixin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.axiom.soap.impl.mixin;
-
-import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultSubCode;
-import org.apache.axiom.weaver.annotation.Mixin;
-
-@Mixin
-public abstract class AxiomSOAP12FaultSubCodeMixin implements
AxiomSOAP12FaultSubCode {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP12FaultSubCode.class;
- }
-}
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 0f4155609..6f30163fc 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
@@ -19,7 +19,6 @@
package org.apache.axiom.soap.impl.mixin;
import javax.xml.namespace.QName;
-import org.apache.axiom.core.CoreNode;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
@@ -36,11 +35,6 @@ public abstract class AxiomSOAP12FaultTextMixin implements
AxiomSOAP12FaultText
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;
- }
-
@Override
public final boolean isChildElementAllowed(OMElement child) {
return false;
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultValueMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultValueMixin.java
index 261b2da99..bd9533113 100644
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultValueMixin.java
+++
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultValueMixin.java
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.soap.impl.mixin;
-import org.apache.axiom.core.CoreNode;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12FaultValue;
import org.apache.axiom.weaver.annotation.Mixin;
@@ -29,9 +28,4 @@ public abstract class AxiomSOAP12FaultValueMixin implements
AxiomSOAP12FaultValu
public final boolean isChildElementAllowed(OMElement child) {
return false;
}
-
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP12FaultValue.class;
- }
}
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12HeaderBlockMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12HeaderBlockMixin.java
deleted file mode 100644
index b19ccfcb7..000000000
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12HeaderBlockMixin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.axiom.soap.impl.mixin;
-
-import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12HeaderBlock;
-import org.apache.axiom.weaver.annotation.Mixin;
-
-@Mixin
-public abstract class AxiomSOAP12HeaderBlockMixin implements
AxiomSOAP12HeaderBlock {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP12HeaderBlock.class;
- }
-}
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12HeaderMixin.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12HeaderMixin.java
deleted file mode 100644
index aad1cc031..000000000
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12HeaderMixin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.axiom.soap.impl.mixin;
-
-import org.apache.axiom.core.CoreNode;
-import org.apache.axiom.soap.impl.intf.soap12.AxiomSOAP12Header;
-import org.apache.axiom.weaver.annotation.Mixin;
-
-@Mixin
-public abstract class AxiomSOAP12HeaderMixin implements AxiomSOAP12Header {
- @Override
- public final Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAP12Header.class;
- }
-}
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 a9850417f..f8b3041ee 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
@@ -32,11 +32,6 @@ import org.apache.axiom.weaver.annotation.Mixin;
public abstract class AxiomSOAPMessageMixin implements AxiomSOAPMessage {
private SOAPFactory factory;
- @Override
- public Class<? extends CoreNode> coreGetNodeClass() {
- return AxiomSOAPMessage.class;
- }
-
@Override
public final void initSOAPFactory(SOAPFactory factory) {
this.factory = factory;
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 0e3042cf1..797d5510a 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
@@ -18,31 +18,19 @@
*/
@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,
