You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2017/03/01 14:30:23 UTC

[2/2] activemq-artemis git commit: ARTEMIS-1007 Missing management annotations

ARTEMIS-1007 Missing management annotations

There are some operations in ActiveMQServerControl that don't have
@Parameter annotations. That will make clients like JBoss Jon failed
to invoke those operations.
Also in AddressControl there is a typo in sendMessage. The second
parameter's name should be 'type' not 'headers'.


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

Branch: refs/heads/master
Commit: 392fd08614ddc07eb2964a4ef99b9f3094ea114d
Parents: 3a9e7ec
Author: Howard Gao <ho...@gmail.com>
Authored: Wed Mar 1 14:44:56 2017 +0800
Committer: Justin Bertram <jb...@apache.org>
Committed: Wed Mar 1 08:30:11 2017 -0600

----------------------------------------------------------------------
 .../artemis/api/core/management/ActiveMQServerControl.java       | 4 ++--
 .../activemq/artemis/api/core/management/AddressControl.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/392fd086/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
index 1c9b0c6..04af61e 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
@@ -1060,10 +1060,10 @@ public interface ActiveMQServerControl {
    String listNetworkTopology() throws Exception;
 
    @Operation(desc = "Get the selected address", impact = MBeanOperationInfo.INFO)
-   String getAddressInfo(String address) throws ActiveMQAddressDoesNotExistException;
+   String getAddressInfo(@Parameter(name = "address", desc = "The address") String address) throws ActiveMQAddressDoesNotExistException;
 
    @Operation(desc = "Get a list of bindings associated with an address", impact = MBeanOperationInfo.INFO)
-   String listBindingsForAddress(String address) throws Exception;
+   String listBindingsForAddress(@Parameter(name = "address", desc = "The address") String address) throws Exception;
 
    @Operation(desc = "List Addresses on the broker", impact = MBeanOperationInfo.INFO)
    String listAddresses(@Parameter(name = "separator", desc = "Separator used on the string listing") String separator) throws Exception;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/392fd086/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java
index 57974aa..635eb72 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java
@@ -119,7 +119,7 @@ public interface AddressControl {
     */
    @Operation(desc = "Sends a TextMessage to a password-protected address.", impact = MBeanOperationInfo.ACTION)
    String sendMessage(@Parameter(name = "headers", desc = "The headers to add to the message") Map<String, String> headers,
-                      @Parameter(name = "headers", desc = "A type for the message") final int type,
+                      @Parameter(name = "type", desc = "A type for the message") final int type,
                       @Parameter(name = "body", desc = "The body (byte[]) of the message encoded as a string using Base64") String body,
                       @Parameter(name = "durable", desc = "Whether the message is durable") boolean durable,
                       @Parameter(name = "user", desc = "The user to authenticate with") String user,