[jboss-cvs] JBoss Messaging SVN: r6670 - in trunk: src/main/org/jboss/messaging/core/message/impl and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 5 15:06:38 EDT 2009
Author: jmesnil
Date: 2009-05-05 15:06:38 -0400 (Tue, 05 May 2009)
New Revision: 6670
Modified:
trunk/src/main/org/jboss/messaging/core/client/management/impl/ManagementHelper.java
trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementHelperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java
Log:
management refactoring
* fixed management tests
Modified: trunk/src/main/org/jboss/messaging/core/client/management/impl/ManagementHelper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/management/impl/ManagementHelper.java 2009-05-05 18:08:03 UTC (rev 6669)
+++ trunk/src/main/org/jboss/messaging/core/client/management/impl/ManagementHelper.java 2009-05-05 19:06:38 UTC (rev 6670)
@@ -219,8 +219,23 @@
if (innerVal instanceof JSONArray)
{
innerVal = fromJSONArray(((JSONArray)innerVal));
+ }
+ else if (innerVal instanceof JSONObject)
+ {
+ Map<String, Object> innerMap = new HashMap<String, Object>();
+ JSONObject o = ((JSONObject)innerVal);
+ Iterator it = o.keys();
+ while (it.hasNext())
+ {
+ String k = (String)it.next();
+ innerMap.put(k, o.get(k));
+ }
+ innerVal = innerMap;
+ } else if (innerVal instanceof Integer)
+ {
+ innerVal = ((Integer)innerVal).longValue();
}
-
+
map.put(key, innerVal);
}
@@ -248,6 +263,7 @@
param instanceof Double == false &&
param instanceof String == false &&
param instanceof Boolean == false &&
+ param instanceof Map == false &&
param instanceof Byte == false &&
param instanceof Short == false)
{
Modified: trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java 2009-05-05 18:08:03 UTC (rev 6669)
+++ trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java 2009-05-05 19:06:38 UTC (rev 6670)
@@ -348,16 +348,18 @@
Map<String, Object> map = new HashMap<String, Object>();
map.put("MessageID", messageID);
- map.put("Destination", destination);
+ map.put("Destination", destination.toString());
map.put("Type", type);
map.put("Durable", durable);
map.put("Expiration", expiration);
map.put("Timestamp", timestamp);
map.put("Priority", priority);
+ Map<String, Object> props = new HashMap<String, Object>();
for (SimpleString propName: properties.getPropertyNames())
{
- map.put(propName.toString(), properties.getProperty(propName));
+ props.put(propName.toString(), properties.getProperty(propName));
}
+ map.put("properties", props);
return map;
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementHelperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementHelperTest.java 2009-05-05 18:08:03 UTC (rev 6669)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementHelperTest.java 2009-05-05 19:06:38 UTC (rev 6670)
@@ -170,7 +170,7 @@
assertEquals(l, parameters[4]);
Map mapRes = (Map)parameters[5];
assertEquals(map.size(), mapRes.size());
- assertEquals(value1, mapRes.get(key1));
+ assertEquals((long)value1, mapRes.get(key1));
assertEquals(value2, mapRes.get(key2));
assertEquals(value3, mapRes.get(key3));
assertEquals(value4, mapRes.get(key4));
@@ -186,7 +186,7 @@
assertEquals(2, mapArray.length);
Map mapRes2 = (Map)mapArray[0];
assertEquals(map2.size(), mapRes2.size());
- assertEquals(value2_1, mapRes2.get(key2_1));
+ assertEquals((long)value2_1, mapRes2.get(key2_1));
assertEquals(value2_2, mapRes2.get(key2_2));
assertEquals(value2_3, mapRes2.get(key2_3));
assertEquals(value2_4, mapRes2.get(key2_4));
@@ -194,7 +194,7 @@
Map mapRes3 = (Map)mapArray[1];
assertEquals(map3.size(), mapRes3.size());
- assertEquals(value3_1, mapRes3.get(key3_1));
+ assertEquals((long)value3_1, mapRes3.get(key3_1));
assertEquals(value3_2, mapRes3.get(key3_2));
assertEquals(value3_3, mapRes3.get(key3_3));
assertEquals(value3_4, mapRes3.get(key3_4));
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-05-05 18:08:03 UTC (rev 6669)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-05-05 19:06:38 UTC (rev 6670)
@@ -303,8 +303,9 @@
producer.send(session.createClientMessage(false));
Map<String, Object>[] messages = queueControl.listScheduledMessages();
- assertEquals(1, messages.length);
- assertEquals(intValue, messages[0].get("key"));
+ assertEquals(1, messages.length);
+ Map properties = (Map)messages[0].get("properties");
+ assertEquals(intValue, properties.get("key"));
Thread.sleep(delay);
@@ -357,8 +358,9 @@
producer.send(message);
Map<String, Object>[] messages = queueControl.listAllMessages();
- assertEquals(1, messages.length);
- assertEquals(intValue, messages[0].get("key"));
+ assertEquals(1, messages.length);
+ Map properties = (Map)messages[0].get("properties");
+ assertEquals(intValue, properties.get("key"));
consumeMessages(1, session, queue);
@@ -391,7 +393,8 @@
Map<String, Object>[] messages = queueControl.listMessages(filter);
assertEquals(1, messages.length);
- assertEquals(matchingValue, messages[0].get("key"));
+ Map properties = (Map)messages[0].get("properties");
+ assertEquals(matchingValue, properties.get("key"));
consumeMessages(2, session, queue);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java 2009-05-05 18:08:03 UTC (rev 6669)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlUsingCoreTest.java 2009-05-05 19:06:38 UTC (rev 6670)
@@ -43,6 +43,8 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.management.DayCounterInfo;
+import org.jboss.messaging.core.management.MessageCounterInfo;
import org.jboss.messaging.core.management.MessagingServerControlMBean;
import org.jboss.messaging.core.management.ResourceNames;
import org.jboss.messaging.core.message.impl.MessageImpl;
@@ -304,11 +306,10 @@
// unscheduled message
producer.send(session.createClientMessage(false));
- Object[] data = (Object[])proxy.invokeOperation("listScheduledMessages", null);
+ Object[] data = (Object[])proxy.invokeOperation("listScheduledMessages");
assertEquals(1, data.length);
Map messageReceived = (Map)data[0];
- Object[] p = (Object[])messageReceived.get("properties");
- Map properties = (Map)p[0];
+ Map properties = (Map)messageReceived.get("properties");
Set entries = properties.entrySet();
Iterator iter = entries.iterator();
@@ -320,11 +321,11 @@
}
- assertEquals(Integer.toString(intValue), properties.get("key"));
+ assertEquals(intValue, properties.get("key"));
Thread.sleep(delay);
- data = (Object[])proxy.invokeOperation("listScheduledMessages", null);
+ data = (Object[])proxy.invokeOperation("listScheduledMessages");
assertEquals(0, data.length);
consumeMessages(2, session, queue);
@@ -377,7 +378,7 @@
//MessageInfo[] messageInfos = MessageInfo.from(data);
Map messageReceived = (Map)data[0];
Map properties = (Map)messageReceived.get("properties");
- assertEquals(Integer.toString(intValue), properties.get("key"));
+ assertEquals(intValue, properties.get("key"));
consumeMessages(1, session, queue);
@@ -413,7 +414,7 @@
// MessageInfo[] messageInfos = MessageInfo.from(data);
Map messageReceived = (Map)data[0];
Map properties = (Map)messageReceived.get("properties");
- assertEquals(Long.toString(matchingValue), properties.get("key"));
+ assertEquals(matchingValue, properties.get("key"));
consumeMessages(2, session, queue);
@@ -590,10 +591,10 @@
assertEquals(0, otherproxy.retrieveAttributeValue("MessageCount"));
// the message IDs are set on the server
- Object[] data = (Object[])proxy.invokeOperation("listAllMessages", null);
+ Object[] data = (Object[])proxy.invokeOperation("listAllMessages");
Map messageReceived = (Map)data[0];
assertEquals(2, data.length);
- long messageID = (Long)messageReceived.get("ID");
+ long messageID = (Long)messageReceived.get("MessageID");
boolean moved = (Boolean)proxy.invokeOperation("moveMessage", messageID, otherQueue.toString());
assertTrue(moved);
@@ -623,10 +624,10 @@
assertEquals(1, proxy.retrieveAttributeValue("MessageCount"));
// the message IDs are set on the server
- Object[] data = (Object[])proxy.invokeOperation("listAllMessages", null);
+ Object[] data = (Object[])proxy.invokeOperation("listAllMessages");
assertEquals(1, data.length);
Map messageReceived = (Map)data[0];
- long messageID = (Long)messageReceived.get("ID");
+ long messageID = (Long)messageReceived.get("MessageID");
// moved all messages to unknown queue
try
@@ -748,7 +749,7 @@
Object[] data = (Object[])proxy.invokeOperation("listAllMessages", null);
assertEquals(2, data.length);
Map message = (Map)data[0];
- long messageID = (Long)message.get("ID");
+ long messageID = (Long)message.get("MessageID");
// delete 1st message
boolean deleted = (Boolean)proxy.invokeOperation("removeMessage", messageID);
@@ -857,10 +858,10 @@
assertEquals(0, expiryproxy.retrieveAttributeValue("MessageCount"));
// the message IDs are set on the server
- Object[] data = (Object[])proxy.invokeOperation("listAllMessages", null);
+ Object[] data = (Object[])proxy.invokeOperation("listAllMessages");
assertEquals(1, data.length);
Map messageReceived = (Map)data[0];
- long messageID = (Long)messageReceived.get("ID");
+ long messageID = (Long)messageReceived.get("MessageID");
proxy.invokeOperation("setExpiryAddress", expiryAddress.toString());
boolean expired = (Boolean)proxy.invokeOperation("expireMessage", messageID);
@@ -897,10 +898,10 @@
assertEquals(2, proxy.retrieveAttributeValue("MessageCount"));
// the message IDs are set on the server
- Object[] data = (Object[])proxy.invokeOperation("listAllMessages", null);
+ Object[] data = (Object[])proxy.invokeOperation("listAllMessages");
assertEquals(2, data.length);
Map message = (Map)data[0];
- long messageID = (Long)message.get("ID");
+ long messageID = (Long)message.get("MessageID");
proxy.invokeOperation("setDeadLetterAddress", deadLetterAddress.toString());
@@ -939,9 +940,9 @@
assertEquals(1, proxy.retrieveAttributeValue("MessageCount"));
// the message IDs are set on the server
- Object[] messages = (Object[])proxy.invokeOperation("listAllMessages", null);
+ Object[] messages = (Object[])proxy.invokeOperation("listAllMessages");
assertEquals(1, messages.length);
- long messageID = (Long)((Map)messages[0]).get("ID");
+ long messageID = (Long)((Map)messages[0]).get("MessageID");
boolean priorityChanged = (Boolean)proxy.invokeOperation("changeMessagePriority", messageID, newPriority);
assertTrue(priorityChanged);
@@ -972,10 +973,10 @@
assertEquals(1, proxy.retrieveAttributeValue("MessageCount"));
// the message IDs are set on the server
- Object[] data = (Object[])proxy.invokeOperation("listAllMessages", null);
+ Object[] data = (Object[])proxy.invokeOperation("listAllMessages");
assertEquals(1, data.length);
Map messageReceived = (Map)data[0];
- long messageID = (Long)messageReceived.get("ID");
+ long messageID = (Long)messageReceived.get("MessageID");
try
{
@@ -1007,37 +1008,41 @@
serverControl.enableMessageCounters();
serverControl.setMessageCounterSamplePeriod(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD);
- Map map = (Map)proxy.invokeOperation("listMessageCounters", null);
- assertEquals(0, map.get("Depth"));
- assertEquals(0, map.get("Count"));
+ String jsonString = (String)proxy.invokeOperation("listMessageCounter");
+ MessageCounterInfo info = MessageCounterInfo.fromJSON(jsonString);
+ assertEquals(0, info.getDepth());
+ assertEquals(0, info.getCount());
ClientProducer producer = session.createProducer(address);
producer.send(session.createClientMessage(false));
Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
- map = (Map)proxy.invokeOperation("listMessageCounters", null);
- assertEquals(1, map.get("Depth"));
- assertEquals(1, map.get("DepthDelta"));
- assertEquals(1, map.get("Count"));
- assertEquals(1, map.get("CountDelta"));
+ jsonString = (String)proxy.invokeOperation("listMessageCounter");
+ info = MessageCounterInfo.fromJSON(jsonString);
+ assertEquals(1, info.getDepth());
+ assertEquals(1, info.getDepthDelta());
+ assertEquals(1, info.getCount());
+ assertEquals(1, info.getCountDelta());
producer.send(session.createClientMessage(false));
Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
- map = (Map)proxy.invokeOperation("listMessageCounters", null);
- assertEquals(2, map.get("Depth"));
- assertEquals(1, map.get("DepthDelta"));
- assertEquals(2, map.get("Count"));
- assertEquals(1, map.get("CountDelta"));
+ jsonString = (String)proxy.invokeOperation("listMessageCounter");
+ info = MessageCounterInfo.fromJSON(jsonString);
+ assertEquals(2, info.getDepth());
+ assertEquals(1, info.getDepthDelta());
+ assertEquals(2, info.getCount());
+ assertEquals(1, info.getCountDelta());
consumeMessages(2, session, queue);
Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
- map = (Map)proxy.invokeOperation("listMessageCounters", null);
- assertEquals(0, map.get("Depth"));
- assertEquals(-2, map.get("DepthDelta"));
- assertEquals(2, map.get("Count"));
- assertEquals(0, map.get("CountDelta"));
+ jsonString = (String)proxy.invokeOperation("listMessageCounter");
+ info = MessageCounterInfo.fromJSON(jsonString);
+ assertEquals(0, info.getDepth());
+ assertEquals(-2, info.getDepthDelta());
+ assertEquals(2, info.getCount());
+ assertEquals(0, info.getCountDelta());
session.deleteQueue(queue);
}
@@ -1054,37 +1059,41 @@
serverControl.enableMessageCounters();
serverControl.setMessageCounterSamplePeriod(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD);
- Map map = (Map)proxy.invokeOperation("listMessageCounters", null);
- assertEquals(0, map.get("Depth"));
- assertEquals(0, map.get("Count"));
+ String jsonString = (String)proxy.invokeOperation("listMessageCounter");
+ MessageCounterInfo info = MessageCounterInfo.fromJSON(jsonString);
+ assertEquals(0, info.getDepth());
+ assertEquals(0, info.getCount());
ClientProducer producer = session.createProducer(address);
producer.send(session.createClientMessage(false));
Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
- map = (Map)proxy.invokeOperation("listMessageCounters", null);
- assertEquals(1, map.get("Depth"));
- assertEquals(1, map.get("DepthDelta"));
- assertEquals(1, map.get("Count"));
- assertEquals(1, map.get("CountDelta"));
+ jsonString = (String)proxy.invokeOperation("listMessageCounter");
+ info = MessageCounterInfo.fromJSON(jsonString);
+ assertEquals(1, info.getDepth());
+ assertEquals(1, info.getDepthDelta());
+ assertEquals(1, info.getCount());
+ assertEquals(1, info.getCountDelta());
consumeMessages(1, session, queue);
Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
- map = (Map)proxy.invokeOperation("listMessageCounters", null);
- assertEquals(0, map.get("Depth"));
- assertEquals(-1, map.get("DepthDelta"));
- assertEquals(1, map.get("Count"));
- assertEquals(0, map.get("CountDelta"));
+ jsonString = (String)proxy.invokeOperation("listMessageCounter");
+ info = MessageCounterInfo.fromJSON(jsonString);
+ assertEquals(0, info.getDepth());
+ assertEquals(-1, info.getDepthDelta());
+ assertEquals(1, info.getCount());
+ assertEquals(0, info.getCountDelta());
- proxy.invokeOperation("resetMessageCounter", null) ;
+ proxy.invokeOperation("resetMessageCounter") ;
Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
- map = (Map)proxy.invokeOperation("listMessageCounters", null);
- assertEquals(0, map.get("Depth"));
- assertEquals(0, map.get("DepthDelta"));
- assertEquals(0, map.get("Count"));
- assertEquals(0, map.get("CountDelta"));
+ jsonString = (String)proxy.invokeOperation("listMessageCounter");
+ info = MessageCounterInfo.fromJSON(jsonString);
+ assertEquals(0, info.getDepth());
+ assertEquals(0, info.getDepthDelta());
+ assertEquals(0, info.getCount());
+ assertEquals(0, info.getCountDelta());
session.deleteQueue(queue);
}
@@ -1116,8 +1125,9 @@
serverControl.enableMessageCounters();
serverControl.setMessageCounterSamplePeriod(counterPeriod);
- Map[] data= (Map[])proxy.invokeOperation("listMessageCounterHistory", null);
- assertEquals(1, data.length);
+ String jsonString = (String)proxy.invokeOperation("listMessageCounterHistory");
+ DayCounterInfo[] infos = DayCounterInfo.fromJSON(jsonString);
+ assertEquals(1, infos.length);
session.deleteQueue(queue);
}
More information about the jboss-cvs-commits
mailing list