You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by va...@apache.org on 2023/02/09 11:23:48 UTC
[qpid-broker-j] branch main updated: QPID-8616 - [Broker-J] Privacy Violation: Heap Inspection in ManagedUser (#172)
This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 93eb627f7d QPID-8616 - [Broker-J] Privacy Violation: Heap Inspection in ManagedUser (#172)
93eb627f7d is described below
commit 93eb627f7d0b8bcd5f8159630f9d7423917e9ded
Author: Daniil Kirilyuk <da...@gmail.com>
AuthorDate: Thu Feb 9 12:23:42 2023 +0100
QPID-8616 - [Broker-J] Privacy Violation: Heap Inspection in ManagedUser (#172)
---
.../logging/messages/AccessControlMessages.java | 18 +++++++--------
.../messages/AuthenticationProviderMessages.java | 14 ++++++------
.../server/logging/messages/BindingMessages.java | 6 ++---
.../server/logging/messages/BrokerMessages.java | 20 ++++++++---------
.../server/logging/messages/ChannelMessages.java | 14 ++++++------
.../logging/messages/ConfigStoreMessages.java | 2 +-
.../logging/messages/ConnectionMessages.java | 12 +++++-----
.../server/logging/messages/ExchangeMessages.java | 14 ++++++------
.../logging/messages/HighAvailabilityMessages.java | 26 +++++++++++-----------
.../server/logging/messages/KeyStoreMessages.java | 14 ++++++------
.../messages/ManagementConsoleMessages.java | 14 ++++++------
.../logging/messages/MessageStoreMessages.java | 2 +-
.../qpid/server/logging/messages/PortMessages.java | 20 ++++++++---------
.../server/logging/messages/QueueMessages.java | 14 ++++++------
.../logging/messages/ResourceLimitMessages.java | 6 ++---
.../server/logging/messages/SenderMessages.java | 4 ++--
.../logging/messages/SubscriptionMessages.java | 4 ++--
.../logging/messages/TransactionLogMessages.java | 12 +++++-----
.../logging/messages/TrustStoreMessages.java | 14 ++++++------
.../qpid/server/logging/messages/UserMessages.java | 6 ++---
.../logging/messages/VirtualHostMessages.java | 14 ++++++------
.../server/security/auth/manager/ManagedUser.java | 16 +++++++++----
.../qpid/server/logging/GenerateLogMessages.java | 6 ++---
23 files changed, 140 insertions(+), 132 deletions(-)
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
index 0296626bc6..bec547b03b 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
@@ -96,7 +96,7 @@ public class AccessControlMessages
* sequentially in the method call.
*
*/
- public static LogMessage ALLOWED(String param1, String param2, String param3)
+ public static LogMessage ALLOWED(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("ALLOWED");
@@ -156,7 +156,7 @@ public class AccessControlMessages
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE(String param1)
+ public static LogMessage CLOSE(CharSequence param1)
{
String rawMessage = MESSAGES.getString("CLOSE");
@@ -216,7 +216,7 @@ public class AccessControlMessages
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1, String param2, String param3)
+ public static LogMessage CREATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("CREATE");
@@ -276,7 +276,7 @@ public class AccessControlMessages
* sequentially in the method call.
*
*/
- public static LogMessage DELETE(String param1, String param2)
+ public static LogMessage DELETE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("DELETE");
@@ -336,7 +336,7 @@ public class AccessControlMessages
* sequentially in the method call.
*
*/
- public static LogMessage DENIED(String param1, String param2, String param3)
+ public static LogMessage DENIED(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("DENIED");
@@ -396,7 +396,7 @@ public class AccessControlMessages
* sequentially in the method call.
*
*/
- public static LogMessage LOADED(String param1)
+ public static LogMessage LOADED(CharSequence param1)
{
String rawMessage = MESSAGES.getString("LOADED");
@@ -456,7 +456,7 @@ public class AccessControlMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPEN(String param1, String param2)
+ public static LogMessage OPEN(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("OPEN");
@@ -516,7 +516,7 @@ public class AccessControlMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage OPERATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("OPERATION");
@@ -576,7 +576,7 @@ public class AccessControlMessages
* sequentially in the method call.
*
*/
- public static LogMessage UPDATE(String param1, String param2, String param3)
+ public static LogMessage UPDATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("UPDATE");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
index 921d2ac271..f48960c3df 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
@@ -92,7 +92,7 @@ public class AuthenticationProviderMessages
* sequentially in the method call.
*
*/
- public static LogMessage AUTHENTICATION_FAILED(String param1, boolean opt1)
+ public static LogMessage AUTHENTICATION_FAILED(CharSequence param1, boolean opt1)
{
String rawMessage = MESSAGES.getString("AUTHENTICATION_FAILED");
StringBuffer msg = new StringBuffer();
@@ -175,7 +175,7 @@ public class AuthenticationProviderMessages
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE(String param1)
+ public static LogMessage CLOSE(CharSequence param1)
{
String rawMessage = MESSAGES.getString("CLOSE");
@@ -235,7 +235,7 @@ public class AuthenticationProviderMessages
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1, String param2, String param3)
+ public static LogMessage CREATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("CREATE");
@@ -295,7 +295,7 @@ public class AuthenticationProviderMessages
* sequentially in the method call.
*
*/
- public static LogMessage DELETE(String param1, String param2)
+ public static LogMessage DELETE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("DELETE");
@@ -355,7 +355,7 @@ public class AuthenticationProviderMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPEN(String param1, String param2)
+ public static LogMessage OPEN(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("OPEN");
@@ -415,7 +415,7 @@ public class AuthenticationProviderMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage OPERATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("OPERATION");
@@ -475,7 +475,7 @@ public class AuthenticationProviderMessages
* sequentially in the method call.
*
*/
- public static LogMessage UPDATE(String param1, String param2, String param3)
+ public static LogMessage UPDATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("UPDATE");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
index adfdba96fd..907c9d0c5e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
@@ -84,7 +84,7 @@ public class BindingMessages
* sequentially in the method call.
*
*/
- public static LogMessage CREATED(String param1)
+ public static LogMessage CREATED(CharSequence param1)
{
String rawMessage = MESSAGES.getString("CREATED");
@@ -144,7 +144,7 @@ public class BindingMessages
* sequentially in the method call.
*
*/
- public static LogMessage DELETED(String param1)
+ public static LogMessage DELETED(CharSequence param1)
{
String rawMessage = MESSAGES.getString("DELETED");
@@ -204,7 +204,7 @@ public class BindingMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage OPERATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("OPERATION");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
index ab8700c34e..1d2df30f8a 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
@@ -104,7 +104,7 @@ public class BrokerMessages
* sequentially in the method call.
*
*/
- public static LogMessage CONFIG(String param1)
+ public static LogMessage CONFIG(CharSequence param1)
{
String rawMessage = MESSAGES.getString("CONFIG");
@@ -164,7 +164,7 @@ public class BrokerMessages
* sequentially in the method call.
*
*/
- public static LogMessage FAILED_CHILDREN(String param1)
+ public static LogMessage FAILED_CHILDREN(CharSequence param1)
{
String rawMessage = MESSAGES.getString("FAILED_CHILDREN");
@@ -224,7 +224,7 @@ public class BrokerMessages
* sequentially in the method call.
*
*/
- public static LogMessage FATAL_ERROR(String param1)
+ public static LogMessage FATAL_ERROR(CharSequence param1)
{
String rawMessage = MESSAGES.getString("FATAL_ERROR");
@@ -284,7 +284,7 @@ public class BrokerMessages
* sequentially in the method call.
*
*/
- public static LogMessage LISTENING(String param1, Number param2)
+ public static LogMessage LISTENING(CharSequence param1, Number param2)
{
String rawMessage = MESSAGES.getString("LISTENING");
@@ -344,7 +344,7 @@ public class BrokerMessages
* sequentially in the method call.
*
*/
- public static LogMessage MANAGEMENT_MODE(String param1, String param2)
+ public static LogMessage MANAGEMENT_MODE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("MANAGEMENT_MODE");
@@ -464,7 +464,7 @@ public class BrokerMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage OPERATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("OPERATION");
@@ -524,7 +524,7 @@ public class BrokerMessages
* sequentially in the method call.
*
*/
- public static LogMessage PLATFORM(String param1, String param2, String param3, String param4, String param5, String param6)
+ public static LogMessage PLATFORM(CharSequence param1, CharSequence param2, CharSequence param3, CharSequence param4, CharSequence param5, CharSequence param6)
{
String rawMessage = MESSAGES.getString("PLATFORM");
@@ -584,7 +584,7 @@ public class BrokerMessages
* sequentially in the method call.
*
*/
- public static LogMessage PROCESS(String param1)
+ public static LogMessage PROCESS(CharSequence param1)
{
String rawMessage = MESSAGES.getString("PROCESS");
@@ -699,7 +699,7 @@ public class BrokerMessages
* sequentially in the method call.
*
*/
- public static LogMessage SHUTTING_DOWN(String param1, Number param2)
+ public static LogMessage SHUTTING_DOWN(CharSequence param1, Number param2)
{
String rawMessage = MESSAGES.getString("SHUTTING_DOWN");
@@ -759,7 +759,7 @@ public class BrokerMessages
* sequentially in the method call.
*
*/
- public static LogMessage STARTUP(String param1, String param2)
+ public static LogMessage STARTUP(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("STARTUP");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
index 0efb5c032f..1f650c440f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
@@ -157,7 +157,7 @@ public class ChannelMessages
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE_FORCED(Number param1, String param2)
+ public static LogMessage CLOSE_FORCED(Number param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("CLOSE_FORCED");
@@ -272,7 +272,7 @@ public class ChannelMessages
* sequentially in the method call.
*
*/
- public static LogMessage DEADLETTERMSG(Number param1, String param2)
+ public static LogMessage DEADLETTERMSG(Number param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("DEADLETTERMSG");
@@ -332,7 +332,7 @@ public class ChannelMessages
* sequentially in the method call.
*
*/
- public static LogMessage DISCARDMSG_NOALTEXCH(Number param1, String param2, String param3)
+ public static LogMessage DISCARDMSG_NOALTEXCH(Number param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("DISCARDMSG_NOALTEXCH");
@@ -392,7 +392,7 @@ public class ChannelMessages
* sequentially in the method call.
*
*/
- public static LogMessage DISCARDMSG_NOROUTE(Number param1, String param2)
+ public static LogMessage DISCARDMSG_NOROUTE(Number param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("DISCARDMSG_NOROUTE");
@@ -452,7 +452,7 @@ public class ChannelMessages
* sequentially in the method call.
*
*/
- public static LogMessage FLOW(String param1)
+ public static LogMessage FLOW(CharSequence param1)
{
String rawMessage = MESSAGES.getString("FLOW");
@@ -567,7 +567,7 @@ public class ChannelMessages
* sequentially in the method call.
*
*/
- public static LogMessage FLOW_ENFORCED(String param1)
+ public static LogMessage FLOW_ENFORCED(CharSequence param1)
{
String rawMessage = MESSAGES.getString("FLOW_ENFORCED");
@@ -682,7 +682,7 @@ public class ChannelMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage OPERATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("OPERATION");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
index ebb15692ea..21fc5638be 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
@@ -308,7 +308,7 @@ public class ConfigStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage STORE_LOCATION(String param1)
+ public static LogMessage STORE_LOCATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("STORE_LOCATION");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
index c89dd51a01..149a1d2d9b 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
@@ -100,7 +100,7 @@ public class ConnectionMessages
* sequentially in the method call.
*
*/
- public static LogMessage CLIENT_VERSION_LOG(String param1)
+ public static LogMessage CLIENT_VERSION_LOG(CharSequence param1)
{
String rawMessage = MESSAGES.getString("CLIENT_VERSION_LOG");
@@ -160,7 +160,7 @@ public class ConnectionMessages
* sequentially in the method call.
*
*/
- public static LogMessage CLIENT_VERSION_REJECT(String param1)
+ public static LogMessage CLIENT_VERSION_REJECT(CharSequence param1)
{
String rawMessage = MESSAGES.getString("CLIENT_VERSION_REJECT");
@@ -220,7 +220,7 @@ public class ConnectionMessages
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE(String param1, boolean opt1)
+ public static LogMessage CLOSE(CharSequence param1, boolean opt1)
{
String rawMessage = MESSAGES.getString("CLOSE");
StringBuffer msg = new StringBuffer();
@@ -358,7 +358,7 @@ public class ConnectionMessages
* sequentially in the method call.
*
*/
- public static LogMessage IDLE_CLOSE(String param1, boolean opt1)
+ public static LogMessage IDLE_CLOSE(CharSequence param1, boolean opt1)
{
String rawMessage = MESSAGES.getString("IDLE_CLOSE");
StringBuffer msg = new StringBuffer();
@@ -616,7 +616,7 @@ public class ConnectionMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPEN(String param1, String param2, String param3, String param4, String param5, String param6, boolean opt1, boolean opt2, boolean opt3, boolean opt4)
+ public static LogMessage OPEN(CharSequence param1, CharSequence param2, CharSequence param3, CharSequence param4, CharSequence param5, CharSequence param6, boolean opt1, boolean opt2, boolean opt3, boolean opt4)
{
String rawMessage = MESSAGES.getString("OPEN");
StringBuffer msg = new StringBuffer();
@@ -789,7 +789,7 @@ public class ConnectionMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage OPERATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("OPERATION");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
index 8c51f28d36..902aab28d7 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
@@ -92,7 +92,7 @@ public class ExchangeMessages
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE(String param1)
+ public static LogMessage CLOSE(CharSequence param1)
{
String rawMessage = MESSAGES.getString("CLOSE");
@@ -152,7 +152,7 @@ public class ExchangeMessages
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1, String param2, String param3)
+ public static LogMessage CREATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("CREATE");
@@ -212,7 +212,7 @@ public class ExchangeMessages
* sequentially in the method call.
*
*/
- public static LogMessage DELETE(String param1, String param2)
+ public static LogMessage DELETE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("DELETE");
@@ -272,7 +272,7 @@ public class ExchangeMessages
* sequentially in the method call.
*
*/
- public static LogMessage DISCARDMSG(String param1, String param2)
+ public static LogMessage DISCARDMSG(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("DISCARDMSG");
@@ -332,7 +332,7 @@ public class ExchangeMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPEN(String param1, String param2)
+ public static LogMessage OPEN(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("OPEN");
@@ -392,7 +392,7 @@ public class ExchangeMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage OPERATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("OPERATION");
@@ -452,7 +452,7 @@ public class ExchangeMessages
* sequentially in the method call.
*
*/
- public static LogMessage UPDATE(String param1, String param2, String param3)
+ public static LogMessage UPDATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("UPDATE");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
index 85ecd52310..a70d8adf7e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
@@ -108,7 +108,7 @@ public class HighAvailabilityMessages
* sequentially in the method call.
*
*/
- public static LogMessage ADDED(String param1, String param2)
+ public static LogMessage ADDED(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("ADDED");
@@ -168,7 +168,7 @@ public class HighAvailabilityMessages
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1, String param2, String param3)
+ public static LogMessage CREATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("CREATE");
@@ -228,7 +228,7 @@ public class HighAvailabilityMessages
* sequentially in the method call.
*
*/
- public static LogMessage DELETE(String param1, String param2)
+ public static LogMessage DELETE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("DELETE");
@@ -288,7 +288,7 @@ public class HighAvailabilityMessages
* sequentially in the method call.
*
*/
- public static LogMessage DESIGNATED_PRIMARY_CHANGED(String param1)
+ public static LogMessage DESIGNATED_PRIMARY_CHANGED(CharSequence param1)
{
String rawMessage = MESSAGES.getString("DESIGNATED_PRIMARY_CHANGED");
@@ -348,7 +348,7 @@ public class HighAvailabilityMessages
* sequentially in the method call.
*
*/
- public static LogMessage INTRUDER_DETECTED(String param1, String param2)
+ public static LogMessage INTRUDER_DETECTED(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("INTRUDER_DETECTED");
@@ -408,7 +408,7 @@ public class HighAvailabilityMessages
* sequentially in the method call.
*
*/
- public static LogMessage JOINED(String param1, String param2)
+ public static LogMessage JOINED(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("JOINED");
@@ -468,7 +468,7 @@ public class HighAvailabilityMessages
* sequentially in the method call.
*
*/
- public static LogMessage LEFT(String param1, String param2)
+ public static LogMessage LEFT(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("LEFT");
@@ -583,7 +583,7 @@ public class HighAvailabilityMessages
* sequentially in the method call.
*
*/
- public static LogMessage PRIORITY_CHANGED(String param1)
+ public static LogMessage PRIORITY_CHANGED(CharSequence param1)
{
String rawMessage = MESSAGES.getString("PRIORITY_CHANGED");
@@ -698,7 +698,7 @@ public class HighAvailabilityMessages
* sequentially in the method call.
*
*/
- public static LogMessage QUORUM_OVERRIDE_CHANGED(String param1)
+ public static LogMessage QUORUM_OVERRIDE_CHANGED(CharSequence param1)
{
String rawMessage = MESSAGES.getString("QUORUM_OVERRIDE_CHANGED");
@@ -758,7 +758,7 @@ public class HighAvailabilityMessages
* sequentially in the method call.
*
*/
- public static LogMessage REMOVED(String param1, String param2)
+ public static LogMessage REMOVED(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("REMOVED");
@@ -818,7 +818,7 @@ public class HighAvailabilityMessages
* sequentially in the method call.
*
*/
- public static LogMessage ROLE_CHANGED(String param1, String param2, String param3, String param4)
+ public static LogMessage ROLE_CHANGED(CharSequence param1, CharSequence param2, CharSequence param3, CharSequence param4)
{
String rawMessage = MESSAGES.getString("ROLE_CHANGED");
@@ -878,7 +878,7 @@ public class HighAvailabilityMessages
* sequentially in the method call.
*
*/
- public static LogMessage TRANSFER_MASTER(String param1, String param2)
+ public static LogMessage TRANSFER_MASTER(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("TRANSFER_MASTER");
@@ -938,7 +938,7 @@ public class HighAvailabilityMessages
* sequentially in the method call.
*
*/
- public static LogMessage UPDATE(String param1, String param2, String param3)
+ public static LogMessage UPDATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("UPDATE");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
index ae0b308b84..828235e0a4 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
@@ -92,7 +92,7 @@ public class KeyStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE(String param1)
+ public static LogMessage CLOSE(CharSequence param1)
{
String rawMessage = MESSAGES.getString("CLOSE");
@@ -152,7 +152,7 @@ public class KeyStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1, String param2, String param3)
+ public static LogMessage CREATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("CREATE");
@@ -212,7 +212,7 @@ public class KeyStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage DELETE(String param1, String param2)
+ public static LogMessage DELETE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("DELETE");
@@ -272,7 +272,7 @@ public class KeyStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage EXPIRING(String param1, String param2, String param3)
+ public static LogMessage EXPIRING(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("EXPIRING");
@@ -332,7 +332,7 @@ public class KeyStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPEN(String param1, String param2)
+ public static LogMessage OPEN(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("OPEN");
@@ -392,7 +392,7 @@ public class KeyStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage OPERATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("OPERATION");
@@ -452,7 +452,7 @@ public class KeyStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage UPDATE(String param1, String param2, String param3)
+ public static LogMessage UPDATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("UPDATE");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
index 453e22528d..ae44140421 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
@@ -92,7 +92,7 @@ public class ManagementConsoleMessages
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE(String param1)
+ public static LogMessage CLOSE(CharSequence param1)
{
String rawMessage = MESSAGES.getString("CLOSE");
@@ -152,7 +152,7 @@ public class ManagementConsoleMessages
* sequentially in the method call.
*
*/
- public static LogMessage LISTENING(String param1, String param2, Number param3)
+ public static LogMessage LISTENING(CharSequence param1, CharSequence param2, Number param3)
{
String rawMessage = MESSAGES.getString("LISTENING");
@@ -212,7 +212,7 @@ public class ManagementConsoleMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPEN(String param1)
+ public static LogMessage OPEN(CharSequence param1)
{
String rawMessage = MESSAGES.getString("OPEN");
@@ -272,7 +272,7 @@ public class ManagementConsoleMessages
* sequentially in the method call.
*
*/
- public static LogMessage READY(String param1)
+ public static LogMessage READY(CharSequence param1)
{
String rawMessage = MESSAGES.getString("READY");
@@ -332,7 +332,7 @@ public class ManagementConsoleMessages
* sequentially in the method call.
*
*/
- public static LogMessage SHUTTING_DOWN(String param1, Number param2)
+ public static LogMessage SHUTTING_DOWN(CharSequence param1, Number param2)
{
String rawMessage = MESSAGES.getString("SHUTTING_DOWN");
@@ -392,7 +392,7 @@ public class ManagementConsoleMessages
* sequentially in the method call.
*
*/
- public static LogMessage STARTUP(String param1)
+ public static LogMessage STARTUP(CharSequence param1)
{
String rawMessage = MESSAGES.getString("STARTUP");
@@ -452,7 +452,7 @@ public class ManagementConsoleMessages
* sequentially in the method call.
*
*/
- public static LogMessage STOPPED(String param1)
+ public static LogMessage STOPPED(CharSequence param1)
{
String rawMessage = MESSAGES.getString("STOPPED");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
index d01717df83..7cf417391c 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
@@ -429,7 +429,7 @@ public class MessageStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage STORE_LOCATION(String param1)
+ public static LogMessage STORE_LOCATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("STORE_LOCATION");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
index d7af34e964..5f5d1bf892 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
@@ -100,7 +100,7 @@ public class PortMessages
* sequentially in the method call.
*
*/
- public static LogMessage BIND_FAILED(String param1, Number param2)
+ public static LogMessage BIND_FAILED(CharSequence param1, Number param2)
{
String rawMessage = MESSAGES.getString("BIND_FAILED");
@@ -160,7 +160,7 @@ public class PortMessages
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE(String param1)
+ public static LogMessage CLOSE(CharSequence param1)
{
String rawMessage = MESSAGES.getString("CLOSE");
@@ -280,7 +280,7 @@ public class PortMessages
* sequentially in the method call.
*
*/
- public static LogMessage CONNECTION_REJECTED_CLOSED(String param1)
+ public static LogMessage CONNECTION_REJECTED_CLOSED(CharSequence param1)
{
String rawMessage = MESSAGES.getString("CONNECTION_REJECTED_CLOSED");
@@ -340,7 +340,7 @@ public class PortMessages
* sequentially in the method call.
*
*/
- public static LogMessage CONNECTION_REJECTED_TOO_MANY(String param1, Number param2)
+ public static LogMessage CONNECTION_REJECTED_TOO_MANY(CharSequence param1, Number param2)
{
String rawMessage = MESSAGES.getString("CONNECTION_REJECTED_TOO_MANY");
@@ -400,7 +400,7 @@ public class PortMessages
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1, String param2, String param3)
+ public static LogMessage CREATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("CREATE");
@@ -460,7 +460,7 @@ public class PortMessages
* sequentially in the method call.
*
*/
- public static LogMessage DELETE(String param1, String param2)
+ public static LogMessage DELETE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("DELETE");
@@ -520,7 +520,7 @@ public class PortMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPEN(String param1, String param2)
+ public static LogMessage OPEN(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("OPEN");
@@ -580,7 +580,7 @@ public class PortMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage OPERATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("OPERATION");
@@ -640,7 +640,7 @@ public class PortMessages
* sequentially in the method call.
*
*/
- public static LogMessage UNSUPPORTED_PROTOCOL_HEADER(String param1, String param2)
+ public static LogMessage UNSUPPORTED_PROTOCOL_HEADER(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("UNSUPPORTED_PROTOCOL_HEADER");
@@ -700,7 +700,7 @@ public class PortMessages
* sequentially in the method call.
*
*/
- public static LogMessage UPDATE(String param1, String param2, String param3)
+ public static LogMessage UPDATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("UPDATE");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
index d10b862ddf..703ce7708c 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
@@ -98,7 +98,7 @@ public class QueueMessages
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE(String param1)
+ public static LogMessage CLOSE(CharSequence param1)
{
String rawMessage = MESSAGES.getString("CLOSE");
@@ -158,7 +158,7 @@ public class QueueMessages
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1, String param2, String param3)
+ public static LogMessage CREATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("CREATE");
@@ -218,7 +218,7 @@ public class QueueMessages
* sequentially in the method call.
*
*/
- public static LogMessage DELETE(String param1, String param2)
+ public static LogMessage DELETE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("DELETE");
@@ -338,7 +338,7 @@ public class QueueMessages
* sequentially in the method call.
*
*/
- public static LogMessage MALFORMED_MESSAGE(String param1, String param2)
+ public static LogMessage MALFORMED_MESSAGE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("MALFORMED_MESSAGE");
@@ -398,7 +398,7 @@ public class QueueMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPEN(String param1, String param2)
+ public static LogMessage OPEN(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("OPEN");
@@ -458,7 +458,7 @@ public class QueueMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage OPERATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("OPERATION");
@@ -638,7 +638,7 @@ public class QueueMessages
* sequentially in the method call.
*
*/
- public static LogMessage UPDATE(String param1, String param2, String param3)
+ public static LogMessage UPDATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("UPDATE");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ResourceLimitMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ResourceLimitMessages.java
index c4ae9c8e44..39e0d848cd 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ResourceLimitMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ResourceLimitMessages.java
@@ -84,7 +84,7 @@ public class ResourceLimitMessages
* sequentially in the method call.
*
*/
- public static LogMessage ACCEPTED(String param1, String param2, String param3, String param4)
+ public static LogMessage ACCEPTED(CharSequence param1, CharSequence param2, CharSequence param3, CharSequence param4)
{
String rawMessage = MESSAGES.getString("ACCEPTED");
@@ -144,7 +144,7 @@ public class ResourceLimitMessages
* sequentially in the method call.
*
*/
- public static LogMessage INFO(String param1, String param2)
+ public static LogMessage INFO(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("INFO");
@@ -204,7 +204,7 @@ public class ResourceLimitMessages
* sequentially in the method call.
*
*/
- public static LogMessage REJECTED(String param1, String param2, String param3, String param4)
+ public static LogMessage REJECTED(CharSequence param1, CharSequence param2, CharSequence param3, CharSequence param4)
{
String rawMessage = MESSAGES.getString("REJECTED");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SenderMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SenderMessages.java
index 023b5ebf8c..da5aadfb36 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SenderMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SenderMessages.java
@@ -82,7 +82,7 @@ public class SenderMessages
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE(String param1, String param2)
+ public static LogMessage CLOSE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("CLOSE");
@@ -142,7 +142,7 @@ public class SenderMessages
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1, String param2)
+ public static LogMessage CREATE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("CREATE");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
index ee989f21e6..f837fc7f85 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
@@ -141,7 +141,7 @@ public class SubscriptionMessages
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1, boolean opt1, boolean opt2)
+ public static LogMessage CREATE(CharSequence param1, boolean opt1, boolean opt2)
{
String rawMessage = MESSAGES.getString("CREATE");
StringBuffer msg = new StringBuffer();
@@ -234,7 +234,7 @@ public class SubscriptionMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage OPERATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("OPERATION");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
index 8848d2462b..a625ef9a4c 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
@@ -204,7 +204,7 @@ public class TransactionLogMessages
* sequentially in the method call.
*
*/
- public static LogMessage RECOVERED(Number param1, String param2)
+ public static LogMessage RECOVERED(Number param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("RECOVERED");
@@ -264,7 +264,7 @@ public class TransactionLogMessages
* sequentially in the method call.
*
*/
- public static LogMessage RECOVERY_COMPLETE(String param1, boolean opt1)
+ public static LogMessage RECOVERY_COMPLETE(CharSequence param1, boolean opt1)
{
String rawMessage = MESSAGES.getString("RECOVERY_COMPLETE");
StringBuffer msg = new StringBuffer();
@@ -347,7 +347,7 @@ public class TransactionLogMessages
* sequentially in the method call.
*
*/
- public static LogMessage RECOVERY_START(String param1, boolean opt1)
+ public static LogMessage RECOVERY_START(CharSequence param1, boolean opt1)
{
String rawMessage = MESSAGES.getString("RECOVERY_START");
StringBuffer msg = new StringBuffer();
@@ -430,7 +430,7 @@ public class TransactionLogMessages
* sequentially in the method call.
*
*/
- public static LogMessage STORE_LOCATION(String param1)
+ public static LogMessage STORE_LOCATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("STORE_LOCATION");
@@ -490,7 +490,7 @@ public class TransactionLogMessages
* sequentially in the method call.
*
*/
- public static LogMessage XA_INCOMPLETE_MESSAGE(String param1, String param2)
+ public static LogMessage XA_INCOMPLETE_MESSAGE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("XA_INCOMPLETE_MESSAGE");
@@ -550,7 +550,7 @@ public class TransactionLogMessages
* sequentially in the method call.
*
*/
- public static LogMessage XA_INCOMPLETE_QUEUE(String param1, String param2)
+ public static LogMessage XA_INCOMPLETE_QUEUE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("XA_INCOMPLETE_QUEUE");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java
index 84665609de..1180f94020 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java
@@ -92,7 +92,7 @@ public class TrustStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE(String param1)
+ public static LogMessage CLOSE(CharSequence param1)
{
String rawMessage = MESSAGES.getString("CLOSE");
@@ -152,7 +152,7 @@ public class TrustStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1, String param2, String param3)
+ public static LogMessage CREATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("CREATE");
@@ -212,7 +212,7 @@ public class TrustStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage DELETE(String param1, String param2)
+ public static LogMessage DELETE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("DELETE");
@@ -272,7 +272,7 @@ public class TrustStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage EXPIRING(String param1, String param2, String param3)
+ public static LogMessage EXPIRING(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("EXPIRING");
@@ -332,7 +332,7 @@ public class TrustStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPEN(String param1, String param2)
+ public static LogMessage OPEN(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("OPEN");
@@ -392,7 +392,7 @@ public class TrustStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage OPERATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("OPERATION");
@@ -452,7 +452,7 @@ public class TrustStoreMessages
* sequentially in the method call.
*
*/
- public static LogMessage UPDATE(String param1, String param2, String param3)
+ public static LogMessage UPDATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("UPDATE");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/UserMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/UserMessages.java
index 29971c9b3c..28956fa5f5 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/UserMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/UserMessages.java
@@ -84,7 +84,7 @@ public class UserMessages
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1, String param2, String param3)
+ public static LogMessage CREATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("CREATE");
@@ -144,7 +144,7 @@ public class UserMessages
* sequentially in the method call.
*
*/
- public static LogMessage DELETE(String param1, String param2)
+ public static LogMessage DELETE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("DELETE");
@@ -204,7 +204,7 @@ public class UserMessages
* sequentially in the method call.
*
*/
- public static LogMessage UPDATE(String param1, String param2, String param3)
+ public static LogMessage UPDATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("UPDATE");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
index 0c6b7ebd43..438a0e8023 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
@@ -96,7 +96,7 @@ public class VirtualHostMessages
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE(String param1)
+ public static LogMessage CLOSE(CharSequence param1)
{
String rawMessage = MESSAGES.getString("CLOSE");
@@ -156,7 +156,7 @@ public class VirtualHostMessages
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1, String param2, String param3)
+ public static LogMessage CREATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("CREATE");
@@ -216,7 +216,7 @@ public class VirtualHostMessages
* sequentially in the method call.
*
*/
- public static LogMessage DELETE(String param1, String param2)
+ public static LogMessage DELETE(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("DELETE");
@@ -276,7 +276,7 @@ public class VirtualHostMessages
* sequentially in the method call.
*
*/
- public static LogMessage ERRORED(String param1)
+ public static LogMessage ERRORED(CharSequence param1)
{
String rawMessage = MESSAGES.getString("ERRORED");
@@ -456,7 +456,7 @@ public class VirtualHostMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPEN(String param1, String param2)
+ public static LogMessage OPEN(CharSequence param1, CharSequence param2)
{
String rawMessage = MESSAGES.getString("OPEN");
@@ -516,7 +516,7 @@ public class VirtualHostMessages
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage OPERATION(CharSequence param1)
{
String rawMessage = MESSAGES.getString("OPERATION");
@@ -576,7 +576,7 @@ public class VirtualHostMessages
* sequentially in the method call.
*
*/
- public static LogMessage UPDATE(String param1, String param2, String param3)
+ public static LogMessage UPDATE(CharSequence param1, CharSequence param2, CharSequence param3)
{
String rawMessage = MESSAGES.getString("UPDATE");
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java
index ef0577c9bc..fe2b440f19 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java
@@ -36,6 +36,8 @@ import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.User;
+import org.apache.qpid.server.util.ClearableCharSequence;
+import org.apache.qpid.server.util.Strings;
@ManagedObject( category = false, type = ManagedUser.MANAGED_USER_TYPE)
class ManagedUser extends AbstractConfiguredObject<ManagedUser> implements User<ManagedUser>
@@ -119,8 +121,11 @@ class ManagedUser extends AbstractConfiguredObject<ManagedUser> implements User<
@Override
protected void logCreated(final Map<String, Object> attributes, final Outcome outcome)
{
- ((Container<?>) _authenticationManager.getParent()).getEventLogger()
- .message(UserMessages.CREATE(getName(), outcome.name(), String.valueOf(getActualAttributes())));
+ try (ClearableCharSequence charSequence = Strings.toCharSequence(String.valueOf(getActualAttributes())))
+ {
+ ((Container<?>) _authenticationManager.getParent()).getEventLogger()
+ .message(UserMessages.CREATE(getName(), outcome.name(), charSequence));
+ }
}
@Override
@@ -133,7 +138,10 @@ class ManagedUser extends AbstractConfiguredObject<ManagedUser> implements User<
@Override
protected void logUpdated(final Map<String, Object> attributes, final Outcome outcome)
{
- ((Container<?>) _authenticationManager.getParent()).getEventLogger()
- .message(UserMessages.UPDATE(getName(), outcome.name(), String.valueOf(getActualAttributes())));
+ try (ClearableCharSequence charSequence = Strings.toCharSequence(String.valueOf(getActualAttributes())))
+ {
+ ((Container<?>) _authenticationManager.getParent()).getEventLogger()
+ .message(UserMessages.UPDATE(getName(), outcome.name(), charSequence));
+ }
}
}
diff --git a/broker-core/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java b/broker-core/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
index ad0f6e9acc..3e0c42507e 100644
--- a/broker-core/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
+++ b/broker-core/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
@@ -472,14 +472,14 @@ public class GenerateLogMessages
// The parameter type
String type;
- //Be default all types are Strings
+ // By default all types are CharSequence
if (typeIndex == -1 || typeIndexEnd == -1)
{
- type = "String";
+ type = "CharSequence";
}
else
{
- //Check string ',....}' for existence of number
+ // Check string ',....}' for existence of number
// to identify this parameter as an integer
// This allows for a style value to be present
// Only check the text inside the braces '{}'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org