You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/10/04 18:19:49 UTC
svn commit: r1529205 - in /qpid/jms/trunk/src:
main/java/org/apache/qpid/jms/engine/ main/java/org/apache/qpid/jms/impl/
test/java/org/apache/qpid/jms/ test/java/org/apache/qpid/jms/impl/
Author: robbie
Date: Fri Oct 4 16:19:49 2013
New Revision: 1529205
URL: http://svn.apache.org/r1529205
Log:
QPIDJMS-3: some minor cleanup and rationalisation, replace PHTODO with
TODO in comments to leverage standard IDE etc matching rules, use 'Not
Implemented' in exception message to avoid duplicate TODO pickup by tools.
Removed:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/ReceivedMessageImpl.java
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpReceiver.java
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/ConnectionImpl.java
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/MessageImpl.java
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/ReceiverImpl.java
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/SenderImpl.java
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/SessionImpl.java
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/TextMessageImpl.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SessionIntegrationTest.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/ReceiverImplTest.java
Modified: qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpReceiver.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpReceiver.java?rev=1529205&r1=1529204&r2=1529205&view=diff
==============================================================================
--- qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpReceiver.java (original)
+++ qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpReceiver.java Fri Oct 4 16:19:49 2013
@@ -37,7 +37,10 @@ public class AmqpReceiver extends AmqpLi
public void credit(int credit)
{
- _protonReceiver.flow(credit);
+ synchronized (getAmqpConnection())
+ {
+ _protonReceiver.flow(credit);
+ }
}
public AmqpMessage receiveNoWait()
Modified: qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/ConnectionImpl.java?rev=1529205&r1=1529204&r2=1529205&view=diff
==============================================================================
--- qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/ConnectionImpl.java (original)
+++ qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/ConnectionImpl.java Fri Oct 4 16:19:49 2013
@@ -235,7 +235,7 @@ public class ConnectionImpl implements C
{
AmqpSession amqpSession = _amqpConnection.createSession();
- SessionImpl session = new SessionImpl(amqpSession, this);
+ SessionImpl session = new SessionImpl(acknowledgeMode, amqpSession, this);
stateChanged();
session.establish();
@@ -289,36 +289,36 @@ public class ConnectionImpl implements C
@Override
public String getClientID() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setClientID(String clientID) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public ConnectionMetaData getMetaData() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public ExceptionListener getExceptionListener() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setExceptionListener(ExceptionListener listener) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
@@ -330,22 +330,22 @@ public class ConnectionImpl implements C
@Override
public void stop() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
boolean isStarted()
Modified: qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/MessageImpl.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/MessageImpl.java?rev=1529205&r1=1529204&r2=1529205&view=diff
==============================================================================
--- qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/MessageImpl.java (original)
+++ qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/MessageImpl.java Fri Oct 4 16:19:49 2013
@@ -26,13 +26,22 @@ import javax.jms.Message;
import org.apache.qpid.jms.engine.AmqpMessage;
-public abstract class MessageImpl implements Message
+public class MessageImpl implements Message
{
private final AmqpMessage _amqpMessage;
+ private final SessionImpl _sessionImpl;
+ private final ConnectionImpl _connectionImpl;
- protected MessageImpl()
+ public MessageImpl(SessionImpl sessionImpl, ConnectionImpl connectionImpl)
{
- _amqpMessage = new AmqpMessage();
+ this(new AmqpMessage(), sessionImpl, connectionImpl);
+ }
+
+ public MessageImpl(AmqpMessage amqpMessage, SessionImpl sessionImpl, ConnectionImpl connectionImpl)
+ {
+ _amqpMessage = amqpMessage;
+ _sessionImpl = sessionImpl;
+ _connectionImpl = connectionImpl;
}
AmqpMessage getAmqpMessage()
@@ -43,317 +52,316 @@ public abstract class MessageImpl implem
@Override
public String getJMSMessageID() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setJMSMessageID(String id) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public long getJMSTimestamp() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setJMSTimestamp(long timestamp) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public byte[] getJMSCorrelationIDAsBytes() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setJMSCorrelationIDAsBytes(byte[] correlationID) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setJMSCorrelationID(String correlationID) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public String getJMSCorrelationID() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public Destination getJMSReplyTo() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setJMSReplyTo(Destination replyTo) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public Destination getJMSDestination() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setJMSDestination(Destination destination) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public int getJMSDeliveryMode() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setJMSDeliveryMode(int deliveryMode) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public boolean getJMSRedelivered() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setJMSRedelivered(boolean redelivered) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public String getJMSType() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setJMSType(String type) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public long getJMSExpiration() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setJMSExpiration(long expiration) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public int getJMSPriority() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setJMSPriority(int priority) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void clearProperties() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public boolean propertyExists(String name) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public boolean getBooleanProperty(String name) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public byte getByteProperty(String name) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public short getShortProperty(String name) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public int getIntProperty(String name) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public long getLongProperty(String name) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public float getFloatProperty(String name) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public double getDoubleProperty(String name) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public String getStringProperty(String name) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public Object getObjectProperty(String name) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
- public Enumeration getPropertyNames() throws JMSException
+ public Enumeration<?> getPropertyNames() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setBooleanProperty(String name, boolean value) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setByteProperty(String name, byte value) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setShortProperty(String name, short value) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setIntProperty(String name, int value) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setLongProperty(String name, long value) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setFloatProperty(String name, float value) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setDoubleProperty(String name, double value) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setStringProperty(String name, String value) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setObjectProperty(String name, Object value) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void acknowledge() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void clearBody() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
-
}
Modified: qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/ReceiverImpl.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/ReceiverImpl.java?rev=1529205&r1=1529204&r2=1529205&view=diff
==============================================================================
--- qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/ReceiverImpl.java (original)
+++ qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/ReceiverImpl.java Fri Oct 4 16:19:49 2013
@@ -24,6 +24,7 @@ import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageListener;
+import javax.jms.Session;
import org.apache.qpid.jms.engine.AmqpMessage;
import org.apache.qpid.jms.engine.AmqpReceiver;
@@ -43,8 +44,8 @@ public class ReceiverImpl extends LinkIm
@Override
public Message receive() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
@@ -62,10 +63,22 @@ public class ReceiverImpl extends LinkIm
getConnectionImpl().waitUntil(messageReceievedCondition, timeout);
//TODO: decide what if any particular message impl class to instantiate
+
+ AmqpMessage receivedAmqpMessage = messageReceievedCondition.getReceivedMessage();
+ MessageImpl receivedMessageImpl = new MessageImpl(receivedAmqpMessage, _sessionImpl, getConnectionImpl());
+
//TODO: accepting/settling will be acknowledge-mode dependent
- ReceivedMessageImpl receivedMessageImpl = new ReceivedMessageImpl(messageReceievedCondition.getReceivedMessage(), _sessionImpl);
- receivedMessageImpl.accept(true);
+ if(_sessionImpl.getAcknowledgeMode() == Session.AUTO_ACKNOWLEDGE)
+ {
+ receivedAmqpMessage.accept(true);
+ }
+ else
+ {
+ throw new UnsupportedOperationException("Only Auto-Ack currently supported");
+ }
+
getConnectionImpl().stateChanged();
+
return receivedMessageImpl;
}
catch (JmsTimeoutException e)
@@ -121,29 +134,29 @@ public class ReceiverImpl extends LinkIm
@Override
public String getMessageSelector() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public MessageListener getMessageListener() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setMessageListener(MessageListener listener) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public Message receiveNoWait() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
}
Modified: qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/SenderImpl.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/SenderImpl.java?rev=1529205&r1=1529204&r2=1529205&view=diff
==============================================================================
--- qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/SenderImpl.java (original)
+++ qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/SenderImpl.java Fri Oct 4 16:19:49 2013
@@ -77,98 +77,98 @@ public class SenderImpl extends LinkImpl
@Override
public void setDisableMessageID(boolean value) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public boolean getDisableMessageID() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setDisableMessageTimestamp(boolean value) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public boolean getDisableMessageTimestamp() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setDeliveryMode(int deliveryMode) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public int getDeliveryMode() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setPriority(int defaultPriority) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public int getPriority() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setTimeToLive(long timeToLive) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public long getTimeToLive() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public Destination getDestination() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void send(Destination destination, Message message) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void send(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
}
Modified: qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/SessionImpl.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/SessionImpl.java?rev=1529205&r1=1529204&r2=1529205&view=diff
==============================================================================
--- qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/SessionImpl.java (original)
+++ qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/SessionImpl.java Fri Oct 4 16:19:49 2013
@@ -50,11 +50,14 @@ import org.apache.qpid.jms.engine.AmqpSe
public class SessionImpl implements Session
{
private static final int INITIAL_RECEIVER_CREDIT = 1;
+
+ private int _acknowledgeMode;
private AmqpSession _amqpSession;
private ConnectionImpl _connectionImpl;
- public SessionImpl(AmqpSession amqpSession, ConnectionImpl connectionImpl)
+ public SessionImpl(int acknowledgeMode, AmqpSession amqpSession, ConnectionImpl connectionImpl)
{
+ _acknowledgeMode = acknowledgeMode;
_amqpSession = amqpSession;
_connectionImpl = connectionImpl;
}
@@ -162,6 +165,7 @@ public class SessionImpl implements Sess
}
else if(destination instanceof Topic)
{
+ //TODO: support Topic destinations
throw new UnsupportedOperationException("Topics are not yet supported");
}
else
@@ -182,7 +186,8 @@ public class SessionImpl implements Sess
if(_connectionImpl.isStarted())
{
- //issue initial flow for the consumer
+ //Issue initial flow for the consumer.
+ //TODO: decide on prefetch behaviour, i.e. whether we defer flow or do it now, and what value to use.
amqpReceiver.credit(INITIAL_RECEIVER_CREDIT);
_connectionImpl.stateChanged();
}
@@ -198,125 +203,125 @@ public class SessionImpl implements Sess
@Override
public BytesMessage createBytesMessage() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public MapMessage createMapMessage() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public Message createMessage() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public ObjectMessage createObjectMessage() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public ObjectMessage createObjectMessage(Serializable object) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public StreamMessage createStreamMessage() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public TextMessage createTextMessage() throws JMSException
{
- return new TextMessageImpl();
+ return new TextMessageImpl(this, _connectionImpl);
}
@Override
public TextMessage createTextMessage(String text) throws JMSException
{
- return new TextMessageImpl(text);
+ return new TextMessageImpl(text, this, _connectionImpl);
}
@Override
public boolean getTransacted() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public int getAcknowledgeMode() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO do we need to throw an exceptions (e.g. if closed)?
+ return _acknowledgeMode;
}
@Override
public void commit() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void rollback() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void recover() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public MessageListener getMessageListener() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void setMessageListener(MessageListener listener) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void run()
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public MessageConsumer createConsumer(Destination destination, String messageSelector) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public MessageConsumer createConsumer(Destination destination, String messageSelector, boolean NoLocal) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
@@ -328,56 +333,56 @@ public class SessionImpl implements Sess
@Override
public Topic createTopic(String topicName) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public TopicSubscriber createDurableSubscriber(Topic topic, String name) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public QueueBrowser createBrowser(Queue queue) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public QueueBrowser createBrowser(Queue queue, String messageSelector) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public TemporaryQueue createTemporaryQueue() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public TemporaryTopic createTemporaryTopic() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
public void unsubscribe(String name) throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
}
Modified: qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/TextMessageImpl.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/TextMessageImpl.java?rev=1529205&r1=1529204&r2=1529205&view=diff
==============================================================================
--- qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/TextMessageImpl.java (original)
+++ qpid/jms/trunk/src/main/java/org/apache/qpid/jms/impl/TextMessageImpl.java Fri Oct 4 16:19:49 2013
@@ -23,21 +23,22 @@ import javax.jms.TextMessage;
public class TextMessageImpl extends MessageImpl implements TextMessage
{
- public TextMessageImpl() throws JMSException
+ public TextMessageImpl(SessionImpl sessionImpl, ConnectionImpl connectionImpl) throws JMSException
{
- super();
+ super(sessionImpl, connectionImpl);
}
- public TextMessageImpl(String text) throws JMSException
+ public TextMessageImpl(String text, SessionImpl sessionImpl, ConnectionImpl connectionImpl) throws JMSException
{
+ this(sessionImpl, connectionImpl);
setText(text);
}
@Override
public String getText() throws JMSException
{
- // PHTODO Auto-generated method stub
- throw new UnsupportedOperationException("PHTODO");
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("Not Implemented");
}
@Override
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SessionIntegrationTest.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SessionIntegrationTest.java?rev=1529205&r1=1529204&r2=1529205&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SessionIntegrationTest.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SessionIntegrationTest.java Fri Oct 4 16:19:49 2013
@@ -27,7 +27,7 @@ import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
-import org.apache.qpid.jms.impl.ReceivedMessageImpl;
+import org.apache.qpid.jms.impl.MessageImpl;
import org.apache.qpid.jms.test.testpeer.TestAmqpPeer;
import org.junit.Test;
@@ -92,7 +92,7 @@ public class SessionIntegrationTest exte
MessageConsumer messageConsumer = session.createConsumer(queue);
// TODO check that it's a TextMessage with expected content: String expectedText = "myMessage";
- ReceivedMessageImpl receivedMessage = (ReceivedMessageImpl) messageConsumer.receive(1000);
+ MessageImpl receivedMessage = (MessageImpl) messageConsumer.receive(1000);
assertNotNull(receivedMessage);
testPeer.waitForAllHandlersToComplete();
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/ReceiverImplTest.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/ReceiverImplTest.java?rev=1529205&r1=1529204&r2=1529205&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/ReceiverImplTest.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/ReceiverImplTest.java Fri Oct 4 16:19:49 2013
@@ -24,6 +24,8 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import javax.jms.Session;
+
import org.apache.qpid.jms.QpidJmsTestCase;
import org.apache.qpid.jms.engine.AmqpMessage;
import org.apache.qpid.jms.engine.AmqpReceiver;
@@ -56,12 +58,13 @@ public class ReceiverImplTest extends Qp
Mockito.when(_mockConnection.isStarted()).thenReturn(true);
Mockito.when(_mockAmqpReceiver.receiveNoWait()).thenReturn(_mockAmqpMessage);
Mockito.when(_mockSession.getConnectionImpl()).thenReturn(_mockConnection);
+ Mockito.when(_mockSession.getAcknowledgeMode()).thenReturn(Session.AUTO_ACKNOWLEDGE);
ImmediateWaitUntil.mockWaitUntil(_mockConnection);
ReceiverImpl receiver = new ReceiverImpl(_mockConnection, _mockSession, _mockAmqpReceiver);
- ReceivedMessageImpl messageImpl = (ReceivedMessageImpl) receiver.receive(1);
+ MessageImpl messageImpl = (MessageImpl) receiver.receive(1);
assertNotNull("Should not receive a message when connection is not started", messageImpl);
assertEquals("Underlying AmqpMessage should be the one provided", _mockAmqpMessage, messageImpl.getAmqpMessage());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org