From 8ceebf2deddde5122ab8d4c7d95ced294b34c16c Mon Sep 17 00:00:00 2001 From: Pablo Fernandez Date: Sat, 28 Apr 2012 12:57:45 -0700 Subject: [PATCH] specific exception for connection problems --- .../exceptions/OAuthConnectionException.java | 14 ++++++++++++++ .../scribe/exceptions/OAuthSignatureException.java | 3 ++- src/main/java/org/scribe/model/Request.java | 8 ++------ 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 src/main/java/org/scribe/exceptions/OAuthConnectionException.java diff --git a/src/main/java/org/scribe/exceptions/OAuthConnectionException.java b/src/main/java/org/scribe/exceptions/OAuthConnectionException.java new file mode 100644 index 0000000..918de81 --- /dev/null +++ b/src/main/java/org/scribe/exceptions/OAuthConnectionException.java @@ -0,0 +1,14 @@ +package org.scribe.exceptions; + +/** + * @author: Pablo Fernandez + */ +public class OAuthConnectionException extends OAuthException +{ + private static final String MSG = "There was a problem while creating a connection to the remote service."; + + public OAuthConnectionException(Exception e) + { + super(MSG, e); + } +} diff --git a/src/main/java/org/scribe/exceptions/OAuthSignatureException.java b/src/main/java/org/scribe/exceptions/OAuthSignatureException.java index 50143b5..94692be 100644 --- a/src/main/java/org/scribe/exceptions/OAuthSignatureException.java +++ b/src/main/java/org/scribe/exceptions/OAuthSignatureException.java @@ -8,6 +8,7 @@ package org.scribe.exceptions; public class OAuthSignatureException extends OAuthException { private static final long serialVersionUID = 1L; + private static final String MSG = "Error while signing string: %s"; /** * Default constructor @@ -17,7 +18,7 @@ public class OAuthSignatureException extends OAuthException */ public OAuthSignatureException(String stringToSign, Exception e) { - super("Error while signing string: " + stringToSign, e); + super(String.format(MSG, stringToSign), e); } } diff --git a/src/main/java/org/scribe/model/Request.java b/src/main/java/org/scribe/model/Request.java index 6465c95..81db94e 100644 --- a/src/main/java/org/scribe/model/Request.java +++ b/src/main/java/org/scribe/model/Request.java @@ -61,13 +61,9 @@ class Request createConnection(); return doSend(); } - catch (UnknownHostException uhe) + catch (Exception e) { - throw new OAuthException("Could not reach the desired host. Check your network connection.", uhe); - } - catch (IOException ioe) - { - throw new OAuthException("Problems while creating connection.", ioe); + throw new OAuthConnectionException(e); } }