From 02a9c4b90729ea68cbeefe0983db43539ab87eca Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Wed, 10 Jan 2007 11:16:48 +0000 Subject: [PATCH] Made TransportException a subclass of IOException --- .../ws/transport/TransportException.java | 9 ++--- .../http/HttpServletTransportInputStream.java | 5 +-- .../support/EnumerationIterator.java | 3 +- .../transport/jms/JmsTransportException.java | 39 +++++++++++++++++++ .../jms/JmsTransportInputStream.java | 10 ++--- .../jms/JmsTransportOutputStream.java | 10 ++--- 6 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportException.java diff --git a/core/src/main/java/org/springframework/ws/transport/TransportException.java b/core/src/main/java/org/springframework/ws/transport/TransportException.java index 99a28925..4ba0e6d0 100644 --- a/core/src/main/java/org/springframework/ws/transport/TransportException.java +++ b/core/src/main/java/org/springframework/ws/transport/TransportException.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2007 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,20 +16,17 @@ package org.springframework.ws.transport; -import org.springframework.ws.WebServiceException; +import java.io.IOException; /** * Abstract base class for exceptions related to the transport layer. * * @author Arjen Poutsma */ -public abstract class TransportException extends WebServiceException { +public abstract class TransportException extends IOException { protected TransportException(String msg) { super(msg); } - protected TransportException(String msg, Throwable ex) { - super(msg, ex); - } } diff --git a/core/src/main/java/org/springframework/ws/transport/http/HttpServletTransportInputStream.java b/core/src/main/java/org/springframework/ws/transport/http/HttpServletTransportInputStream.java index 2d456593..42c0e6ea 100644 --- a/core/src/main/java/org/springframework/ws/transport/http/HttpServletTransportInputStream.java +++ b/core/src/main/java/org/springframework/ws/transport/http/HttpServletTransportInputStream.java @@ -21,7 +21,6 @@ import java.io.InputStream; import java.util.Iterator; import javax.servlet.http.HttpServletRequest; -import org.springframework.ws.transport.TransportException; import org.springframework.ws.transport.TransportInputStream; import org.springframework.ws.transport.support.EnumerationIterator; @@ -55,11 +54,11 @@ public class HttpServletTransportInputStream extends TransportInputStream { return httpServletRequest; } - public Iterator getHeaderNames() throws TransportException { + public Iterator getHeaderNames() { return new EnumerationIterator(httpServletRequest.getHeaderNames()); } - public Iterator getHeaders(String name) throws TransportException { + public Iterator getHeaders(String name) { return new EnumerationIterator(httpServletRequest.getHeaders(name)); } } diff --git a/core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java b/core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java index 6491ea12..dff4e679 100644 --- a/core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java +++ b/core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java @@ -20,8 +20,7 @@ import java.util.Enumeration; import java.util.Iterator; /** - * Private static class that adapts a header enumeration provided by the HttpServletRequest and provides it as an - * iterator. + * Adapts an {@link Enumeration} to follow the interface of {@link Iterator}. * * @author Arjen Poutsma */ diff --git a/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportException.java b/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportException.java new file mode 100644 index 00000000..95ab4e3f --- /dev/null +++ b/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportException.java @@ -0,0 +1,39 @@ +/* + * Copyright 2007 the original author or authors. + * + * Licensed 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.springframework.ws.transport.jms; + +import javax.jms.JMSException; + +import org.springframework.ws.transport.TransportException; + +/** + * @author Arjen Poutsma + */ +public class JmsTransportException extends TransportException { + + public JmsTransportException(String msg) { + super(msg); + } + + public JmsTransportException(String msg, JMSException ex) { + super(msg + ": " + ex.getMessage()); + } + + public JmsTransportException(JMSException ex) { + super(ex.getMessage()); + } +} diff --git a/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportInputStream.java b/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportInputStream.java index bc775e8a..e0e2d63b 100644 --- a/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportInputStream.java +++ b/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportInputStream.java @@ -66,7 +66,7 @@ public class JmsTransportInputStream extends TransportInputStream { return new EnumerationIterator(message.getPropertyNames()); } catch (JMSException ex) { - throw new IOException("Could not get property names: " + ex.getMessage()); + throw new JmsTransportException("Could not get property names", ex); } } @@ -76,7 +76,7 @@ public class JmsTransportInputStream extends TransportInputStream { return Collections.singletonList(value).iterator(); } catch (JMSException ex) { - throw new IOException("Could not get property value: " + ex.getMessage()); + throw new JmsTransportException("Could not get property value", ex); } } @@ -90,7 +90,7 @@ public class JmsTransportInputStream extends TransportInputStream { return message.readBytes(b); } catch (JMSException ex) { - throw new IOException(ex.getMessage()); + throw new JmsTransportException(ex); } } @@ -100,7 +100,7 @@ public class JmsTransportInputStream extends TransportInputStream { return message.readBytes(b, len); } catch (JMSException ex) { - throw new IOException(ex.getMessage()); + throw new JmsTransportException(ex); } } else { @@ -116,7 +116,7 @@ public class JmsTransportInputStream extends TransportInputStream { return -1; } catch (JMSException ex) { - throw new IOException(ex.getMessage()); + throw new JmsTransportException(ex); } } } diff --git a/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportOutputStream.java b/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportOutputStream.java index c210c67a..f92ee604 100644 --- a/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportOutputStream.java +++ b/sandbox/src/main/java/org/springframework/ws/transport/jms/JmsTransportOutputStream.java @@ -84,7 +84,7 @@ public class JmsTransportOutputStream extends TransportOutputStream { } } catch (JMSException ex) { - throw new IOException("Could not create message: " + ex.getMessage()); + throw new JmsTransportException("Could not create message", ex); } } return message; @@ -99,7 +99,7 @@ public class JmsTransportOutputStream extends TransportOutputStream { getMessage().setStringProperty(name, value); } catch (JMSException ex) { - throw new IOException("Could not set property " + ex.getMessage()); + throw new JmsTransportException("Could not set property", ex); } } @@ -113,7 +113,7 @@ public class JmsTransportOutputStream extends TransportOutputStream { getMessage().writeBytes(b); } catch (JMSException ex) { - throw new IOException(ex.getMessage()); + throw new JmsTransportException(ex); } } @@ -122,7 +122,7 @@ public class JmsTransportOutputStream extends TransportOutputStream { getMessage().writeBytes(b, off, len); } catch (JMSException ex) { - throw new IOException(ex.getMessage()); + throw new JmsTransportException(ex); } } @@ -131,7 +131,7 @@ public class JmsTransportOutputStream extends TransportOutputStream { getMessage().writeByte((byte) b); } catch (JMSException ex) { - throw new IOException(ex.getMessage()); + throw new JmsTransportException(ex); } } }