[typica-svn] [typica] r326 committed - changes to catch clauses for every service

[typ...@googlecode.com]

Revision: 326
Author: dkavanagh
Date: Wed May 5 18:11:34 2010
Log: changes to catch clauses for every service

http://code.google.com/p/typica/source/detail?r=326

Modified:
/trunk/java/com/xerox/amazonws/common/AWSQueryConnection.java
/trunk/java/com/xerox/amazonws/devpay/DevPayLS.java
/trunk/java/com/xerox/amazonws/ec2/AutoScaling.java
/trunk/java/com/xerox/amazonws/ec2/Jec2.java
/trunk/java/com/xerox/amazonws/ec2/LoadBalancing.java
/trunk/java/com/xerox/amazonws/fps/FlexiblePaymentsService.java
/trunk/java/com/xerox/amazonws/monitoring/Monitoring.java
/trunk/java/com/xerox/amazonws/sdb/Domain.java
/trunk/java/com/xerox/amazonws/sdb/Item.java
/trunk/java/com/xerox/amazonws/sdb/SimpleDB.java
/trunk/java/com/xerox/amazonws/simpledb/Domain.java
/trunk/java/com/xerox/amazonws/simpledb/SimpleDB.java
/trunk/java/com/xerox/amazonws/sns/NotificationService.java
/trunk/java/com/xerox/amazonws/sqs2/MessageQueue.java
/trunk/java/com/xerox/amazonws/sqs2/QueueService.java

=======================================
--- /trunk/java/com/xerox/amazonws/common/AWSQueryConnection.java Wed May
5 11:14:03 2010
+++ /trunk/java/com/xerox/amazonws/common/AWSQueryConnection.java Wed May
5 18:11:34 2010
@@ -41,6 +41,7 @@

import javax.xml.bind.JAXBException;
import javax.xml.bind.UnmarshalException;
+import org.xml.sax.SAXException;

