Author: veithen
Date: Sun Aug 23 22:17:08 2015
New Revision: 1697266
URL: http://svn.apache.org/r1697266
Log:
Unify the SOAPFault implementation code.
Added:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFaultSupport.aj
(with props)
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java
Added:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFaultSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFaultSupport.aj?rev=1697266&view=auto
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFaultSupport.aj
(added)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFaultSupport.aj
Sun Aug 23 22:17:08 2015
@@ -0,0 +1,61 @@
+/*
+ * 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.common;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.soap.SOAPConstants;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPFaultDetail;
+
+public aspect AxiomSOAPFaultSupport {
+ public final void AxiomSOAPFault.setException(Exception e) {
+ StringWriter sw = new StringWriter();
+ e.printStackTrace(new PrintWriter(sw));
+ sw.flush();
+ 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);
+ faultDetailEnty.setText(sw.getBuffer().toString());
+ }
+
+ public final Exception AxiomSOAPFault.getException() {
+ SOAPFaultDetail detail = getDetail();
+ if (detail == null) {
+ return null;
+ } else {
+ OMElement exceptionElement = getDetail().getFirstChildWithName(
+ new
QName(SOAPConstants.SOAP_FAULT_DETAIL_EXCEPTION_ENTRY));
+ if (exceptionElement != null) {
+ return new Exception(exceptionElement.getText());
+ } else {
+ return null;
+ }
+ }
+ }
+}
Propchange:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFaultSupport.aj
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java?rev=1697266&r1=1697265&r2=1697266&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
Sun Aug 23 22:17:08 2015
@@ -19,34 +19,12 @@
package org.apache.axiom.soap.impl.dom;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.impl.dom.NSAwareElement;
-import org.apache.axiom.om.impl.dom.ParentNode;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAPElement;
public abstract class SOAPElement extends NSAwareElement implements
AxiomSOAPElement {
public SOAPElement(OMFactory factory) {
super(factory);
}
-
- /** @param parent */
- protected SOAPElement(OMElement parent,
- String localName,
- boolean extractNamespaceFromParent,
- SOAPFactory factory) throws SOAPProcessingException {
- super((ParentNode) parent, localName, null, null, factory, true);
- if (parent == null) {
- throw new SOAPProcessingException(
- " Can not create " + localName +
- " element without a parent !!");
- }
- checkParent(parent);
-
- if (extractNamespaceFromParent) {
- internalSetNamespace(parent.getNamespace());
- }
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java?rev=1697266&r1=1697265&r2=1697266&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultDetailImpl.java
Sun Aug 23 22:17:08 2015
@@ -20,21 +20,10 @@
package org.apache.axiom.soap.impl.dom;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAPFaultDetail;
public abstract class SOAPFaultDetailImpl extends SOAPElement implements
AxiomSOAPFaultDetail {
public SOAPFaultDetailImpl(OMFactory factory) {
super(factory);
}
-
- protected SOAPFaultDetailImpl(SOAPFault parent,
- boolean extractNamespaceFromParent,
- SOAPFactory factory) throws
SOAPProcessingException {
- super(parent,
- factory.getSOAPVersion().getFaultDetailQName().getLocalPart(),
- extractNamespaceFromParent, factory);
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java?rev=1697266&r1=1697265&r2=1697266&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultImpl.java
Sun Aug 23 22:17:08 2015
@@ -19,67 +19,11 @@
package org.apache.axiom.soap.impl.dom;
-import org.apache.axiom.om.OMConstants;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.dom.NSAwareElement;
-import org.apache.axiom.om.impl.dom.ParentNode;
-import org.apache.axiom.soap.SOAPConstants;
-import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPFaultDetail;
-import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAPFault;
-import javax.xml.namespace.QName;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-public abstract class SOAPFaultImpl extends SOAPElement implements
AxiomSOAPFault,
- OMConstants {
-
+public abstract class SOAPFaultImpl extends SOAPElement implements
AxiomSOAPFault {
public SOAPFaultImpl(OMFactory factory) {
super(factory);
}
-
- public void setException(Exception e) {
- putExceptionToSOAPFault(e);
- }
-
- protected abstract SOAPFaultDetail getNewSOAPFaultDetail(SOAPFault fault)
- throws SOAPProcessingException;
-
- // --------------- Getters and Settors --------------------------- //
-
- /** If exception detailElement is not there we will return null */
- public Exception getException() throws OMException {
- SOAPFaultDetail detail = getDetail();
- if (detail == null) {
- return null;
- }
-
- OMElement exceptionElement = getDetail().getFirstChildWithName(
- new QName(SOAPConstants.SOAP_FAULT_DETAIL_EXCEPTION_ENTRY));
- if (exceptionElement != null && exceptionElement.getText() != null) {
- return new Exception(exceptionElement.getText());
- }
- return null;
- }
-
- protected void putExceptionToSOAPFault(Exception e)
- throws SOAPProcessingException {
- StringWriter sw = new StringWriter();
- e.printStackTrace(new PrintWriter(sw));
- sw.flush();
- SOAPFaultDetail detail = getDetail();
- if (detail == null) {
- detail = getNewSOAPFaultDetail(this);
- setDetail(detail);
- }
- OMElement faultDetailEnty = new NSAwareElement((ParentNode)detail,
-
SOAPConstants.SOAP_FAULT_DETAIL_EXCEPTION_ENTRY,
- null, null,
getOMFactory(), true);
- faultDetailEnty.setText(sw.getBuffer().toString());
- }
}
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java?rev=1697266&r1=1697265&r2=1697266&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
Sun Aug 23 22:17:08 2015
@@ -21,8 +21,6 @@ package org.apache.axiom.soap.impl.dom.s
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAP11FaultDetail;
import org.apache.axiom.soap.impl.dom.SOAPFaultDetailImpl;
@@ -32,11 +30,6 @@ public class SOAP11FaultDetailImpl exten
super(factory);
}
- public SOAP11FaultDetailImpl(SOAPFault parent, SOAPFactory factory)
- throws SOAPProcessingException {
- super(parent, false, factory);
- }
-
public void checkParent(OMElement parent) throws SOAPProcessingException {
if (!(parent instanceof SOAP11FaultImpl)) {
throw new SOAPProcessingException(
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java?rev=1697266&r1=1697265&r2=1697266&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java
Sun Aug 23 22:17:08 2015
@@ -21,9 +21,6 @@ package org.apache.axiom.soap.impl.dom.s
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPFaultDetail;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAP11Fault;
import org.apache.axiom.soap.impl.dom.SOAPFaultImpl;
@@ -33,11 +30,6 @@ public class SOAP11FaultImpl extends SOA
super(factory);
}
- protected SOAPFaultDetail getNewSOAPFaultDetail(SOAPFault fault)
- throws SOAPProcessingException {
- return new SOAP11FaultDetailImpl(fault, (SOAPFactory)getOMFactory());
- }
-
public void checkParent(OMElement parent) throws SOAPProcessingException {
if (!(parent instanceof SOAP11BodyImpl)) {
throw new SOAPProcessingException(
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java?rev=1697266&r1=1697265&r2=1697266&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultDetailImpl.java
Sun Aug 23 22:17:08 2015
@@ -21,8 +21,6 @@ package org.apache.axiom.soap.impl.dom.s
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAP12FaultDetail;
import org.apache.axiom.soap.impl.dom.SOAPFaultDetailImpl;
@@ -32,11 +30,6 @@ public class SOAP12FaultDetailImpl exten
super(factory);
}
- public SOAP12FaultDetailImpl(SOAPFault parent, SOAPFactory factory)
- throws SOAPProcessingException {
- super(parent, true, factory);
- }
-
public void checkParent(OMElement parent) throws SOAPProcessingException {
if (!(parent instanceof SOAP12FaultImpl)) {
throw new SOAPProcessingException(
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java?rev=1697266&r1=1697265&r2=1697266&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java
Sun Aug 23 22:17:08 2015
@@ -21,9 +21,6 @@ package org.apache.axiom.soap.impl.dom.s
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPFaultDetail;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAP12Fault;
import org.apache.axiom.soap.impl.dom.SOAPFaultImpl;
@@ -33,11 +30,6 @@ public class SOAP12FaultImpl extends SOA
super(factory);
}
- protected SOAPFaultDetail getNewSOAPFaultDetail(SOAPFault fault) {
- return new SOAP12FaultDetailImpl(fault, (SOAPFactory)getOMFactory());
-
- }
-
public void checkParent(OMElement parent) throws SOAPProcessingException {
if (!(parent instanceof SOAP12BodyImpl)) {
throw new SOAPProcessingException(
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java?rev=1697266&r1=1697265&r2=1697266&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java
Sun Aug 23 22:17:08 2015
@@ -23,8 +23,6 @@ import org.apache.axiom.core.CoreParentN
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.impl.llom.OMElementImpl;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAPElement;
public abstract class SOAPElement extends OMElementImpl implements
AxiomSOAPElement {
@@ -32,29 +30,6 @@ public abstract class SOAPElement extend
super(factory);
}
- /**
- * @param parent
- * @param localName
- * @param extractNamespaceFromParent
- */
- protected SOAPElement(OMElement parent,
- String localName,
- boolean extractNamespaceFromParent,
- SOAPFactory factory) throws SOAPProcessingException {
- super(parent, localName, null, null, factory, true);
- if (parent == null) {
- throw new SOAPProcessingException(
- " Can not create " + localName +
- " element without a parent !!");
- }
- checkParent(parent);
-
- if (extractNamespaceFromParent) {
- internalSetNamespace(parent.getNamespace());
- }
- }
-
-
public void internalSetParent(CoreParentNode element) {
super.internalSetParent(element);
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java?rev=1697266&r1=1697265&r2=1697266&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
Sun Aug 23 22:17:08 2015
@@ -25,7 +25,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAPFaultDetail;
public abstract class SOAPFaultDetailImpl extends SOAPElement implements
AxiomSOAPFaultDetail {
@@ -33,14 +32,6 @@ public abstract class SOAPFaultDetailImp
super(factory);
}
- protected SOAPFaultDetailImpl(SOAPFault parent,
- boolean extractNamespaceFromParent,
- SOAPFactory factory) throws
SOAPProcessingException {
- super(parent,
- factory.getSOAPVersion().getFaultDetailQName().getLocalPart(),
- extractNamespaceFromParent, factory);
- }
-
protected OMElement createClone(OMCloneOptions options, OMContainer
targetParent) {
return
((SOAPFactory)getOMFactory()).createSOAPFaultDetail((SOAPFault)targetParent);
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java?rev=1697266&r1=1697265&r2=1697266&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
Sun Aug 23 22:17:08 2015
@@ -20,73 +20,18 @@
package org.apache.axiom.soap.impl.llom;
import org.apache.axiom.om.OMCloneOptions;
-import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.llom.OMElementImpl;
import org.apache.axiom.soap.SOAPBody;
-import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPFaultDetail;
-import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAPFault;
-import javax.xml.namespace.QName;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-/** Class SOAPFaultImpl */
-public abstract class SOAPFaultImpl extends SOAPElement
- implements AxiomSOAPFault, OMConstants {
-
+public abstract class SOAPFaultImpl extends SOAPElement implements
AxiomSOAPFault {
public SOAPFaultImpl(OMFactory factory) {
super(factory);
}
- public void setException(Exception e) {
- putExceptionToSOAPFault(e);
- }
-
- protected abstract SOAPFaultDetail getNewSOAPFaultDetail(SOAPFault fault)
- throws SOAPProcessingException;
-
- // --------------- Getters and Settors --------------------------- //
-
- /** If exception detailElement is not there we will return null */
- public Exception getException() throws OMException {
- SOAPFaultDetail detail = getDetail();
- if (detail == null) {
- return null;
- }
-
- OMElement exceptionElement = getDetail().getFirstChildWithName(
- new QName(SOAPConstants.SOAP_FAULT_DETAIL_EXCEPTION_ENTRY));
- if (exceptionElement != null && exceptionElement.getText() != null) {
- return new Exception(exceptionElement.getText());
- }
- return null;
- }
-
- protected void putExceptionToSOAPFault(Exception e)
- throws SOAPProcessingException {
- StringWriter sw = new StringWriter();
- e.printStackTrace(new PrintWriter(sw));
- sw.flush();
- SOAPFaultDetail detail = getDetail();
- if (detail == null) {
- detail = getNewSOAPFaultDetail(this);
- setDetail(detail);
- }
- OMElement faultDetailEnty = new OMElementImpl(detail,
- SOAPConstants.SOAP_FAULT_DETAIL_EXCEPTION_ENTRY, null, null,
- getOMFactory(), true);
- faultDetailEnty.setText(sw.getBuffer().toString());
- }
-
protected OMElement createClone(OMCloneOptions options, OMContainer
targetParent) {
return ((SOAPFactory)getOMFactory()).createSOAPFault((SOAPBody)
targetParent);
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java?rev=1697266&r1=1697265&r2=1697266&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
Sun Aug 23 22:17:08 2015
@@ -21,8 +21,6 @@ package org.apache.axiom.soap.impl.llom.
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAP11FaultDetail;
import org.apache.axiom.soap.impl.llom.SOAPFaultDetailImpl;
@@ -32,11 +30,6 @@ public class SOAP11FaultDetailImpl exten
super(factory);
}
- public SOAP11FaultDetailImpl(SOAPFault parent, SOAPFactory factory)
- throws SOAPProcessingException {
- super(parent, false, factory);
- }
-
public void checkParent(OMElement parent) throws SOAPProcessingException {
if (!(parent instanceof SOAP11FaultImpl)) {
throw new SOAPProcessingException("Expecting SOAP11FaultImpl, got
" +
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java?rev=1697266&r1=1697265&r2=1697266&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java
Sun Aug 23 22:17:08 2015
@@ -21,9 +21,6 @@ package org.apache.axiom.soap.impl.llom.
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPFaultDetail;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAP11Fault;
import org.apache.axiom.soap.impl.llom.SOAPFaultImpl;
@@ -33,11 +30,6 @@ public class SOAP11FaultImpl extends SOA
super(factory);
}
- protected SOAPFaultDetail getNewSOAPFaultDetail(SOAPFault fault)
- throws SOAPProcessingException {
- return new SOAP11FaultDetailImpl(fault, (SOAPFactory)getOMFactory());
- }
-
public void checkParent(OMElement parent) throws SOAPProcessingException {
if (!(parent instanceof SOAP11BodyImpl)) {
throw new SOAPProcessingException(
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java?rev=1697266&r1=1697265&r2=1697266&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java
Sun Aug 23 22:17:08 2015
@@ -21,8 +21,6 @@ package org.apache.axiom.soap.impl.llom.
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAP12FaultDetail;
import org.apache.axiom.soap.impl.llom.SOAPFaultDetailImpl;
@@ -32,11 +30,6 @@ public class SOAP12FaultDetailImpl exten
super(factory);
}
- public SOAP12FaultDetailImpl(SOAPFault parent, SOAPFactory factory)
- throws SOAPProcessingException {
- super(parent, true, factory);
- }
-
public void checkParent(OMElement parent) throws SOAPProcessingException {
if (!(parent instanceof SOAP12FaultImpl)) {
throw new SOAPProcessingException(
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java?rev=1697266&r1=1697265&r2=1697266&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java
Sun Aug 23 22:17:08 2015
@@ -21,9 +21,6 @@ package org.apache.axiom.soap.impl.llom.
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPFaultDetail;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.common.AxiomSOAP12Fault;
import org.apache.axiom.soap.impl.llom.SOAPFaultImpl;
@@ -33,11 +30,6 @@ public class SOAP12FaultImpl extends SOA
super(factory);
}
- protected SOAPFaultDetail getNewSOAPFaultDetail(SOAPFault fault) {
- return new SOAP12FaultDetailImpl(fault, (SOAPFactory)getOMFactory());
-
- }
-
public void checkParent(OMElement parent) throws SOAPProcessingException {
if (!(parent instanceof SOAP12BodyImpl)) {
throw new SOAPProcessingException(
