Author: jmesnil Date: 2009-11-06 05:16:01 -0500 (Fri, 06 Nov 2009) New Revision: 8234 Modified: trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java trunk/examples/jms/bridge/src/org/hornetq/jms/example/HatColourChangeTransformer.java trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java trunk/src/main/org/hornetq/core/client/management/impl/ManagementHelper.java trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java trunk/src/main/org/hornetq/core/management/impl/ManagementServiceImpl.java trunk/src/main/org/hornetq/core/message/Message.java trunk/src/main/org/hornetq/core/message/PropertyConversionException.java trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java trunk/src/main/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java trunk/src/main/org/hornetq/jms/client/HornetQMessage.java trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/SimpleTransformer.java trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistrubtionTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java trunk/tests/src/org/hornetq/tests/unit/core/message/impl/MessageImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/message/impl/MessagePropertyConversionTest.java trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeFilter.java Log: https://jira.jboss.org/jira/browse/HORNETQ-176: typed property getters on the core Message class * renamed Message.getProperty() to Message.getObjectProperty() * added typed getter methods with a String key (in addition to getter with a SimpleString key) * used typed getter methods in HornetQ source instead of the untyped metod getObjectProperty() Modified: trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java =================================================================== --- trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -94,7 +94,7 @@ // Step 8. Receive the message. ClientMessage messageReceived = messageConsumer.receive(1000); - System.out.println("Received TextMessage:" + messageReceived.getObjectProperty(propName)); + System.out.println("Received TextMessage:" + messageReceived.getStringProperty(propName)); } finally { Modified: trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java =================================================================== --- trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -86,7 +86,7 @@ // Step 9. Receive the message. ClientMessage messageReceived = messageConsumer.receive(1000); - System.out.println("Received TextMessage:" + messageReceived.getObjectProperty(propName)); + System.out.println("Received TextMessage:" + messageReceived.getStringProperty(propName)); } finally { Modified: trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java =================================================================== --- trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -87,7 +87,7 @@ // Step 7. Receive the message. ClientMessage messageReceived = messageConsumer.receive(1000); - System.out.println("Received TextMessage:" + messageReceived.getObjectProperty(propName)); + System.out.println("Received TextMessage:" + messageReceived.getStringProperty(propName)); } finally { Modified: trunk/examples/jms/bridge/src/org/hornetq/jms/example/HatColourChangeTransformer.java =================================================================== --- trunk/examples/jms/bridge/src/org/hornetq/jms/example/HatColourChangeTransformer.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/examples/jms/bridge/src/org/hornetq/jms/example/HatColourChangeTransformer.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -31,7 +31,7 @@ { SimpleString propName = new SimpleString("hat"); - SimpleString oldProp = (SimpleString)message.getProperty(propName); + SimpleString oldProp = message.getSimpleStringProperty(propName); System.out.println("Old hat colour is " + oldProp); Modified: trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -248,7 +248,7 @@ if (m.containsProperty(FORCED_DELIVERY_MESSAGE)) { - Long seq = (Long)m.getProperty(FORCED_DELIVERY_MESSAGE); + long seq = m.getLongProperty(FORCED_DELIVERY_MESSAGE); if (seq >= forceDeliveryCount.longValue()) { // forced delivery messages are discarded, nothing has been delivered by the queue Modified: trunk/src/main/org/hornetq/core/client/management/impl/ManagementHelper.java =================================================================== --- trunk/src/main/org/hornetq/core/client/management/impl/ManagementHelper.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/client/management/impl/ManagementHelper.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -357,7 +357,7 @@ } if (message.containsProperty(HDR_OPERATION_SUCCEEDED)) { - return (Boolean)message.getProperty(HDR_OPERATION_SUCCEEDED); + return message.getBooleanProperty(HDR_OPERATION_SUCCEEDED); } return false; } Modified: trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -155,7 +155,7 @@ if (val == null) { - val = message.getProperty(id.getName()); + val = message.getObjectProperty(id.getName()); } id.setValue(val); Modified: trunk/src/main/org/hornetq/core/management/impl/ManagementServiceImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/ManagementServiceImpl.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/management/impl/ManagementServiceImpl.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -415,13 +415,13 @@ ServerMessageImpl reply = new ServerMessageImpl(storageManager.generateUniqueID()); reply.setBody(ChannelBuffers.dynamicBuffer(1024)); - SimpleString resourceName = (SimpleString)message.getProperty(ManagementHelper.HDR_RESOURCE_NAME); + String resourceName = message.getStringProperty(ManagementHelper.HDR_RESOURCE_NAME); if (log.isDebugEnabled()) { log.debug("handling management message for " + resourceName); } - SimpleString operation = (SimpleString)message.getProperty(ManagementHelper.HDR_OPERATION_NAME); + String operation = message.getStringProperty(ManagementHelper.HDR_OPERATION_NAME); if (operation != null) { @@ -434,7 +434,7 @@ try { - Object result = invokeOperation(resourceName.toString(), operation.toString(), params); + Object result = invokeOperation(resourceName, operation, params); ManagementHelper.storeResult(reply, result); @@ -457,13 +457,13 @@ } else { - SimpleString attribute = (SimpleString)message.getProperty(ManagementHelper.HDR_ATTRIBUTE); + String attribute = message.getStringProperty(ManagementHelper.HDR_ATTRIBUTE); if (attribute != null) { try { - Object result = getAttribute(resourceName.toString(), attribute.toString()); + Object result = getAttribute(resourceName, attribute); ManagementHelper.storeResult(reply, result); } Modified: trunk/src/main/org/hornetq/core/message/Message.java =================================================================== --- trunk/src/main/org/hornetq/core/message/Message.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/message/Message.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -139,34 +139,54 @@ void putTypedProperties(TypedProperties properties); - Object getProperty(SimpleString key); - Object removeProperty(SimpleString key); boolean containsProperty(SimpleString key); - Object getObjectProperty(String key); - Boolean getBooleanProperty(SimpleString key) throws PropertyConversionException; + Boolean getBooleanProperty(String key) throws PropertyConversionException; + Byte getByteProperty(SimpleString key) throws PropertyConversionException; + Byte getByteProperty(String key) throws PropertyConversionException; + Double getDoubleProperty(SimpleString key) throws PropertyConversionException; + Double getDoubleProperty(String key) throws PropertyConversionException; + Integer getIntProperty(SimpleString key) throws PropertyConversionException; + Integer getIntProperty(String key) throws PropertyConversionException; + Long getLongProperty(SimpleString key) throws PropertyConversionException; + Long getLongProperty(String key) throws PropertyConversionException; + Object getObjectProperty(SimpleString key); + Object getObjectProperty(String key); + Short getShortProperty(SimpleString key) throws PropertyConversionException; + Short getShortProperty(String key) throws PropertyConversionException; + Float getFloatProperty(SimpleString key) throws PropertyConversionException; + Float getFloatProperty(String key) throws PropertyConversionException; + String getStringProperty(SimpleString key) throws PropertyConversionException; + String getStringProperty(String key) throws PropertyConversionException; + + SimpleString getSimpleStringProperty(SimpleString key) throws PropertyConversionException; + + SimpleString getSimpleStringProperty(String key) throws PropertyConversionException; + byte[] getBytesProperty(SimpleString key) throws PropertyConversionException; + byte[] getBytesProperty(String key) throws PropertyConversionException; + Object removeProperty(String key); boolean containsProperty(String key); Modified: trunk/src/main/org/hornetq/core/message/PropertyConversionException.java =================================================================== --- trunk/src/main/org/hornetq/core/message/PropertyConversionException.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/message/PropertyConversionException.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -20,7 +20,7 @@ * * */ -public class PropertyConversionException extends Exception +public class PropertyConversionException extends RuntimeException { private static final long serialVersionUID = -3010008708334904332L; Modified: trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -502,14 +502,14 @@ properties.putTypedProperties(otherProps); } - public Object getProperty(final SimpleString key) + public Object getObjectProperty(final SimpleString key) { return properties.getProperty(key); } public Boolean getBooleanProperty(SimpleString key) throws PropertyConversionException { - final Object value = getObjectProperty(key); + Object value = properties.getProperty(key); if (value == null) { return Boolean.valueOf(null); @@ -528,10 +528,15 @@ throw new PropertyConversionException("Invalid conversion"); } } + + public Boolean getBooleanProperty(String key) throws PropertyConversionException + { + return getBooleanProperty(new SimpleString(key)); + } public Byte getByteProperty(SimpleString key) throws PropertyConversionException { - final Object value = properties.getProperty(key); + Object value = properties.getProperty(key); if (value == null) { @@ -552,13 +557,18 @@ } } + public Byte getByteProperty(String key) throws PropertyConversionException + { + return getByteProperty(new SimpleString(key)); + } + public byte[] getBytesProperty(SimpleString key) throws PropertyConversionException { - final Object value = properties.getProperty(key); + Object value = properties.getProperty(key); if (value == null) { - throw new IllegalArgumentException(key + " property is not defined"); + return null; } if (value instanceof byte[]) @@ -570,10 +580,15 @@ throw new PropertyConversionException("Invalid conversion"); } } + + public byte[] getBytesProperty(String key) throws PropertyConversionException + { + return getBytesProperty(new SimpleString(key)); + } public Double getDoubleProperty(SimpleString key) throws PropertyConversionException { - Object value = getProperty(key); + Object value = properties.getProperty(key); if (value == null) { return Double.valueOf(null); @@ -597,9 +612,14 @@ } } + public Double getDoubleProperty(String key) throws PropertyConversionException + { + return getDoubleProperty(new SimpleString(key)); + } + public Integer getIntProperty(SimpleString key) throws PropertyConversionException { - Object value = getObjectProperty(key); + Object value = properties.getProperty(key); if (value == null) { return Integer.valueOf(null); @@ -626,9 +646,14 @@ } } + public Integer getIntProperty(String key) throws PropertyConversionException + { + return getIntProperty(new SimpleString(key)); + } + public Long getLongProperty(SimpleString key) throws PropertyConversionException { - Object value = getObjectProperty(key); + Object value = properties.getProperty(key); if (value == null) { return Long.valueOf(null); @@ -658,10 +683,15 @@ throw new PropertyConversionException("Invalid conversion"); } } + + public Long getLongProperty(String key) throws PropertyConversionException + { + return getLongProperty(new SimpleString(key)); + } public Short getShortProperty(SimpleString key) throws PropertyConversionException { - Object value = getObjectProperty(key); + Object value = properties.getProperty(key); if (value == null) { return Short.valueOf(null); @@ -682,12 +712,16 @@ { throw new PropertyConversionException("Invalid Conversion."); } - } + + public Short getShortProperty(String key) throws PropertyConversionException + { + return getShortProperty(new SimpleString(key)); + } public Float getFloatProperty(SimpleString key) throws PropertyConversionException { - Object value = getProperty(key); + Object value = properties.getProperty(key); if (value == null) { return Float.valueOf(null); @@ -707,8 +741,32 @@ } } + public Float getFloatProperty(String key) throws PropertyConversionException + { + return getFloatProperty(new SimpleString(key)); + } + public String getStringProperty(SimpleString key) throws PropertyConversionException { + SimpleString str = getSimpleStringProperty(key); + + if (str == null) + { + return null; + } + else + { + return str.toString(); + } + } + + public String getStringProperty(String key) throws PropertyConversionException + { + return getStringProperty(new SimpleString(key)); + } + + public SimpleString getSimpleStringProperty(SimpleString key) throws PropertyConversionException + { Object value = properties.getProperty(key); if (value == null) @@ -718,51 +776,51 @@ if (value instanceof SimpleString) { - return ((SimpleString)value).toString(); + return (SimpleString)value; } else if (value instanceof Boolean) { - return value.toString(); + return new SimpleString(value.toString()); } else if (value instanceof Byte) { - return value.toString(); + return new SimpleString(value.toString()); } else if (value instanceof Short) { - return value.toString(); + return new SimpleString(value.toString()); } else if (value instanceof Integer) { - return value.toString(); + return new SimpleString(value.toString()); } else if (value instanceof Long) { - return value.toString(); + return new SimpleString(value.toString()); } else if (value instanceof Float) { - return value.toString(); + return new SimpleString(value.toString()); } else if (value instanceof Double) { - return value.toString(); + return new SimpleString(value.toString()); } else { throw new PropertyConversionException("Invalid conversion"); } } + + public SimpleString getSimpleStringProperty(String key) throws PropertyConversionException + { + return getSimpleStringProperty(new SimpleString(key)); + } public Object getObjectProperty(final String key) { return properties.getProperty(new SimpleString(key)); } - - public Object getObjectProperty(final SimpleString key) - { - return properties.getProperty(key); - } public Object removeProperty(final SimpleString key) { Modified: trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -237,11 +237,11 @@ if (!routed) { - if (message.getProperty(MessageImpl.HDR_FROM_CLUSTER) != null) + if (message.containsProperty(MessageImpl.HDR_FROM_CLUSTER)) { routeFromCluster(message, context); } - else if (groupingHandler != null && message.getProperty(MessageImpl.HDR_GROUP_ID) != null) + else if (groupingHandler != null && message.containsProperty(MessageImpl.HDR_GROUP_ID)) { routeUsingStrictOrdering(message, context, groupingHandler); } @@ -374,7 +374,7 @@ final RoutingContext context, final GroupingHandler groupingGroupingHandler) throws Exception { - SimpleString groupId = (SimpleString)message.getProperty(MessageImpl.HDR_GROUP_ID); + SimpleString groupId = message.getSimpleStringProperty(MessageImpl.HDR_GROUP_ID); for (Map.Entry<SimpleString, List<Binding>> entry : routingNameBindingMap.entrySet()) { Modified: trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -543,7 +543,7 @@ SimpleString address = message.getDestination(); - Object duplicateID = message.getProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID); + Object duplicateID = message.getObjectProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID); DuplicateIDCache cache = null; @@ -672,10 +672,9 @@ MessageReference reference = message.createReference(queue); - Long scheduledDeliveryTime = (Long)message.getProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME); - - if (scheduledDeliveryTime != null) + if (message.containsProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME)) { + Long scheduledDeliveryTime = message.getLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME); reference.setScheduledDeliveryTime(scheduledDeliveryTime); } @@ -863,10 +862,9 @@ refs.add(reference); - Long scheduledDeliveryTime = (Long)message.getProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME); - - if (scheduledDeliveryTime != null) + if (message.containsProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME)) { + Long scheduledDeliveryTime = message.getLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME); reference.setScheduledDeliveryTime(scheduledDeliveryTime); } @@ -897,7 +895,7 @@ storageManager.storeReference(queue.getID(), message.getMessageID()); } - if (scheduledDeliveryTime != null) + if (message.containsProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME)) { if (tx != null) { Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -408,7 +408,7 @@ Set<SimpleString> propNames = new HashSet<SimpleString>(message.getPropertyNames()); - byte[] queueIds = (byte[])message.getProperty(idsHeaderName); + byte[] queueIds = message.getBytesProperty(idsHeaderName); for (SimpleString propName : propNames) { Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -495,7 +495,7 @@ try { // Reset the bindings - if (message.getProperty(HDR_RESET_QUEUE_DATA) != null) + if (message.containsProperty(HDR_RESET_QUEUE_DATA)) { clearBindings(); @@ -511,7 +511,7 @@ // TODO - optimised this by just passing int in header - but filter needs to be extended to support IN with // a list of integers - SimpleString type = (SimpleString)message.getProperty(ManagementHelper.HDR_NOTIFICATION_TYPE); + SimpleString type = message.getSimpleStringProperty(ManagementHelper.HDR_NOTIFICATION_TYPE); NotificationType ntype = NotificationType.valueOf(type.toString()); @@ -566,16 +566,16 @@ * */ private synchronized void doProposalReceived(final ClientMessage message) throws Exception { - SimpleString type = (SimpleString) message.getProperty(ManagementHelper.HDR_PROPOSAL_GROUP_ID); - - if (type == null) + if (!message.containsProperty(ManagementHelper.HDR_PROPOSAL_GROUP_ID)) { throw new IllegalStateException("proposal type is null"); } + + SimpleString type = message.getSimpleStringProperty(ManagementHelper.HDR_PROPOSAL_GROUP_ID); - SimpleString val = (SimpleString) message.getProperty(ManagementHelper.HDR_PROPOSAL_VALUE); + SimpleString val = message.getSimpleStringProperty(ManagementHelper.HDR_PROPOSAL_VALUE); - Integer hops = (Integer) message.getProperty(ManagementHelper.HDR_DISTANCE); + Integer hops = message.getIntProperty(ManagementHelper.HDR_DISTANCE); Response response = server.getGroupingHandler().receive(new Proposal(type, val), hops + 1); @@ -591,14 +591,15 @@ * */ private synchronized void doProposalResponseReceived(final ClientMessage message) throws Exception { - SimpleString type = (SimpleString) message.getProperty(ManagementHelper.HDR_PROPOSAL_GROUP_ID); - if (type == null) + if (!message.containsProperty(ManagementHelper.HDR_PROPOSAL_GROUP_ID)) { throw new IllegalStateException("proposal type is null"); } - SimpleString val = (SimpleString) message.getProperty(ManagementHelper.HDR_PROPOSAL_VALUE); - SimpleString alt = (SimpleString) message.getProperty(ManagementHelper.HDR_PROPOSAL_ALT_VALUE); - Integer hops = (Integer) message.getProperty(ManagementHelper.HDR_DISTANCE); + + SimpleString type = message.getSimpleStringProperty(ManagementHelper.HDR_PROPOSAL_GROUP_ID); + SimpleString val = message.getSimpleStringProperty(ManagementHelper.HDR_PROPOSAL_VALUE); + SimpleString alt = message.getSimpleStringProperty(ManagementHelper.HDR_PROPOSAL_ALT_VALUE); + Integer hops = message.getIntProperty(ManagementHelper.HDR_DISTANCE); Response response = new Response(type, val, alt); server.getGroupingHandler().proposed(response); server.getGroupingHandler().send(response, hops + 1); @@ -614,43 +615,43 @@ private synchronized void doBindingAdded(final ClientMessage message) throws Exception { - Integer distance = (Integer)message.getProperty(ManagementHelper.HDR_DISTANCE); - - if (distance == null) + if (!message.containsProperty(ManagementHelper.HDR_DISTANCE)) { throw new IllegalStateException("distance is null"); } - SimpleString queueAddress = (SimpleString)message.getProperty(ManagementHelper.HDR_ADDRESS); - - if (queueAddress == null) + if (!message.containsProperty(ManagementHelper.HDR_ADDRESS)) { throw new IllegalStateException("queueAddress is null"); } - SimpleString clusterName = (SimpleString)message.getProperty(ManagementHelper.HDR_CLUSTER_NAME); - - if (clusterName == null) + if (!message.containsProperty(ManagementHelper.HDR_CLUSTER_NAME)) { throw new IllegalStateException("clusterName is null"); } - SimpleString routingName = (SimpleString)message.getProperty(ManagementHelper.HDR_ROUTING_NAME); - - if (routingName == null) + if (!message.containsProperty(ManagementHelper.HDR_ROUTING_NAME)) { throw new IllegalStateException("routingName is null"); } - - SimpleString filterString = (SimpleString)message.getProperty(ManagementHelper.HDR_FILTERSTRING); - - Long queueID = (Long)message.getProperty(ManagementHelper.HDR_BINDING_ID); - - if (queueID == null) + + if (!message.containsProperty(ManagementHelper.HDR_BINDING_ID)) { throw new IllegalStateException("queueID is null"); } + Integer distance = message.getIntProperty(ManagementHelper.HDR_DISTANCE); + + SimpleString queueAddress = message.getSimpleStringProperty(ManagementHelper.HDR_ADDRESS); + + SimpleString clusterName = message.getSimpleStringProperty(ManagementHelper.HDR_CLUSTER_NAME); + + SimpleString routingName = message.getSimpleStringProperty(ManagementHelper.HDR_ROUTING_NAME); + + SimpleString filterString = message.getSimpleStringProperty(ManagementHelper.HDR_FILTERSTRING); + + Long queueID = message.getLongProperty(ManagementHelper.HDR_BINDING_ID); + RemoteQueueBinding binding = new RemoteQueueBindingImpl(server.getStorageManager().generateUniqueID(), queueAddress, clusterName, @@ -692,12 +693,12 @@ private void doBindingRemoved(final ClientMessage message) throws Exception { - SimpleString clusterName = (SimpleString)message.getProperty(ManagementHelper.HDR_CLUSTER_NAME); - - if (clusterName == null) + if (!message.containsProperty(ManagementHelper.HDR_CLUSTER_NAME)) { throw new IllegalStateException("clusterName is null"); } + + SimpleString clusterName = message.getSimpleStringProperty(ManagementHelper.HDR_CLUSTER_NAME); removeBinding(clusterName); } @@ -716,23 +717,23 @@ private synchronized void doConsumerCreated(final ClientMessage message) throws Exception { - Integer distance = (Integer)message.getProperty(ManagementHelper.HDR_DISTANCE); - - if (distance == null) + if (!message.containsProperty(ManagementHelper.HDR_DISTANCE)) { throw new IllegalStateException("distance is null"); } - SimpleString clusterName = (SimpleString)message.getProperty(ManagementHelper.HDR_CLUSTER_NAME); - - if (clusterName == null) + if (!message.containsProperty(ManagementHelper.HDR_CLUSTER_NAME)) { throw new IllegalStateException("clusterName is null"); } + Integer distance = message.getIntProperty(ManagementHelper.HDR_DISTANCE); + + SimpleString clusterName = message.getSimpleStringProperty(ManagementHelper.HDR_CLUSTER_NAME); + message.putIntProperty(ManagementHelper.HDR_DISTANCE, distance + 1); - SimpleString filterString = (SimpleString)message.getProperty(ManagementHelper.HDR_FILTERSTRING); + SimpleString filterString = message.getSimpleStringProperty(ManagementHelper.HDR_FILTERSTRING); RemoteQueueBinding binding = bindings.get(clusterName); @@ -751,23 +752,23 @@ private synchronized void doConsumerClosed(final ClientMessage message) throws Exception { - Integer distance = (Integer)message.getProperty(ManagementHelper.HDR_DISTANCE); - - if (distance == null) + if (!message.containsProperty(ManagementHelper.HDR_DISTANCE)) { throw new IllegalStateException("distance is null"); } - - SimpleString clusterName = (SimpleString)message.getProperty(ManagementHelper.HDR_CLUSTER_NAME); - - if (clusterName == null) + + if (!message.containsProperty(ManagementHelper.HDR_CLUSTER_NAME)) { throw new IllegalStateException("clusterName is null"); } + Integer distance = message.getIntProperty(ManagementHelper.HDR_DISTANCE); + + SimpleString clusterName = message.getSimpleStringProperty(ManagementHelper.HDR_CLUSTER_NAME); + message.putIntProperty(ManagementHelper.HDR_DISTANCE, distance + 1); - SimpleString filterString = (SimpleString)message.getProperty(ManagementHelper.HDR_FILTERSTRING); + SimpleString filterString = message.getSimpleStringProperty(ManagementHelper.HDR_FILTERSTRING); RemoteQueueBinding binding = bindings.get(clusterName); Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -179,7 +179,7 @@ public void route(final ServerMessage message, final RoutingContext context) { - byte[] ids = (byte[])message.getProperty(idsHeaderName); + byte[] ids = message.getBytesProperty(idsHeaderName); if (ids == null) { Modified: trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -70,7 +70,7 @@ @Override public synchronized void add(final MessageReference ref, final boolean first) { - SimpleString prop = (SimpleString)ref.getMessage().getProperty(MessageImpl.HDR_LAST_VALUE_NAME); + SimpleString prop = ref.getMessage().getSimpleStringProperty(MessageImpl.HDR_LAST_VALUE_NAME); if (prop != null) { Modified: trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -1147,7 +1147,7 @@ initPagingStore(reference.getMessage().getDestination()); - final SimpleString groupID = (SimpleString)reference.getMessage().getProperty(MessageImpl.HDR_GROUP_ID); + final SimpleString groupID = reference.getMessage().getSimpleStringProperty(MessageImpl.HDR_GROUP_ID); if (groupID != null) { @@ -1283,7 +1283,7 @@ Consumer consumer = distributionPolicy.getNextConsumer(); consumerCount++; - final SimpleString groupId = (SimpleString)reference.getMessage().getProperty(MessageImpl.HDR_GROUP_ID); + final SimpleString groupId = reference.getMessage().getSimpleStringProperty(MessageImpl.HDR_GROUP_ID); if (groupId != null) { Modified: trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -208,11 +208,11 @@ public void setOriginalHeaders(final ServerMessage other, final boolean expiry) { - if (other.getProperty(HDR_ORIG_MESSAGE_ID) != null) + if (other.containsProperty(HDR_ORIG_MESSAGE_ID)) { - putStringProperty(HDR_ORIGINAL_DESTINATION, (SimpleString)other.getProperty(HDR_ORIGINAL_DESTINATION)); + putStringProperty(HDR_ORIGINAL_DESTINATION, other.getSimpleStringProperty(HDR_ORIGINAL_DESTINATION)); - putLongProperty(HDR_ORIG_MESSAGE_ID, (Long)other.getProperty(HDR_ORIG_MESSAGE_ID)); + putLongProperty(HDR_ORIG_MESSAGE_ID, other.getLongProperty(HDR_ORIG_MESSAGE_ID)); } else { Modified: trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -1799,7 +1799,7 @@ ServerMessage reply = managementService.handleMessage(message); - SimpleString replyTo = (SimpleString)message.getProperty(ClientMessageImpl.REPLYTO_HEADER_NAME); + SimpleString replyTo = message.getSimpleStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME); if (replyTo != null) { Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessage.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -338,7 +338,7 @@ { if (msgID == null) { - SimpleString id = (SimpleString)message.getProperty(HORNETQ_MESSAGE_ID); + SimpleString id = message.getSimpleStringProperty(HORNETQ_MESSAGE_ID); msgID = id == null ? null : id.toString(); } @@ -374,7 +374,7 @@ public byte[] getJMSCorrelationIDAsBytes() throws JMSException { - Object obj = message.getProperty(CORRELATIONID_HEADER_NAME); + Object obj = message.getObjectProperty(CORRELATIONID_HEADER_NAME); if (obj instanceof byte[]) { @@ -415,12 +415,7 @@ { if (jmsCorrelationID == null) { - Object obj = message.getProperty(CORRELATIONID_HEADER_NAME); - - if (obj != null) - { - jmsCorrelationID = ((SimpleString)obj).toString(); - } + jmsCorrelationID = message.getStringProperty(CORRELATIONID_HEADER_NAME); } return jmsCorrelationID; @@ -430,7 +425,7 @@ { if (replyTo == null) { - SimpleString repl = (SimpleString)message.getProperty(REPLYTO_HEADER_NAME); + SimpleString repl = message.getSimpleStringProperty(REPLYTO_HEADER_NAME); if (repl != null) { @@ -539,7 +534,7 @@ { if (jmsType == null) { - SimpleString ss = (SimpleString)message.getProperty(TYPE_HEADER_NAME); + SimpleString ss = message.getSimpleStringProperty(TYPE_HEADER_NAME); if (ss != null) { @@ -732,7 +727,7 @@ return String.valueOf(message.getDeliveryCount()); } - Object val = message.getProperty(new SimpleString(name)); + Object val = message.getObjectProperty(name); if (val instanceof SimpleString) { val = ((SimpleString)val).toString(); Modified: trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -71,14 +71,14 @@ ClientMessage message = createMessage(session, 0); producer.send(message); ClientMessage message2 = consumer.receive(1000); - assertEquals(0, message2.getProperty(propKey)); + assertEquals(0, message2.getObjectProperty(propKey)); message = createMessage(session, 1); SimpleString dupID = new SimpleString("abcdefg"); message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message2 = consumer.receive(1000); - assertEquals(1, message2.getProperty(propKey)); + assertEquals(1, message2.getObjectProperty(propKey)); message = createMessage(session, 2); message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); @@ -99,7 +99,7 @@ message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); message2 = consumer.receive(1000); - assertEquals(4, message2.getProperty(propKey)); + assertEquals(4, message2.getObjectProperty(propKey)); message = createMessage(session, 5); message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); @@ -137,14 +137,14 @@ ClientMessage message = createMessage(session, 0); producer.send(message); ClientMessage message2 = consumer.receive(1000); - assertEquals(0, message2.getProperty(propKey)); + assertEquals(0, message2.getObjectProperty(propKey)); message = createMessage(session, 1); SimpleString dupID = new SimpleString("abcdefg"); message.putStringProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID); producer.send(message); message2 = consumer.receive(1000); - assertEquals(1, message2.getProperty(propKey)); + assertEquals(1, message2.getObjectProperty(propKey)); message = createMessage(session, 2); message.putStringProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID); @@ -165,7 +165,7 @@ message.putStringProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2); producer.send(message); message2 = consumer.receive(1000); - assertEquals(4, message2.getProperty(propKey)); + assertEquals(4, message2.getObjectProperty(propKey)); message = createMessage(session, 5); message.putStringProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2); @@ -230,13 +230,13 @@ { ClientMessage message = consumer1.receive(1000); assertNotNull(message); - assertEquals(i, message.getProperty(propKey)); + assertEquals(i, message.getObjectProperty(propKey)); message = consumer2.receive(1000); assertNotNull(message); - assertEquals(i, message.getProperty(propKey)); + assertEquals(i, message.getObjectProperty(propKey)); message = consumer3.receive(1000); assertNotNull(message); - assertEquals(i, message.getProperty(propKey)); + assertEquals(i, message.getObjectProperty(propKey)); } log.info("Now sending more"); @@ -277,13 +277,13 @@ { message = consumer1.receive(1000); assertNotNull(message); - assertEquals(i, message.getProperty(propKey)); + assertEquals(i, message.getObjectProperty(propKey)); message = consumer2.receive(1000); assertNotNull(message); - assertEquals(i, message.getProperty(propKey)); + assertEquals(i, message.getObjectProperty(propKey)); message = consumer3.receive(1000); assertNotNull(message); - assertEquals(i, message.getProperty(propKey)); + assertEquals(i, message.getObjectProperty(propKey)); } for (int i = 0; i < cacheSize; i++) @@ -325,13 +325,13 @@ { message = consumer1.receive(1000); assertNotNull(message); - assertEquals(i, message.getProperty(propKey)); + assertEquals(i, message.getObjectProperty(propKey)); message = consumer2.receive(1000); assertNotNull(message); - assertEquals(i, message.getProperty(propKey)); + assertEquals(i, message.getObjectProperty(propKey)); message = consumer3.receive(1000); assertNotNull(message); - assertEquals(i, message.getProperty(propKey)); + assertEquals(i, message.getObjectProperty(propKey)); } session.close(); @@ -377,7 +377,7 @@ session.commit(); message = consumer.receive(250); - assertEquals(1, message.getProperty(propKey)); + assertEquals(1, message.getObjectProperty(propKey)); message = consumer.receive(250); assertNull(message); @@ -419,7 +419,7 @@ session.commit(); message = consumer.receive(250); - assertEquals(1, message.getProperty(propKey)); + assertEquals(1, message.getObjectProperty(propKey)); message = consumer.receive(250); assertNull(message); @@ -470,10 +470,10 @@ session.commit(); message = consumer.receive(250); - assertEquals(0, message.getProperty(propKey)); + assertEquals(0, message.getObjectProperty(propKey)); message = consumer.receive(250); - assertEquals(1, message.getProperty(propKey)); + assertEquals(1, message.getObjectProperty(propKey)); message = consumer.receive(250); assertNull(message); @@ -534,7 +534,7 @@ ClientConsumer consumer = session.createConsumer(queueName); message = consumer.receive(250); - assertEquals(0, message.getProperty(propKey)); + assertEquals(0, message.getObjectProperty(propKey)); message = consumer.receive(250); assertNull(message); @@ -600,7 +600,7 @@ session.start(xid3, XAResource.TMNOFLAGS); message = consumer.receive(250); - assertEquals(1, message.getProperty(propKey)); + assertEquals(1, message.getObjectProperty(propKey)); message = consumer.receive(250); assertNull(message); @@ -677,7 +677,7 @@ session.start(xid3, XAResource.TMNOFLAGS); message = consumer.receive(250); - assertEquals(1, message.getProperty(propKey)); + assertEquals(1, message.getObjectProperty(propKey)); message = consumer.receive(250); assertNull(message); @@ -890,14 +890,14 @@ message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); ClientMessage message2 = consumer.receive(1000); - assertEquals(1, message2.getProperty(propKey)); + assertEquals(1, message2.getObjectProperty(propKey)); message = createMessage(session, 2); SimpleString dupID2 = new SimpleString("hijklmnopqr"); message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); message2 = consumer.receive(1000); - assertEquals(2, message2.getProperty(propKey)); + assertEquals(2, message2.getObjectProperty(propKey)); session.close(); @@ -975,7 +975,7 @@ message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); ClientMessage message2 = consumer.receive(1000); - assertEquals(i, message2.getProperty(propKey)); + assertEquals(i, message2.getObjectProperty(propKey)); } session.close(); @@ -1053,7 +1053,7 @@ message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); ClientMessage message2 = consumer.receive(1000); - assertEquals(i, message2.getProperty(propKey)); + assertEquals(i, message2.getObjectProperty(propKey)); } session.close(); @@ -1090,7 +1090,7 @@ { //Message should get through ClientMessage message2 = consumer.receive(1000); - assertEquals(i, message2.getProperty(propKey)); + assertEquals(i, message2.getObjectProperty(propKey)); } else { @@ -1142,7 +1142,7 @@ message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); ClientMessage message2 = consumer.receive(1000); - assertEquals(i, message2.getProperty(propKey)); + assertEquals(i, message2.getObjectProperty(propKey)); } session.close(); @@ -1190,7 +1190,7 @@ { //Message should get through ClientMessage message2 = consumer.receive(1000); - assertEquals(i, message2.getProperty(propKey)); + assertEquals(i, message2.getObjectProperty(propKey)); } else { @@ -1239,14 +1239,14 @@ message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); ClientMessage message2 = consumer.receive(1000); - assertEquals(1, message2.getProperty(propKey)); + assertEquals(1, message2.getObjectProperty(propKey)); message = createMessage(session, 2); SimpleString dupID2 = new SimpleString("hijklmnopqr"); message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); message2 = consumer.receive(1000); - assertEquals(2, message2.getProperty(propKey)); + assertEquals(2, message2.getObjectProperty(propKey)); session.close(); @@ -1274,13 +1274,13 @@ message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message2 = consumer.receive(200); - assertEquals(1, message2.getProperty(propKey)); + assertEquals(1, message2.getObjectProperty(propKey)); message = createMessage(session, 2); message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); message2 = consumer.receive(200); - assertEquals(2, message2.getProperty(propKey)); + assertEquals(2, message2.getObjectProperty(propKey)); session.close(); @@ -1323,7 +1323,7 @@ producer.send(message); session.commit(); ClientMessage message2 = consumer.receive(1000); - assertEquals(1, message2.getProperty(propKey)); + assertEquals(1, message2.getObjectProperty(propKey)); message = createMessage(session, 2); SimpleString dupID2 = new SimpleString("hijklmnopqr"); @@ -1331,7 +1331,7 @@ producer.send(message); session.commit(); message2 = consumer.receive(1000); - assertEquals(2, message2.getProperty(propKey)); + assertEquals(2, message2.getObjectProperty(propKey)); session.close(); @@ -1360,14 +1360,14 @@ producer.send(message); session.commit(); message2 = consumer.receive(200); - assertEquals(1, message2.getProperty(propKey)); + assertEquals(1, message2.getObjectProperty(propKey)); message = createMessage(session, 2); message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.commit(); message2 = consumer.receive(200); - assertEquals(2, message2.getProperty(propKey)); + assertEquals(2, message2.getObjectProperty(propKey)); session.close(); @@ -1410,7 +1410,7 @@ ClientMessage message2 = consumer.receive(1000); message2.acknowledge(); session.commit(); - assertEquals(1, message2.getProperty(propKey)); + assertEquals(1, message2.getObjectProperty(propKey)); message = createMessage(session, 2); SimpleString dupID2 = new SimpleString("hijklmnopqr"); @@ -1420,7 +1420,7 @@ message2 = consumer.receive(1000); message2.acknowledge(); session.commit(); - assertEquals(2, message2.getProperty(propKey)); + assertEquals(2, message2.getObjectProperty(propKey)); session.close(); @@ -1554,10 +1554,10 @@ session.start(xid3, XAResource.TMNOFLAGS); ClientMessage message2 = consumer.receive(200); - assertEquals(1, message2.getProperty(propKey)); + assertEquals(1, message2.getObjectProperty(propKey)); message2 = consumer.receive(200); - assertEquals(2, message2.getProperty(propKey)); + assertEquals(2, message2.getObjectProperty(propKey)); session.close(); @@ -1651,10 +1651,10 @@ session.start(xid3, XAResource.TMNOFLAGS); ClientMessage message2 = consumer.receive(200); - assertEquals(1, message2.getProperty(propKey)); + assertEquals(1, message2.getObjectProperty(propKey)); message2 = consumer.receive(200); - assertEquals(2, message2.getProperty(propKey)); + assertEquals(2, message2.getObjectProperty(propKey)); session.close(); Modified: trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -272,7 +272,7 @@ { ClientMessage message = consumer.receive(1000); - assertEquals("orange", ((SimpleString)message.getObjectProperty(key)).toString()); + assertEquals("orange", message.getStringProperty(key)); } server.getRemotingService().removeInterceptor(interceptor); @@ -290,7 +290,7 @@ { ClientMessage message = consumer.receive(1000); - assertEquals("apple", ((SimpleString)message.getObjectProperty(key)).toString()); + assertEquals("apple", message.getStringProperty(key)); } session.close(); @@ -365,7 +365,7 @@ { ClientMessage message = consumer.receive(1000); - assertEquals("orange", ((SimpleString)message.getObjectProperty(key)).toString()); + assertEquals("orange", message.getStringProperty(key)); } sf.removeInterceptor(interceptor); @@ -383,7 +383,7 @@ { ClientMessage message = consumer.receive(1000); - assertEquals("apple", ((SimpleString)message.getObjectProperty(key)).toString()); + assertEquals("apple", message.getStringProperty(key)); } session.close(); @@ -460,10 +460,10 @@ { ClientMessage message = consumer.receive(1000); - assertEquals(1, ((Integer)message.getObjectProperty("a")).intValue()); - assertEquals(2, ((Integer)message.getObjectProperty("b")).intValue()); - assertEquals(3, ((Integer)message.getObjectProperty("c")).intValue()); - assertEquals(4, ((Integer)message.getObjectProperty("d")).intValue()); + assertEquals(1, message.getIntProperty("a").intValue()); + assertEquals(2, message.getIntProperty("b").intValue()); + assertEquals(3, message.getIntProperty("c").intValue()); + assertEquals(4, message.getIntProperty("d").intValue()); } server.getRemotingService().removeInterceptor(interceptor2); @@ -479,10 +479,10 @@ { ClientMessage message = consumer.receive(1000); - assertEquals(1, ((Integer)message.getObjectProperty("a")).intValue()); - assertNull(message.getObjectProperty("b")); - assertEquals(3, ((Integer)message.getObjectProperty("c")).intValue()); - assertEquals(4, ((Integer)message.getObjectProperty("d")).intValue()); + assertEquals(1, message.getIntProperty("a").intValue()); + assertFalse(message.containsProperty("b")); + assertEquals(3, message.getIntProperty("c").intValue()); + assertEquals(4, message.getIntProperty("d").intValue()); } @@ -549,10 +549,10 @@ { ClientMessage message = consumer.receive(1000); - assertEquals(1, ((Integer)message.getObjectProperty("a")).intValue()); - assertEquals(2, ((Integer)message.getObjectProperty("b")).intValue()); - assertEquals(3, ((Integer)message.getObjectProperty("c")).intValue()); - assertEquals(4, ((Integer)message.getObjectProperty("d")).intValue()); + assertEquals(1, message.getIntProperty("a").intValue()); + assertEquals(2, message.getIntProperty("b").intValue()); + assertEquals(3, message.getIntProperty("c").intValue()); + assertEquals(4, message.getIntProperty("d").intValue()); } sf.removeInterceptor(interceptor2); @@ -568,10 +568,10 @@ { ClientMessage message = consumer.receive(1000); - assertEquals(1, ((Integer)message.getObjectProperty("a")).intValue()); - assertNull(message.getObjectProperty("b")); - assertEquals(3, ((Integer)message.getObjectProperty("c")).intValue()); - assertEquals(4, ((Integer)message.getObjectProperty("d")).intValue()); + assertEquals(1, message.getIntProperty("a").intValue()); + assertFalse(message.containsProperty("b")); + assertEquals(3, message.getIntProperty("c").intValue()); + assertEquals(4, message.getIntProperty("d").intValue()); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -365,7 +365,7 @@ { ClientMessage message = (ClientMessage)consumer.receive(); - int count = (Integer)message.getObjectProperty("count"); + int count = message.getIntProperty("count"); boolean redelivered = message.getDeliveryCount() > 1; @@ -425,7 +425,7 @@ { ClientMessage message = (ClientMessage)consumer.receive(); - int count = (Integer)message.getObjectProperty("count"); + int count = message.getIntProperty("count"); boolean redelivered = message.getDeliveryCount() > 1; Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -196,9 +196,9 @@ assertEquals("Message:" + i, text); // Check the headers - SimpleString origDest = (SimpleString)tm.getProperty(MessageImpl.HDR_ORIGINAL_DESTINATION); + SimpleString origDest = (SimpleString)tm.getObjectProperty(MessageImpl.HDR_ORIGINAL_DESTINATION); - Long origMessageId = (Long)tm.getProperty(MessageImpl.HDR_ORIG_MESSAGE_ID); + Long origMessageId = (Long)tm.getObjectProperty(MessageImpl.HDR_ORIG_MESSAGE_ID); assertEquals(qName, origDest); Modified: trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -201,7 +201,7 @@ assertEquals("Message:" + i, text); // Check the headers - Long actualExpiryTime = (Long)tm.getProperty(HDR_ACTUAL_EXPIRY_TIME); + Long actualExpiryTime = (Long)tm.getObjectProperty(HDR_ACTUAL_EXPIRY_TIME); assertTrue(actualExpiryTime >= expiration); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -218,7 +218,7 @@ msg.acknowledge(); - assertEquals(i, msg.getProperty(new SimpleString("key"))); + assertEquals(i, msg.getObjectProperty(new SimpleString("key"))); } session.close(); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -2045,7 +2045,7 @@ ClientMessage msg = consumer.receive(50000); assertNotNull(msg); - assertEquals(i, msg.getProperty(new SimpleString("key"))); + assertEquals(i, msg.getObjectProperty(new SimpleString("key"))); msg.acknowledge(); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -172,8 +172,8 @@ ClientConsumer expiryConsumer = session.createConsumer(expiryQueue); ClientMessage expiredMessage = expiryConsumer.receive(500); assertNotNull(expiredMessage); - assertNotNull(expiredMessage.getProperty(MessageImpl.HDR_ACTUAL_EXPIRY_TIME)); - assertEquals(address, expiredMessage.getProperty(MessageImpl.HDR_ORIGINAL_DESTINATION)); + assertNotNull(expiredMessage.getObjectProperty(MessageImpl.HDR_ACTUAL_EXPIRY_TIME)); + assertEquals(address, expiredMessage.getObjectProperty(MessageImpl.HDR_ORIGINAL_DESTINATION)); consumer.close(); expiryConsumer.close(); session.deleteQueue(queue); Modified: trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -162,7 +162,7 @@ assertNotNull(message2); - assertEquals(i, ((Integer)message2.getProperty(new SimpleString("id"))).intValue()); + assertEquals(i, ((Integer)message2.getObjectProperty(new SimpleString("id"))).intValue()); message2.acknowledge(); @@ -283,7 +283,7 @@ consumer.close(); } - Integer messageID = (Integer)message.getProperty(new SimpleString("id")); + Integer messageID = (Integer)message.getObjectProperty(new SimpleString("id")); assertNotNull(messageID); assertEquals(messageID.intValue(), i); @@ -304,7 +304,7 @@ assertNotNull(message); - Integer messageID = (Integer)message.getProperty(new SimpleString("id")); + Integer messageID = (Integer)message.getObjectProperty(new SimpleString("id")); assertNotNull(messageID); assertEquals("message received out of order", messageID.intValue(), i); @@ -432,7 +432,7 @@ assertNotNull(message2); - Long scheduled = (Long)message2.getProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME); + Long scheduled = (Long)message2.getObjectProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME); if (scheduled != null) { assertTrue("Scheduling didn't work", System.currentTimeMillis() >= scheduledTime); Modified: trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -80,7 +80,7 @@ ClientMessage reply = requestor.request(request, 500); assertNotNull("reply was not received", reply); - assertEquals(value, reply.getProperty(key)); + assertEquals(value, reply.getObjectProperty(key)); session.close(); } @@ -108,14 +108,14 @@ ClientMessage reply = requestor.request(request, 500); assertNotNull("reply was not received", reply); - assertEquals(value, reply.getProperty(key)); + assertEquals(value, reply.getObjectProperty(key)); request = session.createClientMessage(false); request.putLongProperty(key, value + 1); reply = requestor.request(request, 500); assertNotNull("reply was not received", reply); - assertEquals(value + 1, reply.getProperty(key)); + assertEquals(value + 1, reply.getObjectProperty(key)); session.close(); } @@ -191,7 +191,7 @@ ClientMessage reply = requestor.request(request, 500); assertNotNull("reply was not received", reply); - assertEquals(value, reply.getProperty(key)); + assertEquals(value, reply.getObjectProperty(key)); request = session.createClientMessage(false); request.putLongProperty(key, value + 1); @@ -260,8 +260,8 @@ try { ClientMessage reply = session.createClientMessage(false); - SimpleString replyTo = (SimpleString)request.getProperty(ClientMessageImpl.REPLYTO_HEADER_NAME); - long value = (Long)request.getProperty(key); + SimpleString replyTo = (SimpleString)request.getObjectProperty(ClientMessageImpl.REPLYTO_HEADER_NAME); + long value = (Long)request.getObjectProperty(key); reply.putLongProperty(key, value); ClientProducer replyProducer = session.createProducer(replyTo); replyProducer.send(reply); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -161,7 +161,7 @@ { ClientMessage r1 = cons2.receive(1500); assertNotNull(r1); - assertEquals(i, r1.getProperty(propKey)); + assertEquals(i, r1.getObjectProperty(propKey)); } session0.close(); @@ -291,7 +291,7 @@ { ClientMessage r1 = cons2.receive(1500); assertNotNull(r1); - assertEquals(i, r1.getProperty(propKey)); + assertEquals(i, r1.getObjectProperty(propKey)); } session0.close(); @@ -408,7 +408,7 @@ { ClientMessage r1 = cons1.receive(1500); assertNotNull(r1); - assertEquals(i, r1.getProperty(propKey)); + assertEquals(i, r1.getObjectProperty(propKey)); } session0.close(); @@ -520,8 +520,8 @@ { ClientMessage r1 = cons1.receive(30000); assertNotNull(r1); - assertEquals(i, r1.getProperty(propKey)); - log.info("got message " + r1.getProperty(propKey)); + assertEquals(i, r1.getObjectProperty(propKey)); + log.info("got message " + r1.getObjectProperty(propKey)); } log.info("got messages"); @@ -632,7 +632,7 @@ { ClientMessage r1 = cons1.receive(1500); assertNotNull(r1); - assertEquals(i, r1.getProperty(propKey)); + assertEquals(i, r1.getObjectProperty(propKey)); } // Fail again - should reconnect @@ -653,7 +653,7 @@ { ClientMessage r1 = cons1.receive(1500); assertNotNull(r1); - assertEquals(i, r1.getProperty(propKey)); + assertEquals(i, r1.getObjectProperty(propKey)); } session0.close(); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -138,7 +138,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -168,7 +168,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -289,7 +289,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -311,7 +311,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -359,7 +359,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -490,7 +490,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -600,7 +600,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -639,7 +639,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -667,7 +667,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -169,7 +169,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); if (largeMessage) { @@ -367,7 +367,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); @@ -509,7 +509,7 @@ assertNotNull(message); - SimpleString val = (SimpleString)message.getProperty(propKey); + SimpleString val = (SimpleString)message.getObjectProperty(propKey); assertEquals(new SimpleString("bong"), val); @@ -639,7 +639,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -151,7 +151,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -181,7 +181,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/SimpleTransformer.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/SimpleTransformer.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/SimpleTransformer.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -35,7 +35,7 @@ public ServerMessage transform(final ServerMessage message) { - SimpleString oldProp = (SimpleString)message.getProperty(new SimpleString("wibble")); + SimpleString oldProp = (SimpleString)message.getObjectProperty(new SimpleString("wibble")); if (!oldProp.equals(new SimpleString("bing"))) { Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -569,7 +569,7 @@ assertTrue("Message received too soon", System.currentTimeMillis() >= firstReceiveTime); } - SimpleString id = (SimpleString)message.getProperty(MessageImpl.HDR_GROUP_ID); + SimpleString id = (SimpleString)message.getObjectProperty(MessageImpl.HDR_GROUP_ID); System.out.println("received " + id + " on consumer " + consumerIDs[i]); if (groupIdsReceived.get(id) == null) { @@ -665,10 +665,10 @@ assertTrue("Message received too soon", System.currentTimeMillis() >= firstReceiveTime); } - if (j != (Integer)(message.getProperty(COUNT_PROP))) + if (j != (Integer)(message.getObjectProperty(COUNT_PROP))) { outOfOrder = true; - System.out.println("Message j=" + j + " was received out of order = " + message.getProperty(COUNT_PROP)); + System.out.println("Message j=" + j + " was received out of order = " + message.getObjectProperty(COUNT_PROP)); } } } @@ -724,7 +724,7 @@ { log.info("check receive Consumer " + consumerIDs[i] + " received message " + - message.getProperty(COUNT_PROP)); + message.getObjectProperty(COUNT_PROP)); } else { @@ -753,7 +753,7 @@ assertNotNull("consumer " + consumerIDs[count] + " did not receive message " + i, message); - assertEquals("consumer " + consumerIDs[count] + " message " + i, i, message.getProperty(COUNT_PROP)); + assertEquals("consumer " + consumerIDs[count] + " message " + i, i, message.getObjectProperty(COUNT_PROP)); count++; @@ -795,7 +795,7 @@ if (message != null) { - int count = (Integer)message.getProperty(COUNT_PROP); + int count = (Integer)message.getObjectProperty(COUNT_PROP); Integer prevCount = countMap.get(i); @@ -857,7 +857,7 @@ if (message != null) { - int count = (Integer)message.getProperty(COUNT_PROP); + int count = (Integer)message.getObjectProperty(COUNT_PROP); // log.info("consumer " + consumerIDs[i] + " received message " + count); @@ -945,7 +945,7 @@ if (message != null) { - int count = (Integer)message.getProperty(COUNT_PROP); + int count = (Integer)message.getObjectProperty(COUNT_PROP); ints.add(count); } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -260,7 +260,7 @@ // messages must remain ordered but there could be a "jump" if messages // are missing or duplicated - int count = (Integer)message.getObjectProperty("counter"); + int count = message.getIntProperty("counter"); counts.add(count); if (count != lastCount + 1) { @@ -379,7 +379,7 @@ // There may be some missing or duplicate messages - but the order should be correct - int count = (Integer)message.getObjectProperty("counter"); + int count = message.getIntProperty("counter"); assertTrue("count:" + count + " last count:" + lastCount, count >= lastCount); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -155,7 +155,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -227,7 +227,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -393,7 +393,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -482,7 +482,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -553,7 +553,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -636,7 +636,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -659,7 +659,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -964,7 +964,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -1041,7 +1041,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -1127,7 +1127,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -1228,7 +1228,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -1393,7 +1393,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -1465,7 +1465,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); } fail(session, latch); @@ -1482,7 +1482,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -1545,7 +1545,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); } fail(session, latch); @@ -1564,7 +1564,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -1628,7 +1628,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -1658,7 +1658,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -1882,7 +1882,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -2022,7 +2022,7 @@ assertMessageBody(i, message); - assertEquals(i, message.getObjectProperty("counter")); + assertEquals(i, message.getIntProperty("counter").intValue()); message.acknowledge(); } @@ -2129,7 +2129,7 @@ assertEquals("aardvarks", message2.getBody().readString()); - assertEquals(i, message2.getProperty(new SimpleString("count"))); + assertEquals(i, message2.getObjectProperty(new SimpleString("count"))); message2.acknowledge(); } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -142,7 +142,7 @@ { session.commit(); } - assertEquals((Integer)i, (Integer)msg.getProperty(new SimpleString("key"))); + assertEquals((Integer)i, (Integer)msg.getObjectProperty(new SimpleString("key"))); } session.commit(); @@ -166,7 +166,7 @@ assertNotNull(msg); msg.acknowledge(); - int result = (Integer)msg.getProperty(new SimpleString("key")); + int result = (Integer)msg.getObjectProperty(new SimpleString("key")); assertEquals(i, result); } } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistrubtionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistrubtionTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistrubtionTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -92,7 +92,7 @@ System.out.println(i + " msg = " + msg); - int received = (Integer)msg.getProperty(new SimpleString("key")); + int received = (Integer)msg.getObjectProperty(new SimpleString("key")); if (i != received) { @@ -130,7 +130,7 @@ System.out.println(i + " msg = " + msg); - int received = (Integer)msg.getProperty(new SimpleString("key")); + int received = (Integer)msg.getObjectProperty(new SimpleString("key")); if (i != received) { @@ -199,7 +199,7 @@ System.out.println(i + " msg = " + msg); - int received = (Integer)msg.getProperty(new SimpleString("key")); + int received = (Integer)msg.getObjectProperty(new SimpleString("key")); if (i != received) { Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -1377,8 +1377,8 @@ assertNotNull(msg); - int tn = (Integer)msg.getProperty(new SimpleString("threadnum")); - int cnt = (Integer)msg.getProperty(new SimpleString("count")); + int tn = (Integer)msg.getObjectProperty(new SimpleString("threadnum")); + int cnt = (Integer)msg.getObjectProperty(new SimpleString("count")); Integer c = consumerCounts.get(tn); if (c == null) @@ -1456,8 +1456,8 @@ return; } - int threadNum = (Integer)message.getProperty(new SimpleString("threadnum")); - int cnt = (Integer)message.getProperty(new SimpleString("count")); + int threadNum = (Integer)message.getObjectProperty(new SimpleString("threadnum")); + int cnt = (Integer)message.getObjectProperty(new SimpleString("count")); Integer c = counts.get(threadNum); if (c == null) Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -305,7 +305,7 @@ fail("Too many messages"); } - assertEquals(count, message.getProperty(new SimpleString("count"))); + assertEquals(count, message.getObjectProperty(new SimpleString("count"))); count++; @@ -424,7 +424,7 @@ fail("Too many messages"); } - assertEquals(count, message.getProperty(new SimpleString("count"))); + assertEquals(count, message.getObjectProperty(new SimpleString("count"))); count++; @@ -548,7 +548,7 @@ fail("Too many messages"); } - assertEquals(count, message.getProperty(new SimpleString("count"))); + assertEquals(count, message.getObjectProperty(new SimpleString("count"))); count++; @@ -702,7 +702,7 @@ fail("Too many messages"); } - assertEquals(count, message.getProperty(new SimpleString("count"))); + assertEquals(count, message.getObjectProperty(new SimpleString("count"))); count++; @@ -835,7 +835,7 @@ assertNotNull(msg); - assertEquals(i, msg.getProperty(new SimpleString("count"))); + assertEquals(i, msg.getObjectProperty(new SimpleString("count"))); msg.acknowledge(); } @@ -932,7 +932,7 @@ assertNotNull(msg); - assertEquals(i, msg.getProperty(new SimpleString("count"))); + assertEquals(i, msg.getObjectProperty(new SimpleString("count"))); msg.acknowledge(); } @@ -1038,7 +1038,7 @@ assertNotNull(msg); - assertEquals(i, msg.getProperty(new SimpleString("count"))); + assertEquals(i, msg.getObjectProperty(new SimpleString("count"))); msg.acknowledge(); } @@ -1064,7 +1064,7 @@ assertNotNull(msg); - assertEquals(i, msg.getProperty(new SimpleString("count"))); + assertEquals(i, msg.getObjectProperty(new SimpleString("count"))); msg.acknowledge(); } @@ -1176,7 +1176,7 @@ assertNotNull(msg); - assertEquals(i, msg.getProperty(new SimpleString("count"))); + assertEquals(i, msg.getObjectProperty(new SimpleString("count"))); msg.acknowledge(); } @@ -1205,7 +1205,7 @@ assertNotNull(msg); - assertEquals(i, msg.getProperty(new SimpleString("count"))); + assertEquals(i, msg.getObjectProperty(new SimpleString("count"))); msg.acknowledge(); } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -121,7 +121,7 @@ assertEquals("aardvarks", message.getBody().readString()); - assertEquals(i, message.getProperty(new SimpleString("count"))); + assertEquals(i, message.getObjectProperty(new SimpleString("count"))); message.acknowledge(); } @@ -215,7 +215,7 @@ assertEquals("aardvarks", message.getBody().readString()); - assertEquals(i, message.getProperty(new SimpleString("count"))); + assertEquals(i, message.getIntProperty("count").intValue()); message.acknowledge(); } @@ -330,7 +330,7 @@ assertEquals("aardvarks", message.getBody().readString()); - assertEquals(i, message.getProperty(new SimpleString("count"))); + assertEquals(i, message.getIntProperty("count").intValue()); message.acknowledge(); } @@ -479,7 +479,7 @@ assertEquals("aardvarks", message.getBody().readString()); - assertEquals(i, message.getProperty(new SimpleString("count"))); + assertEquals(i, message.getIntProperty("count").intValue()); message.acknowledge(); } @@ -565,7 +565,7 @@ assertEquals("aardvarks", message.getBody().readString()); - assertEquals(i, message.getProperty(new SimpleString("count"))); + assertEquals(i, message.getIntProperty("count").intValue()); message.acknowledge(); } @@ -641,7 +641,7 @@ assertEquals("aardvarks", message.getBody().readString()); - assertEquals(i, message.getProperty(new SimpleString("count"))); + assertEquals(i, message.getObjectProperty(new SimpleString("count"))); message.acknowledge(); } @@ -720,7 +720,7 @@ assertEquals("aardvarks", message.getBody().readString()); - assertEquals(i, message.getProperty(new SimpleString("count"))); + assertEquals(i, message.getIntProperty("count").intValue()); message.acknowledge(); } Modified: trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -111,7 +111,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -124,7 +124,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -217,7 +217,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -230,7 +230,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -243,7 +243,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -256,7 +256,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -331,7 +331,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -422,7 +422,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -541,7 +541,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals(i, message.getIntProperty(propKey).intValue()); message.acknowledge(); } @@ -554,7 +554,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals(i, message.getIntProperty(propKey).intValue()); message.acknowledge(); } @@ -567,7 +567,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals(i, message.getIntProperty(propKey).intValue()); message.acknowledge(); } @@ -580,7 +580,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals(i, message.getIntProperty(propKey).intValue()); message.acknowledge(); } @@ -693,7 +693,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals(i, message.getIntProperty(propKey).intValue()); message.acknowledge(); } @@ -706,7 +706,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals(i, message.getIntProperty(propKey).intValue()); message.acknowledge(); } @@ -719,7 +719,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals(i, message.getIntProperty(propKey).intValue()); message.acknowledge(); } @@ -834,7 +834,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals(i, message.getIntProperty(propKey).intValue()); message.acknowledge(); } @@ -847,7 +847,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals(i, message.getIntProperty(propKey).intValue()); message.acknowledge(); } @@ -982,7 +982,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -995,7 +995,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -1008,7 +1008,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -1032,7 +1032,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -1151,7 +1151,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); @@ -1166,7 +1166,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); @@ -1181,7 +1181,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); @@ -1198,7 +1198,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -1313,7 +1313,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals(i, message.getIntProperty(propKey).intValue()); message.acknowledge(); } @@ -1328,7 +1328,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals(i, message.getIntProperty(propKey).intValue()); message.acknowledge(); } @@ -1341,7 +1341,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals(i, message.getIntProperty(propKey).intValue()); message.acknowledge(); } Modified: trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -128,7 +128,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -141,7 +141,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -154,7 +154,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -167,7 +167,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -280,7 +280,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -293,7 +293,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -306,7 +306,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -319,7 +319,7 @@ assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } Modified: trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -290,7 +290,7 @@ { if (delayDelivery > 0) { - long originalTime = (Long)message.getProperty(new SimpleString("original-time")); + long originalTime = (Long)message.getObjectProperty(new SimpleString("original-time")); assertTrue(System.currentTimeMillis() - originalTime + "<" + delayDelivery, System.currentTimeMillis() - originalTime >= delayDelivery); } @@ -308,7 +308,7 @@ // the same // scheduled delivery time assertEquals(msgCounter, - ((Integer)message.getProperty(new SimpleString("counter-message"))).intValue()); + ((Integer)message.getObjectProperty(new SimpleString("counter-message"))).intValue()); } if (useStreamOnConsume) @@ -403,7 +403,7 @@ if (delayDelivery > 0) { - long originalTime = (Long)message.getProperty(new SimpleString("original-time")); + long originalTime = (Long)message.getObjectProperty(new SimpleString("original-time")); assertTrue(System.currentTimeMillis() - originalTime + "<" + delayDelivery, System.currentTimeMillis() - originalTime >= delayDelivery); } @@ -419,7 +419,7 @@ { // right now there is no guarantee of ordered delivered on multiple scheduledMessages with the same // scheduled delivery time - assertEquals(i, ((Integer)message.getProperty(new SimpleString("counter-message"))).intValue()); + assertEquals(i, ((Integer)message.getObjectProperty(new SimpleString("counter-message"))).intValue()); } HornetQBuffer buffer = message.getBody(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -77,9 +77,9 @@ session.createQueue(address, queue, durable); ClientMessage[] notifications = consumeMessages(1, notifConsumer); - assertEquals(BINDING_ADDED.toString(), notifications[0].getProperty(HDR_NOTIFICATION_TYPE).toString()); - assertEquals(queue.toString(), notifications[0].getProperty(HDR_ROUTING_NAME).toString()); - assertEquals(address.toString(), notifications[0].getProperty(HDR_ADDRESS).toString()); + assertEquals(BINDING_ADDED.toString(), notifications[0].getObjectProperty(HDR_NOTIFICATION_TYPE).toString()); + assertEquals(queue.toString(), notifications[0].getObjectProperty(HDR_ROUTING_NAME).toString()); + assertEquals(address.toString(), notifications[0].getObjectProperty(HDR_ADDRESS).toString()); session.deleteQueue(queue); } @@ -98,9 +98,9 @@ session.createQueue(address, queue, durable); ClientMessage[] notifications = consumeMessages(1, notifConsumer); - assertEquals(BINDING_ADDED.toString(), notifications[0].getProperty(HDR_NOTIFICATION_TYPE).toString()); - assertEquals(queue.toString(), notifications[0].getProperty(HDR_ROUTING_NAME).toString()); - assertEquals(address.toString(), notifications[0].getProperty(HDR_ADDRESS).toString()); + assertEquals(BINDING_ADDED.toString(), notifications[0].getObjectProperty(HDR_NOTIFICATION_TYPE).toString()); + assertEquals(queue.toString(), notifications[0].getObjectProperty(HDR_ROUTING_NAME).toString()); + assertEquals(address.toString(), notifications[0].getObjectProperty(HDR_ADDRESS).toString()); session.deleteQueue(queue); } @@ -136,9 +136,9 @@ session.deleteQueue(queue); ClientMessage[] notifications = consumeMessages(1, notifConsumer); - assertEquals(BINDING_REMOVED.toString(), notifications[0].getProperty(HDR_NOTIFICATION_TYPE).toString()); - assertEquals(queue.toString(), notifications[0].getProperty(HDR_ROUTING_NAME).toString()); - assertEquals(address.toString(), notifications[0].getProperty(HDR_ADDRESS).toString()); + assertEquals(BINDING_REMOVED.toString(), notifications[0].getObjectProperty(HDR_NOTIFICATION_TYPE).toString()); + assertEquals(queue.toString(), notifications[0].getObjectProperty(HDR_ROUTING_NAME).toString()); + assertEquals(address.toString(), notifications[0].getObjectProperty(HDR_ADDRESS).toString()); } public void testCONSUMER_CREATED() throws Exception @@ -154,10 +154,10 @@ ClientConsumer consumer = session.createConsumer(queue); ClientMessage[] notifications = consumeMessages(1, notifConsumer); - assertEquals(CONSUMER_CREATED.toString(), notifications[0].getProperty(HDR_NOTIFICATION_TYPE).toString()); - assertEquals(queue.toString(), notifications[0].getProperty(HDR_ROUTING_NAME).toString()); - assertEquals(address.toString(), notifications[0].getProperty(HDR_ADDRESS).toString()); - assertEquals(1, notifications[0].getProperty(HDR_CONSUMER_COUNT)); + assertEquals(CONSUMER_CREATED.toString(), notifications[0].getObjectProperty(HDR_NOTIFICATION_TYPE).toString()); + assertEquals(queue.toString(), notifications[0].getObjectProperty(HDR_ROUTING_NAME).toString()); + assertEquals(address.toString(), notifications[0].getObjectProperty(HDR_ADDRESS).toString()); + assertEquals(1, notifications[0].getObjectProperty(HDR_CONSUMER_COUNT)); consumer.close(); session.deleteQueue(queue); @@ -177,10 +177,10 @@ consumer.close(); ClientMessage[] notifications = consumeMessages(1, notifConsumer); - assertEquals(CONSUMER_CLOSED.toString(), notifications[0].getProperty(HDR_NOTIFICATION_TYPE).toString()); - assertEquals(queue.toString(), notifications[0].getProperty(HDR_ROUTING_NAME).toString()); - assertEquals(address.toString(), notifications[0].getProperty(HDR_ADDRESS).toString()); - assertEquals(0, notifications[0].getProperty(HDR_CONSUMER_COUNT)); + assertEquals(CONSUMER_CLOSED.toString(), notifications[0].getObjectProperty(HDR_NOTIFICATION_TYPE).toString()); + assertEquals(queue.toString(), notifications[0].getObjectProperty(HDR_ROUTING_NAME).toString()); + assertEquals(address.toString(), notifications[0].getObjectProperty(HDR_ADDRESS).toString()); + assertEquals(0, notifications[0].getObjectProperty(HDR_CONSUMER_COUNT)); session.deleteQueue(queue); } @@ -252,7 +252,7 @@ { for (SimpleString key : m.getPropertyNames()) { - System.out.println(key + "=" + m.getProperty(key)); + System.out.println(key + "=" + m.getObjectProperty(key)); } } assertNotNull("expected to received " + expected + " messages, got only " + i, m); @@ -265,7 +265,7 @@ for (SimpleString key : m.getPropertyNames()) { - System.out.println(key + "=" + m.getProperty(key)); + System.out.println(key + "=" + m.getObjectProperty(key)); } } assertNull("received one more message than expected (" + expected + ")", m); Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -556,7 +556,7 @@ // consume the message from otherQueue ClientConsumer otherConsumer = session.createConsumer(otherQueue); ClientMessage m = otherConsumer.receive(500); - assertEquals(value, m.getProperty(key)); + assertEquals(value, m.getObjectProperty(key)); m.acknowledge(); @@ -644,13 +644,13 @@ ClientConsumer consumer = session.createConsumer(queue); ClientMessage m = consumer.receive(500); assertNotNull(m); - assertEquals(unmatchingValue, m.getProperty(key)); + assertEquals(unmatchingValue, m.getObjectProperty(key)); // consume the matched message from otherQueue ClientConsumer otherConsumer = session.createConsumer(otherQueue); m = otherConsumer.receive(500); assertNotNull(m); - assertEquals(matchingValue, m.getProperty(key)); + assertEquals(matchingValue, m.getObjectProperty(key)); m.acknowledge(); @@ -773,7 +773,7 @@ ClientConsumer consumer = session.createConsumer(queue); ClientMessage m = consumer.receive(500); assertNotNull(m); - assertEquals(unmatchingValue, m.getProperty(key)); + assertEquals(unmatchingValue, m.getObjectProperty(key)); m.acknowledge(); @@ -923,7 +923,7 @@ ClientConsumer consumer = session.createConsumer(queue); ClientMessage m = consumer.receive(500); assertNotNull(m); - assertEquals(unmatchingValue, m.getProperty(key)); + assertEquals(unmatchingValue, m.getObjectProperty(key)); m.acknowledge(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -86,8 +86,8 @@ } ClientMessage[] notifications = consumeMessages(1, notifConsumer); - assertEquals(SECURITY_AUTHENTICATION_VIOLATION.toString(), notifications[0].getProperty(HDR_NOTIFICATION_TYPE).toString()); - assertEquals(unknownUser, notifications[0].getProperty(ManagementHelper.HDR_USER).toString()); + assertEquals(SECURITY_AUTHENTICATION_VIOLATION.toString(), notifications[0].getObjectProperty(HDR_NOTIFICATION_TYPE).toString()); + assertEquals(unknownUser, notifications[0].getObjectProperty(ManagementHelper.HDR_USER).toString()); } public void testSECURITY_PERMISSION_VIOLATION() throws Exception @@ -118,10 +118,10 @@ } ClientMessage[] notifications = consumeMessages(1, notifConsumer); - assertEquals(SECURITY_PERMISSION_VIOLATION.toString(), notifications[0].getProperty(HDR_NOTIFICATION_TYPE).toString()); - assertEquals("guest", notifications[0].getProperty(ManagementHelper.HDR_USER).toString()); - assertEquals(address.toString(), notifications[0].getProperty(ManagementHelper.HDR_ADDRESS).toString()); - assertEquals(CheckType.CREATE_DURABLE_QUEUE.toString(), notifications[0].getProperty(ManagementHelper.HDR_CHECK_TYPE).toString()); + assertEquals(SECURITY_PERMISSION_VIOLATION.toString(), notifications[0].getObjectProperty(HDR_NOTIFICATION_TYPE).toString()); + assertEquals("guest", notifications[0].getObjectProperty(ManagementHelper.HDR_USER).toString()); + assertEquals(address.toString(), notifications[0].getObjectProperty(ManagementHelper.HDR_ADDRESS).toString()); + assertEquals(CheckType.CREATE_DURABLE_QUEUE.toString(), notifications[0].getObjectProperty(ManagementHelper.HDR_CHECK_TYPE).toString()); guestSession.close(); } @@ -205,7 +205,7 @@ { for (SimpleString key : m.getPropertyNames()) { - System.out.println(key + "=" + m.getProperty(key)); + System.out.println(key + "=" + m.getObjectProperty(key)); } } assertNotNull("expected to received " + expected + " messages, got only " + i, m); @@ -218,7 +218,7 @@ for (SimpleString key : m.getPropertyNames()) { - System.out.println(key + "=" + m.getProperty(key)); + System.out.println(key + "=" + m.getObjectProperty(key)); } } assertNull("received one more message than expected (" + expected + ")", m); Modified: trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -181,12 +181,12 @@ { ClientMessage message = consumer1.receive(200); assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); message = consumer2.receive(200); assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -279,17 +279,17 @@ { ClientMessage message = consumer1.receive(200); assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); message = consumer2.receive(200); assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); message = consumer3.receive(200); assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -378,7 +378,7 @@ { message = consumer2.receive(200); assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } @@ -446,7 +446,7 @@ { ClientMessage message = consumer1.receive(200); assertNotNull(message); - assertEquals((Integer)i, (Integer)message.getProperty(propKey)); + assertEquals((Integer)i, (Integer)message.getObjectProperty(propKey)); message.acknowledge(); } Modified: trunk/tests/src/org/hornetq/tests/unit/core/message/impl/MessageImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/message/impl/MessageImplTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/unit/core/message/impl/MessageImplTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -227,24 +227,24 @@ assertTrue(msg.containsProperty(prop8)); assertTrue(msg.containsProperty(prop9)); - assertEquals(val1, msg.getProperty(prop1)); - assertEquals(val2, msg.getProperty(prop2)); - assertEquals(val3, msg.getProperty(prop3)); - assertEquals(val4, msg.getProperty(prop4)); - assertEquals(val5, msg.getProperty(prop5)); - assertEquals(val6, msg.getProperty(prop6)); - assertEquals(val7, msg.getProperty(prop7)); - assertEquals(val8, msg.getProperty(prop8)); - assertEquals(val9, msg.getProperty(prop9)); + assertEquals(val1, msg.getObjectProperty(prop1)); + assertEquals(val2, msg.getObjectProperty(prop2)); + assertEquals(val3, msg.getObjectProperty(prop3)); + assertEquals(val4, msg.getObjectProperty(prop4)); + assertEquals(val5, msg.getObjectProperty(prop5)); + assertEquals(val6, msg.getObjectProperty(prop6)); + assertEquals(val7, msg.getObjectProperty(prop7)); + assertEquals(val8, msg.getObjectProperty(prop8)); + assertEquals(val9, msg.getObjectProperty(prop9)); SimpleString val10 = new SimpleString(randomString()); //test overwrite msg.putStringProperty(prop9, val10); - assertEquals(val10, msg.getProperty(prop9)); + assertEquals(val10, msg.getObjectProperty(prop9)); int val11 = randomInt(); msg.putIntProperty(prop9, val11); - assertEquals(val11, msg.getProperty(prop9)); + assertEquals(val11, msg.getObjectProperty(prop9)); msg.removeProperty(prop1); assertEquals(8, msg.getPropertyNames().size()); @@ -312,9 +312,9 @@ for (SimpleString propname: props1) { - Object val1 = msg1.getProperty(propname); + Object val1 = msg1.getObjectProperty(propname); - Object val2 = msg2.getProperty(propname); + Object val2 = msg2.getObjectProperty(propname); assertEquals(val1, val2); } Modified: trunk/tests/src/org/hornetq/tests/unit/core/message/impl/MessagePropertyConversionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/message/impl/MessagePropertyConversionTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/unit/core/message/impl/MessagePropertyConversionTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -329,14 +329,7 @@ { } - try - { - msg.getBytesProperty(unknownKey); - fail(); - } - catch (Exception e) - { - } + assertNull(msg.getBytesProperty(unknownKey)); } // Package protected --------------------------------------------- Modified: trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -561,15 +561,6 @@ } /* (non-Javadoc) - * @see org.hornetq.core.message.Message#getProperty(org.hornetq.utils.SimpleString) - */ - public Object getProperty(final SimpleString key) - { - - return null; - } - - /* (non-Javadoc) * @see org.hornetq.core.message.Message#getPropertyNames() */ public Set<SimpleString> getPropertyNames() @@ -687,8 +678,24 @@ } /* (non-Javadoc) - * @see org.hornetq.core.message.Message#putObjectProperty(org.hornetq.utils.SimpleString, java.lang.Object) + * @see org.hornetq.core.message.Message#getSimpleStringProperty(org.hornetq.utils.SimpleString) */ + public SimpleString getSimpleStringProperty(SimpleString key) throws PropertyConversionException + { + // TODO Auto-generated method stub + return null; + } + + + /* (non-Javadoc) + * @see org.hornetq.core.message.Message#getSimpleStringProperty(java.lang.String) + */ + public SimpleString getSimpleStringProperty(String key) throws PropertyConversionException + { + // TODO Auto-generated method stub + return null; + } + public void putObjectProperty(SimpleString key, Object value) { // TODO Auto-generated method stub @@ -980,6 +987,86 @@ // TODO Auto-generated method stub return 0; } + /* (non-Javadoc) + * @see org.hornetq.core.message.Message#getBooleanProperty(java.lang.String) + */ + public Boolean getBooleanProperty(String key) throws PropertyConversionException + { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.hornetq.core.message.Message#getByteProperty(java.lang.String) + */ + public Byte getByteProperty(String key) throws PropertyConversionException + { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.hornetq.core.message.Message#getBytesProperty(java.lang.String) + */ + public byte[] getBytesProperty(String key) throws PropertyConversionException + { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.hornetq.core.message.Message#getDoubleProperty(java.lang.String) + */ + public Double getDoubleProperty(String key) throws PropertyConversionException + { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.hornetq.core.message.Message#getFloatProperty(java.lang.String) + */ + public Float getFloatProperty(String key) throws PropertyConversionException + { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.hornetq.core.message.Message#getIntProperty(java.lang.String) + */ + public Integer getIntProperty(String key) throws PropertyConversionException + { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.hornetq.core.message.Message#getLongProperty(java.lang.String) + */ + public Long getLongProperty(String key) throws PropertyConversionException + { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.hornetq.core.message.Message#getShortProperty(java.lang.String) + */ + public Short getShortProperty(String key) throws PropertyConversionException + { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.hornetq.core.message.Message#getStringProperty(java.lang.String) + */ + public String getStringProperty(String key) throws PropertyConversionException + { + // TODO Auto-generated method stub + return null; + } /* (non-Javadoc) * @see org.hornetq.core.server.ServerMessage#decrementRefCount(org.hornetq.core.paging.PagingStore, org.hornetq.core.server.MessageReference) Modified: trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeFilter.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeFilter.java 2009-11-06 09:52:34 UTC (rev 8233) +++ trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeFilter.java 2009-11-06 10:16:01 UTC (rev 8234) @@ -45,7 +45,7 @@ { if (headerName != null) { - Object value = message.getProperty(new SimpleString(headerName)); + Object value = message.getObjectProperty(new SimpleString(headerName)); if (value instanceof SimpleString) {