Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA fixed checkstyle issues and added tests

This commit is contained in:
Pat Fox 2017-12-11 22:08:43 +01:00 committed by Michael Pearce
parent f08da813a1
commit d7b464cff3
8 changed files with 357 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ActiveMQAbstractView.java
View File

@ -19,7 +19,6 @@ package org.apache.activemq.artemis.core.management.impl.view;
import javax.json.JsonArrayBuilder;
import javax.json.JsonObject;
import javax.json.JsonObjectBuilder;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.List;
@ -101,8 +100,8 @@ public abstract class ActiveMQAbstractView<T> {
@Override
public int compare(T left, T right) {
try {
Object leftValue = getField(left, sortColumn);;
Object rightValue = getField(right, sortColumn);;
Object leftValue = getField(left, sortColumn);
Object rightValue = getField(right, sortColumn);
if (leftValue instanceof Comparable && rightValue instanceof Comparable) {
if (sortOrder.equals("desc")) {
return ((Comparable) rightValue).compareTo(leftValue);

8
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/AddressView.java
View File

@ -17,16 +17,9 @@
package org.apache.activemq.artemis.core.management.impl.view;
import javax.json.JsonObjectBuilder;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.activemq.artemis.core.management.impl.view.predicate.AddressFilterPredicate;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.ServerSession;
import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.utils.JsonLoader;
public class AddressView extends ActiveMQAbstractView<AddressInfo> {
@ -63,6 +56,7 @@ public class AddressView extends ActiveMQAbstractView<AddressInfo> {
return obj;
}
@Override
public Object getField(AddressInfo address, String fieldName) {
if (address == null) {
return null;

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ConnectionView.java
View File

@ -24,7 +24,6 @@ import java.util.Set;
import org.apache.activemq.artemis.core.management.impl.view.predicate.ConnectionFilterPredicate;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.ServerConsumer;
import org.apache.activemq.artemis.core.server.ServerSession;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.utils.JsonLoader;
@ -69,6 +68,7 @@ public class ConnectionView extends ActiveMQAbstractView<RemotingConnection> {
.add("sessionCount", server.getSessions(connection.getID().toString()).size());
}
@Override
public Object getField(RemotingConnection connection, String fieldName) {
List<ServerSession> sessions = server.getSessions(connection.getID().toString());

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerView.java
View File

@ -22,7 +22,6 @@ import java.util.Date;
import org.apache.activemq.artemis.core.management.impl.view.predicate.ConsumerFilterPredicate;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.ServerConsumer;
import org.apache.activemq.artemis.core.server.ServerProducer;
import org.apache.activemq.artemis.core.server.ServerSession;
import org.apache.activemq.artemis.utils.JsonLoader;
@ -66,6 +65,7 @@ public class ConsumerView extends ActiveMQAbstractView<ServerConsumer> {
return obj;
}
@Override
public Object getField(ServerConsumer consumer, String fieldName) {
ServerSession session = server.getSessionByID(consumer.getSessionID());

1
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ProducerView.java
View File

@ -62,6 +62,7 @@ public class ProducerView extends ActiveMQAbstractView<ServerProducer> {
return obj;
}
@Override
public Object getField(ServerProducer producer, String fieldName) {
ServerSession session = server.getSessionByID(producer.getSessionID());

5
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/QueueView.java
View File

@ -17,15 +17,11 @@
package org.apache.activemq.artemis.core.management.impl.view;
import javax.json.JsonObjectBuilder;
import java.util.Date;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.management.QueueControl;
import org.apache.activemq.artemis.core.management.impl.view.predicate.QueueFilterPredicate;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.server.ServerSession;
import org.apache.activemq.artemis.utils.JsonLoader;
public class QueueView extends ActiveMQAbstractView<QueueControl> {
@ -68,6 +64,7 @@ public class QueueView extends ActiveMQAbstractView<QueueControl> {
return obj;
}
@Override
public Object getField(QueueControl queue, String fieldName) {
Queue q = server.locateQueue(new SimpleString(queue.getName()));
switch (fieldName) {

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/SessionView.java
View File

@ -21,7 +21,6 @@ import java.util.Date;
import org.apache.activemq.artemis.core.management.impl.view.predicate.SessionFilterPredicate;
import org.apache.activemq.artemis.core.server.ServerSession;
import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.utils.JsonLoader;
public class SessionView extends ActiveMQAbstractView<ServerSession> {
@ -49,6 +48,7 @@ public class SessionView extends ActiveMQAbstractView<ServerSession> {
return obj;
}
@Override
public Object getField(ServerSession session, String fieldName) {
switch (fieldName) {
case "id":

363
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
View File

@ -53,6 +53,7 @@ import org.apache.activemq.artemis.api.core.management.QueueControl;
import org.apache.activemq.artemis.api.core.management.RoleInfo;
import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.api.jms.JMSFactoryType;
import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl;
import org.apache.activemq.artemis.core.client.impl.ClientSessionImpl;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.impl.SecurityConfiguration;
@ -1542,6 +1543,119 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
}
@Test
public void testListQueuesOrder() throws Exception {
SimpleString queueName1 = new SimpleString("my_queue_1");
SimpleString queueName2 = new SimpleString("my_queue_2");
SimpleString queueName3 = new SimpleString("my_queue_3");
ActiveMQServerControl serverControl = createManagementControl();
server.addAddressInfo(new AddressInfo(queueName1, RoutingType.ANYCAST));
server.createQueue(queueName1, RoutingType.ANYCAST, queueName1, new SimpleString("filter1"),null,true,
false, false,20,false,false);
Thread.sleep(500);
server.addAddressInfo(new AddressInfo(queueName2, RoutingType.ANYCAST));
server.createQueue(queueName2, RoutingType.ANYCAST, queueName2, new SimpleString("filter3"), null,true,
false, true,40,false,false);
Thread.sleep(500);
server.addAddressInfo(new AddressInfo(queueName3, RoutingType.ANYCAST));
server.createQueue(queueName3, RoutingType.ANYCAST, queueName3, new SimpleString("filter0"),null,true,
false, false,10,false,false);
//test default order
String filterString = createJsonFilter("name", "CONTAINS", "my_queue");
String queuesAsJsonString = serverControl.listQueues(filterString, 1, 50);
JsonObject queuesAsJsonObject = JsonUtil.readJsonObject(queuesAsJsonString);
JsonArray array = (JsonArray) queuesAsJsonObject.get("data");
Assert.assertEquals("number of queues returned from query", 3, array.size());
Assert.assertEquals("queue1 default Order", queueName1.toString(), array.getJsonObject(0).getString("name"));
Assert.assertEquals("queue2 default Order", queueName2.toString(), array.getJsonObject(1).getString("name"));
Assert.assertEquals("queue3 default Order", queueName3.toString(), array.getJsonObject(2).getString("name"));
//test ordered by id desc
filterString = createJsonFilter("name", "CONTAINS", "my_queue", "id", "desc");
queuesAsJsonString = serverControl.listQueues(filterString, 1, 50);
queuesAsJsonObject = JsonUtil.readJsonObject(queuesAsJsonString);
array = (JsonArray) queuesAsJsonObject.get("data");
Assert.assertEquals("number of queues returned from query", 3, array.size());
Assert.assertEquals("queue3 ordered by id", queueName3.toString(), array.getJsonObject(0).getString("name"));
Assert.assertEquals("queue2 ordered by id", queueName2.toString(), array.getJsonObject(1).getString("name"));
Assert.assertEquals("queue1 ordered by id", queueName1.toString(), array.getJsonObject(2).getString("name"));
//ordered by address desc
filterString = createJsonFilter("name", "CONTAINS", "my_queue", "address", "desc");
queuesAsJsonString = serverControl.listQueues(filterString, 1, 50);
queuesAsJsonObject = JsonUtil.readJsonObject(queuesAsJsonString);
array = (JsonArray) queuesAsJsonObject.get("data");
Assert.assertEquals("number of queues returned from query", 3, array.size());
Assert.assertEquals("queue3 ordered by address", queueName3.toString(), array.getJsonObject(0).getString("name"));
Assert.assertEquals("queue2 ordered by address", queueName2.toString(), array.getJsonObject(1).getString("name"));
Assert.assertEquals("queue1 ordered by address", queueName1.toString(), array.getJsonObject(2).getString("name"));
//ordered by auto create desc
filterString = createJsonFilter("name", "CONTAINS", "my_queue", "autoCreated", "asc");
queuesAsJsonString = serverControl.listQueues(filterString, 1, 50);
queuesAsJsonObject = JsonUtil.readJsonObject(queuesAsJsonString);
array = (JsonArray) queuesAsJsonObject.get("data");
Assert.assertEquals("number of queues returned from query", 3, array.size());
Assert.assertEquals("pos1 ordered by autocreate", "false", array.getJsonObject(0).getString("autoCreated"));
Assert.assertEquals("pos2 ordered by autocreate", "false", array.getJsonObject(1).getString("autoCreated"));
Assert.assertEquals("pos3 ordered by autocreate", "true", array.getJsonObject(2).getString("autoCreated"));
//ordered by filter desc
filterString = createJsonFilter("name", "CONTAINS", "my_queue", "filter", "desc");
queuesAsJsonString = serverControl.listQueues(filterString, 1, 50);
queuesAsJsonObject = JsonUtil.readJsonObject(queuesAsJsonString);
array = (JsonArray) queuesAsJsonObject.get("data");
Assert.assertEquals("number of queues returned from query", 3, array.size());
Assert.assertEquals("queue2 ordered by filter", queueName2.toString(), array.getJsonObject(0).getString("name"));
Assert.assertEquals("queue1 ordered by filter", queueName1.toString(), array.getJsonObject(1).getString("name"));
Assert.assertEquals("queue3 ordered by filter", queueName3.toString(), array.getJsonObject(2).getString("name"));
//ordered by max consumers asc
filterString = createJsonFilter("name", "CONTAINS", "my_queue", "maxConsumers", "asc");
queuesAsJsonString = serverControl.listQueues(filterString, 1, 50);
queuesAsJsonObject = JsonUtil.readJsonObject(queuesAsJsonString);
array = (JsonArray) queuesAsJsonObject.get("data");
Assert.assertEquals("number of queues returned from query", 3, array.size());
Assert.assertEquals("queue3 ordered by filter", queueName3.toString(), array.getJsonObject(0).getString("name"));
Assert.assertEquals("queue1 ordered by filter", queueName1.toString(), array.getJsonObject(1).getString("name"));
Assert.assertEquals("queue2 ordered by filter", queueName2.toString(), array.getJsonObject(2).getString("name"));
//ordering between the pages
//page 1
filterString = createJsonFilter("name", "CONTAINS", "my_queue", "address", "desc");
queuesAsJsonString = serverControl.listQueues(filterString, 1, 1);
queuesAsJsonObject = JsonUtil.readJsonObject(queuesAsJsonString);
array = (JsonArray) queuesAsJsonObject.get("data");
Assert.assertEquals("number of queues returned from query", 1, array.size());
Assert.assertEquals("queue3 ordered by page", queueName3.toString(), array.getJsonObject(0).getString("name"));
//page 2
filterString = createJsonFilter("name", "CONTAINS", "my_queue", "address", "desc");
queuesAsJsonString = serverControl.listQueues(filterString, 2, 1);
queuesAsJsonObject = JsonUtil.readJsonObject(queuesAsJsonString);
array = (JsonArray) queuesAsJsonObject.get("data");
Assert.assertEquals("number of queues returned from query", 1, array.size());
Assert.assertEquals("queue2 ordered by page", queueName2.toString(), array.getJsonObject(0).getString("name"));
//page 3
filterString = createJsonFilter("name", "CONTAINS", "my_queue", "address", "desc");
queuesAsJsonString = serverControl.listQueues(filterString, 3, 1);
queuesAsJsonObject = JsonUtil.readJsonObject(queuesAsJsonString);
array = (JsonArray) queuesAsJsonObject.get("data");
Assert.assertEquals("number of queues returned from query", 1, array.size());
Assert.assertEquals("queue1 ordered by page", queueName1.toString(), array.getJsonObject(0).getString("name"));
}
@Test
public void testListQueuesNumericFilter() throws Exception {
SimpleString queueName1 = new SimpleString("my_queue_one");
@ -1854,6 +1968,61 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
}
@Test
public void testListAddressOrder() throws Exception {
SimpleString queueName1 = new SimpleString("my_queue_one");
SimpleString queueName2 = new SimpleString("my_queue_two");
SimpleString queueName3 = new SimpleString("other_queue_three");
SimpleString queueName4 = new SimpleString("other_queue_four");
SimpleString addressName1 = new SimpleString("my_address_1");
SimpleString addressName2 = new SimpleString("my_address_2");
SimpleString addressName3 = new SimpleString("my_address_3");
ActiveMQServerControl serverControl = createManagementControl();
server.addAddressInfo(new AddressInfo(addressName1, RoutingType.ANYCAST));
server.createQueue(addressName1, RoutingType.ANYCAST, queueName1, null, false, false);
server.addAddressInfo(new AddressInfo(addressName2, RoutingType.ANYCAST));
server.addAddressInfo(new AddressInfo(addressName3, RoutingType.ANYCAST));
server.createQueue(addressName3, RoutingType.ANYCAST, queueName3, null, false, false);
server.createQueue(addressName3, RoutingType.ANYCAST, queueName4, null, false, false);
//test default order
String filterString = createJsonFilter("name", "CONTAINS", "my");
String addressesAsJsonString = serverControl.listAddresses(filterString, 1, 50);
JsonObject addressesAsJsonObject = JsonUtil.readJsonObject(addressesAsJsonString);
JsonArray array = (JsonArray) addressesAsJsonObject.get("data");
Assert.assertEquals("number addresses returned", 3, array.size());
Assert.assertEquals("address1 default order", addressName1.toString(), array.getJsonObject(0).getString("name"));
Assert.assertEquals("address2 default order", addressName2.toString(), array.getJsonObject(1).getString("name"));
Assert.assertEquals("address3 default order", addressName3.toString(), array.getJsonObject(2).getString("name"));
//test ordered by name desc
filterString = createJsonFilter("name", "CONTAINS", "my", "name", "desc");
addressesAsJsonString = serverControl.listAddresses(filterString, 1, 50);
addressesAsJsonObject = JsonUtil.readJsonObject(addressesAsJsonString);
array = (JsonArray) addressesAsJsonObject.get("data");
Assert.assertEquals("number addresses returned", 3, array.size());
Assert.assertEquals("address3 ordered by name", addressName3.toString(), array.getJsonObject(0).getString("name"));
Assert.assertEquals("address2 ordered by name", addressName2.toString(), array.getJsonObject(1).getString("name"));
Assert.assertEquals("address1 ordered by name", addressName1.toString(), array.getJsonObject(2).getString("name"));
//test ordered by queue count asc
filterString = createJsonFilter("name", "CONTAINS", "my", "queueCount", "asc");
addressesAsJsonString = serverControl.listAddresses(filterString, 1, 50);
addressesAsJsonObject = JsonUtil.readJsonObject(addressesAsJsonString);
array = (JsonArray) addressesAsJsonObject.get("data");
Assert.assertEquals("number addresses returned", 3, array.size());
Assert.assertEquals("address2 ordered by queue count", addressName2.toString(), array.getJsonObject(0).getString("name"));
Assert.assertEquals("address1 ordered by queue count", addressName1.toString(), array.getJsonObject(1).getString("name"));
Assert.assertEquals("address3 ordered by queue count", addressName3.toString(), array.getJsonObject(2).getString("name"));
}
@Test
public void testListConsumers() throws Exception {
SimpleString queueName1 = new SimpleString("my_queue_one");
@ -1945,6 +2114,54 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
}
@Test
public void testListConsumersOrder() throws Exception {
SimpleString queueName1 = new SimpleString("my_queue_one");
SimpleString addressName1 = new SimpleString("my_address_one");
ActiveMQServerControl serverControl = createManagementControl();
server.addAddressInfo(new AddressInfo(addressName1, RoutingType.ANYCAST));
server.createQueue(addressName1, RoutingType.ANYCAST, queueName1, null, false, false);
try (ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory csf = createSessionFactory(locator);) {
ClientSessionImpl session1 = (ClientSessionImpl) csf.createSession();
ClientSessionImpl session2 = (ClientSessionImpl) csf.createSession();
ClientSessionImpl session3 = (ClientSessionImpl) csf.createSession();
//sleep - test compares creationTimes
ClientConsumer consumer_s1 = session1.createConsumer(queueName1);
Thread.sleep(500);
ClientConsumer consumer_s2 = session2.createConsumer(queueName1);
Thread.sleep(500);
ClientConsumer consumer_s3 = session3.createConsumer(queueName1);
//test default Order
String filterString = createJsonFilter("queue", "EQUALS", queueName1.toString());
String consumersAsJsonString = serverControl.listConsumers(filterString, 1, 50);
JsonObject consumersAsJsonObject = JsonUtil.readJsonObject(consumersAsJsonString);
JsonArray array = (JsonArray) consumersAsJsonObject.get("data");
Assert.assertEquals("number of consumers returned from query", 3, array.size());
Assert.assertEquals("Consumer1 default order", session1.getName(), array.getJsonObject(0).getString("session"));
Assert.assertEquals("Consumer2 default order", session2.getName(), array.getJsonObject(1).getString("session"));
Assert.assertEquals("Consumer3 default order", session3.getName(), array.getJsonObject(2).getString("session"));
//test ordered by creationTime
filterString = createJsonFilter("queue", "EQUALS", queueName1.toString(), "creationTime", "desc");
consumersAsJsonString = serverControl.listConsumers(filterString, 1, 50);
consumersAsJsonObject = JsonUtil.readJsonObject(consumersAsJsonString);
array = (JsonArray) consumersAsJsonObject.get("data");
Assert.assertEquals("number of consumers returned from query", 3, array.size());
Assert.assertEquals("Consumer3 creation time", session3.getName(), array.getJsonObject(0).getString("session"));
Assert.assertEquals("Consumer2 creation time", session2.getName(), array.getJsonObject(1).getString("session"));
Assert.assertEquals("Consumer1 creation time", session1.getName(), array.getJsonObject(2).getString("session"));
}
}
@Test
public void testListSessions() throws Exception {
SimpleString queueName1 = new SimpleString("my_queue_one");
@ -1958,28 +2175,78 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
// create some consumers
try (ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory csf = createSessionFactory(locator);) {
ClientSession session1 = csf.createSession();
ClientSession session2 = csf.createSession();
ClientSessionImpl session1 = (ClientSessionImpl) csf.createSession();
Thread.sleep(500);
ClientSessionImpl session2 = (ClientSessionImpl) csf.createSession();
Thread.sleep(500);
ClientSessionImpl session3 = (ClientSessionImpl) csf.createSession();
ClientConsumer consumer1_s1 = session1.createConsumer(queueName1);
ClientConsumer consumer2_s1 = session1.createConsumer(queueName1);
ClientConsumer consumer1_q1 = session1.createConsumer(queueName1);
ClientConsumer consumer2_q1 = session2.createConsumer(queueName1);
ClientConsumer consumer1_s2 = session2.createConsumer(queueName1);
ClientConsumer consumer2_s2 = session2.createConsumer(queueName1);
ClientConsumer consumer3_s2 = session2.createConsumer(queueName1);
ClientConsumer consumer4_s2 = session2.createConsumer(queueName1);
//bring back all sessions
String filterString = createJsonFilter("", "", "");
ClientConsumer consumer1_s3 = session3.createConsumer(queueName1);
ClientConsumer consumer2_s3 = session3.createConsumer(queueName1);
ClientConsumer consumer3_s3 = session3.createConsumer(queueName1);
String filterString = createJsonFilter("CONSUMER_COUNT", "GREATER_THAN", "1");
String sessionsAsJsonString = serverControl.listSessions(filterString, 1, 50);
JsonObject sessionsAsJsonObject = JsonUtil.readJsonObject(sessionsAsJsonString);
JsonArray array = (JsonArray) sessionsAsJsonObject.get("data");
Assert.assertTrue("number of sessions returned from query", 2 <= array.size());
Assert.assertEquals("number of sessions returned from query", 3, array.size());
JsonObject jsonSession = array.getJsonObject(0);
//check all fields
Assert.assertNotEquals("id", "", jsonSession.getString("id"));
Assert.assertEquals("user", "", jsonSession.getString("user"));
Assert.assertNotEquals("creationTime", "", jsonSession.getString("creationTime"));
Assert.assertEquals("consumerCount", 1, jsonSession.getInt("consumerCount"));
Assert.assertEquals("consumerCount", 2, jsonSession.getInt("consumerCount"));
Assert.assertTrue("producerCount", 0 <= jsonSession.getInt("producerCount"));
Assert.assertNotEquals("connectionID", "", jsonSession.getString("connectionID"));
//check default order
Assert.assertEquals("session1 location", session1.getName(), array.getJsonObject(0).getString("id"));
Assert.assertEquals("session2 location", session2.getName(), array.getJsonObject(1).getString("id"));
Assert.assertEquals("session3 location", session3.getName(), array.getJsonObject(2).getString("id"));
//bring back session ordered by consumer count
filterString = createJsonFilter("CONSUMER_COUNT", "GREATER_THAN", "1", "consumerCount", "asc");
sessionsAsJsonString = serverControl.listSessions(filterString, 1, 50);
sessionsAsJsonObject = JsonUtil.readJsonObject(sessionsAsJsonString);
array = (JsonArray) sessionsAsJsonObject.get("data");
Assert.assertTrue("number of sessions returned from query", 3 == array.size());
Assert.assertEquals("session1 ordered by consumer", session1.getName(), array.getJsonObject(0).getString("id"));
Assert.assertEquals("session3 ordered by consumer", session3.getName(), array.getJsonObject(1).getString("id"));
Assert.assertEquals("session2 ordered by consumer", session2.getName(), array.getJsonObject(2).getString("id"));
//bring back session ordered by consumer Count
filterString = createJsonFilter("CONSUMER_COUNT", "GREATER_THAN", "1", "consumerCount", "asc");
sessionsAsJsonString = serverControl.listSessions(filterString, 1, 50);
sessionsAsJsonObject = JsonUtil.readJsonObject(sessionsAsJsonString);
array = (JsonArray) sessionsAsJsonObject.get("data");
Assert.assertTrue("number of sessions returned from query", 3 == array.size());
Assert.assertEquals("session1 ordered by consumer", session1.getName(), array.getJsonObject(0).getString("id"));
Assert.assertEquals("session3 ordered by consumer", session3.getName(), array.getJsonObject(1).getString("id"));
Assert.assertEquals("session2 ordered by consumer", session2.getName(), array.getJsonObject(2).getString("id"));
//bring back session ordered by creation time (desc)
filterString = createJsonFilter("CONSUMER_COUNT", "GREATER_THAN", "1", "creationTime", "desc");
sessionsAsJsonString = serverControl.listSessions(filterString, 1, 50);
sessionsAsJsonObject = JsonUtil.readJsonObject(sessionsAsJsonString);
array = (JsonArray) sessionsAsJsonObject.get("data");
Assert.assertTrue("number of sessions returned from query", 3 == array.size());
Assert.assertEquals("session3 ordered by creationTime", session3.getName(), array.getJsonObject(0).getString("id"));
Assert.assertEquals("session2 ordered by creationTime", session2.getName(), array.getJsonObject(1).getString("id"));
Assert.assertEquals("session1 ordered by creationTime", session1.getName(), array.getJsonObject(2).getString("id"));
}
}
@ -1993,18 +2260,38 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
server.addAddressInfo(new AddressInfo(addressName1, RoutingType.ANYCAST));
server.createQueue(addressName1, RoutingType.ANYCAST, queueName1, null, false, false);
ClientSessionFactoryImpl csf = null;
ClientSessionFactoryImpl csf2 = null;
ClientSessionFactoryImpl csf3 = null;
// create some consumers
try (ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory csf = createSessionFactory(locator);) {
try (ServerLocator locator = createInVMNonHALocator()) {
ClientSession session1 = csf.createSession();
//sleep as test compares creationTime
csf = (ClientSessionFactoryImpl) createSessionFactory(locator);
Thread.sleep(500);
csf2 = (ClientSessionFactoryImpl) createSessionFactory(locator);
Thread.sleep(500);
csf3 = (ClientSessionFactoryImpl) createSessionFactory(locator);
//bring back all connection
String filterString = createJsonFilter("", "", "");
ClientSession session1_c1 = csf.createSession();
ClientSession session2_c1 = csf.createSession();
ClientSession session1_c2 = csf2.createSession();
ClientSession session2_c2 = csf2.createSession();
ClientSession session3_c2 = csf2.createSession();
ClientSession session4_c2 = csf2.createSession();
ClientSession session1_c4 = csf3.createSession();
ClientSession session2_c4 = csf3.createSession();
ClientSession session3_c4 = csf3.createSession();
String filterString = createJsonFilter("SESSION_COUNT", "GREATER_THAN", "1");
String connectionsAsJsonString = serverControl.listConnections(filterString, 1, 50);
JsonObject connectionsAsJsonObject = JsonUtil.readJsonObject(connectionsAsJsonString);
JsonArray array = (JsonArray) connectionsAsJsonObject.get("data");
Assert.assertTrue("number of connections returned from query", 1 <= array.size());
Assert.assertEquals("number of connections returned from query", 3, array.size());
JsonObject jsonConnection = array.getJsonObject(0);
//check all fields
@ -2016,7 +2303,44 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
Assert.assertNotEquals("protocol", "", jsonConnection.getString("protocol"));
Assert.assertEquals("clientID", "", jsonConnection.getString("clientID"));
Assert.assertNotEquals("localAddress", "", jsonConnection.getString("localAddress"));
Assert.assertEquals("sessionCount", 1, jsonConnection.getInt("sessionCount"));
Assert.assertEquals("sessionCount", 2, jsonConnection.getInt("sessionCount"));
//check default order
Assert.assertEquals("connection1 default Order", csf.getConnection().getID(), array.getJsonObject(0).getString("connectionID"));
Assert.assertEquals("connection2 default Order", csf2.getConnection().getID(), array.getJsonObject(1).getString("connectionID"));
Assert.assertEquals("connection3 session Order", csf3.getConnection().getID(), array.getJsonObject(2).getString("connectionID"));
//check order by session count desc
filterString = createJsonFilter("SESSION_COUNT", "GREATER_THAN", "1", "sessionCount", "desc");
connectionsAsJsonString = serverControl.listConnections(filterString, 1, 50);
connectionsAsJsonObject = JsonUtil.readJsonObject(connectionsAsJsonString);
array = (JsonArray) connectionsAsJsonObject.get("data");
Assert.assertEquals("number of connections returned from query", 3, array.size());
Assert.assertEquals("connection2 session Order", csf2.getConnection().getID(), array.getJsonObject(0).getString("connectionID"));
Assert.assertEquals("connection3 session Order", csf3.getConnection().getID(), array.getJsonObject(1).getString("connectionID"));
Assert.assertEquals("connection1 session Order", csf.getConnection().getID(), array.getJsonObject(2).getString("connectionID"));
//check order by creationTime desc
filterString = createJsonFilter("SESSION_COUNT", "GREATER_THAN", "1", "creationTime", "desc");
connectionsAsJsonString = serverControl.listConnections(filterString, 1, 50);
connectionsAsJsonObject = JsonUtil.readJsonObject(connectionsAsJsonString);
array = (JsonArray) connectionsAsJsonObject.get("data");
Assert.assertEquals("number of connections returned from query", 3, array.size());
Assert.assertEquals("connection3 creationTime Order", csf3.getConnection().getID(), array.getJsonObject(0).getString("connectionID"));
Assert.assertEquals("connection2 creationTime Order", csf2.getConnection().getID(), array.getJsonObject(1).getString("connectionID"));
Assert.assertEquals("connection1 creationTime Order", csf.getConnection().getID(), array.getJsonObject(2).getString("connectionID"));
} finally {
if (csf != null) {
csf.close();
}
if (csf2 != null) {
csf.close();
}
if (csf3 != null) {
csf.close();
}
}
}
@ -2278,6 +2602,17 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
return jsonFilterObject.toString();
}
private String createJsonFilter(String fieldName, String operationName, String value,String sortColumn, String sortOrder) {
HashMap<String, Object> filterMap = new HashMap<>();
filterMap.put("field", fieldName);
filterMap.put("operation", operationName);
filterMap.put("value", value);
filterMap.put("sortColumn", sortColumn);
filterMap.put("sortOrder", sortOrder);
JsonObject jsonFilterObject = JsonUtil.toJsonObject(filterMap);
return jsonFilterObject.toString();
}
private void sendMessagesWithPredefinedSize(int numberOfMessages,
ClientSession session,
ClientProducer producer,