1 files changed, 7 insertions, 163 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
index ec482a8f79..0f44ac5501 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
@@ -20,182 +20,30 @@
  */
 package org.apache.qpid.client;
 
-import java.io.Serializable;
-
-import javax.jms.BytesMessage;
-import javax.jms.Destination;
+import javax.jms.*;
 import javax.jms.IllegalStateException;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueBrowser;
-import javax.jms.Session;
-import javax.jms.StreamMessage;
-import javax.jms.TemporaryQueue;
-import javax.jms.TemporaryTopic;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.jms.TopicPublisher;
-import javax.jms.TopicSession;
-import javax.jms.TopicSubscriber;
 
-public class AMQTopicSessionAdaptor implements TopicSession, AMQSessionAdapter
+class AMQTopicSessionAdaptor extends AMQSessionAdapter<TopicSession> implements TopicSession
 {
-    protected final AMQSession _session;
-
-    public AMQTopicSessionAdaptor(Session session)
-    {
-        _session = (AMQSession) session;
-    }
 
-    public Topic createTopic(String string) throws JMSException
+    public AMQTopicSessionAdaptor(TopicSession session)
     {
-        return _session.createTopic(string);
+        super(session);
     }
 
     public TopicSubscriber createSubscriber(Topic topic) throws JMSException
     {
-        return _session.createSubscriber(topic);
+        return getSession().createSubscriber(topic);
     }
 
     public TopicSubscriber createSubscriber(Topic topic, String string, boolean b) throws JMSException
     {
-        return _session.createSubscriber(topic, string, b);
-    }
-
-    public TopicSubscriber createDurableSubscriber(Topic topic, String string) throws JMSException
-    {
-        return _session.createDurableSubscriber(topic, string);
-    }
-
-    public TopicSubscriber createDurableSubscriber(Topic topic, String string, String string1, boolean b) throws JMSException
-    {
-        return _session.createDurableSubscriber(topic, string, string1, b);
+        return getSession().createSubscriber(topic, string, b);
     }
 
     public TopicPublisher createPublisher(Topic topic) throws JMSException
     {
-        return _session.createPublisher(topic);
-    }
-
-    public TemporaryTopic createTemporaryTopic() throws JMSException
-    {
-        return _session.createTemporaryTopic();
-    }
-
-    public void unsubscribe(String string) throws JMSException
-    {
-        _session.unsubscribe(string);
-    }
-
-    public BytesMessage createBytesMessage() throws JMSException
-    {
-        return _session.createBytesMessage();
-    }
-
-    public MapMessage createMapMessage() throws JMSException
-    {
-        return _session.createMapMessage();
-    }
-
-    public Message createMessage() throws JMSException
-    {
-        return _session.createMessage();
-    }
-
-    public ObjectMessage createObjectMessage() throws JMSException
-    {
-        return _session.createObjectMessage();
-    }
-
-    public ObjectMessage createObjectMessage(Serializable serializable) throws JMSException
-    {
-        return _session.createObjectMessage(serializable);
-    }
-
-    public StreamMessage createStreamMessage() throws JMSException
-    {
-        return _session.createStreamMessage();
-    }
-
-    public TextMessage createTextMessage() throws JMSException
-    {
-        return _session.createTextMessage();
-    }
-
-    public TextMessage createTextMessage(String string) throws JMSException
-    {
-        return _session.createTextMessage(string);
-    }
-
-    public boolean getTransacted() throws JMSException
-    {
-        return _session.getTransacted();
-    }
-
-    public int getAcknowledgeMode() throws JMSException
-    {
-        return _session.getAcknowledgeMode();
-    }
-
-    public void commit() throws JMSException
-    {
-        _session.commit();
-    }
-
-    public void rollback() throws JMSException
-    {
-        _session.rollback();
-    }
-
-    public void close() throws JMSException
-    {
-        _session.close();
-    }
-
-    public void recover() throws JMSException
-    {
-        _session.recover();
-    }
-
-    public MessageListener getMessageListener() throws JMSException
-    {
-        return _session.getMessageListener();
-    }
-
-    public void setMessageListener(MessageListener messageListener) throws JMSException
-    {
-        _session.setMessageListener(messageListener);
-    }
-
-    public void run()
-    {
-        _session.run();
-    }
-
-    public MessageProducer createProducer(Destination destination) throws JMSException
-    {
-        return _session.createProducer(destination);
-    }
-
-    public MessageConsumer createConsumer(Destination destination) throws JMSException
-    {
-        return _session.createConsumer(destination);
-    }
-
-    public MessageConsumer createConsumer(Destination destination, String string) throws JMSException
-    {
-        return _session.createConsumer(destination, string);
-    }
-
-    public MessageConsumer createConsumer(Destination destination, String string, boolean b) throws JMSException
-    {
-        return _session.createConsumer(destination, string, b);
+        return getSession().createPublisher(topic);
     }
 
     //The following methods cannot be called from a TopicSession as per JMS spec
@@ -219,8 +67,4 @@ public class AMQTopicSessionAdaptor implements TopicSession, AMQSessionAdapter
         throw new IllegalStateException("Cannot call createTemporaryQueue from TopicSession");
     }
 
-    public AMQSession getSession()
-    {
-        return _session;
-    }
 }