import org.apache.http.message.BasicHeader;
import org.apache.http.params.BasicHttpParams;
@@ -345,7 +346,7 @@
* @param respType the class that represents the desired/expected
return type
*/
public <T> T makeRequest(HttpRequestBase method, String action,
Map<String, String> params, Class<T> respType)
- throws HttpException, IOException, JAXBException, AWSException {
+ throws HttpException, IOException, JAXBException, AWSException,
SAXException {

// add auth params, and protocol specific headers
Map<String, String> qParams;
@@ -597,7 +598,7 @@
/**
* This method creates a detail packed exception to pass up
*/
- private AWSException createException(String errorResponse, String
msgPrefix) throws JAXBException {
+ private AWSException createException(String errorResponse, String
msgPrefix) throws IOException, JAXBException, SAXException {
String errorMsg;
String requestId;
List<AWSError> errors = null;
=======================================
--- /trunk/java/com/xerox/amazonws/devpay/DevPayLS.java Thu Mar 25 10:53:30
2010
+++ /trunk/java/com/xerox/amazonws/devpay/DevPayLS.java Wed May 5 18:11:34
2010
@@ -26,6 +26,7 @@
import java.util.Map;

import javax.xml.bind.JAXBException;
+import org.xml.sax.SAXException;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -257,6 +258,8 @@
} catch (AWSException ex) {
throw new DevPayException(ex);
} catch (JAXBException ex) {
+ throw new DevPayException("Problem parsing returned message.", ex);
+ } catch (SAXException ex) {
throw new DevPayException("Problem parsing returned message.", ex);
} catch (HttpException ex) {
throw new DevPayException(ex.getMessage(), ex);
=======================================
--- /trunk/java/com/xerox/amazonws/ec2/AutoScaling.java Thu Mar 25 10:53:30
2010
+++ /trunk/java/com/xerox/amazonws/ec2/AutoScaling.java Wed May 5 18:11:34
2010
@@ -25,6 +25,7 @@
import java.util.Map;

import javax.xml.bind.JAXBException;
+import org.xml.sax.SAXException;

import org.apache.commons.codec.binary.Base64;
import org.apache.http.HttpException;
@@ -521,6 +522,8 @@
} catch (AWSException ex) {
throw new AutoScalingException(ex);
} catch (JAXBException ex) {
+ throw new AutoScalingException("Problem parsing returned message.", ex);
+ } catch (SAXException ex) {
throw new AutoScalingException("Problem parsing returned message.", ex);
} catch (MalformedURLException ex) {
throw new AutoScalingException(ex.getMessage(), ex);
=======================================
--- /trunk/java/com/xerox/amazonws/ec2/Jec2.java Thu Mar 25 10:53:30 2010
+++ /trunk/java/com/xerox/amazonws/ec2/Jec2.java Wed May 5 18:11:34 2010
@@ -28,6 +28,7 @@
import java.util.Map;

import javax.xml.bind.JAXBException;
+import org.xml.sax.SAXException;

import org.apache.commons.codec.binary.Base64;
import org.apache.http.HttpException;
@@ -2287,6 +2288,8 @@
} catch (AWSException ex) {
throw new EC2Exception(ex);
} catch (JAXBException ex) {
+ throw new EC2Exception("Problem parsing returned message.", ex);
+ } catch (SAXException ex) {
throw new EC2Exception("Problem parsing returned message.", ex);
} catch (MalformedURLException ex) {
throw new EC2Exception(ex.getMessage(), ex);
=======================================
--- /trunk/java/com/xerox/amazonws/ec2/LoadBalancing.java Thu Mar 25
10:53:30 2010
+++ /trunk/java/com/xerox/amazonws/ec2/LoadBalancing.java Wed May 5
18:11:34 2010
@@ -25,6 +25,7 @@
import java.util.Map;

import javax.xml.bind.JAXBException;
+import org.xml.sax.SAXException;

import org.apache.http.HttpException;
import org.apache.http.client.methods.HttpRequestBase;
@@ -388,6 +389,8 @@
} catch (AWSException ex) {
throw new LoadBalancingException(ex);
} catch (JAXBException ex) {
+ throw new LoadBalancingException("Problem parsing returned message.",
ex);
+ } catch (SAXException ex) {
throw new LoadBalancingException("Problem parsing returned message.",
ex);
} catch (MalformedURLException ex) {
throw new LoadBalancingException(ex.getMessage(), ex);
=======================================
--- /trunk/java/com/xerox/amazonws/fps/FlexiblePaymentsService.java Thu Mar
25 10:53:30 2010
+++ /trunk/java/com/xerox/amazonws/fps/FlexiblePaymentsService.java Wed
May 5 18:11:34 2010
@@ -13,6 +13,7 @@
import org.apache.commons.logging.LogFactory;
import javax.servlet.http.HttpServletRequest;
import javax.xml.bind.JAXBException;
+import org.xml.sax.SAXException;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
@@ -2291,6 +2292,8 @@
} catch (AWSException ex) {
throw new FPSException(ex);
} catch (JAXBException ex) {
+ throw new FPSException("Problem parsing returned message.", ex);
+ } catch (SAXException ex) {
throw new FPSException("Problem parsing returned message.", ex);
} catch (HttpException ex) {
throw new FPSException(ex.getMessage(), ex);
=======================================
--- /trunk/java/com/xerox/amazonws/monitoring/Monitoring.java Thu Mar 25
10:53:30 2010
+++ /trunk/java/com/xerox/amazonws/monitoring/Monitoring.java Wed May 5
18:11:34 2010
@@ -30,6 +30,7 @@
import java.util.Map;

import javax.xml.bind.JAXBException;
+import org.xml.sax.SAXException;

import org.apache.http.HttpException;
import org.apache.http.client.methods.HttpRequestBase;
@@ -206,6 +207,8 @@
} catch (AWSException ex) {
throw new MonitoringException(ex);
} catch (JAXBException ex) {
+ throw new MonitoringException("Problem parsing returned message.", ex);
+ } catch (SAXException ex) {
throw new MonitoringException("Problem parsing returned message.", ex);
} catch (MalformedURLException ex) {
throw new MonitoringException(ex.getMessage(), ex);
=======================================
--- /trunk/java/com/xerox/amazonws/sdb/Domain.java Thu Mar 25 10:53:30 2010
+++ /trunk/java/com/xerox/amazonws/sdb/Domain.java Wed May 5 18:11:34 2010
@@ -32,6 +32,7 @@
import java.util.concurrent.TimeUnit;

import javax.xml.bind.JAXBException;
+import org.xml.sax.SAXException;

import org.apache.commons.codec.binary.Base64;
import org.apache.commons.logging.Log;
@@ -288,6 +289,8 @@
} catch (AWSException ex) {
throw new SDBException(ex);
} catch (JAXBException ex) {
+ throw new SDBException("Problem parsing returned message.", ex);
+ } catch (SAXException ex) {
throw new SDBException("Problem parsing returned message.", ex);
} catch (HttpException ex) {
throw new SDBException(ex.getMessage(), ex);
=======================================
--- /trunk/java/com/xerox/amazonws/sdb/Item.java Thu Mar 25 10:53:30 2010
+++ /trunk/java/com/xerox/amazonws/sdb/Item.java Wed May 5 18:11:34 2010
@@ -26,6 +26,7 @@
import java.util.Map;

import javax.xml.bind.JAXBException;
+import org.xml.sax.SAXException;

import org.apache.commons.codec.binary.Base64;
import org.apache.commons.logging.Log;
@@ -317,6 +318,8 @@
} catch (AWSException ex) {
throw new SDBException(ex);
} catch (JAXBException ex) {
+ throw new SDBException("Problem parsing returned message.", ex);
+ } catch (SAXException ex) {
throw new SDBException("Problem parsing returned message.", ex);
} catch (HttpException ex) {
throw new SDBException(ex.getMessage(), ex);
=======================================
--- /trunk/java/com/xerox/amazonws/sdb/SimpleDB.java Thu Mar 25 10:53:30
2010
+++ /trunk/java/com/xerox/amazonws/sdb/SimpleDB.java Wed May 5 18:11:34
2010
@@ -25,6 +25,7 @@
import java.util.Map;

import javax.xml.bind.JAXBException;
+import org.xml.sax.SAXException;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -231,6 +232,8 @@
} catch (AWSException ex) {
throw new SDBException(ex);
} catch (JAXBException ex) {
+ throw new SDBException("Problem parsing returned message.", ex);
+ } catch (SAXException ex) {
throw new SDBException("Problem parsing returned message.", ex);
} catch (HttpException ex) {
throw new SDBException(ex.getMessage(), ex);
=======================================
--- /trunk/java/com/xerox/amazonws/simpledb/Domain.java Thu Apr 15 11:51:06
2010
+++ /trunk/java/com/xerox/amazonws/simpledb/Domain.java Wed May 5 18:11:34
2010
@@ -31,6 +31,7 @@
import java.util.Set;

import javax.xml.bind.JAXBException;
+import org.xml.sax.SAXException;

import org.apache.commons.codec.binary.Base64;
import org.apache.commons.logging.Log;
@@ -497,6 +498,8 @@
} catch (AWSException ex) {
throw new SDBException(ex);
} catch (JAXBException ex) {
+ throw new SDBException("Problem parsing returned message.", ex);
+ } catch (SAXException ex) {
throw new SDBException("Problem parsing returned message.", ex);
} catch (HttpException ex) {
throw new SDBException(ex.getMessage(), ex);
=======================================
--- /trunk/java/com/xerox/amazonws/simpledb/SimpleDB.java Tue Apr 13
07:39:30 2010
+++ /trunk/java/com/xerox/amazonws/simpledb/SimpleDB.java Wed May 5
18:11:34 2010
@@ -26,6 +26,7 @@
import java.util.Map;

import javax.xml.bind.JAXBException;
+import org.xml.sax.SAXException;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -231,6 +232,8 @@
} catch (AWSException ex) {
throw new SDBException(ex);
} catch (JAXBException ex) {
+ throw new SDBException("Problem parsing returned message.", ex);
+ } catch (SAXException ex) {
throw new SDBException("Problem parsing returned message.", ex);
} catch (HttpException ex) {
throw new SDBException(ex.getMessage(), ex);
=======================================
--- /trunk/java/com/xerox/amazonws/sns/NotificationService.java Mon Apr 12
06:41:16 2010
+++ /trunk/java/com/xerox/amazonws/sns/NotificationService.java Wed May 5
18:11:34 2010
@@ -26,6 +26,7 @@
import java.util.Map;

import javax.xml.bind.JAXBException;
+import org.xml.sax.SAXException;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -405,6 +406,8 @@
} catch (AWSException ex) {
throw new SNSException(ex);
} catch (JAXBException ex) {
+ throw new SNSException("Problem parsing returned message.", ex);
+ } catch (SAXException ex) {
throw new SNSException("Problem parsing returned message.", ex);
} catch (HttpException ex) {
throw new SNSException(ex.getMessage(), ex);
=======================================
--- /trunk/java/com/xerox/amazonws/sqs2/MessageQueue.java Thu Mar 25
10:53:30 2010
+++ /trunk/java/com/xerox/amazonws/sqs2/MessageQueue.java Wed May 5
18:11:34 2010
@@ -34,6 +34,7 @@
import java.util.Map;

import javax.xml.bind.JAXBException;
+import org.xml.sax.SAXException;

import org.apache.commons.codec.binary.Base64;
import org.apache.http.client.HttpClient;
@@ -448,6 +449,8 @@
} catch (AWSException ex) {
throw new SQSException(ex);
} catch (JAXBException ex) {
+ throw new SQSException("Problem parsing returned message.", ex);
+ } catch (SAXException ex) {
throw new SQSException("Problem parsing returned message.", ex);
} catch (HttpException ex) {
throw new SQSException(ex.getMessage(), ex);
=======================================
--- /trunk/java/com/xerox/amazonws/sqs2/QueueService.java Thu Mar 25
10:53:30 2010
+++ /trunk/java/com/xerox/amazonws/sqs2/QueueService.java Wed May 5
18:11:34 2010
@@ -27,6 +27,7 @@
import java.util.TreeMap;

import javax.xml.bind.JAXBException;
+import org.xml.sax.SAXException;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -202,6 +203,8 @@
} catch (AWSException ex) {
throw new SQSException(ex);
} catch (JAXBException ex) {
+ throw new SQSException("Problem parsing returned message.", ex);
+ } catch (SAXException ex) {
throw new SQSException("Problem parsing returned message.", ex);
} catch (HttpException ex) {
throw new SQSException(ex.getMessage(), ex);

--
You received this message because you are subscribed to the Google Groups "typica-svn" group.
To post to this group, send email to typic...@googlegroups.com.
To unsubscribe from this group, send email to typica-svn+...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/typica-svn?hl=en.