Author: chinthaka
Date: Tue May 8 16:31:31 2007
New Revision: 536378
URL: http://svn.apache.org/viewvc?view=rev&rev=536378
Log:
- SOAP 1.1 and 1.2 versions of fault details elements were extending their own
serialization logic. But the only difference was the local name. Fixed it by
moving the code in to the super class and overriding the local name variable
inside them.
- Removing redundant variables
- removing verbose code within one of the tests.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11FaultImplConversionTest.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java?view=diff&rev=536378&r1=536377&r2=536378
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultCodeImpl.java
Tue May 8 16:31:31 2007
@@ -95,8 +95,7 @@
SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME,
writer);
- String text = this.getText();
- writer.writeCharacters(text);
+ writer.writeCharacters(this.getText());
writer.writeEndElement();
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java?view=diff&rev=536378&r1=536377&r2=536378
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultDetailImpl.java
Tue May 8 16:31:31 2007
@@ -71,8 +71,7 @@
SOAP11Constants.SOAP_FAULT_DETAIL_LOCAL_NAME,
writer);
- String text = this.getText();
- writer.writeCharacters(text);
+ writer.writeCharacters(this.getText());
if (firstChild != null) {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java?view=diff&rev=536378&r1=536377&r2=536378
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultReasonImpl.java
Tue May 8 16:31:31 2007
@@ -74,8 +74,7 @@
SOAP11Constants.SOAP_FAULT_STRING_LOCAL_NAME,
writer);
- String text = this.getText();
- writer.writeCharacters(text);
+ writer.writeCharacters(this.getText());
writer.writeEndElement();
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java?view=diff&rev=536378&r1=536377&r2=536378
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultRoleImpl.java
Tue May 8 16:31:31 2007
@@ -68,8 +68,7 @@
SOAP11Constants.SOAP_FAULT_ACTOR_LOCAL_NAME,
writer);
- String text = this.getText();
- writer.writeCharacters(text);
+ writer.writeCharacters(this.getText());
writer.writeEndElement();
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java?view=diff&rev=536378&r1=536377&r2=536378
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
Tue May 8 16:31:31 2007
@@ -23,7 +23,6 @@
import org.apache.axiom.om.impl.llom.OMNodeImpl;
import
org.apache.axiom.om.impl.serialize.StreamWriterToContentHandlerConverter;
import org.apache.axiom.om.impl.util.OMSerializerUtil;
-import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultDetail;
@@ -43,15 +42,15 @@
boolean extractNamespaceFromParent,
SOAPFactory factory) throws
SOAPProcessingException {
super(parent,
- factory.getSOAPVersion().getFaultDetailQName().getLocalPart(),
- extractNamespaceFromParent, factory);
+ factory.getSOAPVersion().getFaultDetailQName().getLocalPart(),
+ extractNamespaceFromParent, factory);
}
protected SOAPFaultDetailImpl(SOAPFault parent,
OMXMLParserWrapper builder,
SOAPFactory factory) {
super(parent,
factory.getSOAPVersion().getFaultDetailQName().getLocalPart(), builder,
- factory);
+ factory);
}
public void addDetailEntry(OMElement detailElement) {
@@ -76,8 +75,8 @@
}
OMSerializerUtil.serializeStartpart(this,
- getLocalName(),
- writer);
+ this.localName,
+ writer);
OMNode child = firstChild;
while (child != null && ((!(child instanceof OMElement)) ||
child.isComplete())) {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java?view=diff&rev=536378&r1=536377&r2=536378
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
Tue May 8 16:31:31 2007
@@ -90,8 +90,7 @@
SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME,
writer);
- String text = this.getText();
- writer.writeCharacters(text);
+ writer.writeCharacters(this.getText());
writer.writeEndElement();
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java?view=diff&rev=536378&r1=536377&r2=536378
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
Tue May 8 16:31:31 2007
@@ -33,18 +33,23 @@
public class SOAP11FaultDetailImpl extends SOAPFaultDetailImpl {
+
+
public SOAP11FaultDetailImpl(SOAPFactory factory) {
super(null, factory);
+ this.localName = SOAP11Constants.SOAP_FAULT_DETAIL_LOCAL_NAME;
}
public SOAP11FaultDetailImpl(SOAPFault parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, false, factory);
+ this.localName = SOAP11Constants.SOAP_FAULT_DETAIL_LOCAL_NAME;
}
public SOAP11FaultDetailImpl(SOAPFault parent, OMXMLParserWrapper builder,
SOAPFactory factory) {
super(parent, builder, factory);
+ this.localName = SOAP11Constants.SOAP_FAULT_DETAIL_LOCAL_NAME;
}
protected void checkParent(OMElement parent) throws
SOAPProcessingException {
@@ -54,32 +59,4 @@
"parent. But received some other implementation");
}
}
-
- public void internalSerialize(XMLStreamWriter writer, boolean cache)
throws XMLStreamException {
-
- // select the builder
- short builderType = PULL_TYPE_BUILDER; // default is pull type
- if (builder != null) {
- builderType = this.builder.getBuilderType();
- }
- if ((builderType == PUSH_TYPE_BUILDER)
- && (builder.getRegisteredContentHandler() == null)) {
- builder.registerExternalContentHandler(
- new StreamWriterToContentHandlerConverter(writer));
- }
-
- OMSerializerUtil.serializeStartpart(this,
-
SOAP11Constants.SOAP_FAULT_DETAIL_LOCAL_NAME,
- writer);
-
- OMNode child = firstChild;
- while (child != null && ((!(child instanceof OMElement)) ||
child.isComplete())) {
- ((OMNodeImpl) child).internalSerializeAndConsume(writer);
- child = child.getNextOMSibling();
- }
-
- writer.writeEndElement();
- }
-
-
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java?view=diff&rev=536378&r1=536377&r2=536378
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java
Tue May 8 16:31:31 2007
@@ -68,12 +68,6 @@
return new SOAP11FaultDetailImpl(fault, (SOAPFactory) this.factory);
}
-
- public void internalSerializeAndConsume(XMLStreamWriter writer)
- throws XMLStreamException {
- super.internalSerializeAndConsume(writer);
- }
-
public void setCode(SOAPFaultCode soapFaultCode)
throws SOAPProcessingException {
if (!(soapFaultCode instanceof SOAP11FaultCodeImpl)) {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java?view=diff&rev=536378&r1=536377&r2=536378
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java
Tue May 8 16:31:31 2007
@@ -85,8 +85,7 @@
SOAP11Constants.SOAP_FAULT_STRING_LOCAL_NAME,
writer);
- String text = this.getText();
- writer.writeCharacters(text);
+ writer.writeCharacters(this.getText());
writer.writeEndElement();
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java?view=diff&rev=536378&r1=536377&r2=536378
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java
Tue May 8 16:31:31 2007
@@ -72,8 +72,7 @@
SOAP11Constants.SOAP_FAULT_ACTOR_LOCAL_NAME,
writer);
- String text = this.getText();
- writer.writeCharacters(text);
+ writer.writeCharacters(this.getText());
writer.writeEndElement();
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java?view=diff&rev=536378&r1=536377&r2=536378
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java
Tue May 8 16:31:31 2007
@@ -21,6 +21,8 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPProcessingException;
+import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.impl.llom.SOAPFaultDetailImpl;
@@ -28,16 +30,20 @@
public SOAP12FaultDetailImpl(SOAPFactory factory) {
super(factory.getNamespace(), factory);
+ this.localName = SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME;
+
}
public SOAP12FaultDetailImpl(SOAPFault parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, true, factory);
+ this.localName = SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME;
}
public SOAP12FaultDetailImpl(SOAPFault parent, OMXMLParserWrapper builder,
SOAPFactory factory) {
super(parent, builder, factory);
+ this.localName = SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME;
}
protected void checkParent(OMElement parent) throws
SOAPProcessingException {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11FaultImplConversionTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11FaultImplConversionTest.java?view=diff&rev=536378&r1=536377&r2=536378
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11FaultImplConversionTest.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11FaultImplConversionTest.java
Tue May 8 16:31:31 2007
@@ -45,7 +45,7 @@
env2.toString();
- System.out.println(env2);
+ //System.out.println(env2);
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
