This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch new-logging in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 79a2a2b0ee067008184fb308b9adc376ceb59d23 Author: Clebert Suconic <[email protected]> AuthorDate: Thu Jul 14 15:34:54 2022 -0400 Fixing up some {0} versus {} --- .../artemis/core/client/ActiveMQClientLogger.java | 62 +++++++++++----------- .../core/client/ActiveMQClientMessageBundle.java | 38 ++++++------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java index 5beb963958..c35e4fab22 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java @@ -46,19 +46,19 @@ public interface ActiveMQClientLogger { @LogMessage(id = 212004, value = "Failed to connect to server.", level = LogMessage.Level.WARN) void failedToConnectToServer(); - @LogMessage(id = 212005, value = "Tried {0} times to connect. Now giving up on reconnecting it.", level = LogMessage.Level.WARN) + @LogMessage(id = 212005, value = "Tried {} times to connect. Now giving up on reconnecting it.", level = LogMessage.Level.WARN) void failedToConnectToServer(Integer reconnectAttempts); @LogMessage(id = 212007, value = "connector.create or connectorFactory.createConnector should never throw an exception, implementation is badly behaved, but we will deal with it anyway.", level = LogMessage.Level.WARN) void createConnectorException(@Cause Exception e); - @LogMessage(id = 212008, value = "I am closing a core ClientSessionFactory you left open. Please make sure you close all ClientSessionFactories explicitly " + "before letting them go out of scope! {0}", level = LogMessage.Level.WARN) + @LogMessage(id = 212008, value = "I am closing a core ClientSessionFactory you left open. Please make sure you close all ClientSessionFactories explicitly " + "before letting them go out of scope! {}", level = LogMessage.Level.WARN) void factoryLeftOpen(@Cause Exception e, int i); @LogMessage(id = 212009, value = "resetting session after failure", level = LogMessage.Level.WARN) void resettingSessionAfterFailure(); - @LogMessage(id = 212010, value = "Server is starting, retry to create the session {0}", level = LogMessage.Level.WARN) + @LogMessage(id = 212010, value = "Server is starting, retry to create the session {}", level = LogMessage.Level.WARN) void retryCreateSessionSeverStarting(String name); @LogMessage(id = 212011, value = "committing transaction after failover occurred, any non persistent messages may be lost", level = LogMessage.Level.WARN) @@ -73,7 +73,7 @@ public interface ActiveMQClientLogger { @LogMessage(id = 212015, value = "failover occurred during prepare rolling back", level = LogMessage.Level.WARN) void errorDuringPrepare(@Cause Throwable e); - @LogMessage(id = 212016, value = "I am closing a core ClientSession you left open. Please make sure you close all ClientSessions explicitly before letting them go out of scope! {0}", level = LogMessage.Level.WARN) + @LogMessage(id = 212016, value = "I am closing a core ClientSession you left open. Please make sure you close all ClientSessions explicitly before letting them go out of scope! {}", level = LogMessage.Level.WARN) void clientSessionNotClosed(@Cause Exception e, int identity); @LogMessage(id = 212017, value = "error adding packet", level = LogMessage.Level.WARN) @@ -125,19 +125,19 @@ public interface ActiveMQClientLogger { @LogMessage(id = 212033, value = "unable to send notification when discovery group is stopped", level = LogMessage.Level.WARN) void errorSendingNotifOnDiscoveryStop(@Cause Throwable e); - @LogMessage(id = 212034, value = "There are more than one servers on the network broadcasting the same node id. " + "You will see this message exactly once (per node) if a node is restarted, in which case it can be safely " + "ignored. But if it is logged continuously it means you really do have more than one node on the same network " + "active concurrently with the same node id. This could occur if you have a backup node active at the same time as " + "its live node. nodeID={0}", le [...] + @LogMessage(id = 212034, value = "There are more than one servers on the network broadcasting the same node id. " + "You will see this message exactly once (per node) if a node is restarted, in which case it can be safely " + "ignored. But if it is logged continuously it means you really do have more than one node on the same network " + "active concurrently with the same node id. This could occur if you have a backup node active at the same time as " + "its live node. nodeID={}", lev [...] void multipleServersBroadcastingSameNode(String nodeId); @LogMessage(id = 212035, value = "error receiving packet in discovery", level = LogMessage.Level.WARN) void errorReceivingPacketInDiscovery(@Cause Throwable e); - @LogMessage(id = 212036, value = "Can not find packet to clear: {0} last received command id first stored command id {1}", level = LogMessage.Level.WARN) + @LogMessage(id = 212036, value = "Can not find packet to clear: {} last received command id first stored command id {}", level = LogMessage.Level.WARN) void cannotFindPacketToClear(Integer lastReceivedCommandID, Integer firstStoredCommandID); - @LogMessage(id = 212037, value = "Connection failure to {0} has been detected: {1} [code={2}]", level = LogMessage.Level.WARN) + @LogMessage(id = 212037, value = "Connection failure to {} has been detected: {} [code={}]", level = LogMessage.Level.WARN) void connectionFailureDetected(String remoteAddress, String message, ActiveMQExceptionType type); - @LogMessage(id = 212038, value = "Failure in calling interceptor: {0}", level = LogMessage.Level.WARN) + @LogMessage(id = 212038, value = "Failure in calling interceptor: {}", level = LogMessage.Level.WARN) void errorCallingInterceptor(@Cause Throwable e, Interceptor interceptor); @LogMessage(id = 212040, value = "Timed out waiting for netty ssl close future to complete", level = LogMessage.Level.WARN) @@ -149,34 +149,34 @@ public interface ActiveMQClientLogger { @LogMessage(id = 212042, value = "Timed out waiting for packet to be flushed", level = LogMessage.Level.WARN) void timeoutFlushingPacket(); - @LogMessage(id = 212043, value = "Property {0} must be an Integer, it is {1}", level = LogMessage.Level.WARN) + @LogMessage(id = 212043, value = "Property {} must be an Integer, it is {}", level = LogMessage.Level.WARN) void propertyNotInteger(String propName, String name); - @LogMessage(id = 212044, value = "Property {0} must be a Long, it is {1}", level = LogMessage.Level.WARN) + @LogMessage(id = 212044, value = "Property {} must be a Long, it is {}", level = LogMessage.Level.WARN) void propertyNotLong(String propName, String name); - @LogMessage(id = 212045, value = "Property {0} must be a Boolean, it is {1}", level = LogMessage.Level.WARN) + @LogMessage(id = 212045, value = "Property {} must be a Boolean, it is {}", level = LogMessage.Level.WARN) void propertyNotBoolean(String propName, String name); - @LogMessage(id = 212046, value = "Cannot find activemq-version.properties on classpath: {0}", level = LogMessage.Level.WARN) + @LogMessage(id = 212046, value = "Cannot find activemq-version.properties on classpath: {}", level = LogMessage.Level.WARN) void noVersionOnClasspath(String classpath); - @LogMessage(id = 212047, value = "Warning: JVM allocated more data what would make results invalid {0}:{1}", level = LogMessage.Level.WARN) + @LogMessage(id = 212047, value = "Warning: JVM allocated more data what would make results invalid {}:{}", level = LogMessage.Level.WARN) void jvmAllocatedMoreMemory(Long totalMemory1, Long totalMemory2); - @LogMessage(id = 212048, value = "Random address ({0}) was already in use, trying another time", level = LogMessage.Level.WARN) + @LogMessage(id = 212048, value = "Random address ({}) was already in use, trying another time", level = LogMessage.Level.WARN) void broadcastGroupBindErrorRetry(String hostAndPort, @Cause Throwable t); - @LogMessage(id = 212049, value = "Could not bind to {0} ({1} address); " + "make sure your discovery group-address is of the same type as the IP stack (IPv4 or IPv6)." + "\nIgnoring discovery group-address, but this may lead to cross talking.", level = LogMessage.Level.WARN) + @LogMessage(id = 212049, value = "Could not bind to {} ({} address); " + "make sure your discovery group-address is of the same type as the IP stack (IPv4 or IPv6)." + "\nIgnoring discovery group-address, but this may lead to cross talking.", level = LogMessage.Level.WARN) void ioDiscoveryError(String hostAddress, String s); - @LogMessage(id = 212050, value = "Compressed large message tried to read {0} bytes from stream {1}", level = LogMessage.Level.WARN) + @LogMessage(id = 212050, value = "Compressed large message tried to read {} bytes from stream {}", level = LogMessage.Level.WARN) void compressedLargeMessageError(int length, int nReadBytes); @LogMessage(id = 212051, value = "Invalid concurrent session usage. Sessions are not supposed to be used by more than one thread concurrently.", level = LogMessage.Level.WARN) void invalidConcurrentSessionUsage(@Cause Throwable t); - @LogMessage(id = 212052, value = "Packet {0} was answered out of sequence due to a previous server timeout and it''s being ignored", level = LogMessage.Level.WARN) + @LogMessage(id = 212052, value = "Packet {} was answered out of sequence due to a previous server timeout and it''s being ignored", level = LogMessage.Level.WARN) void packetOutOfOrder(Object obj, @Cause Throwable t); /** @@ -187,13 +187,13 @@ public interface ActiveMQClientLogger { @LogMessage(id = 212053, value = "CompletionListener/SendAcknowledgementHandler used with confirmationWindowSize=-1. Enable confirmationWindowSize to receive acks from server!", level = LogMessage.Level.WARN) void confirmationWindowDisabledWarning(); - @LogMessage(id = 212054, value = "Destination address={0} is blocked. If the system is configured to block make sure you consume messages on this configuration.", level = LogMessage.Level.WARN) + @LogMessage(id = 212054, value = "Destination address={} is blocked. If the system is configured to block make sure you consume messages on this configuration.", level = LogMessage.Level.WARN) void outOfCreditOnFlowControl(String address); @LogMessage(id = 212055, value = "Unable to close consumer", level = LogMessage.Level.WARN) void unableToCloseConsumer(@Cause Exception e); - @LogMessage(id = 212056, value = "local-bind-address specified for broadcast group but no local-bind-port. Using random port for UDP Broadcast ({0})", level = LogMessage.Level.WARN) + @LogMessage(id = 212056, value = "local-bind-address specified for broadcast group but no local-bind-port. Using random port for UDP Broadcast ({})", level = LogMessage.Level.WARN) void broadcastGroupBindError(String hostAndPort); @LogMessage(id = 212057, value = "Large Message Streaming is taking too long to flush on back pressure.", level = LogMessage.Level.WARN) @@ -202,7 +202,7 @@ public interface ActiveMQClientLogger { @LogMessage(id = 212058, value = "Unable to get a message.", level = LogMessage.Level.WARN) void unableToGetMessage(@Cause Exception e); - @LogMessage(id = 212059, value = "Failed to clean up: {0} ", level = LogMessage.Level.WARN) + @LogMessage(id = 212059, value = "Failed to clean up: {} ", level = LogMessage.Level.WARN) void failedCleaningUp(String target); @LogMessage(id = 212060, value = "Unexpected null data received from DiscoveryEndpoint ", level = LogMessage.Level.WARN) @@ -220,7 +220,7 @@ public interface ActiveMQClientLogger { @LogMessage(id = 212064, value = "Unable to receive cluster topology ", level = LogMessage.Level.WARN) void unableToReceiveClusterTopology(@Cause Throwable e); - @LogMessage(id = 212065, value = "{0} getting exception when receiving broadcasting ", level = LogMessage.Level.WARN) + @LogMessage(id = 212065, value = "{} getting exception when receiving broadcasting ", level = LogMessage.Level.WARN) void unableToReceiveBroadcast(@Cause Exception e, String target); @LogMessage(id = 212066, value = "failed to parse int property ", level = LogMessage.Level.WARN) @@ -253,13 +253,13 @@ public interface ActiveMQClientLogger { @LogMessage(id = 212076, value = "Epoll is not available, please add to the classpath or configure useEpoll=false to remove this warning", level = LogMessage.Level.WARN) void unableToCheckEpollAvailabilitynoClass(); - @LogMessage(id = 212077, value = "Timed out waiting to receive initial broadcast from cluster. Retry {0} of {1}", level = LogMessage.Level.WARN) + @LogMessage(id = 212077, value = "Timed out waiting to receive initial broadcast from cluster. Retry {} of {}", level = LogMessage.Level.WARN) void broadcastTimeout(int retry, int maxretry); - @LogMessage(id = 212079, value = "The upstream connector from the downstream federation will ignore url parameter {0}", level = LogMessage.Level.WARN) + @LogMessage(id = 212079, value = "The upstream connector from the downstream federation will ignore url parameter {}", level = LogMessage.Level.WARN) void ignoredParameterForDownstreamFederation(String name); - @LogMessage(id = 212080, value = "Using legacy SSL store provider value: {0}. Please use either ''keyStoreType'' or ''trustStoreType'' instead as appropriate.", level = LogMessage.Level.WARN) + @LogMessage(id = 212080, value = "Using legacy SSL store provider value: {}. Please use either ''keyStoreType'' or ''trustStoreType'' instead as appropriate.", level = LogMessage.Level.WARN) void oldStoreProvider(String value); @LogMessage(id = 214000, value = "Failed to call onMessage", level = LogMessage.Level.ERROR) @@ -277,7 +277,7 @@ public interface ActiveMQClientLogger { @LogMessage(id = 214004, value = "XA end operation failed ", level = LogMessage.Level.ERROR) void errorCallingEnd(@Cause Throwable t); - @LogMessage(id = 214005, value = "XA start operation failed {0} code:{1}", level = LogMessage.Level.ERROR) + @LogMessage(id = 214005, value = "XA start operation failed {} code:{}", level = LogMessage.Level.ERROR) void errorCallingStart(String message, Integer code); @LogMessage(id = 214006, value = "Session is not XA", level = LogMessage.Level.ERROR) @@ -313,28 +313,28 @@ public interface ActiveMQClientLogger { @LogMessage(id = 214017, value = "Caught unexpected Throwable", level = LogMessage.Level.ERROR) void caughtunexpectedThrowable(@Cause Throwable t); - @LogMessage(id = 214018, value = "Failed to invoke getTextContent() on node {0}", level = LogMessage.Level.ERROR) + @LogMessage(id = 214018, value = "Failed to invoke getTextContent() on node {}", level = LogMessage.Level.ERROR) void errorOnXMLTransform(@Cause Throwable t, Node n); @LogMessage(id = 214019, value = "Invalid configuration", level = LogMessage.Level.ERROR) void errorOnXMLTransformInvalidConf(@Cause Throwable t); - @LogMessage(id = 214020, value = "Exception happened while stopping Discovery BroadcastEndpoint {0}", level = LogMessage.Level.ERROR) + @LogMessage(id = 214020, value = "Exception happened while stopping Discovery BroadcastEndpoint {}", level = LogMessage.Level.ERROR) void errorStoppingDiscoveryBroadcastEndpoint(Object endpoint, @Cause Throwable t); - @LogMessage(id = 214021, value = "Invalid cipher suite specified. Supported cipher suites are: {0}", level = LogMessage.Level.ERROR) + @LogMessage(id = 214021, value = "Invalid cipher suite specified. Supported cipher suites are: {}", level = LogMessage.Level.ERROR) void invalidCipherSuite(String validSuites); - @LogMessage(id = 214022, value = "Invalid protocol specified. Supported protocols are: {0}", level = LogMessage.Level.ERROR) + @LogMessage(id = 214022, value = "Invalid protocol specified. Supported protocols are: {}", level = LogMessage.Level.ERROR) void invalidProtocol(String validProtocols); - @LogMessage(id = 214025, value = "Invalid type {0}, Using default connection factory at {1}", level = LogMessage.Level.ERROR) + @LogMessage(id = 214025, value = "Invalid type {}, Using default connection factory at {}", level = LogMessage.Level.ERROR) void invalidCFType(String type, String uri); @LogMessage(id = 214029, value = "Unexpected response from HTTP server: %s", level = LogMessage.Level.ERROR) void unexpectedResponseFromHttpServer(Object response); - @LogMessage(id = 214030, value = "Failed to bind {0}={1}", level = LogMessage.Level.ERROR) + @LogMessage(id = 214030, value = "Failed to bind {}={}", level = LogMessage.Level.ERROR) void failedToBind(String p1, String p2, @Cause Throwable cause); @LogMessage(id = 214031, value = "Failed to decode buffer, disconnect immediately.", level = LogMessage.Level.ERROR) diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java index 219c184de4..753b46fa06 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java @@ -81,16 +81,16 @@ public interface ActiveMQClientMessageBundle { @Message(id = 219010, value = "Connection is destroyed") ActiveMQNotConnectedException connectionDestroyed(); - @Message(id = 219011, value = "Did not receive data from server for {0}") + @Message(id = 219011, value = "Did not receive data from server for {}") ActiveMQConnectionTimedOutException connectionTimedOut(Connection transportConnection); @Message(id = 219012, value = "Timed out waiting to receive initial broadcast from cluster") ActiveMQConnectionTimedOutException connectionTimedOutInInitialBroadcast(); - @Message(id = 219013, value = "Timed out waiting to receive cluster topology. Group:{0}") + @Message(id = 219013, value = "Timed out waiting to receive cluster topology. Group:{}") ActiveMQConnectionTimedOutException connectionTimedOutOnReceiveTopology(DiscoveryGroup discoveryGroup); - @Message(id = 219014, value = "Timed out after waiting {0} ms for response when sending packet {1}") + @Message(id = 219014, value = "Timed out after waiting {} ms for response when sending packet {}") ActiveMQConnectionTimedOutException timedOutSendingPacket(long timeout, Byte type); @Message(id = 219015, value = "The connection was disconnected because of server shutdown") @@ -114,7 +114,7 @@ public interface ActiveMQClientMessageBundle { @Message(id = 219021, value = "Cannot set MessageHandler - consumer is in receive(...)") ActiveMQIllegalStateException inReceive(); - @Message(id = 219022, value = "Header size ({0}) is too big, use the messageBody for large data, or increase minLargeMessageSize") + @Message(id = 219022, value = "Header size ({}) is too big, use the messageBody for large data, or increase minLargeMessageSize") ActiveMQIllegalStateException headerSizeTooBig(Integer headerSize); @Message(id = 219023, value = "The large message lost connection with its session, either because of a rollback or a closed session") @@ -144,22 +144,22 @@ public interface ActiveMQClientMessageBundle { @Message(id = 219031, value = "The transaction was rolled back on failover however commit may have been successful") ActiveMQTransactionOutcomeUnknownException txOutcomeUnknown(); - @Message(id = 219032, value = "Invalid type: {0}") + @Message(id = 219032, value = "Invalid type: {}") IllegalArgumentException invalidType(Object type); - @Message(id = 219033, value = "Invalid type: {0}") + @Message(id = 219033, value = "Invalid type: {}") IllegalArgumentException invalidEncodeType(Object type); - @Message(id = 219034, value = "Params for management operations must be of the following type: int long double String boolean Map or array thereof but found {0}") + @Message(id = 219034, value = "Params for management operations must be of the following type: int long double String boolean Map or array thereof but found {}") IllegalArgumentException invalidManagementParam(Object type); - @Message(id = 219035, value = "Invalid window size {0}") + @Message(id = 219035, value = "Invalid window size {}") IllegalArgumentException invalidWindowSize(Integer size); - @Message(id = 219037, value = "Invalid last Received Command ID: {0}") + @Message(id = 219037, value = "Invalid last Received Command ID: {}") IllegalArgumentException invalidCommandID(Integer lastReceivedCommandID); - @Message(id = 219038, value = "Cannot find channel with id {0} to close") + @Message(id = 219038, value = "Cannot find channel with id {} to close") IllegalArgumentException noChannelToClose(Long id); @Message(id = 219039, value = "Close Listener cannot be null") @@ -168,7 +168,7 @@ public interface ActiveMQClientMessageBundle { @Message(id = 219040, value = "Fail Listener cannot be null") IllegalArgumentException failListenerCannotBeNull(); - @Message(id = 219041, value = "Connection already exists with id {0}") + @Message(id = 219041, value = "Connection already exists with id {}") IllegalArgumentException connectionExists(Object id); @Message(id = 219042, value = "Invalid argument null listener") @@ -189,7 +189,7 @@ public interface ActiveMQClientMessageBundle { @Message(id = 219048, value = "nodes have a different number of attributes") IllegalArgumentException nodeHaveDifferentAttNumber(); - @Message(id = 219049, value = "attribute {0}={1} does not match") + @Message(id = 219049, value = "attribute {}={} does not match") IllegalArgumentException attsDontMatch(String name, String value); @Message(id = 219050, value = "one node has children and the other does not") @@ -198,25 +198,25 @@ public interface ActiveMQClientMessageBundle { @Message(id = 219051, value = "nodes have a different number of children") IllegalArgumentException nodeHasDifferentChildNumber(); - @Message(id = 219052, value = "Element {0} requires a valid Boolean value, but ''{1}'' cannot be parsed as a Boolean") + @Message(id = 219052, value = "Element {} requires a valid Boolean value, but ''{}'' cannot be parsed as a Boolean") IllegalArgumentException mustBeBoolean(Node elem, String value); - @Message(id = 219053, value = "Element {0} requires a valid Double value, but ''{1}'' cannot be parsed as a Double") + @Message(id = 219053, value = "Element {} requires a valid Double value, but ''{}'' cannot be parsed as a Double") IllegalArgumentException mustBeDouble(Node elem, String value); - @Message(id = 219054, value = "Element {0} requires a valid Integer value, but ''{1}'' cannot be parsed as an Integer") + @Message(id = 219054, value = "Element {} requires a valid Integer value, but ''{}'' cannot be parsed as an Integer") IllegalArgumentException mustBeInteger(Node elem, String value); - @Message(id = 219055, value = "Element {0} requires a valid Long value, but ''{1}'' cannot be parsed as a Long") + @Message(id = 219055, value = "Element {} requires a valid Long value, but ''{}'' cannot be parsed as a Long") IllegalArgumentException mustBeLong(Node element, String value); @Message(id = 219057, value = "Error decoding password") IllegalArgumentException errordecodingPassword(@Cause Exception e); - @Message(id = 219058, value = "Address \"{0}\" is full. Message encode size = {1}B") + @Message(id = 219058, value = "Address \"{}\" is full. Message encode size = {}B") ActiveMQAddressFullException addressIsFull(String addressName, int size); - @Message(id = 219059, value = "Interceptor {0} rejected packet in a blocking call. This call will never complete.") + @Message(id = 219059, value = "Interceptor {} rejected packet in a blocking call. This call will never complete.") ActiveMQInterceptorRejectedPacketException interceptorRejectedPacket(String interceptionResult); @Message(id = 219060, value = "Large Message Transmission interrupted on consumer shutdown.") @@ -231,7 +231,7 @@ public interface ActiveMQClientMessageBundle { @Message(id = 219063, value = "Cannot send a packet while response cache is full.") IllegalStateException cannotSendPacketWhilstResponseCacheFull(); - @Message(id = 219064, value = "Invalide packet: {0}") + @Message(id = 219064, value = "Invalide packet: {}") IllegalStateException invalidPacket(byte type); @Message(id = 219065, value = "Failed to handle packet.")
