Author: rgodfrey
Date: Wed Mar 27 13:40:47 2013
New Revision: 1461575
URL: http://svn.apache.org/r1461575
Log:
QPID-4659 : Address JIRA comments from Robbie Gemmell
Removed:
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_0_10.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_0_8.java
Modified:
qpid/branches/QPID-4659/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaDataType_0_10.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataType_0_8.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaDataType_1_0.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataTypeRegistry.java
Modified:
qpid/branches/QPID-4659/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java?rev=1461575&r1=1461574&r2=1461575&view=diff
==============================================================================
---
qpid/branches/QPID-4659/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
(original)
+++
qpid/branches/QPID-4659/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
Wed Mar 27 13:40:47 2013
@@ -33,12 +33,14 @@ import org.apache.qpid.framing.ProtocolV
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.protocol.v0_10.MessageMetaDataType_0_10;
import org.apache.qpid.server.protocol.v0_8.MessageMetaData;
import org.apache.qpid.server.protocol.v0_10.MessageMetaData_0_10;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.plugin.MessageMetaDataType;
+import org.apache.qpid.server.protocol.v0_8.MessageMetaDataType_0_8;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.StorableMessageMetaData;
import org.apache.qpid.server.store.StoredMessage;
@@ -130,7 +132,7 @@ public class BDBMessageStoreTest extends
*/
StorableMessageMetaData storeableMMD_0_8 =
bdbStore.getMessageMetaData(messageid_0_8);
- assertEquals("Unexpected message
type",MessageMetaDataType.META_DATA_0_8, storeableMMD_0_8.getType());
+ assertEquals("Unexpected message type", MessageMetaDataType_0_8.TYPE,
storeableMMD_0_8.getType());
assertTrue("Unexpected instance type", storeableMMD_0_8 instanceof
MessageMetaData);
MessageMetaData returnedMMD_0_8 = (MessageMetaData) storeableMMD_0_8;
@@ -162,7 +164,7 @@ public class BDBMessageStoreTest extends
*/
StorableMessageMetaData storeableMMD_0_10 =
bdbStore.getMessageMetaData(messageid_0_10);
- assertEquals("Unexpected message
type",MessageMetaDataType.META_DATA_0_10, storeableMMD_0_10.getType());
+ assertEquals("Unexpected message type", MessageMetaDataType_0_10.TYPE,
storeableMMD_0_10.getType());
assertTrue("Unexpected instance type", storeableMMD_0_10 instanceof
MessageMetaData_0_10);
MessageMetaData_0_10 returnedMMD_0_10 = (MessageMetaData_0_10)
storeableMMD_0_10;
Modified:
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java?rev=1461575&r1=1461574&r2=1461575&view=diff
==============================================================================
---
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
(original)
+++
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
Wed Mar 27 13:40:47 2013
@@ -51,9 +51,20 @@ public class MessageConverter_0_10_to_1_
}
Properties props = new Properties();
+
+ /*
+ TODO: the current properties are not currently set:
+
+ absoluteExpiryTime
+ creationTime
+ groupId
+ groupSequence
+ replyToGroupId
+ to
+ */
+
if(msgProps != null)
{
- // props.setAbsoluteExpiryTime();
if(msgProps.hasContentEncoding())
{
props.setContentEncoding(Symbol.valueOf(msgProps.getContentEncoding()));
@@ -63,9 +74,7 @@ public class MessageConverter_0_10_to_1_
{
props.setCorrelationId(msgProps.getCorrelationId());
}
- // props.setCreationTime();
- // props.setGroupId();
- // props.setGroupSequence();
+
if(msgProps.hasMessageId())
{
props.setMessageId(msgProps.getMessageId());
@@ -84,9 +93,9 @@ public class MessageConverter_0_10_to_1_
props.setContentType(Symbol.valueOf("application/x-java-serialized-object"));
}
}
- // props.setReplyToGroupId();
+
props.setSubject(serverMessage.getRoutingKey());
- // props.setTo();
+
if(msgProps.hasUserId())
{
props.setUserId(new Binary(msgProps.getUserId()));
Modified:
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java?rev=1461575&r1=1461574&r2=1461575&view=diff
==============================================================================
---
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
(original)
+++
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
Wed Mar 27 13:40:47 2013
@@ -51,6 +51,16 @@ public class MessageConverter_0_8_to_1_0
Properties props = new Properties();
+ /*
+ TODO: The following properties are not currently set:
+
+ creationTime
+ groupId
+ groupSequence
+ replyToGroupId
+ to
+ */
+
props.setContentEncoding(Symbol.valueOf(contentHeader.getEncodingAsString()));
props.setContentType(Symbol.valueOf(contentHeader.getContentTypeAsString()));
@@ -66,9 +76,7 @@ public class MessageConverter_0_8_to_1_0
{
props.setCorrelationId(new Binary(correlationId.getBytes()));
}
- // props.setCreationTime();
- // props.setGroupId();
- // props.setGroupSequence();
+
final AMQShortString messageId = contentHeader.getMessageId();
if(messageId != null)
{
@@ -76,13 +84,12 @@ public class MessageConverter_0_8_to_1_0
}
props.setReplyTo(String.valueOf(contentHeader.getReplyTo()));
- // props.setReplyToGroupId();
props.setSubject(serverMessage.getRoutingKey());
- // props.setTo();
if(contentHeader.getUserId() != null)
{
props.setUserId(new Binary(contentHeader.getUserId().getBytes()));
}
+
sections.add(props);
sections.add(new
ApplicationProperties(FieldTable.convertToMap(contentHeader.getHeaders())));
Modified:
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaDataType_0_10.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaDataType_0_10.java?rev=1461575&r1=1461574&r2=1461575&view=diff
==============================================================================
---
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaDataType_0_10.java
(original)
+++
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaDataType_0_10.java
Wed Mar 27 13:40:47 2013
@@ -28,10 +28,12 @@ import org.apache.qpid.server.store.Stor
public class MessageMetaDataType_0_10 implements
MessageMetaDataType<MessageMetaData_0_10>
{
+ public static final int TYPE = 1;
+
@Override
public int ordinal()
{
- return 1;
+ return TYPE;
}
@Override
Modified:
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java?rev=1461575&r1=1461574&r2=1461575&view=diff
==============================================================================
---
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
(original)
+++
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
Wed Mar 27 13:40:47 2013
@@ -469,7 +469,7 @@ public class ServerConnection extends Co
@Override
public String getVirtualHostName()
{
- return _virtualHost.getName();
+ return _virtualHost == null ? null : _virtualHost.getName();
}
public long getSessionCountLimit()
Modified:
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataType_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataType_0_8.java?rev=1461575&r1=1461574&r2=1461575&view=diff
==============================================================================
---
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataType_0_8.java
(original)
+++
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataType_0_8.java
Wed Mar 27 13:40:47 2013
@@ -28,10 +28,12 @@ import org.apache.qpid.server.store.Stor
public class MessageMetaDataType_0_8 implements
MessageMetaDataType<MessageMetaData>
{
+ public static final int TYPE = 0;
+
@Override
public int ordinal()
{
- return 0;
+ return TYPE;
}
@Override
Modified:
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java?rev=1461575&r1=1461574&r2=1461575&view=diff
==============================================================================
---
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
(original)
+++
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java
Wed Mar 27 13:40:47 2013
@@ -78,8 +78,6 @@ public class ConnectionOpenMethodHandler
}
else
{
- session.setVirtualHost(virtualHost);
-
// Check virtualhost access
if
(!virtualHost.getSecurityManager().accessVirtualhost(virtualHostName,
session.getRemoteAddress()))
{
@@ -90,6 +88,7 @@ public class ConnectionOpenMethodHandler
throw
body.getConnectionException(AMQConstant.CONNECTION_FORCED, "Virtual host '" +
virtualHost.getName() + "' is not active");
}
+ session.setVirtualHost(virtualHost);
// See Spec (0.8.2). Section 3.1.2 Virtual Hosts
if (session.getContextKey() == null)
Modified:
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java?rev=1461575&r1=1461574&r2=1461575&view=diff
==============================================================================
---
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
(original)
+++
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
Wed Mar 27 13:40:47 2013
@@ -220,7 +220,7 @@ public class Connection_1_0 implements C
@Override
public String getVirtualHostName()
{
- return _vhost.getName();
+ return _vhost == null ? null : _vhost.getName();
}
@Override
Modified:
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaDataType_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaDataType_1_0.java?rev=1461575&r1=1461574&r2=1461575&view=diff
==============================================================================
---
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaDataType_1_0.java
(original)
+++
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaDataType_1_0.java
Wed Mar 27 13:40:47 2013
@@ -28,10 +28,12 @@ import org.apache.qpid.server.store.Stor
public class MessageMetaDataType_1_0 implements
MessageMetaDataType<MessageMetaData_1_0>
{
+ public static final int TYPE = 2;
+
@Override
public int ordinal()
{
- return 2;
+ return TYPE;
}
@Override
Modified:
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataTypeRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataTypeRegistry.java?rev=1461575&r1=1461574&r2=1461575&view=diff
==============================================================================
---
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataTypeRegistry.java
(original)
+++
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataTypeRegistry.java
Wed Mar 27 13:40:47 2013
@@ -29,8 +29,12 @@ public class MessageMetaDataTypeRegistry
static
{
- int maxOrdinal = 0;
- for(MessageMetaDataType type : new
QpidServiceLoader<MessageMetaDataType>().instancesOf(MessageMetaDataType.class))
+ int maxOrdinal = -1;
+
+ Iterable<MessageMetaDataType> messageMetaDataTypes =
+ new
QpidServiceLoader<MessageMetaDataType>().atLeastOneInstanceOf(MessageMetaDataType.class);
+
+ for(MessageMetaDataType type : messageMetaDataTypes)
{
if(type.ordinal()>maxOrdinal)
{
@@ -40,6 +44,14 @@ public class MessageMetaDataTypeRegistry
values = new MessageMetaDataType[maxOrdinal+1];
for(MessageMetaDataType type : new
QpidServiceLoader<MessageMetaDataType>().instancesOf(MessageMetaDataType.class))
{
+ if(values[type.ordinal()] != null)
+ {
+ throw new IllegalStateException("Multiple MessageDataType ("
+
+values[type.ordinal()].getClass().getName()
+ +", "
+ + type.getClass().getName()
+ + ") defined for the same
ordinal value: " + type.ordinal());
+ }
values[type.ordinal()] = type;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
