This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new c2820ac7fc ARTEMIS-5535 use Objects.toString() instead of ternary
operator
c2820ac7fc is described below
commit c2820ac7fc69226d298a1c7103772a0b4105ac59
Author: Justin Bertram <[email protected]>
AuthorDate: Wed Jun 11 14:32:02 2025 -0500
ARTEMIS-5535 use Objects.toString() instead of ternary operator
---
.../core/impl/ActiveMQClientProtocolManager.java | 4 +--
.../activemq/artemis/reader/MessageUtil.java | 4 +--
.../activemq/artemis/utils/BufferHelper.java | 5 ++--
.../jdbc/store/sql/PropertySQLProvider.java | 3 ++-
.../artemis/jms/client/ActiveMQDestination.java | 5 ++--
.../artemis/jms/client/ActiveMQQueueBrowser.java | 3 ++-
.../artemis/protocol/amqp/broker/AMQPMessage.java | 5 ++--
.../bridge/AMQPBridgeSenderControlType.java | 2 +-
.../AMQPFederationProducerControlType.java | 2 +-
.../protocol/amqp/converter/AmqpCoreConverter.java | 3 ++-
.../protocol/stomp/VersionedStompFrameHandler.java | 4 +--
.../core/config/CoreQueueConfiguration.java | 12 ++++-----
.../management/impl/ActiveMQServerControlImpl.java | 10 ++++----
.../impl/ConnectionRouterControlImpl.java | 3 ++-
.../core/management/impl/QueueControlImpl.java | 12 ++++-----
.../config/PersistedSecuritySetting.java | 30 ++++++++++------------
.../artemis/core/protocol/ProtocolHandler.java | 3 ++-
.../protocol/core/ServerSessionPacketHandler.java | 2 +-
.../cluster/impl/ClusterConnectionBridge.java | 7 ++---
.../server/cluster/impl/ClusterConnectionImpl.java | 4 +--
.../artemis/core/server/impl/QueueImpl.java | 2 +-
.../server/impl/ServerLegacyProducersImpl.java | 3 ++-
.../core/server/impl/ServerSessionImpl.java | 6 ++---
.../artemis/core/server/impl/ServerStatus.java | 3 ++-
.../quorum/ActivationSequenceStateMachine.java | 6 ++---
.../apache/activemq/ActiveMQConnectionFactory.java | 2 +-
26 files changed, 75 insertions(+), 70 deletions(-)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
index 18c3fb4620..1b3671e8e0 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
@@ -17,6 +17,7 @@
package org.apache.activemq.artemis.core.protocol.core.impl;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
@@ -499,8 +500,7 @@ public class ActiveMQClientProtocolManager implements
ClientProtocolManager {
private void handleDisconnect(SimpleString nodeID, DisconnectReason
reason, SimpleString targetNodeID, TransportConfiguration tagetConnector) {
if (topologyResponseHandler != null) {
- topologyResponseHandler.nodeDisconnected(conn, nodeID == null ?
null : nodeID.toString(), reason,
- targetNodeID == null ? null : targetNodeID.toString(),
tagetConnector);
+ topologyResponseHandler.nodeDisconnected(conn,
Objects.toString(nodeID, null), reason, Objects.toString(targetNodeID, null),
tagetConnector);
}
}
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java
index 8c626cb208..36adf4df29 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/reader/MessageUtil.java
@@ -260,11 +260,11 @@ public class MessageUtil {
public static void setObjectProperty(final Message message, final String
name, final Object value) {
if (MessageUtil.JMSXGROUPID.equals(name)) {
- message.setGroupID(value == null ? null : value.toString());
+ message.setGroupID(Objects.toString(value, null));
} else if (MessageUtil.JMSXGROUPSEQ.equals(name)) {
message.setGroupSequence(getInteger(value));
} else if (MessageUtil.JMSXUSERID.equals(name)) {
- message.setValidatedUserID(value == null ? null : value.toString());
+ message.setValidatedUserID(Objects.toString(value, null));
} else {
message.putObjectProperty(name, value);
}
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/BufferHelper.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/BufferHelper.java
index 695050b4c9..475982af25 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/BufferHelper.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/BufferHelper.java
@@ -16,6 +16,8 @@
*/
package org.apache.activemq.artemis.utils;
+import java.util.Objects;
+
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQInvalidBufferException;
import org.apache.activemq.artemis.api.core.SimpleString;
@@ -49,8 +51,7 @@ public class BufferHelper {
}
public static String readNullableSimpleStringAsString(ActiveMQBuffer
buffer) {
- SimpleString str = buffer.readNullableSimpleString();
- return str != null ? str.toString() : null;
+ return Objects.toString(buffer.readNullableSimpleString(), null);
}
public static void writeAsSimpleString(ActiveMQBuffer buffer, String str) {
diff --git
a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/sql/PropertySQLProvider.java
b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/sql/PropertySQLProvider.java
index 2549db4ff9..ccf7caf6d2 100644
---
a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/sql/PropertySQLProvider.java
+++
b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/sql/PropertySQLProvider.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
import java.util.function.Function;
import java.util.stream.Stream;
@@ -312,7 +313,7 @@ public class PropertySQLProvider implements SQLProvider {
}
String result = sql.getProperty(key);
if (checkNull && result == null) {
- throw ActiveMQJournalBundle.BUNDLE.propertyNotFound(key, dialect !=
null ? dialect.toString() : null);
+ throw ActiveMQJournalBundle.BUNDLE.propertyNotFound(key,
Objects.toString(dialect, null));
}
return result;
}
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
index a911668431..af8801e077 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
@@ -20,6 +20,7 @@ import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.JMSRuntimeException;
import java.io.Serializable;
+import java.util.Objects;
import java.util.Properties;
import java.util.UUID;
@@ -352,7 +353,7 @@ public class ActiveMQDestination extends JNDIStorable
implements Destination, Se
this.name = name;
- this.address = simpleAddress != null ? simpleAddress.toString() : null;
+ this.address = Objects.toString(simpleAddress, null);
}
public void setAddress(String address) {
@@ -427,7 +428,7 @@ public class ActiveMQDestination extends JNDIStorable
implements Destination, Se
public String getAddress() {
- return simpleAddress != null ? simpleAddress.toString() : null;
+ return Objects.toString(simpleAddress, null);
}
public SimpleString getSimpleAddress() {
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
index 0466ad29f8..46b801bf27 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
@@ -21,6 +21,7 @@ import javax.jms.Queue;
import javax.jms.QueueBrowser;
import java.util.Enumeration;
import java.util.NoSuchElementException;
+import java.util.Objects;
import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.SimpleString;
@@ -93,7 +94,7 @@ public final class ActiveMQQueueBrowser implements
QueueBrowser {
@Override
public String getMessageSelector() throws JMSException {
- return filterString == null ? null : filterString.toString();
+ return Objects.toString(filterString, null);
}
@Override
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
index aa4dadcedf..e078fdb236 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -1242,8 +1242,7 @@ public abstract class AMQPMessage extends RefCountMessage
implements org.apache.
@Override
public final String getAddress() {
- SimpleString addressSimpleString = getAddressSimpleString();
- return addressSimpleString == null ? null :
addressSimpleString.toString();
+ return Objects.toString(getAddressSimpleString(), null);
}
@Override
@@ -1344,7 +1343,7 @@ public abstract class AMQPMessage extends RefCountMessage
implements org.apache.
properties = new Properties();
}
- properties.setReplyTo(address != null ? address.toString() : null);
+ properties.setReplyTo(Objects.toString(address, null));
return this;
}
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeSenderControlType.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeSenderControlType.java
index 06e115f62b..563f7f9a93 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeSenderControlType.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeSenderControlType.java
@@ -56,7 +56,7 @@ public class AMQPBridgeSenderControlType extends
AbstractControl implements AMQP
this.routingType = consumer.getQueueType();
this.fqqn = CompositeAddress.toFullyQualified(address, queue);
this.priority = consumer.getPriority();
- this.filterString = consumer.getFilterString() == null ? null :
consumer.getFilterString().toString();
+ this.filterString = Objects.toString(consumer.getFilterString(), null);
}
@Override
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationProducerControlType.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationProducerControlType.java
index 7e4e11c1d5..07ffa47493 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationProducerControlType.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationProducerControlType.java
@@ -56,7 +56,7 @@ public class AMQPFederationProducerControlType extends
AbstractControl implement
this.routingType = consumer.getQueueType();
this.fqqn = CompositeAddress.toFullyQualified(address, queue);
this.priority = consumer.getPriority();
- this.filterString = consumer.getFilterString() == null ? null :
consumer.getFilterString().toString();
+ this.filterString = Objects.toString(consumer.getFilterString(), null);
}
@Override
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
index f2fb3e9d6a..6099accf75 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
@@ -57,6 +57,7 @@ import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.UUID;
@@ -116,7 +117,7 @@ public class AmqpCoreConverter {
public static ICoreMessage toCore(AMQPMessage message,
CoreMessageObjectPools coreMessageObjectPools, Header header,
MessageAnnotations annotations, Properties properties, ApplicationProperties
applicationProperties, Section body, Footer footer) throws ConversionException {
final long messageId = message.getMessageID();
final Symbol contentType = properties != null ?
properties.getContentType() : null;
- final String contentTypeString = contentType != null ?
contentType.toString() : null;
+ final String contentTypeString = Objects.toString(contentType, null);
CoreMessageWrapper result;
diff --git
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
index 24ffb78de8..1f09cc9c6b 100644
---
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
+++
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
@@ -18,6 +18,7 @@ package org.apache.activemq.artemis.core.protocol.stomp;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
+import java.util.Objects;
import java.util.concurrent.ScheduledExecutorService;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
@@ -307,8 +308,7 @@ public abstract class VersionedStompFrameHandler {
if (destination == null) {
return null;
}
- SimpleString prefix =
connection.getSession().getCoreSession().getPrefix(SimpleString.of(destination));
- return prefix == null ? null : prefix.toString();
+ return
Objects.toString(connection.getSession().getCoreSession().getPrefix(SimpleString.of(destination)),
null);
}
public StompFrame postprocess(StompFrame request) {
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
index d5bc8625cf..5ab4eed039 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
@@ -157,17 +157,17 @@ public class CoreQueueConfiguration implements
Serializable {
public static CoreQueueConfiguration
fromQueueConfiguration(QueueConfiguration queueConfiguration) {
return new CoreQueueConfiguration()
- .setAddress(queueConfiguration.getAddress() != null ?
queueConfiguration.getAddress().toString() : null)
- .setName(queueConfiguration.getName() != null ?
queueConfiguration.getName().toString() : null)
- .setFilterString(queueConfiguration.getFilterString() != null ?
queueConfiguration.getFilterString().toString() : null)
+ .setAddress(Objects.toString(queueConfiguration.getAddress(), null))
+ .setName(Objects.toString(queueConfiguration.getName(), null))
+
.setFilterString(Objects.toString(queueConfiguration.getFilterString(), null))
.setDurable(Objects.requireNonNullElse(queueConfiguration.isDurable(), true))
- .setUser(queueConfiguration.getUser() != null ?
queueConfiguration.getUser().toString() : null)
+ .setUser(Objects.toString(queueConfiguration.getUser(), null))
.setExclusive(queueConfiguration.isExclusive())
.setGroupRebalance(queueConfiguration.isGroupRebalance())
.setGroupBuckets(queueConfiguration.getGroupBuckets())
- .setGroupFirstKey(queueConfiguration.getGroupFirstKey() != null ?
queueConfiguration.getGroupFirstKey().toString() : null)
+
.setGroupFirstKey(Objects.toString(queueConfiguration.getGroupFirstKey(), null))
.setLastValue(queueConfiguration.isLastValue())
- .setLastValueKey(queueConfiguration.getLastValueKey() != null ?
queueConfiguration.getLastValueKey().toString() : null)
+
.setLastValueKey(Objects.toString(queueConfiguration.getLastValueKey(), null))
.setNonDestructive(queueConfiguration.isNonDestructive())
.setMaxConsumers(queueConfiguration.getMaxConsumers())
.setConsumersBeforeDispatch(queueConfiguration.getConsumersBeforeDispatch())
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index 55ede404fc..22a877be5c 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -1100,7 +1100,7 @@ public class ActiveMQServerControlImpl extends
AbstractControl implements Active
addressSettings.isDefaultGroupRebalance(),
addressSettings.getDefaultGroupBuckets(),
addressSettings.isDefaultLastValueQueue(),
- addressSettings.getDefaultLastValueKey() == null ? null :
addressSettings.getDefaultLastValueKey().toString(),
+ Objects.toString(addressSettings.getDefaultLastValueKey(), null),
addressSettings.isDefaultNonDestructive(),
addressSettings.getDefaultConsumersBeforeDispatch(),
addressSettings.getDefaultDelayBeforeDispatch(),
@@ -1183,7 +1183,7 @@ public class ActiveMQServerControlImpl extends
AbstractControl implements Active
exclusive,
groupRebalance,
groupBuckets,
- addressSettings.getDefaultGroupFirstKey() == null ? null :
addressSettings.getDefaultGroupFirstKey().toString(),
+ Objects.toString(addressSettings.getDefaultGroupFirstKey(), null),
lastValue,
lastValueKey,
nonDestructive,
@@ -3172,12 +3172,12 @@ public class ActiveMQServerControlImpl extends
AbstractControl implements Active
AddressSettings.DEFAULT_CONFIG_DELETE_QUEUES.toString(),
AddressSettings.DEFAULT_CONFIG_DELETE_ADDRESSES.toString(),
AddressSettings.DEFAULT_ADDRESS_REJECT_THRESHOLD,
- ActiveMQDefaultConfiguration.getDefaultLastValueKey()
== null ? null :
ActiveMQDefaultConfiguration.getDefaultLastValueKey().toString(),
+
Objects.toString(ActiveMQDefaultConfiguration.getDefaultLastValueKey(), null),
ActiveMQDefaultConfiguration.getDefaultNonDestructive(),
ActiveMQDefaultConfiguration.getDefaultExclusive(),
ActiveMQDefaultConfiguration.getDefaultGroupRebalance(),
ActiveMQDefaultConfiguration.getDefaultGroupBuckets(),
-
ActiveMQDefaultConfiguration.getDefaultGroupFirstKey() == null ? null :
ActiveMQDefaultConfiguration.getDefaultGroupFirstKey().toString(),
+
Objects.toString(ActiveMQDefaultConfiguration.getDefaultGroupFirstKey(), null),
ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(),
ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(),
ActiveMQDefaultConfiguration.getDefaultConsumersBeforeDispatch(),
@@ -4373,7 +4373,7 @@ public class ActiveMQServerControlImpl extends
AbstractControl implements Active
if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.getNodeID(this.server);
}
- return server.getNodeID() == null ? null : server.getNodeID().toString();
+ return Objects.toString(server.getNodeID(), null);
}
@Override
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ConnectionRouterControlImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ConnectionRouterControlImpl.java
index b4c6ff1e52..677aa9cdd7 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ConnectionRouterControlImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ConnectionRouterControlImpl.java
@@ -38,6 +38,7 @@ import javax.management.openmbean.TabularData;
import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
import java.util.Map;
+import java.util.Objects;
public class ConnectionRouterControlImpl extends AbstractControl implements
ConnectionRouterControl {
private final ConnectionRouter connectionRouter;
@@ -68,7 +69,7 @@ public class ConnectionRouterControlImpl extends
AbstractControl implements Conn
TabularData paramsData = new
TabularDataSupport(getParametersType());
for (Map.Entry<String, Object> param :
connector.getParams().entrySet()) {
paramsData.put(new CompositeDataSupport(getParameterType(), new
String[]{"key", "value"},
- new Object[]{param.getKey(), param.getValue() == null ? null
: param.getValue().toString()}));
+ new Object[]{param.getKey(),
Objects.toString(param.getValue(), null)}));
}
connectorData = new
CompositeDataSupport(getTransportConfigurationType(),
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
index 6be75a5bc4..ad8b45a81d 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
@@ -204,7 +204,7 @@ public class QueueControlImpl extends AbstractControl
implements QueueControl {
clearIO();
try {
SimpleString user = queue.getUser();
- return user == null ? null : user.toString();
+ return Objects.toString(user, null);
} finally {
blockOnIO();
}
@@ -552,7 +552,7 @@ public class QueueControlImpl extends AbstractControl
implements QueueControl {
clearIO();
try {
- return queue.getDeadLetterAddress() == null ? null :
queue.getDeadLetterAddress().toString();
+ return Objects.toString(queue.getDeadLetterAddress(), null);
} finally {
blockOnIO();
}
@@ -567,7 +567,7 @@ public class QueueControlImpl extends AbstractControl
implements QueueControl {
clearIO();
try {
- return queue.getExpiryAddress() == null ? null :
queue.getExpiryAddress().toString();
+ return Objects.toString(queue.getExpiryAddress(), null);
} finally {
blockOnIO();
}
@@ -1158,9 +1158,7 @@ public class QueueControlImpl extends AbstractControl
implements QueueControl {
if (groupByProperty == null) {
result.compute(null, (k, v) -> v == null ? 1 : ++v);
} else {
- Object value = message.getObjectPropertyForFilter(groupByProperty);
- String valueStr = value == null ? null : value.toString();
- result.compute(valueStr, (k, v) -> v == null ? 1 : ++v);
+
result.compute(Objects.toString(message.getObjectPropertyForFilter(groupByProperty),
null), (k, v) -> v == null ? 1 : ++v);
}
}
}
@@ -2132,7 +2130,7 @@ public class QueueControlImpl extends AbstractControl
implements QueueControl {
try {
SimpleString groupFirstKey = queue.getGroupFirstKey();
- return groupFirstKey != null ? groupFirstKey.toString() : null;
+ return Objects.toString(groupFirstKey, null);
} finally {
blockOnIO();
}
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedSecuritySetting.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedSecuritySetting.java
index 12c2f0d9a8..f4002f2474 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedSecuritySetting.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedSecuritySetting.java
@@ -16,6 +16,8 @@
*/
package org.apache.activemq.artemis.core.persistence.config;
+import java.util.Objects;
+
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.journal.EncodingSupport;
@@ -100,55 +102,51 @@ public class PersistedSecuritySetting implements
EncodingSupport {
}
public String getSendRoles() {
- return stringFrom(sendRoles);
+ return Objects.toString(sendRoles, null);
}
public String getConsumeRoles() {
- return stringFrom(consumeRoles);
+ return Objects.toString(consumeRoles, null);
}
public String getCreateDurableQueueRoles() {
- return stringFrom(createDurableQueueRoles);
+ return Objects.toString(createDurableQueueRoles, null);
}
public String getDeleteDurableQueueRoles() {
- return stringFrom(deleteDurableQueueRoles);
+ return Objects.toString(deleteDurableQueueRoles, null);
}
public String getCreateNonDurableQueueRoles() {
- return stringFrom(createNonDurableQueueRoles);
+ return Objects.toString(createNonDurableQueueRoles, null);
}
public String getDeleteNonDurableQueueRoles() {
- return stringFrom(deleteNonDurableQueueRoles);
+ return Objects.toString(deleteNonDurableQueueRoles, null);
}
public String getManageRoles() {
- return stringFrom(manageRoles);
+ return Objects.toString(manageRoles, null);
}
public String getBrowseRoles() {
- return stringFrom(browseRoles);
+ return Objects.toString(browseRoles, null);
}
public String getCreateAddressRoles() {
- return stringFrom(createAddressRoles);
+ return Objects.toString(createAddressRoles, null);
}
public String getDeleteAddressRoles() {
- return stringFrom(deleteAddressRoles);
+ return Objects.toString(deleteAddressRoles, null);
}
public String getViewRoles() {
- return stringFrom(viewRoles);
+ return Objects.toString(viewRoles, null);
}
public String getEditRoles() {
- return stringFrom(editRoles);
- }
-
- private String stringFrom(SimpleString possiblyNullSimpleString) {
- return possiblyNullSimpleString != null ?
possiblyNullSimpleString.toString() : null;
+ return Objects.toString(editRoles, null);
}
@Override
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
index 5450b76df3..02d54bfb97 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
@@ -19,6 +19,7 @@ package org.apache.activemq.artemis.core.protocol;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
@@ -240,7 +241,7 @@ public class ProtocolHandler {
ProtocolManager protocolManagerToUse = protocolMap.get(protocolToUse);
if (protocolManagerToUse == null) {
-
ActiveMQServerLogger.LOGGER.failedToFindProtocolManager(ctx.channel() == null ?
null : ctx.channel().remoteAddress() == null ? null :
ctx.channel().remoteAddress().toString(), ctx.channel() == null ? null :
ctx.channel().localAddress() == null ? null :
ctx.channel().localAddress().toString(), protocolToUse,
protocolMap.keySet().toString());
+
ActiveMQServerLogger.LOGGER.failedToFindProtocolManager(ctx.channel() == null ?
null : Objects.toString(ctx.channel().remoteAddress()), ctx.channel() == null ?
null : Objects.toString(ctx.channel().localAddress(), null), protocolToUse,
protocolMap.keySet().toString());
return;
}
ConnectionCreator channelHandler =
nettyAcceptor.createConnectionCreator();
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
index f6d97677e1..c1aca76b82 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
@@ -665,7 +665,7 @@ public class ServerSessionPacketHandler implements
ChannelHandler {
// this is used to create/destroy the producer so needs
to be unique
String senderName = PRODUCER_ID_PREFIX +
UUIDGenerator.getInstance().generateUUID();
producers.put(message.getId(), senderName);
- session.addProducer(senderName,
ActiveMQClient.DEFAULT_CORE_PROTOCOL, message.getAddress() != null ?
message.getAddress().toString() : null);
+ session.addProducer(senderName,
ActiveMQClient.DEFAULT_CORE_PROTOCOL, Objects.toString(message.getAddress(),
null));
} else {
ActiveMQServerLogger.LOGGER.producerAlreadyExists(message.getId(),
session.getName(), remotingConnection.getRemoteAddress());
}
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
index fc6f272b25..64235fdd25 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
@@ -19,6 +19,7 @@ package org.apache.activemq.artemis.core.server.cluster.impl;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledExecutorService;
@@ -123,15 +124,15 @@ public class ClusterConnectionBridge extends BridgeImpl {
final StorageManager storageManager,
final String clientId) throws
ActiveMQException {
super(targetLocator, new BridgeConfiguration()
- .setName(name == null ? null : name.toString())
+ .setName(Objects.toString(name, null))
.setInitialConnectAttempts(initialConnectAttempts)
.setReconnectAttempts(reconnectAttempts)
.setReconnectAttemptsOnSameNode(0) // reconnectAttemptsOnSameNode
means nothing on the clustering bridge since we always try the same
.setRetryInterval(retryInterval)
.setRetryIntervalMultiplier(retryMultiplier)
.setMaxRetryInterval(maxRetryInterval)
- .setFilterString(filterString == null ? null :
filterString.toString())
- .setForwardingAddress(forwardingAddress == null ? null :
forwardingAddress.toString())
+ .setFilterString(Objects.toString(filterString, null))
+ .setForwardingAddress(Objects.toString(forwardingAddress, null))
.setUseDuplicateDetection(useDuplicateDetection)
.setUser(user)
.setPassword(password)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
index 5216c6221e..e21bcf3fa9 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
@@ -498,7 +498,7 @@ public final class ClusterConnectionImpl implements
ClusterConnection, AfterConn
props.putSimpleStringProperty(SimpleString.of("name"), name);
//nodeID can be null if there's only a backup
SimpleString nodeId = nodeManager.getNodeId();
- Notification notification = new Notification(nodeId == null ? null :
nodeId.toString(), CoreNotificationType.CLUSTER_CONNECTION_STOPPED, props);
+ Notification notification = new Notification(Objects.toString(nodeId,
null), CoreNotificationType.CLUSTER_CONNECTION_STOPPED, props);
managementService.sendNotification(notification);
}
executor.execute(() -> {
@@ -797,7 +797,7 @@ public final class ClusterConnectionImpl implements
ClusterConnection, AfterConn
@Override
public String getNodeID() {
- return nodeManager == null ? null : (nodeManager.getNodeId() == null ?
null : nodeManager.getNodeId().toString());
+ return nodeManager == null ? null :
(Objects.toString(nodeManager.getNodeId(), null));
}
@Override
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index 8acf1f755d..d65496d682 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -1738,7 +1738,7 @@ public class QueueImpl extends CriticalComponentImpl
implements Queue {
}
private void auditLogAck(Subject subject, String remoteAddress,
MessageReference ref, Transaction tx) {
- AuditLogger.coreAcknowledgeMessage(subject, remoteAddress,
getName().toString(), ref.getMessage().toString(), tx == null ? null :
tx.toString());
+ AuditLogger.coreAcknowledgeMessage(subject, remoteAddress,
getName().toString(), ref.getMessage().toString(), Objects.toString(tx, null));
}
@Override
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerLegacyProducersImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerLegacyProducersImpl.java
index e1ab46561a..6188186fa4 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerLegacyProducersImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerLegacyProducersImpl.java
@@ -26,6 +26,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
public class ServerLegacyProducersImpl implements ServerProducers {
@@ -38,7 +39,7 @@ public class ServerLegacyProducersImpl implements
ServerProducers {
public ServerLegacyProducersImpl(ServerSession session) {
this.sessionName = session.getName();
- this.connectionID = session.getConnectionID() != null ?
session.getConnectionID().toString() : null;
+ this.connectionID = Objects.toString(session.getConnectionID(), null);
}
@Override
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index a289c24ce9..adccaaac72 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -2036,7 +2036,7 @@ public class ServerSessionImpl implements ServerSession,
FailureListener {
}
private void auditLogSend(Message message, Transaction tx) {
- AuditLogger.coreSendMessage(remotingConnection.getSubject(),
remotingConnection.getRemoteAddress(), message.toString(), routingContext, tx
== null ? null : tx.toString());
+ AuditLogger.coreSendMessage(remotingConnection.getSubject(),
remotingConnection.getRemoteAddress(), message.toString(), routingContext,
Objects.toString(tx, null));
}
@Override
@@ -2520,7 +2520,7 @@ public class ServerSessionImpl implements ServerSession,
FailureListener {
public void addProducer(String name, String protocol, String address) {
ServerProducer producer = new ServerProducerImpl(name, protocol,
Objects.requireNonNullElse(address, ServerProducer.ANONYMOUS));
producer.setSessionID(getName());
- producer.setConnectionID(getConnectionID() != null ?
getConnectionID().toString() : null);
+ producer.setConnectionID(Objects.toString(getConnectionID(), null));
serverProducers.put(name, producer);
}
@@ -2536,7 +2536,7 @@ public class ServerSessionImpl implements ServerSession,
FailureListener {
@Override
public String getDefaultAddress() {
- return defaultAddress != null ? defaultAddress.toString() : null;
+ return Objects.toString(defaultAddress, null);
}
@Override
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerStatus.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerStatus.java
index e8470bd52f..306cf7f118 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerStatus.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerStatus.java
@@ -19,6 +19,7 @@ package org.apache.activemq.artemis.core.server.impl;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.apache.activemq.artemis.api.core.JsonUtil;
import org.apache.activemq.artemis.api.core.SimpleString;
@@ -76,7 +77,7 @@ public class ServerStatus {
snapshotOfServerStatusAttributes.putAll(immutableStateValues);
snapshotOfServerStatusAttributes.put("identity",
server.getIdentity());
SimpleString nodeId = server.getNodeID();
- snapshotOfServerStatusAttributes.put("nodeId", nodeId == null ? null
: nodeId.toString());
+ snapshotOfServerStatusAttributes.put("nodeId",
Objects.toString(nodeId, null));
snapshotOfServerStatusAttributes.put("uptime", server.getUptime());
snapshotOfServerStatusAttributes.put("state",
server.getState().toString());
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/quorum/ActivationSequenceStateMachine.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/quorum/ActivationSequenceStateMachine.java
index 09375291c3..e4defff4fd 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/quorum/ActivationSequenceStateMachine.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/quorum/ActivationSequenceStateMachine.java
@@ -63,8 +63,8 @@ public final class ActivationSequenceStateMachine {
Objects.requireNonNull(nodeManager);
Objects.requireNonNull(distributedManager);
Objects.requireNonNull(logger);
- final String nodeId = nodeManager.getNodeId() == null ? null :
nodeManager.getNodeId().toString();
- Objects.requireNonNull(nodeId);
+ Objects.requireNonNull(nodeManager.getNodeId());
+ final String nodeId = nodeManager.getNodeId().toString();
final long nodeActivationSequence =
nodeManager.getNodeActivationSequence();
if (nodeActivationSequence < 0) {
throw new IllegalArgumentException("nodeActivationSequence must be >
0");
@@ -267,7 +267,7 @@ public final class ActivationSequenceStateMachine {
Objects.requireNonNull(nodeManager);
Objects.requireNonNull(distributedManager);
Objects.requireNonNull(logger);
- final String lockAndLongId = nodeManager.getNodeId() == null ? null :
nodeManager.getNodeId().toString();
+ final String lockAndLongId = Objects.toString(nodeManager.getNodeId(),
null);
Objects.requireNonNull(lockAndLongId);
final long nodeActivationSequence =
nodeManager.getNodeActivationSequence();
if (nodeActivationSequence < 0) {
diff --git
a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
index 9d6578bf47..aad5279de8 100644
---
a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
+++
b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
@@ -415,7 +415,7 @@ public class ActiveMQConnectionFactory extends
JNDIBaseStorable implements Conne
System.out.println("vm uri: " + vmBrokerUri);
if (vmBrokerUri != null)
return vmBrokerUri.toString();
- return brokerURL == null ? null : brokerURL.toString();
+ return Objects.toString(brokerURL, null);
}
public void setBrokerURL(String brokerURL) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
