Author: orudyy
Date: Thu Nov 26 14:38:19 2015
New Revision: 1716702
URL: http://svn.apache.org/viewvc?rev=1716702&view=rev
Log:
QPID-6912: Avoid duplicates when list operations of types.
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1716619 https://svn.apache.org/repos/asf/qpid/java/trunk
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:38:19 2015
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619
/qpid/trunk/qpid:796646-796653
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java?rev=1716702&r1=1716701&r2=1716702&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java
Thu Nov 26 14:38:19 2015
@@ -315,11 +315,15 @@ public class ApiDocsServlet extends Abst
writer.println("<a name=\"types\"><h2>Operations</h2></a>");
writer.println("<h2>Common Operations</h2>");
- writeOperationsTables(writer,
_model.getTypeRegistry().getOperations(getConfiguredClass()).values());
+ Collection<ConfiguredObjectOperation<?>> categoryOperations =
+
_model.getTypeRegistry().getOperations(getConfiguredClass()).values();
+ writeOperationsTables(writer, categoryOperations);
for(Class<? extends ConfiguredObject> type : _types)
{
String typeName = getTypeName(type);
- final Collection<ConfiguredObjectOperation<?>>
typeSpecificOperations = _model.getTypeRegistry().getOperations(type).values();
+ Set<ConfiguredObjectOperation<?>> typeSpecificOperations = new
HashSet<>(_model.getTypeRegistry().getOperations(type).values());
+ typeSpecificOperations.removeAll(categoryOperations);
+
if(!typeSpecificOperations.isEmpty() && type !=
getConfiguredClass())
{
writer.println("<h2><span class=\"type\">"+typeName+"</span>
Specific Operations</h2>");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
