qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1772573 - in /qpid/java/trunk: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ broker-core/src/main/java/org/apache/qpid/server/model/ broker-core/src/main/java/org/apache/qpid/server/security/ broker-core/src/main/java/org...
Date Sun, 04 Dec 2016 21:31:31 GMT
Author: kwall
Date: Sun Dec  4 21:31:30 2016
New Revision: 1772573

URL: http://svn.apache.org/viewvc?rev=1772573&view=rev
Log:
QPID-7571: [Java Broker] Apply mandatory param annotation to existing operations

Modified:
    qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBEnvironmentContainer.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStore.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
    qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedAccessControlProvider.java
    qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java
    qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLogger.java
    qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBEnvironmentContainer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBEnvironmentContainer.java?rev=1772573&r1=1772572&r2=1772573&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBEnvironmentContainer.java
(original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBEnvironmentContainer.java
Sun Dec  4 21:31:30 2016
@@ -51,5 +51,5 @@ public interface BDBEnvironmentContainer
 
     @ManagedOperation(description = "Get the BDB database statistics", nonModifying = true,
             changesConfiguredObjectState = false)
-    Map<String, Object> databaseStatistics(@Param(name="database", description = "database
table for which to retrieve statistics")String database, @Param(name="reset", defaultValue
= "false", description = "If true, reset the statistics") boolean reset);
+    Map<String, Object> databaseStatistics(@Param(name="database", description = "database
table for which to retrieve statistics", mandatory = true)String database, @Param(name="reset",
defaultValue = "false", description = "If true, reset the statistics") boolean reset);
 }

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java?rev=1772573&r1=1772572&r2=1772573&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
(original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
Sun Dec  4 21:31:30 2016
@@ -391,7 +391,7 @@ public abstract class AbstractContainer<
                 threadNameFindExpression);
         for (ThreadInfo threadInfo : threadInfos)
         {
-            if (pattern== null || pattern.matcher(threadInfo.getThreadName()).find())
+            if (pattern == null || pattern.matcher(threadInfo.getThreadName()).find())
             {
                 threadDump.append(getThreadStackTraces(threadInfo));
             }

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1772573&r1=1772572&r2=1772573&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java Sun
Dec  4 21:31:30 2016
@@ -295,7 +295,7 @@ public interface Broker<X extends Broker
     @ManagedOperation(description = "Removes a user and all associated preferences from the
broker's configuration",
             changesConfiguredObjectState = true)
     void purgeUser(@Param(name="origin", description="The AuthenticationProvider the username
is associated with")AuthenticationProvider<?> origin,
-                   @Param(name="username", description="The unqualified username that should
be purged from the broker")String username);
+                   @Param(name="username", description="The unqualified username that should
be purged from the broker", mandatory = true)String username);
 
     @ManagedOperation(description = "Resets statistics on this object and all child objects",
changesConfiguredObjectState = false, nonModifying = true)
     void resetStatistics();

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java?rev=1772573&r1=1772572&r2=1772573&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
(original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
Sun Dec  4 21:31:30 2016
@@ -255,7 +255,7 @@ public class BrokerAttributeInjector imp
                                                             "true",
                                                             "if true dump only live objects
i.e. objects that are reachable from others",
                                                             new String[]{Boolean.TRUE.toString(),
Boolean.FALSE.toString()},
-                                                            true);
+                                                            false);
             ConfiguredObjectInjectedOperation<?> setVMOptionOperation = new ConfiguredObjectInjectedOperation(
                     "dumpHeap",
                     "Dumps the heap to the outputFile file in the same format as the hprof
heap dump.",

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java?rev=1772573&r1=1772572&r2=1772573&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java Sun
Dec  4 21:31:30 2016
@@ -368,14 +368,14 @@ public interface Queue<X extends Queue<X
     void resetStatistics();
 
     @ManagedOperation(description = "move messages from this queue to another", changesConfiguredObjectState
= false)
-    List<Long> moveMessages(@Param(name = "destination", description = "The queue to
which the messages should be moved") Queue<?> destination,
+    List<Long> moveMessages(@Param(name = "destination", description = "The queue to
which the messages should be moved", mandatory = true) Queue<?> destination,
                             @Param(name = "messageIds", description = "If provided, only
messages in the queue whose (internal) message-id is supplied will be considered for moving")
List<Long> messageIds,
                             @Param(name = "selector", description = "A (JMS) selector - if
provided, only messages which match the selector will be considered for moving") String selector,
                             @Param(name = "limit", description = "Maximum number of messages
to move", defaultValue = "-1") int limit);
 
 
     @ManagedOperation(description = "copies messages from this queue to another", changesConfiguredObjectState
= false)
-    List<Long> copyMessages(@Param(name = "destination", description = "The queue to
which the messages should be copied") Queue<?> destination,
+    List<Long> copyMessages(@Param(name = "destination", description = "The queue to
which the messages should be copied", mandatory = true) Queue<?> destination,
                             @Param(name = "messageIds", description = "If provided, only
messages in the queue whose (internal) message-id is supplied will be considered for copying")
List<Long> messageIds,
                             @Param(name = "selector", description = "A (JMS) selector - if
provided, only messages which match the selector will be considered for copying")  String
selector,
                             @Param(name = "limit", description = "Maximum number of messages
to copy", defaultValue = "-1") int limit);

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStore.java?rev=1772573&r1=1772572&r2=1772573&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStore.java
(original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStore.java
Sun Dec  4 21:31:30 2016
@@ -54,6 +54,6 @@ public interface ManagedPeerCertificateT
 
     @ManagedOperation(description = "Remove given certificates from the Trust Store.",
             changesConfiguredObjectState = true)
-    void removeCertificates(@Param(name = "certificates", description = "List of certificate
details to be removed. The details should take the form given by the certificateDetails attribute")
+    void removeCertificates(@Param(name = "certificates", description = "List of certificate
details to be removed. The details should take the form given by the certificateDetails attribute",
mandatory = true)
                             List<CertificateDetails> certificates);
 }

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java?rev=1772573&r1=1772572&r2=1772573&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
(original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
Sun Dec  4 21:31:30 2016
@@ -206,14 +206,14 @@ public interface QueueManagingVirtualHos
     Collection<? extends Connection<?>> getConnections();
 
     @ManagedOperation(nonModifying = true, changesConfiguredObjectState = false)
-    Connection<?> getConnection(@Param(name="name") String name);
+    Connection<?> getConnection(@Param(name="name", mandatory = true) String name);
 
     @ManagedOperation(secure = true,
             description = "Publishes a message to a specified address. "
                           + "Returns the number of queues onto which it has been placed,
"
                           + " or zero, if the address routes to no queues.",
             changesConfiguredObjectState = false)
-    int publishMessage(@Param(name = "message")ManageableMessage message);
+    int publishMessage(@Param(name = "message", mandatory = true)ManageableMessage message);
 
     @ManagedOperation(nonModifying = true,
             description = "Extract configuration",
@@ -232,7 +232,7 @@ public interface QueueManagingVirtualHos
     @ManagedOperation(description = "Import message store content",
             secure = true,
             changesConfiguredObjectState = false)
-    void importMessageStore(@Param(name="source", description = "Extract file")String source);
+    void importMessageStore(@Param(name="source", description = "Extract file", mandatory
= true)String source);
 
     @ManagedOperation(description = "Resets statistics on this object and all child objects",
changesConfiguredObjectState = false, nonModifying = true)
     void resetStatistics();

Modified: qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedAccessControlProvider.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedAccessControlProvider.java?rev=1772573&r1=1772572&r2=1772573&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedAccessControlProvider.java
(original)
+++ qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedAccessControlProvider.java
Sun Dec  4 21:31:30 2016
@@ -46,7 +46,7 @@ public interface RuleBasedAccessControlP
 
     @ManagedOperation(description = "Load access control rules from a file in the legacy
access control rule format",
             changesConfiguredObjectState = true)
-    void loadFromFile(@Param(name = "path")String path);
+    void loadFromFile(@Param(name = "path", mandatory = true)String path);
 
     @ManagedOperation(nonModifying = true,
             description = "Extract the access control rules in the legacy access control
rule format",

Modified: qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java?rev=1772573&r1=1772572&r2=1772573&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java
(original)
+++ qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java
Sun Dec  4 21:31:30 2016
@@ -45,7 +45,7 @@ public interface RuleBasedVirtualHostAcc
     List<AclRule> getRules();
 
     @ManagedOperation(changesConfiguredObjectState = true)
-    void loadFromFile(@Param(name = "path") String path);
+    void loadFromFile(@Param(name = "path", mandatory = true) String path);
 
     @ManagedOperation(nonModifying = true, changesConfiguredObjectState = false)
     Content extractRules();

Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLogger.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLogger.java?rev=1772573&r1=1772572&r2=1772573&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLogger.java
(original)
+++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLogger.java
Sun Dec  4 21:31:30 2016
@@ -69,10 +69,10 @@ public interface BrokerFileLogger<X exte
     List<LogFileDetails> getLogFiles();
 
     @ManagedOperation(nonModifying = true, changesConfiguredObjectState = false)
-    Content getFile(@Param(name = "fileName") String fileName);
+    Content getFile(@Param(name = "fileName", mandatory = true) String fileName);
 
     @ManagedOperation(nonModifying = true, changesConfiguredObjectState = false)
-    Content getFiles(@Param(name = "fileName") Set<String> fileName);
+    Content getFiles(@Param(name = "fileName", mandatory = true) Set<String> fileName);
 
     @ManagedOperation(nonModifying = true,
             changesConfiguredObjectState = false)

Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java?rev=1772573&r1=1772572&r2=1772573&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java
(original)
+++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java
Sun Dec  4 21:31:30 2016
@@ -68,10 +68,10 @@ public interface VirtualHostFileLogger<X
     List<LogFileDetails> getLogFiles();
 
     @ManagedOperation(nonModifying = true, changesConfiguredObjectState = false)
-    Content getFile(@Param(name = "fileName") String fileName);
+    Content getFile(@Param(name = "fileName", mandatory = true) String fileName);
 
     @ManagedOperation(nonModifying = true, changesConfiguredObjectState = false)
-    Content getFiles(@Param(name = "fileName") Set<String> fileName);
+    Content getFiles(@Param(name = "fileName", mandatory = true) Set<String> fileName);
 
     @ManagedOperation(nonModifying = true, changesConfiguredObjectState = false)
     Content getAllFiles();



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message