activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject activemq-artemis git commit: ARTEMIS-1819 Reverting ARTEMIS-1819 [Forced Update!]
Date Mon, 18 Jun 2018 20:14:26 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x b0b159ba1 -> 8f1dc394a (forced update)


ARTEMIS-1819 Reverting ARTEMIS-1819

Revert "[ARTEMIS-1819] Missing fields on listAllConsumersAsJSON, listConsumersAsJSON and listConnectionsAsJSON"

This reverts commit c3fbd1b9e479f87898e0acd53f386d588c997632.

Based on the discussion on the PR
https://github.com/apache/activemq-artemis/pull/2035 this shouldn't have
been merged. It's importing JMS-specific code into the core broker which
is something we've worked hard to eliminate in recent releases.

(cherry picked from commit 7df3bcecefe3979b3bbb09f7745199e5af061962)


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8f1dc394
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8f1dc394
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8f1dc394

Branch: refs/heads/2.6.x
Commit: 8f1dc394a44e9c7589fa32ed675a4b77cef5c7a9
Parents: efe7d18
Author: Justin Bertram <jbertram@apache.org>
Authored: Mon Jun 11 21:35:33 2018 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Mon Jun 18 16:14:03 2018 -0400

----------------------------------------------------------------------
 .../impl/ActiveMQServerControlImpl.java         | 26 --------------------
 .../management/ActiveMQServerControlTest.java   | 14 -----------
 2 files changed, 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8f1dc394/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index f4537a0..58f2613 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -53,7 +53,6 @@ import org.apache.activemq.artemis.api.core.JsonUtil;
 import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.api.core.client.ClientSession;
 import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
 import org.apache.activemq.artemis.api.core.management.AddressControl;
 import org.apache.activemq.artemis.api.core.management.BridgeControl;
@@ -1832,19 +1831,6 @@ public class ActiveMQServerControlImpl extends AbstractControl implements
Active
 
          for (RemotingConnection connection : connections) {
             JsonObjectBuilder obj = JsonLoader.createObjectBuilder().add("connectionID",
connection.getID().toString()).add("clientAddress", connection.getRemoteAddress()).add("creationTime",
connection.getCreationTime()).add("implementation", connection.getClass().getSimpleName()).add("sessionCount",
server.getSessions(connection.getID().toString()).size());
-
-            List<ServerSession> sessions = server.getSessions(connection.getID().toString());
-
-            if (sessions.size() > 0) {
-               if (sessions.get(0).getMetaData(ClientSession.JMS_SESSION_CLIENT_ID_PROPERTY)
!= null) {
-                  obj.add("clientID", sessions.get(0).getMetaData(ClientSession.JMS_SESSION_CLIENT_ID_PROPERTY));
-               } else {
-                  obj.add("clientID", "");
-               }
-            } else {
-               obj.add("clientID", "");
-            }
-
             array.add(obj);
          }
          return array.build().toString();
@@ -1962,18 +1948,6 @@ public class ActiveMQServerControlImpl extends AbstractControl implements
Active
          obj.add("filter", consumer.getFilter().getFilterString().toString());
       }
 
-      obj.add("destinationName", consumer.getQueue().getAddress().toString());
-
-      if (consumer.getQueueType().getType() == 0) {
-         obj.add("destinationType", "topic");
-      } else if (consumer.getQueueType().getType() == 1) {
-         obj.add("destinationType", "queue");
-      } else {
-         obj.add("destinationType", "");
-      }
-
-      obj.add("durable", consumer.getQueue().isDurable());
-
       return obj.build();
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8f1dc394/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
index cdf7a08..b79fced 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
@@ -1317,13 +1317,11 @@ public class ActiveMQServerControlTest extends ManagementTestBase
{
       Assert.assertTrue(first.getString("clientAddress").length() > 0);
       Assert.assertTrue(first.getJsonNumber("creationTime").longValue() > 0);
       Assert.assertEquals(0, first.getJsonNumber("sessionCount").longValue());
-      Assert.assertEquals("", first.getString("clientID"));
 
       Assert.assertTrue(second.getString("connectionID").length() > 0);
       Assert.assertTrue(second.getString("clientAddress").length() > 0);
       Assert.assertTrue(second.getJsonNumber("creationTime").longValue() > 0);
       Assert.assertEquals(1, second.getJsonNumber("sessionCount").longValue());
-      Assert.assertEquals("", second.getString("clientID"));
    }
 
    @Test
@@ -1366,9 +1364,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
       Assert.assertEquals(false, first.getBoolean("browseOnly"));
       Assert.assertTrue(first.getJsonNumber("creationTime").longValue() > 0);
       Assert.assertEquals(0, first.getJsonNumber("deliveringCount").longValue());
-      Assert.assertEquals(queueName.toString(), first.getString("destinationName"));
-      Assert.assertEquals("queue", first.getString("destinationType"));
-      Assert.assertFalse(first.getBoolean("durable"));
 
       Assert.assertNotNull(second.getJsonNumber("consumerID").longValue());
       Assert.assertTrue(second.getString("connectionID").length() > 0);
@@ -1382,9 +1377,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
       Assert.assertEquals(0, second.getJsonNumber("deliveringCount").longValue());
       Assert.assertTrue(second.getString("filter").length() > 0);
       Assert.assertEquals(filter, second.getString("filter"));
-      Assert.assertEquals(queueName.toString(), second.getString("destinationName"));
-      Assert.assertEquals("queue", second.getString("destinationType"));
-      Assert.assertFalse(second.getBoolean("durable"));
    }
 
    @Test
@@ -1449,9 +1441,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
       Assert.assertEquals(queueName.toString(), first.getString("queueName"));
       Assert.assertEquals(false, first.getBoolean("browseOnly"));
       Assert.assertEquals(0, first.getJsonNumber("deliveringCount").longValue());
-      Assert.assertEquals(queueName.toString(), first.getString("destinationName"));
-      Assert.assertEquals("queue", first.getString("destinationType"));
-      Assert.assertFalse(first.getBoolean("durable"));
 
       Assert.assertTrue(second.getJsonNumber("creationTime").longValue() > 0);
       Assert.assertNotNull(second.getJsonNumber("consumerID").longValue());
@@ -1463,9 +1452,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
       Assert.assertEquals(queueName.toString(), second.getString("queueName"));
       Assert.assertEquals(false, second.getBoolean("browseOnly"));
       Assert.assertEquals(0, second.getJsonNumber("deliveringCount").longValue());
-      Assert.assertEquals(queueName.toString(), second.getString("destinationName"));
-      Assert.assertEquals("queue", second.getString("destinationType"));
-      Assert.assertFalse(second.getBoolean("durable"));
    }
 
    @Test


Mime
View raw message