Skip to content

Commit

Permalink
a bit of reformatting cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@mosabua
mosabua committed Jul 8, 2011
1 parent 76d9bf6 commit 426439a
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 96 deletions.
33 changes: 14 additions & 19 deletions ksoap2-base/src/main/java/org/ksoap2/SoapFault.java
View file
Expand Up @@ -30,8 +30,7 @@
* Exception class encapsulating SOAP Faults
*/

public class SoapFault extends IOException
{
public class SoapFault extends IOException {

private static final long serialVersionUID = 1011001L;
/** The SOAP fault code */
Expand All @@ -44,13 +43,11 @@ public class SoapFault extends IOException
public Node detail;
/** an integer that holds current soap version */
public int version;



public SoapFault() {
super();
this.version = SoapEnvelope.VER11;
}


public SoapFault(int version) {
super();
Expand All @@ -61,26 +58,24 @@ public SoapFault(int version) {
public void parse(XmlPullParser parser) throws IOException, XmlPullParserException
{
parser.require(XmlPullParser.START_TAG, SoapEnvelope.ENV, "Fault");
while (parser.nextTag() == XmlPullParser.START_TAG)
{
while (parser.nextTag() == XmlPullParser.START_TAG) {
String name = parser.getName();
if (name.equals("detail"))
{
if (name.equals("detail")) {
detail = new Node();
detail.parse(parser);
// Handle case '...<detail/></soap:Fault>'
if ( parser.getNamespace().equals( SoapEnvelope.ENV ) && parser.getName().equals( "Fault" ) )
break;
continue;
}
else if (name.equals("faultcode"))
faultcode = parser.nextText();
else if (name.equals("faultstring"))
} else if (name.equals("faultcode")) {
faultcode = parser.nextText();
} else if (name.equals("faultstring")) {
faultstring = parser.nextText();
else if (name.equals("faultactor"))
} else if (name.equals("faultactor")) {
faultactor = parser.nextText();
else
} else {
throw new RuntimeException("unexpected tag:" + name);
}
parser.require(XmlPullParser.END_TAG, null, name);
}
parser.require(XmlPullParser.END_TAG, SoapEnvelope.ENV, "Fault");
Expand All @@ -107,15 +102,15 @@ public void write(XmlSerializer xw) throws IOException
/**
* @see java.lang.Throwable#getMessage()
*/
public String getMessage()
{
public String getMessage() {
return faultstring;
}

/** Returns a simple string representation of the fault */
public String toString()
{
return "SoapFault - faultcode: '" + faultcode + "' faultstring: '" + faultstring + "' faultactor: '"
+ faultactor + "' detail: " + detail;
return "SoapFault - faultcode: '" + faultcode + "' faultstring: '"
+ faultstring + "' faultactor: '" + faultactor + "' detail: " +
detail;
}
}
112 changes: 35 additions & 77 deletions ksoap2-base/src/main/java/org/ksoap2/SoapFault12.java
View file
Expand Up @@ -21,25 +21,22 @@

package org.ksoap2;


import java.io.IOException;

import org.kxml2.kdom.Node;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;



/**
* Exception class encapsulating SOAP 1.2 Faults
*
* see http://www.w3.org/TR/soap12-part1/#soapfault for explanation of fields
*
* @author Petter Uvesten
*/

public class SoapFault12 extends SoapFault
{

public class SoapFault12 extends SoapFault {
private static final long serialVersionUID = 1012001L;

/** Top-level nodes */
Expand Down Expand Up @@ -69,75 +66,47 @@ public void parse(XmlPullParser parser) throws IOException, XmlPullParserExcepti
this.faultstring = Reason.getElement(SoapEnvelope.ENV2003, "Text").getText(0);
this.detail = this.Detail;
this.faultactor = null;


}


private void parseSelf(XmlPullParser parser) throws IOException, XmlPullParserException {
parser.require(XmlPullParser.START_TAG, SoapEnvelope.ENV2003, "Fault");
parser.require(XmlPullParser.START_TAG, SoapEnvelope.ENV2003, "Fault");

while (parser.nextTag() == XmlPullParser.START_TAG)
{
String name = parser.getName();
parser.nextTag();
if (name.equals("Code"))
{

this.Code = new Node();
this.Code.parse(parser);


}
else if (name.equals("Reason"))
{
this.Reason = new Node();
this.Reason.parse(parser);



} else if (name.equals("Node"))
{
this.Node = new Node();
this.Node.parse(parser);


}
else if (name.equals("Role"))
{
this.Role = new Node();
this.Role.parse(parser);


}
else if (name.equals("Detail"))
{
this.Detail = new Node();
this.Detail.parse(parser);


}
else
throw new RuntimeException("unexpected tag:" + name);

parser.require(XmlPullParser.END_TAG, SoapEnvelope.ENV2003, name);

}
parser.require(XmlPullParser.END_TAG, SoapEnvelope.ENV2003, "Fault");
parser.nextTag();

}

while (parser.nextTag() == XmlPullParser.START_TAG) {
String name = parser.getName();
parser.nextTag();
if (name.equals("Code")) {
this.Code = new Node();
this.Code.parse(parser);
} else if (name.equals("Reason")) {
this.Reason = new Node();
this.Reason.parse(parser);
} else if (name.equals("Node")) {
this.Node = new Node();
this.Node.parse(parser);
} else if (name.equals("Role")) {
this.Role = new Node();
this.Role.parse(parser);
} else if (name.equals("Detail")) {
this.Detail = new Node();
this.Detail.parse(parser);
} else {
throw new RuntimeException("unexpected tag:" + name);
}

parser.require(XmlPullParser.END_TAG, SoapEnvelope.ENV2003, name);
}
parser.require(XmlPullParser.END_TAG, SoapEnvelope.ENV2003, "Fault");
parser.nextTag();

}

/** Writes the fault to the given XML stream */
public void write(XmlSerializer xw) throws IOException
{


xw.startTag(SoapEnvelope.ENV2003, "Fault");
//this.Code.write(xw);



xw.startTag(SoapEnvelope.ENV2003, "Code");
this.Code.write(xw);
xw.endTag(SoapEnvelope.ENV2003, "Code");
Expand All @@ -161,31 +130,20 @@ public void write(XmlSerializer xw) throws IOException
this.Detail.write(xw);
xw.endTag(SoapEnvelope.ENV2003, "Detail");
}




xw.endTag(SoapEnvelope.ENV2003, "Fault");
}

/**
* @see java.lang.Throwable#getMessage()
*/
public String getMessage()
{
public String getMessage() {
return Reason.getElement(SoapEnvelope.ENV2003, "Text").getText(0);
}

/** Returns a string representation of the fault */
public String toString()
{


public String toString() {
String reason = Reason.getElement(SoapEnvelope.ENV2003, "Text").getText(0);

String code = Code.getElement(SoapEnvelope.ENV2003, "Value").getText(0);


return "Code: " + code + ", Reason: " + reason;
}
}

0 comments on commit 426439a

Please sign in to comment.