[AMQ-9769] Add name property to connector interface and MBean. (#1493)

* [AMQ-9769] Add name property to connector interface and MBean.

* [AMQ-9769] Use connector name property in web console.

* Add getConnectionId() to ConnectionViewMBeanAdd.

Author: thezbyg

activemq-broker/src/main/java/org/apache/activemq/broker/Connector.java

@@ -111,4 +111,8 @@ public interface Connector extends Service {
 
     public int getConnectionCount();
 
+    /**
+     * @return connector name
+     */
+    public String getName();
 }

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectionView.java

@@ -105,6 +105,7 @@ public String getClientId() {
         return connection.getConnectionId();
     }
 
+    @Override
     public String getConnectionId() {
         return connection.getConnectionId();
     }

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java

@@ -68,6 +68,14 @@ public interface ConnectionViewMBean extends Service {
     @MBeanInfo("client id for this connection")
     String getClientId();
 
+    /**
+     * Returns the identifier for this connection
+     *
+     * @return the identifier for this connection
+     */
+    @MBeanInfo("ID for this connection")
+    String getConnectionId();
+
     /**
      * Returns the number of messages to be dispatched to this connection
      * @return the  number of messages pending dispatch

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java

@@ -230,4 +230,8 @@ public int getConnectionCount() {
         return this.connector.connectionCount();
     }
 
+    @Override
+    public String getName() {
+        return this.connector.getName();
+    }
 }

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java

@@ -145,4 +145,7 @@ public interface ConnectorViewMBean extends Service {
 
     @MBeanInfo("Connection count")
     public int getConnectionCount();
+
+    @MBeanInfo("Connector name")
+    String getName();
 }

activemq-web-console/src/main/webapp/WEB-INF/tags/jms/forEachConnection.tag

@@ -23,9 +23,8 @@
 <%
 	Iterator it = broker.getConnections(connectorName).iterator();
 	while (it.hasNext()) {
-		String conName = (String) it.next();
-		ConnectionViewMBean con = broker.getConnection(conName);
-		request.setAttribute(connectionName, conName);
+		ConnectionViewMBean con = (ConnectionViewMBean) it.next();
+		request.setAttribute(connectionName, con.getClientId());
 		request.setAttribute(connection, con);
 %>
 <jsp:doBody/>

activemq-web-console/src/main/webapp/connections.jsp

@@ -28,8 +28,8 @@
 
 <h2>Connections</h2>
 
-<c:forEach items="${requestContext.brokerQuery.connectors}" var="connectorName">
-<h3>Connector <c:out value="${connectorName}" /></h3>
+<c:forEach items="${requestContext.brokerQuery.connectors}" var="connector">
+<h3>Connector <c:out value="${connector.name}" /></h3>
 
 <table id="connections" class="sortable autostripe">
 <thead>
@@ -41,7 +41,7 @@
 </tr>
 </thead>
 <tbody>
-<jms:forEachConnection broker="${requestContext.brokerQuery}" connectorName="${connectorName}"
+<jms:forEachConnection broker="${requestContext.brokerQuery}" connectorName="${connector.name}"
 	connection="con" connectionName="conName">
 <tr>
 

activemq-web/src/main/java/org/apache/activemq/web/BrokerFacade.java

@@ -134,12 +134,12 @@ Collection<DurableSubscriptionViewMBean> getInactiveDurableTopicSubscribers()
 			throws Exception;
 
 	/**
-	 * The names of all transport connectors of the broker (f.e. openwire, ssl)
+	 * All transport connectors of the broker (f.e. openwire, ssl)
 	 * 
 	 * @return not <code>null</code>
 	 * @throws Exception
 	 */
-	Collection<String> getConnectors() throws Exception;
+	Collection<ConnectorViewMBean> getConnectors() throws Exception;
 
 	/**
 	 * A transport connectors.
@@ -160,16 +160,15 @@ Collection<DurableSubscriptionViewMBean> getInactiveDurableTopicSubscribers()
 	Collection<ConnectionViewMBean> getConnections() throws Exception;
 
 	/**
-	 * The names of all connections to a specific transport connectors of the
-	 * broker.
+	 * All connections to a specific transport connectors of the broker.
 	 * 
 	 * @see #getConnection(String)
 	 * @param connectorName
 	 *            not <code>null</code>
 	 * @return not <code>null</code>
 	 * @throws Exception
 	 */
-	Collection<String> getConnections(String connectorName) throws Exception;
+	Collection<ConnectionViewMBean> getConnections(String connectorName) throws Exception;
 
 	/**
 	 * A specific connection to the broker.

activemq-web/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java

@@ -169,18 +169,14 @@ public Collection<ConnectionViewMBean> getConnections() throws Exception {
 
     @Override
     @SuppressWarnings("unchecked")
-    public Collection<String> getConnections(String connectorName) throws Exception {
+    public Collection<ConnectionViewMBean> getConnections(String connectorName) throws Exception {
         String brokerName = getBrokerName();
         connectorName = JMXSupport.encodeObjectNamePart(connectorName);
         ObjectName query = new ObjectName("org.apache.activemq:type=Broker,brokerName=" + brokerName
             + ",connector=clientConnectors,connectorName=" + connectorName + ",connectionViewType=clientId,connectionName=*");
         Set<ObjectName> queryResult = queryNames(query, null);
-        Collection<ConnectionViewMBean> connections = getManagedObjects(queryResult.toArray(new ObjectName[queryResult.size()]),
+        return getManagedObjects(queryResult.toArray(new ObjectName[queryResult.size()]),
                 ConnectionViewMBean.class);
-        Collection<String> result = new ArrayList<String>(queryResult.size());
-        for (ConnectionViewMBean connection : connections)
-            result.add(connection.getClientId());
-        return result;
     }
 
     @Override
@@ -200,14 +196,13 @@ public ConnectionViewMBean getConnection(String connectionName) throws Exception
 
     @Override
     @SuppressWarnings("unchecked")
-    public Collection<String> getConnectors() throws Exception {
+    public Collection<ConnectorViewMBean> getConnectors() throws Exception {
         String brokerName = getBrokerName();
         ObjectName query = new ObjectName("org.apache.activemq:type=Broker,brokerName=" + brokerName + ",connector=clientConnectors,connectorName=*");
         Set<ObjectName> queryResult = queryNames(query, null);
         Collection<String> result = new ArrayList<String>(queryResult.size());
-        for (ObjectName on : queryResult)
-            result.add(on.getKeyProperty("connectorName"));
-        return result;
+        return getManagedObjects(queryResult.toArray(new ObjectName[queryResult.size()]),
+                ConnectorViewMBean.class);
     }
 
     @Override